mate runtime did not get initialized when configured after loading a capture file

[obnox/wireshark/wip.git] / configure.in

diff --git a/configure.in b/configure.in
index 4b54bc56f3d271b07ed33470a92d6395e7add689..50a67585be01951467c90e17744739f58fee257d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl Check for CPU / vendor / OS
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(ethereal, 0.10.6)
+AM_INIT_AUTOMAKE(ethereal, 0.10.9)
 
 AM_DISABLE_STATIC
 
@@ -89,9 +89,9 @@ AC_ARG_WITH(extra-gcc-checks,
                ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes"
        fi
 ],)
-AC_MSG_CHECKING(to see if we can add '-Wall -W$ethereal_extra_gcc_flags' to CFLAGS)
+AC_MSG_CHECKING(to see if we can add '-Wall -W $ethereal_extra_gcc_flags' to CFLAGS)
 if test x$GCC != x ; then
-  CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W$ethereal_extra_gcc_flags $CFLAGS"
+  CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W $ethereal_extra_gcc_flags $CFLAGS"
   AC_MSG_RESULT(yes)
 else
   CFLAGS="-D_U_=\"\" $CFLAGS"
@@ -357,7 +357,7 @@ if test "$GTK_OK" = "no" ; then
        ethereal_man=""
        # Honor GLIB_CFLAGS
        if test "x$enable_gtk2" = "xyes" ; then
-               AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule)
+               AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
        else
                AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule)
        fi
@@ -510,20 +510,20 @@ AC_SUBST(editcap_bin)
 AC_SUBST(editcap_man)
 
 
-# Enable/disable capinfo
+# Enable/disable capinfos
 
-AC_ARG_ENABLE(capinfo,
-[  --enable-capinfo        build capinfo.  [default=yes]],enable_capinfo=$enableval,enable_capinfo=yes)
+AC_ARG_ENABLE(capinfos,
+[  --enable-capinfos       build capinfos.  [default=yes]],enable_capinfos=$enableval,enable_capinfos=yes)
 
-if test "x$enable_capinfo" = "xyes" ; then
-       capinfo_bin="capinfo\$(EXEEXT)"
-       capinfo_man="capinfo.1"
+if test "x$enable_capinfos" = "xyes" ; then
+       capinfos_bin="capinfos\$(EXEEXT)"
+       capinfos_man="capinfos.1"
 else
-       capinfo_bin=""
-       capinfo_man=""
+       capinfos_bin=""
+       capinfos_man=""
 fi
-AC_SUBST(capinfo_bin)
-AC_SUBST(capinfo_man)
+AC_SUBST(capinfos_bin)
+AC_SUBST(capinfos_man)
 
 
 # Enable/disable mergecap
@@ -886,18 +886,18 @@ else
 fi
 
 if test "x$have_net_snmp" = "xyes" || test "x$have_ucd_snmp" = "xyes"; then
-       AC_DEFINE(HAVE_SOME_SNMP, 1, [Define to if some SNMP support is to be used])
+       AC_DEFINE(HAVE_SOME_SNMP, 1, [Define to 1 if some SNMP support is to be used])
 fi
 
 AC_SUBST(SNMP_LIBS)
 
 
-dnl kerberos/heimdal check
-AC_MSG_CHECKING(whether to use kerberos/heimdal)
+dnl kerberos check
+AC_MSG_CHECKING(whether to use kerberos)
 
 AC_ARG_WITH(krb5,
 changequote(<<, >>)dnl
-<<  --with-krb5[=DIR]       use kerberos/heimdal (located in directory DIR, if supplied) to use in kerberos dissection  [default=yes]>>,
+<<  --with-krb5[=DIR]       use kerberos (located in directory DIR, if supplied) to use in kerberos dissection  [default=yes]>>,
 changequote([, ])dnl
 [
        if test $withval = no
@@ -912,7 +912,7 @@ changequote([, ])dnl
        fi
 ],[
        #
-       # Use kerberos/heimdal if specified, otherwise don't.
+       # Use kerberos if specified, otherwise don't.
        #
        want_krb5=ifpresent
        krb5_dir=
@@ -1229,6 +1229,7 @@ AC_OUTPUT(
   packaging/svr4/pkginfo
   plugins/Makefile
   plugins/acn/Makefile
+  plugins/agentx/Makefile
   plugins/artnet/Makefile
   plugins/asn1/Makefile
   plugins/ciscosm/Makefile
@@ -1238,6 +1239,7 @@ AC_OUTPUT(
   plugins/gryphon/Makefile
   plugins/irda/Makefile
   plugins/lwres/Makefile
+  plugins/mate/Makefile
   plugins/megaco/Makefile
   plugins/mgcp/Makefile
   plugins/opsi/Makefile
@@ -1281,7 +1283,7 @@ fi
 if test "x$want_krb5" = "xno" ; then
        krb5_message="no"
 else
-       krb5_message="yes (heimdal)"
+       krb5_message="yes ($ac_krb5_version)"
 fi
 
 if test "x$have_good_adns" = "xyes" ; then
@@ -1302,7 +1304,7 @@ echo ""
 echo "The Ethereal package has been configured with the following options."
 echo "                    Build ethereal : $enable_ethereal"
 echo "                   Build tethereal : $enable_tethereal"
-echo "                     Build capinfo : $enable_capinfo"
+echo "                    Build capinfos : $enable_capinfos"
 echo "                     Build editcap : $enable_editcap"
 echo "                    Build mergecap : $enable_mergecap"
 echo "                   Build text2pcap : $enable_text2pcap"