forked from osmocom/wireshark
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. svn path=/trunk/; revision=38659
This commit is contained in:
parent
6d409485ac
commit
cf889e0707
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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_) {}
|
||||
|
|
Loading…
Reference in New Issue