mirror of
https://github.com/nmap/nmap.git
synced 2026-01-20 05:09:02 +00:00
A small change in ordering in the configure script. We'll now test for inline and '' _after_ the host type testing. is tested for when doing the inline stuff, but doesn't seem to be set until (or can be reset during) the host type testing.
This commit is contained in:
kris
154
configure
vendored
154
configure
vendored
@@ -3163,83 +3163,6 @@ fi
|
||||
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for inline" >&5
|
||||
echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_c_inline+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_c_inline=no
|
||||
for ac_kw in inline __inline__ __inline; do
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#ifndef __cplusplus
|
||||
typedef int foo_t;
|
||||
static $ac_kw foo_t static_foo () {return 0; }
|
||||
$ac_kw foo_t foo () {return 0; }
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
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_compile") 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_objext; then
|
||||
ac_cv_c_inline=$ac_kw
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
test "$ac_cv_c_inline" != no && break
|
||||
done
|
||||
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
|
||||
echo "${ECHO_T}$ac_cv_c_inline" >&6; }
|
||||
|
||||
|
||||
case $ac_cv_c_inline in
|
||||
inline | yes) ;;
|
||||
*)
|
||||
case $ac_cv_c_inline in
|
||||
no) ac_val=;;
|
||||
*) ac_val=$ac_cv_c_inline;;
|
||||
esac
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#ifndef __cplusplus
|
||||
#define inline $ac_val
|
||||
#endif
|
||||
_ACEOF
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -n "$sgi_cc"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define inline
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
@@ -3406,6 +3329,7 @@ _ACEOF
|
||||
# To link with libnet and NM (/usr/lib/libnm.sl) library
|
||||
# on HP-UX 11.11 (other versions?) Mikhail Zakharov (zmey20000@yahoo.com)
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for open_mib in -lnm" >&5
|
||||
echo $ECHO_N "checking for open_mib in -lnm... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_nm_open_mib+set}" = set; then
|
||||
@@ -3593,6 +3517,82 @@ _ACEOF
|
||||
;;
|
||||
esac
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for inline" >&5
|
||||
echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_c_inline+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_c_inline=no
|
||||
for ac_kw in inline __inline__ __inline; do
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#ifndef __cplusplus
|
||||
typedef int foo_t;
|
||||
static $ac_kw foo_t static_foo () {return 0; }
|
||||
$ac_kw foo_t foo () {return 0; }
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
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_compile") 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_objext; then
|
||||
ac_cv_c_inline=$ac_kw
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
test "$ac_cv_c_inline" != no && break
|
||||
done
|
||||
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
|
||||
echo "${ECHO_T}$ac_cv_c_inline" >&6; }
|
||||
|
||||
|
||||
case $ac_cv_c_inline in
|
||||
inline | yes) ;;
|
||||
*)
|
||||
case $ac_cv_c_inline in
|
||||
no) ac_val=;;
|
||||
*) ac_val=$ac_cv_c_inline;;
|
||||
esac
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#ifndef __cplusplus
|
||||
#define inline $ac_val
|
||||
#endif
|
||||
_ACEOF
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -n "$sgi_cc"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define inline
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
|
||||
12
configure.ac
12
configure.ac
@@ -100,12 +100,6 @@ dnl AC_MSG_CHECKING(for const)
|
||||
dnl AC_TRY_COMPILE(, [const int foo = 0;],
|
||||
dnl [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)])
|
||||
|
||||
dnl equiv to '#define inline' to 'inline', '__inline__', '__inline' or ''
|
||||
AC_C_INLINE
|
||||
if test -n "$sgi_cc"; then
|
||||
AC_DEFINE(inline, )
|
||||
fi
|
||||
|
||||
AC_SUBST(COMPAT_OBJS)
|
||||
AC_SUBST(COMPAT_SRCS)
|
||||
|
||||
@@ -197,6 +191,12 @@ case "$host" in
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl equiv to '#define inline' to 'inline', '__inline__', '__inline' or ''
|
||||
AC_C_INLINE
|
||||
if test -n "$sgi_cc"; then
|
||||
AC_DEFINE(inline, )
|
||||
fi
|
||||
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS(string.h getopt.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h sys/stat.h fcntl.h termios.h pwd.h unistd.h )
|
||||
|
||||
Reference in New Issue
Block a user