From: jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Mon, 22 Aug 2011 08:08:38 +0000 (+0000)
Subject: Rename UI_MANAGER to ENABLE_UI_MANAGER, put it into
X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=e5119b49ec7ee3108d4b1e63005641f9df08bf47

Rename UI_MANAGER to ENABLE_UI_MANAGER, put it into
  CMakeOptions and enable it by default.
Update comment in proto_help that this feature is no
  longer built by default.
Enable PYTHON by default.



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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32051badfd..63f3915ffe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -431,6 +431,9 @@ add_subdirectory( wsutil )
 
 if(BUILD_wireshark AND GTK_FOUND)
 	add_subdirectory( gtk )
+	if (ENABLE_UI_MANAGER)
+		set(MAIN_MENU_USE_UIMANAGER 1)
+	endif()
 endif()
 
 # Basedir where to install guides
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index 3d5a99843d..414ad071cd 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -18,6 +18,7 @@ option(AUTOGEN_pidl      "Autogenerate pidl dissectors" OFF)
 option(DISABLE_WERROR    "Do not treat Warnings as errors" OFF)
 option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC (disables -Werror)" OFF)
 option(ENABLE_GTK3       "Use GTK3 instead of GTK2 (does not compile yet)" OFF)
+option(ENABLE_UI_MANAGER) "Build GTK UI with the new UI-Manager API" ON)
 #
 # Do not make this the default on UN*X; AirPcap support is available
 # only on Windows.  It might be nice to have it, on Windows, check
@@ -37,7 +38,7 @@ option(ENABLE_PCRE       "Build with pcre support" OFF)
 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" OFF)
+option(ENABLE_PYTHON     "Build with python dissector support" ON)
 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/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 0dcc8deece..b9ca691be1 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -221,12 +221,6 @@ if (WERROR)
 	)
 endif()
 
-if (UI_MANAGER)
-	add_definitions(
-		-DMAIN_MENU_USE_UIMANAGER=1
-	)
-endif()
-
 if (NOT ENABLE_GTK3)
 	add_definitions(
 		# We are only allowed to include gtk/gtk.h, no other files. When
diff --git a/gtk/proto_help.c b/gtk/proto_help.c
index 1f7ee8526c..ac17499a57 100644
--- a/gtk/proto_help.c
+++ b/gtk/proto_help.c
@@ -63,8 +63,8 @@
    See http://developer.gnome.org/gtk/2.24/GtkItemFactory.html: "As of GTK+ 2.4,
    GtkItemFactory has been deprecated in favour of GtkUIManager."
    This needs to be rewritten by the people who added this code or some other
-   volunteers. Otherwise this functionality will be lost once the UI_MANAGER
-   stuff becomes default.
+   volunteers. Otherwise this functionality will be lost once the non UI_MANAGER
+   stuff gets removed it isn't built by default any more.
  */
 #ifdef MAIN_MENU_USE_UIMANAGER
 void proto_help_menu_modify(GtkTreeSelection *selection _U_, capture_file *cf _U_) {}