diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2011-08-22 08:08:38 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2011-08-22 08:08:38 +0000 |
| commit | cf889e07077f1acf0ebc40fc87094f6c5ed9b11d (patch) | |
| tree | a8848c4da5c5bb3153c7507c6a162836e01c564c /CMakeOptions.txt | |
| parent | 6d409485ac2703e65601a05c234c5311e47465d1 (diff) | |
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
Diffstat (limited to 'CMakeOptions.txt')
| -rw-r--r-- | CMakeOptions.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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) |