Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / configure.ac

diff --git a/configure.ac b/configure.ac
index 98195d597838adb78c8816c8158fce5b9cc5898a..0278e7c5cd77a564c464040430d97b3afbdd7caf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,8 @@ dnl
 # config.sub.
 #
 
 # config.sub.
 #
 

-AC_PREREQ(2.64)
-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
 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_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>
 /* libsmi available check */
 #include <stdio.h>
 #include <stdlib.h>


@@ -106,6 +105,7 @@ int main()
     exit(4);
   exit(0);
 }
     exit(4);
   exit(0);
 }

+                               ]])

                                ],
                                [
                                        AC_MSG_RESULT(yes)
                                ],
                                [
                                        AC_MSG_RESULT(yes)


@@ -407,7 +407,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
 fi
 
 AC_REPLACE_FUNCS(strlcat strlcpy strdup strsep getservent getopt_long)
 fi
 
 AC_REPLACE_FUNCS(strlcat strlcpy strdup strsep getservent getopt_long)

-AC_CHECK_FUNCS(fork vfork strftime)
+AC_CHECK_FUNCS(fork vfork)

 AC_CHECK_FUNCS(setlinebuf)
 
 #
 AC_CHECK_FUNCS(setlinebuf)
 
 #


@@ -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_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>
                #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);
                }
                        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"])])
        ], [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_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;
        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])
     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)
        # 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;
                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])
        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)
                # 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;
                        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])
                if test "$ac_lbl_cv_yydebug_defined" = yes ; then
                        AC_MSG_RESULT(yes)
                        AC_DEFINE(HAVE_YYDEBUG, 1, [define if libpcap has yydebug])


@@ -1043,12 +1044,13 @@ AC_SUBST(MAN_MISC_INFO)
 
 AC_PROG_INSTALL
 
 
 AC_PROG_INSTALL
 

-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([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
        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
 exit 0