d9719e1d52b657fec9bf6676c85a4d2458fd7e89 galt Thu Apr 27 15:54:31 2017 -0700 Remove optional compile switch USE_SSL so that openssl is now an official kent repo dependency. Also using openssl sha1 in hgTracks multiregion. refs #17358. diff --git src/inc/common.mk src/inc/common.mk index b701703..43d506f 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -24,70 +24,61 @@ # to check for builds on hgwdev FULLWARN = $(shell uname -n) #global external libraries L=$(kentSrc)/htslib/libhts.a # pthreads is required ifneq ($(UNAME_S),Darwin) L+=-pthread endif # autodetect if openssl is installed ifeq (${SSLDIR},) SSLDIR = /usr/include/openssl endif -ifeq (${USE_SSL},) - ifneq ($(wildcard ${SSLDIR}),) - USE_SSL=1 - endif -endif - # autodetect UCSC installation of hal: ifeq (${HALDIR},) HALDIR = /hive/groups/browser/hal/halRelease ifneq ($(wildcard ${HALDIR}),) ifeq (${USE_HAL},) USE_HAL=1 endif endif endif ifeq (${USE_HAL},1) HALLIBS=${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halChain.a ${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halLiftover.a ${HALDIR}/lib/halLod.a ${HALDIR}/lib/halLib.a ${HALDIR}/lib/sonLib.a ${HALDIR}/lib/libhdf5_cpp.a ${HALDIR}/lib/libhdf5.a ${HALDIR}/lib/libhdf5_hl.a HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/inc endif # libssl: disabled by default -ifeq (${USE_SSL},1) ifneq (${SSL_DIR}, "/usr/include/openssl") ifneq ($(UNAME_S),Darwin) L+=-L${SSL_DIR}/lib endif 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 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 endif ifeq (${PNGLIB},) ifneq ($(wildcard /opt/local/lib/libpng.a),) PNGLIB=/opt/local/lib/libpng.a