3ca7d9256d1540e9a08df8da2d6806e2a93d986f hiram Wed Nov 6 15:07:28 2013 -0800 need duplicate entries for ssl and crypto static libs refs #12005 diff --git src/inc/common.mk src/inc/common.mk index a56eeeb..788ce1f 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -43,31 +43,33 @@ 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. - ifneq (${FULLWARN},hgwdev) + ifeq (${FULLWARN},hgwdev) + L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 + else 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