When testing whether "inline" works, use the V_CCOPT flags, because some

of those might disable inlining; otherwise, the test for inlining will
succeed, but inlining won't work with the options we're using when
compiling.

diff --git a/aclocal.m4 b/aclocal.m4
index a904943d83f842ac01f2fbba6689dc5e9ae7331f..d500140e7833b742fe7f7db2803e3a3bc72b9268 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/aclocal.m4,v 1.84 2005-03-26 23:57:42 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/aclocal.m4,v 1.85 2005-03-27 03:27:09 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl    The Regents of the University of California.  All rights reserved.
@@ -166,8 +166,13 @@ AC_DEFUN(AC_LBL_C_INIT,
 # at least some versions of HP's C compiler can inline that, but can't
 # inline a function that returns a struct pointer.
 #
+# Make sure we use the V_CCOPT flags, because some of those might
+# disable inlining.
+#
 AC_DEFUN(AC_LBL_C_INLINE,
     [AC_MSG_CHECKING(for inline)
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$V_CCOPT"
     AC_CACHE_VAL(ac_cv_lbl_inline, [
        ac_cv_lbl_inline=""
        ac_lbl_cc_inline=no
@@ -195,6 +200,7 @@ AC_DEFUN(AC_LBL_C_INLINE,
        if test "$ac_lbl_cc_inline" = yes ; then
            ac_cv_lbl_inline=$ac_lbl_inline
        fi])
+    CFLAGS="$save_CFLAGS"
     if test ! -z "$ac_cv_lbl_inline" ; then
        AC_MSG_RESULT($ac_cv_lbl_inline)
     else

diff --git a/configure b/configure
index 7771dd0e56791f632699c9f58ab2c3c59f71471e..c460462c76ca5717bec44d2f71ae1e2b66af35ab 100755 (executable)
--- a/configure
+++ b/configure
@@ -2536,6 +2536,8 @@ _ACEOF
 
 echo "$as_me:$LINENO: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$V_CCOPT"
     if test "${ac_cv_lbl_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2601,6 +2603,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        fi
 fi
 
+    CFLAGS="$save_CFLAGS"
     if test ! -z "$ac_cv_lbl_inline" ; then
        echo "$as_me:$LINENO: result: $ac_cv_lbl_inline" >&5
 echo "${ECHO_T}$ac_cv_lbl_inline" >&6