Add a HAVE_GEOIP_V6 configuration option and enable it by default.

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

diff --git a/configure.in b/configure.in
index 417e1206706f4986c3cdc6be03d1487c591d592d..f261fb826704cf92e62935975771d694e1a1eebe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -820,14 +820,6 @@ else
        GTK_OK=no
 fi
 
-AC_ARG_ENABLE(ui-manager,
-  AC_HELP_STRING( [--enable-ui-manager],
-                  [use ui-manager in Wireshark (experimental) @<:@default=yes@:>@]),
-    enable_uimanager=$enableval,enable_uimanager=yes)
-if test x$enable_uimanager = xyes -o x$with_gtk3 = xyes; then
-       AC_DEFINE(MAIN_MENU_USE_UIMANAGER, 1, [Use GTK ui-manager])
-fi
-
 # GLib checks; we require GLib 2.14 or later, and require gmodule
 # support, as we need that for dynamically loading plugins.
 # If we found GTK+, this doesn't add GLIB_CFLAGS to CFLAGS, because
@@ -1907,6 +1899,7 @@ AC_OUTPUT(
   asn1/cmp/Makefile
   asn1/crmf/Makefile
   asn1/cms/Makefile
+  asn1/credssp/Makefile
   asn1/dap/Makefile
   asn1/disp/Makefile
   asn1/dop/Makefile
@@ -1973,6 +1966,7 @@ AC_OUTPUT(
   asn1/snmp/Makefile
   asn1/spnego/Makefile
   asn1/sv/Makefile
+  asn1/t124/Makefile
   asn1/t125/Makefile
   asn1/t38/Makefile
   asn1/tcap/Makefile