mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 04:31:29 +00:00
Compare commits
2 Commits
9bd68008df
...
cca10689fe
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cca10689fe | ||
|
|
9e0479b618 |
10
configure.ac
10
configure.ac
@@ -482,6 +482,7 @@ if test $have_libpcap = yes; then
|
||||
fi
|
||||
|
||||
if test $have_libpcap != yes; then
|
||||
ac_configure_args="$ac_configure_args '--disable-dbus'"
|
||||
AC_CONFIG_SUBDIRS(libpcap)
|
||||
if test "${LIBPCAP_INC+set}" = "set"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC"
|
||||
@@ -845,7 +846,6 @@ else
|
||||
AC_SEARCH_LIBS(lua_isyieldable, [lua5.4 lua54 lua], [have_lua=yes],, [-lm])
|
||||
AC_LANG_PUSH(C)
|
||||
# We need Lua 5.4 exactly
|
||||
AC_MSG_CHECKING([for lua version == 504])
|
||||
AC_PREPROC_IFELSE([ AC_LANG_PROGRAM( [[
|
||||
#ifdef HAVE_LUA5_4_LUA_H
|
||||
#include <lua5.4/lua.h>
|
||||
@@ -864,6 +864,8 @@ else
|
||||
[[if(LUA_VERSION_NUM != 504) return 1;]])
|
||||
],
|
||||
[have_lua=yes], [have_lua=no])
|
||||
AC_MSG_CHECKING([for lua version == 504])
|
||||
AC_MSG_RESULT([$have_lua])
|
||||
AC_LANG_POP(C)
|
||||
|
||||
LUA_BUILD=""
|
||||
@@ -872,8 +874,9 @@ else
|
||||
fi
|
||||
|
||||
# if we didn't find we use our own
|
||||
AC_MSG_CHECKING([whether lua was found])
|
||||
if test $have_lua != yes; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_RESULT([no, will use our own])
|
||||
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
|
||||
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_BUILD="build-lua"
|
||||
@@ -938,8 +941,9 @@ if test $have_liblinear != yes; then
|
||||
fi
|
||||
|
||||
# if we didn't find we use our own
|
||||
AC_MSG_CHECKING([whether liblinear was found])
|
||||
if test $have_liblinear != yes; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_RESULT([no, will use our own])
|
||||
CPPFLAGS="-I\$(top_srcdir)/$LIBLINEARDIR $CPPFLAGS"
|
||||
LIBLINEAR_LIBS="\$(top_srcdir)/$LIBLINEARDIR/liblinear.a"
|
||||
LIBLINEAR_BUILD="build-liblinear"
|
||||
|
||||
@@ -263,7 +263,6 @@ else
|
||||
AC_CHECK_HEADERS([lua5.4/lua.h lua/5.4/lua.h lua.h lua/lua.h], [break])
|
||||
AC_SEARCH_LIBS(lua_isyieldable, [lua5.4 lua54 lua], [have_lua=yes],, [-lm])
|
||||
AC_LANG_PUSH(C)
|
||||
AC_MSG_CHECKING([for lua version >= 504])
|
||||
AC_PREPROC_IFELSE([ AC_LANG_PROGRAM(
|
||||
[[
|
||||
#ifdef HAVE_LUA5_4_LUA_H
|
||||
@@ -282,6 +281,8 @@ else
|
||||
]],
|
||||
[[if(LUA_VERSION_NUM < 504) return 1;]])],
|
||||
[have_lua=yes], [have_lua=no])
|
||||
AC_MSG_CHECKING([for lua version >= 504])
|
||||
AC_MSG_RESULT([$have_lua])
|
||||
AC_LANG_POP(C)
|
||||
|
||||
LUA_DEPENDS=""
|
||||
@@ -291,8 +292,9 @@ else
|
||||
fi
|
||||
|
||||
# if we didn't find we use our own
|
||||
AC_MSG_CHECKING([whether lua was found])
|
||||
if test $have_lua != yes; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_RESULT([no, will use our own])
|
||||
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
|
||||
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
|
||||
|
||||
Reference in New Issue
Block a user