mirror of
https://github.com/nmap/nmap.git
synced 2025-12-23 16:09:02 +00:00
Changed configure.ac to check for -ldl in more circumstances, regenerated configure in nmap and nmap/nsock/src
This commit is contained in:
27
configure
vendored
27
configure
vendored
@@ -7886,19 +7886,8 @@ if test "${with_liblua+set}" = set; then
|
||||
fi
|
||||
|
||||
|
||||
# They don't want lua
|
||||
if test "$no_lua" = "yes"; then
|
||||
CPPFLAGS="-DNOLUA $CPPFLAGS"
|
||||
LIBLUA_LIBS=""
|
||||
LUA_DEPENDS=""
|
||||
LUA_BUILD=""
|
||||
LUA_CLEAN=""
|
||||
LUA_DIST_CLEAN=""
|
||||
INSTALLNSE=""
|
||||
|
||||
else
|
||||
# NSE C modules are loaded with dlopen.
|
||||
{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
|
||||
# OpenSSL and NSE C modules can require dlopen
|
||||
{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
|
||||
$as_echo_n "checking for library containing dlopen... " >&6; }
|
||||
if test "${ac_cv_search_dlopen+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
@@ -7986,6 +7975,18 @@ if test "$ac_res" != no; then
|
||||
fi
|
||||
|
||||
|
||||
# They don't want lua
|
||||
if test "$no_lua" = "yes"; then
|
||||
CPPFLAGS="-DNOLUA $CPPFLAGS"
|
||||
LIBLUA_LIBS=""
|
||||
LUA_DEPENDS=""
|
||||
LUA_BUILD=""
|
||||
LUA_CLEAN=""
|
||||
LUA_DIST_CLEAN=""
|
||||
INSTALLNSE=""
|
||||
|
||||
else
|
||||
|
||||
# If they didn't specify it, we try to find it
|
||||
if test $have_lua != yes; then
|
||||
|
||||
|
||||
@@ -562,6 +562,9 @@ AC_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
|
||||
esac]
|
||||
)
|
||||
|
||||
# OpenSSL and NSE C modules can require dlopen
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
|
||||
# They don't want lua
|
||||
if test "$no_lua" = "yes"; then
|
||||
CPPFLAGS="-DNOLUA $CPPFLAGS"
|
||||
@@ -573,8 +576,6 @@ if test "$no_lua" = "yes"; then
|
||||
INSTALLNSE=""
|
||||
|
||||
else
|
||||
# NSE C modules are loaded with dlopen.
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
|
||||
# If they didn't specify it, we try to find it
|
||||
if test $have_lua != yes; then
|
||||
|
||||
Reference in New Issue
Block a user