Added protocol name to "Reassembled length" text.

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

diff --git a/configure.in b/configure.in
index b9c8eafb14d409efb3eef1c2a8e851a5886d413e..e44c00154ad7df7ac5d82bfa6b0fdb396b829197 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
-AC_INIT(wireshark, 1.3.2)
+AC_INIT(wireshark, 1.3.3)
 
 dnl Check for CPU / vendor / OS
 dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
@@ -24,7 +24,7 @@ dnl AC_CANONICAL_BUILD
 dnl AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 no-dist-gzip])
 
 AM_DISABLE_STATIC
 
@@ -426,6 +426,9 @@ cygwin*)
 esac
 AC_SUBST(LDFLAGS_SHAREDLIB)
 
+# Control silent compiling
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
+
 #
 # On OS X, if we find the headers for Core Foundation, Launch Services,
 # and Core Services, add -framework options to link with Application
@@ -1087,6 +1090,7 @@ AC_ARG_WITH(pcre,
 ],[
        #
        # Use libpcre if it's present, otherwise don't.
+       # XXX - Should GLib 2.14 take precedence here?
        #
        want_pcre=ifavailable
        pcre_dir=
@@ -1423,6 +1427,9 @@ AC_DEFINE(HAVE_AIRPDCAP, 1, [Enable AirPDcap (WPA/WPA2 decryption)])
 dnl Checks for typedefs, structures, and compiler characteristics.
 # AC_C_CONST
 
+# Check how we can get the time zone abbreviation
+AC_WIRESHARK_TIMEZONE_ABBREV
+
 # We need to know whether "struct sockaddr" has an "sa_len" member
 # for get_interface_list().