From Alejandro Vaquero:
[obnox/wireshark/wip.git] / configure.in
index 29626266273a09dd8f430491dbaec6229bad11b4..b51b4e171f37f35e9a080d28ef3ae1856baecde8 100644 (file)
@@ -8,7 +8,7 @@ dnl Check for CPU / vendor / OS
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(ethereal, 0.10.7)
+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"
@@ -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
@@ -1238,6 +1238,7 @@ AC_OUTPUT(
   plugins/gryphon/Makefile
   plugins/irda/Makefile
   plugins/lwres/Makefile
+  plugins/mate/Makefile
   plugins/megaco/Makefile
   plugins/mgcp/Makefile
   plugins/opsi/Makefile
@@ -1302,7 +1303,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"