diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | CMakeOptions.txt | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 593f7728b6..fbef7412cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,8 +383,7 @@ add_subdirectory( wiretap ) add_subdirectory( wsutil ) if(ENABLE_GUIDES) -# FIXME: Disabling the build via option currently doesn't work -# add_subdirectory( docbook ) + add_subdirectory( docbook ) endif() find_package(POD) @@ -707,9 +706,12 @@ if(BUILD_text2pcap) ${M_LIBRARIES} ${Z_LIBRARIES} ) - set(text2pcap_FILES + set(text2pcap_CLEAN_FILES text2pcap.c ) + set(text2pcap_FILES + ${text2pcap_CLEAN_FILES} + ) add_lex_files(text2pcap_FILES text2pcap-scanner.l ) @@ -902,7 +904,7 @@ set(CLEAN_FILES ${rawshark_FILES} ${dftest_FILES} ${randpkt_FILES} - ${text2pcap_FILES} + ${text2pcap_CLEAN_FILES} ${mergecap_FILES} ${capinfos_FILES} ${editcap_FILES} diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 24b1c5d34b..d35253f1a7 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -21,8 +21,7 @@ option(ENABLE_AIRPCAP "Enable Airpcap support" ON) # todo option(ENABLE_STATIC "Build a static version of Wireshark (not yet working)" OFF) option(ENABLE_PLUGINS "Build with plugins" ON) -# todo -option(ENABLE_GUIDES "Build Guides" ON) +option(ENABLE_GUIDES "Build Guides" OFF) option(ENABLE_ADNS "Build with adns support" ON) option(ENABLE_PCRE "Build with pcre support" ON) |