a871526a760460048f8fd6e622cdf49ce1107fe6 hiram Tue Oct 29 15:42:28 2013 -0700 eliminate bogus debugging sslx and cryptox libraries refs #11899 diff --git src/inc/common.mk src/inc/common.mk index 5031978..71bd68f 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -46,31 +46,31 @@ 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 # on hgwdev, already using the static library with mysqllient. ifeq (${FULLWARN},hgwdev) L+=/cluster/home/hiram/kent/src/lib/x86_64/libssl.a /cluster/home/hiram/kent/src/lib/x86_64/libcrypto.a -lkrb5 else - L+=-lsslx -lcryptox + 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