Rename CMake option to ENABLE_PROTOCHAIN to match Autoconf.

Replace "-DNO_PROTOCHAIN=<no_yes>" with "-DENABLE_PROTOCHAIN=<yes_no>"
to match "--enable-protochain=<yes_no>" in Autoconf as is implemented
for "-DENABLE_REMOTE" and "--enable-remote".

diff --git a/CHANGES b/CHANGES
index a8531345e21cb23416c035b88c996c09d05472e4..dec1d2a78fe4a0dee01bc1f6137d5857ddf07a1c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -108,6 +108,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       filtertest: Add "-l" flag to use Linux BPF extensions.
       filtertest: Use ntohl() on the netmask to fix the -m option.
       filtertest: Add support for stdin as "-" to the -F option.
+      Rename CMake option to ENABLE_PROTOCHAIN to match Autoconf.
     Hurd:
       Support network capture devices too.
       Fix a few device activation bugs.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ccfa3b310d35ec3c30acf4f618209110eefd791..c07d6a27fb5d96b90c7aa1a895eb45c6148c69dc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -487,7 +487,12 @@ endif(WIN32)
 option(ENABLE_PROFILING "Enable code profiling" OFF)
 
 # To pacify those who hate the protochain instruction
-option(NO_PROTOCHAIN "Disable protochain instruction" OFF)
+option(ENABLE_PROTOCHAIN "Enable protochain instruction" ON)
+if(ENABLE_PROTOCHAIN)
+    set(NO_PROTOCHAIN OFF)
+else()
+    set(NO_PROTOCHAIN ON)
+endif()
 
 #
 # Start out with the capture mechanism type unspecified; the user