823025651ec0baffef2fc7037f3b478d62dd4052 jcasper Thu Mar 26 14:28:25 2020 -0700 Fixing libs build for machines without C++ libs; added USE_HIC option to makes, refs #24414 diff --git src/inc/common.mk src/inc/common.mk index 256ed5a..1183f83 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -70,30 +70,37 @@ 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 -lstdc++ HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/inc endif # on hgwdev, include HAL by defaults ifeq (${IS_HGWDEV},yes) L+=${HALLIBS} endif +ifeq (${USE_HIC},) + USE_HIC=1 +endif + +ifeq (${USE_HIC},1) + HG_DEFS+=-DUSE_HIC +endif # libssl: disabled by default ifneq (${SSL_DIR}, "/usr/include/openssl") ifneq ($(UNAME_S),Darwin) ifneq ($(wildcard ${SSL_DIR}),) L+=-L${SSL_DIR}/lib endif endif HG_INC+=-I${SSL_DIR}/include endif # on hgwdev, already using the static library with mysqllient. ifeq (${IS_HGWDEV},yes) L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 -lk5crypto -ldl else ifneq ($(wildcard /opt/local/lib/libssl.a),)