b3210d4c667f79214ceeec1b5248072b47a98065 hiram Mon Aug 13 10:31:01 2018 -0700 dynamic linking on libcrypto and libm refs #21876 diff --git src/inc/common.mk src/inc/common.mk index 26f0bc2..39cacd9 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -69,39 +69,39 @@ HG_INC+=-I${HALDIR}/inc 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 + L+=-lssl -lcrypto -lkrb5 -ldl else L+=-lssl -lcrypto endif # autodetect where libm is installed ifeq (${MLIB},) ifneq ($(wildcard /usr/lib64/libm.a),) - MLIB=/usr/lib64/libm.a + MLIB=-lm endif endif ifeq (${MLIB},) MLIB=-lm 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