PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-11 07:56:35 +00:00
Code Issues Projects Releases Wiki Activity

Keep -lssl and friends out of LIBS for Ncat, allows overriding with static libs

Browse Source
This commit is contained in:
dmiller
2015-03-07 05:37:40 +00:00
parent 564f654747
commit f934e350a8
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ncat/configure vendored
View File

@@ -4672,12 +4672,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_int_ctrl" >&5
$as_echo "$ac_cv_lib_crypto_BIO_int_ctrl" >&6; }
if test "x$ac_cv_lib_crypto_BIO_int_ctrl" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
LIBS="-lcrypto $LIBS"
use_openssl="yes"
else
use_openssl="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find libcrypto so OpenSSL will not be used.
@@ -4726,12 +4721,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSSL 1
_ACEOF
LIBS="-lssl $LIBS"
use_openssl="yes"
else
use_openssl="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find libssl so OpenSSL will not be used.

6
ncat/configure.ac
View File

@@ -86,7 +86,7 @@ if test "$use_openssl" = "yes" -a -z "$specialssldir" ; then
if test "$use_openssl" = "yes"; then
AC_CHECK_LIB(crypto, BIO_int_ctrl,
[],
[ use_openssl="yes"],
[ use_openssl="no"
AC_MSG_WARN([Failed to find libcrypto so OpenSSL will not be used.
If it is installed you can try the --with-openssl=DIR argument]) ])
@@ -94,7 +94,7 @@ if test "$use_openssl" = "yes" -a -z "$specialssldir" ; then
if test "$use_openssl" = "yes"; then
AC_CHECK_LIB(ssl, SSL_new,
[],
[ use_openssl="yes"],
[ use_openssl="no"
AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used.
If it is installed you can try the --with-openssl=DIR argument]) ])
@@ -111,7 +111,7 @@ if test "$use_openssl" = "yes"; then
AC_SUBST(HAVE_OPENSSL)
fi
AC_SUBST(OPENSSL_LIBS)
AC_SUBST(OPENSSL_LIBS)
libpcapdir=../libpcap
AC_SUBST(libpcapdir)