7a5753a34884beb7be87f70866a87c83d36dfac4 hiram Wed Nov 6 14:47:28 2013 -0800 trying different order for crypto ssl mysql static libs refs @12005 diff --git src/inc/common.mk src/inc/common.mk index d14496e..a56eeeb 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -43,33 +43,31 @@ ifeq (${USE_HAL},1) HALLIBS=${HALDIR}/hal/lib/halMaf.a ${HALDIR}/hal/lib/halChain.a ${HALDIR}/hal/lib/halMaf.a ${HALDIR}/hal/lib/halLiftover.a ${HALDIR}/hal/lib/halLod.a ${HALDIR}/hal/lib/halLib.a ${HALDIR}/sonLib/lib/sonLib.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5_cpp.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5_hl.a HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/hal/chain/inc/ endif # libssl: disabled by default ifeq (${USE_SSL},1) ifneq (${SSL_DIR}, "/usr/include/openssl") L+=-L${SSL_DIR}/lib HG_INC+=-I${SSL_DIR}/include endif # on hgwdev, already using the static library with mysqllient. - ifeq (${FULLWARN},hgwdev) - L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 - else + ifneq (${FULLWARN},hgwdev) L+=-lssl -lcrypto endif HG_DEFS+=-DUSE_SSL endif # autodetect where png is installed ifeq (${PNGLIB},) ifneq ($(wildcard /usr/lib64/libpng.a),) PNGLIB=/usr/lib64/libpng.a endif endif ifeq (${PNGLIB},) ifneq ($(wildcard /usr/lib/libpng.a),) PNGLIB=/usr/lib/libpng.a endif @@ -82,31 +80,31 @@ ifeq (${PNGLIB},) PNGLIB=-lpng endif ifeq (${PNGINCL},) ifneq ($(wildcard /opt/local/include/png.h),) PNGINCL=-I/opt/local/include endif endif # autodetect where mysql includes and libraries are installed # do not need to do this during 'clean' target (this is very slow for 'clean') ifneq ($(MAKECMDGOALS),clean) # on hgwdev, use the static library. ifeq (${FULLWARN},hgwdev) MYSQLINC=/usr/include/mysql - MYSQLLIBS=/usr/lib64/mysql/libmysqlclient.a + MYSQLLIBS=/usr/lib64/libssl.a /usr/lib64/libcrypto.a /usr/lib64/mysql/libmysqlclient.a -lkrb5 endif # this does *not* work on Mac OSX with the dynamic libraries ifneq ($(UNAME_S),Darwin) ifeq (${MYSQLINC},) MYSQLINC := $(shell mysql_config --include | sed -e 's/-I//' || true) # $(info using mysql_config to set MYSQLINC: ${MYSQLINC}) endif ifeq (${MYSQLLIBS},) MYSQLLIBS := $(shell mysql_config --libs || true) # $(info using mysql_config to set MYSQLLIBS: ${MYSQLLIBS}) endif endif ifeq (${MYSQLINC},) ifneq ($(wildcard /usr/local/mysql/include/mysql.h),)