32de817ec809cc4edf2598e03c0a1c3f202d984c hiram Sat Feb 9 14:07:30 2019 -0800 new library locations for libssl and libcrypto on Mac OSX Mojave no redmine diff --git src/inc/common.mk src/inc/common.mk index 276f61b..aee647d 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -71,34 +71,43 @@ # 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),) + L+=/opt/local/lib/libssl.a + else ifneq ($(wildcard /usr/lib/x86_64-linux-gnu/libssl.a),) - L+=/usr/lib/x86_64-linux-gnu/libssl.a -lcrypto + L+=/usr/lib/x86_64-linux-gnu/libssl.a + else + L+=-lssl + endif + endif + ifneq (@(wildcard /opt/local/lib/libcrypto.a),) + L+=/opt/local/lib/libcrypto.a else - L+=-lssl -lcrypto + L+=-lcrypto endif endif # autodetect where libm is installed ifeq (${MLIB},) ifneq ($(wildcard /usr/lib64/libm.a),) MLIB=-lm endif endif ifeq (${MLIB},) MLIB=-lm endif # autodetect where png is installed ifeq (${PNGLIB},)