Revisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161

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

diff --git a/configure.in b/configure.in
index 7484e81e8507e0670eb737fcbb6d9f3826045ecd..85f49c3997fff768d4fcfb6d31b97ba2ec60e469 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -801,7 +801,7 @@ if test "x$enable_wireshark" = "xyes"; then
                        have_gtk=yes
                        AC_DEFINE(HAVE_GTK, 1,
                            [Define to 1 if compiling with GTK])
-               ], have_gtk=no, gthread)
+               ], have_gtk=no)
 
        else
                AM_PATH_GTK_2_0(2.12.0,
@@ -811,7 +811,7 @@ if test "x$enable_wireshark" = "xyes"; then
                        have_gtk=yes
                        AC_DEFINE(HAVE_GTK, 1,
                            [Define to 1 if compiling with GTK])
-               ], have_gtk=no, gthread)
+               ], have_gtk=no)
        fi
 else
        have_gtk=no
@@ -1620,7 +1620,7 @@ AC_MSG_CHECKING(whether to use the Python interpreter for scripting)
 
 AC_ARG_WITH(python,
     AC_HELP_STRING( [--with-python@<:@=DIR@:>@],
-                    [use Python interpreter (installed in DIR, if supplied) @<:@default=yes, if available@:>@ (EXPERIMENTAL)]),
+                    [use Python interpreter (installed in DIR, if supplied) @<:@default=no@:>@ (EXPERIMENTAL)]),
 [
        pythondir='${libdir}/wireshark/python/${VERSION}'
        if test "x$withval" = "xno"
@@ -1634,12 +1634,11 @@ AC_ARG_WITH(python,
                pythondir="$withval"
        fi
 ],[
+       # By default (user didn't explicitly enable Python), don't enable
+       # Python support.
        #
-       # Use the embeddable Python interpreter if it's present,
-       # otherwise don't.
-       #
-       want_pythin=ifavailable
-       pythondir='${libdir}/wireshark/python/${VERSION}'
+       want_python=no
+       #pythondir='${libdir}/wireshark/python/${VERSION}'
 ])
 if test "x$want_python" = "xno" ; then
         AC_MSG_RESULT(no)
@@ -1917,6 +1916,7 @@ AC_OUTPUT(
   asn1/lpp/Makefile
   asn1/lppa/Makefile
   asn1/lte-rrc/Makefile
+  asn1/m3ap/Makefile
   asn1/mms/Makefile
   asn1/mpeg-audio/Makefile
   asn1/mpeg-pes/Makefile
@@ -1981,8 +1981,11 @@ AC_OUTPUT(
   epan/wslua/Makefile
   epan/wspython/Makefile
   codecs/Makefile
+  ui/Makefile
+  ui/doxygen.cfg
   ui/gtk/Makefile
   ui/gtk/doxygen.cfg
+  ui/cli/Makefile
   help/Makefile
   packaging/Makefile
   packaging/macosx/Info.plist