mirror of
https://github.com/nmap/nmap.git
synced 2026-01-26 08:09:07 +00:00
Don't link explicitly with liblua in nselib-bin. This was never really correct
and it doesn't work on x86_64.
This commit is contained in:
75
nselib-bin/configure
vendored
75
nselib-bin/configure
vendored
@@ -18389,79 +18389,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||
|
||||
|
||||
|
||||
# liblua appears to need libm.
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for pow in -lm" >&5
|
||||
echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_m_pow+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lm $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char pow ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return pow ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_lib_m_pow=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_m_pow=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
|
||||
if test $ac_cv_lib_m_pow = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBM 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-lm $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Don't bother with --without-liblua because this directory isn't even
|
||||
# configured if that's the case.
|
||||
|
||||
@@ -18688,8 +18615,6 @@ if test "x$with_liblua" != "x"; then
|
||||
LDFLAGS="-L$with_liblua $LDFLAGS"
|
||||
fi
|
||||
|
||||
LIBS="-llua $LIBS"
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
|
||||
@@ -14,9 +14,6 @@ AC_SUBST([LIBTOOL_DEPS])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
# liblua appears to need libm.
|
||||
AC_CHECK_LIB([m], [pow])
|
||||
|
||||
# Don't bother with --without-liblua because this directory isn't even
|
||||
# configured if that's the case.
|
||||
AC_ARG_WITH([liblua],
|
||||
@@ -49,7 +46,5 @@ if test "x$with_liblua" != "x"; then
|
||||
LDFLAGS="-L$with_liblua $LDFLAGS"
|
||||
fi
|
||||
|
||||
LIBS="-llua $LIBS"
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
Reference in New Issue
Block a user