bad571604fa9c779bfbbf258fe96296fb89a162e angie Wed Aug 21 14:21:23 2013 -0700 If a non-standard $SSL_DIR has been specified, add the necessary lib and inc settings. diff --git src/inc/common.mk src/inc/common.mk index 52b165a..3b5443e 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -33,30 +33,34 @@ ifeq (${USE_HAL},) USE_HAL=1 endif endif endif ifeq (${USE_HAL},1) L+=${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 L+=-lssl -lcrypto 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 endif