configure: Apply autoupdate 2.69. [skip appveyor]

Among other things this squelches many warnings from Autoconf 2.71.

diff --git a/configure b/configure
index b9693dec69bb0602f587f25881ea81ab1615141c..26de4db603c67c34a8365de82444cf52321903db 100755 (executable)
--- a/configure
+++ b/configure
@@ -4308,6 +4308,7 @@ int main()
   exit(0);
 }
 
+
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
@@ -6160,6 +6161,7 @@ else
                        exit(0);
                }
 
+
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_buggy_ether_ntohost=no
@@ -6560,6 +6562,7 @@ main ()
   ;
   return 0;
 }
+
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_lbl_cv_pcap_version_defined=yes
@@ -6653,6 +6656,7 @@ main ()
   ;
   return 0;
 }
+
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_lbl_cv_pcap_debug_defined=yes
@@ -6689,6 +6693,7 @@ main ()
   ;
   return 0;
 }
+
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_lbl_cv_yydebug_defined=yes
@@ -8423,7 +8428,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_commands="$ac_config_commands default-1"
+ac_config_commands="$ac_config_commands .devel"
 
 ac_config_files="$ac_config_files Makefile tcpdump.1"
 
@@ -9127,7 +9132,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    ".devel") CONFIG_COMMANDS="$CONFIG_COMMANDS .devel" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "tcpdump.1") CONFIG_FILES="$CONFIG_FILES tcpdump.1" ;;
 
@@ -9685,7 +9690,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "default-1":C) if test -f .devel; then
+    ".devel":C) if test -f .devel; then
        echo timestamp > stamp-h
        cat $srcdir/Makefile-devel-adds >> Makefile
        make depend || exit 1

diff --git a/configure.ac b/configure.ac
index 7934a1b2276eaa4a1571fb0b81571c790e6ac4a1..c71083de51900b94ca71e8ea5a59e8fb0b37de1d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,8 @@ dnl
 # config.sub.
 #
 
-AC_PREREQ(2.69)
-AC_INIT(tcpdump, m4_esyscmd_s([cat VERSION]))
+AC_PREREQ([2.69])
+AC_INIT([tcpdump],[m4_esyscmd_s(cat VERSION)])
 AC_CONFIG_SRCDIR(tcpdump.c)
 
 AC_CANONICAL_HOST
@@ -84,8 +84,7 @@ if test "x$with_smi" != "xno" ; then
                        AC_MSG_CHECKING([whether to enable libsmi])
                        savedlibs="$LIBS"
                        LIBS="-lsmi $LIBS"
-                       AC_TRY_RUN(
-                               [
+                       AC_RUN_IFELSE([AC_LANG_SOURCE([[
 /* libsmi available check */
 #include <stdio.h>
 #include <stdlib.h>
@@ -106,6 +105,7 @@ int main()
     exit(4);
   exit(0);
 }
+                               ]])
                                ],
                                [
                                        AC_MSG_RESULT(yes)
@@ -475,7 +475,7 @@ AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
 #
 AC_CHECK_FUNCS(ether_ntohost, [
     AC_CACHE_CHECK(for buggy ether_ntohost, ac_cv_buggy_ether_ntohost, [
-       AC_TRY_RUN([
+       AC_RUN_IFELSE([AC_LANG_SOURCE([[
                #include <netdb.h>
                #include <netinet/ether.h>
                #include <stdlib.h>
@@ -492,6 +492,7 @@ AC_CHECK_FUNCS(ether_ntohost, [
                        ether_ntohost(name, (struct ether_addr *)ea);
                        exit(0);
                }
+       ]])
        ], [ac_cv_buggy_ether_ntohost=no],
           [ac_cv_buggy_ether_ntohost=yes],
           [ac_cv_buggy_ether_ntohost="not while cross-compiling"])])
@@ -741,14 +742,14 @@ fi
 AC_CHECK_FUNCS(pcap_dump_flush pcap_lib_version)
 if test $ac_cv_func_pcap_lib_version = "no" ; then
     AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
-    AC_TRY_LINK([],
-       [
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
        extern char pcap_version[];
 
        return (int)pcap_version;
+       ]])
        ],
-       ac_lbl_cv_pcap_version_defined=yes,
-       ac_lbl_cv_pcap_version_defined=no)
+       [ac_lbl_cv_pcap_version_defined=yes],
+       [ac_lbl_cv_pcap_version_defined=no])
     if test "$ac_lbl_cv_pcap_version_defined" = yes ; then
        AC_MSG_RESULT(yes)
        AC_DEFINE(HAVE_PCAP_VERSION, 1, [define if libpcap has pcap_version])
@@ -770,14 +771,14 @@ if test "$ac_cv_func_pcap_set_parser_debug" = "no" ; then
        # filter expression parser debug flag; can we directly set the
        # flag?
        AC_MSG_CHECKING(whether pcap_debug is defined by libpcap)
-       AC_TRY_LINK([],
-          [
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
                extern int pcap_debug;
 
                return pcap_debug;
+          ]])
           ],
-          ac_lbl_cv_pcap_debug_defined=yes,
-          ac_lbl_cv_pcap_debug_defined=no)
+          [ac_lbl_cv_pcap_debug_defined=yes],
+          [ac_lbl_cv_pcap_debug_defined=no])
        if test "$ac_lbl_cv_pcap_debug_defined" = yes ; then
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_PCAP_DEBUG, 1, [define if libpcap has pcap_debug])
@@ -787,14 +788,14 @@ if test "$ac_cv_func_pcap_set_parser_debug" = "no" ; then
                # OK, what about "yydebug"?
                #
                AC_MSG_CHECKING(whether yydebug is defined by libpcap)
-               AC_TRY_LINK([],
-                  [
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
                        extern int yydebug;
 
                        return yydebug;
+                  ]])
                   ],
-                  ac_lbl_cv_yydebug_defined=yes,
-                  ac_lbl_cv_yydebug_defined=no)
+                  [ac_lbl_cv_yydebug_defined=yes],
+                  [ac_lbl_cv_yydebug_defined=no])
                if test "$ac_lbl_cv_yydebug_defined" = yes ; then
                        AC_MSG_RESULT(yes)
                        AC_DEFINE(HAVE_YYDEBUG, 1, [define if libpcap has yydebug])
@@ -1045,10 +1046,11 @@ AC_PROG_INSTALL
 
 AC_CONFIG_HEADER(config.h)
 
-AC_OUTPUT_COMMANDS([if test -f .devel; then
+AC_CONFIG_COMMANDS([.devel],[[if test -f .devel; then
        echo timestamp > stamp-h
        cat $srcdir/Makefile-devel-adds >> Makefile
        make depend || exit 1
-fi])
-AC_OUTPUT(Makefile tcpdump.1)
+fi]],[[]])
+AC_CONFIG_FILES([Makefile tcpdump.1])
+AC_OUTPUT
 exit 0