From: morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 20 Jan 2012 03:20:35 +0000 (+0000)
Subject: Bug 6448 says the embedded Python stuff does not really work.
X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=436ed0dec3dacb35fa7863200f32afdda1a50d35

Bug 6448 says the embedded Python stuff does not really work.
And if I run Valgrind with Python enabled, I get pages of errors related to it.

So: disable Python by default.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40602 f5534014-38df-0310-8fa8-9805f1628bb7
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c7bc929ed..bbbaffa7e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,7 @@ endif()
 # - set HAVE_XXX
 
 #The minimum package list
-set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
+set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH)
 set(GLIB2_FIND_REQUIRED)
 set(GLIB2_MIN_VERSION 2.14.0)
 set(GTHREAD2_REQUIRED)
@@ -338,7 +338,7 @@ endforeach()
 #packaging
 include(CPackConfig.txt)
 
-if(HAVE_LIBPYTHON)
+if(PYTHON_FOUND)
 	set(HAVE_PYTHON 1)
 	set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${CPACK_PACKAGE_VERSION}")
 endif()
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index 7f587378b5..86076346d4 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -36,7 +36,7 @@ option(ENABLE_ADNS       "Build with adns support" ON)
 option(ENABLE_PORTAUDIO  "Build with portaudio support" ON)
 option(ENABLE_ZLIB       "Build with zlib compression support" ON)
 option(ENABLE_LUA        "Build with lua dissector support" ON)
-option(ENABLE_PYTHON     "Build with python dissector support" ON)
+option(ENABLE_PYTHON     "Build with python dissector support" OFF)
 option(ENABLE_SMI        "Build with smi snmp support" ON)
 option(ENABLE_GNUTLS     "Build with GNU TLS support" ON)
 option(ENABLE_GCRYPT     "Build with GNU crypto support" ON)
diff --git a/configure.in b/configure.in
index 7484e81e85..73ebc2aac1 100644
--- a/configure.in
+++ b/configure.in
@@ -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)