hardcode /bin/sh to idl2wrs

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

diff --git a/configure.in b/configure.in
index aa2bae3883433d92fda2afa90a1ac22f7fca5b8f..beb3b8d1f37d0bf5b8de4deba18b60ee416a5f0e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
-AC_INIT(wireshark, 1.7.0)
+AC_INIT(wireshark, 1.7.1)
 
 dnl Check for CPU / vendor / OS
 dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
@@ -746,14 +746,6 @@ if test x$enable_packet_editor = xyes; then
        AC_DEFINE(WANT_PACKET_EDITOR, 1, [Support for packet editor])
 fi
 
-AC_ARG_ENABLE(threads,
-  AC_HELP_STRING( [--enable-threads],
-                  [use threads in Wireshark @<:@default=yes@:>@]),
-    enable_threads=$enableval,enable_threads=yes)
-if test x$enable_threads = xyes; then
-       AC_DEFINE(USE_THREADS, 1, [Support for threads])
-fi
-
 AC_ARG_ENABLE(profile-build,
   AC_HELP_STRING( [--enable-profile-build],
                  [build profile-ready binaries @<:@default=no@:>@]),
@@ -820,14 +812,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 +1891,7 @@ AC_OUTPUT(
   asn1/cmp/Makefile
   asn1/crmf/Makefile
   asn1/cms/Makefile
+  asn1/credssp/Makefile
   asn1/dap/Makefile
   asn1/disp/Makefile
   asn1/dop/Makefile
@@ -1933,8 +1918,11 @@ AC_OUTPUT(
   asn1/idmp/Makefile
   asn1/inap/Makefile
   asn1/kerberos/Makefile
+  asn1/lcsap/Makefile
   asn1/ldap/Makefile
   asn1/logotypecertextn/Makefile
+  asn1/lpp/Makefile
+  asn1/lppa/Makefile
   asn1/lte-rrc/Makefile
   asn1/mms/Makefile
   asn1/mpeg-audio/Makefile
@@ -1969,10 +1957,12 @@ AC_OUTPUT(
   asn1/rua/Makefile
   asn1/s1ap/Makefile
   asn1/sabp/Makefile
+  asn1/sbc-ap/Makefile
   asn1/smrse/Makefile
   asn1/snmp/Makefile
   asn1/spnego/Makefile
   asn1/sv/Makefile
+  asn1/t124/Makefile
   asn1/t125/Makefile
   asn1/t38/Makefile
   asn1/tcap/Makefile
@@ -1988,7 +1978,6 @@ AC_OUTPUT(
   doc/Makefile
   docbook/Makefile
   epan/Makefile
-  epan/crc/Makefile
   epan/crypt/Makefile
   epan/doxygen.cfg
   epan/dfilter/Makefile
@@ -2028,7 +2017,6 @@ AC_OUTPUT(
   plugins/wimax/Makefile
   plugins/wimaxasncp/Makefile
   tools/Makefile
-  tools/idl2wrs.sh
   tools/lemon/Makefile
   wiretap/Makefile
   wsutil/Makefile
@@ -2131,7 +2119,6 @@ echo "                      Build editcap : $enable_editcap"
 echo "                      Build dumpcap : $enable_dumpcap"
 echo "                     Build mergecap : $enable_mergecap"
 echo "                    Build text2pcap : $enable_text2pcap"
-echo "                      Build idl2wrs : $enable_idl2wrs"
 echo "                      Build randpkt : $enable_randpkt"
 echo "                       Build dftest : $enable_dftest"
 echo "                     Build rawshark : $enable_rawshark"
@@ -2144,7 +2131,6 @@ echo "                        Use plugins : $have_plugins"
 echo "                    Use Lua library : $lua_message"
 echo "                 Use Python binding : $python_message"
 echo "                   Build rtp_player : $portaudio_message"
-echo "                        Use threads : $enable_threads"
 echo "             Build profile binaries : $enable_profile_build"
 echo "                   Use pcap library : $want_pcap"
 echo "                   Use zlib library : $zlib_message"