3 files changed, 14 insertions, 2 deletions
diff --git a/src/ipcpd/shim-eth-llc/CMakeLists.txt b/src/ipcpd/shim-eth-llc/CMakeLists.txt
index e9c34bbd..c3e954f7 100644
--- a/src/ipcpd/shim-eth-llc/CMakeLists.txt
+++ b/src/ipcpd/shim-eth-llc/CMakeLists.txt
@@ -28,6 +28,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(HAVE_LLC TRUE)
   else ()
     message(STATUS "Raw socket support for shim-eth-llc disabled by user")
+    unset(HAVE_RAW_SOCKETS)
+    unset(HAVE_LLC)
   endif ()
 endif ()
 
@@ -50,6 +52,8 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
     else ()
       message(STATUS "Berkeley Packet Filter support "
                      "for shim-eth-llc disabled by user")
+      unset(HAVE_BPF)
+      unset(HAVE_LLC)
     endif ()
   endif ()
 endif ()
@@ -64,6 +68,8 @@ if (NETMAP_C_INCLUDE_DIR)
     set(HAVE_LLC TRUE)
   else ()
     message(STATUS "Netmap support for shim-eth-llc disabled by user")
+    unset(HAVE_NETMAP)
+    unset(HAVE_LLC)
   endif ()
 endif ()
 
diff --git a/src/ipcpd/shim-udp/CMakeLists.txt b/src/ipcpd/shim-udp/CMakeLists.txt
index 2bc68154..0319e63d 100644
--- a/src/ipcpd/shim-udp/CMakeLists.txt
+++ b/src/ipcpd/shim-udp/CMakeLists.txt
@@ -43,9 +43,10 @@ if (NSLOOKUP_EXECUTABLE AND NSUPDATE_EXECUTABLE)
   if (NOT DISABLE_DNS)
     message(STATUS "DDNS support enabled")
     set(HAVE_DDNS TRUE CACHE INTERNAL "")
- else ()
+  else ()
     message(STATUS "DDNS support disabled by user")
- endif ()
+    unset(HAVE_DDNS CACHE)
+  endif ()
 else ()
   if (NSLOOKUP_EXECUTABLE)
     message(STATUS "Install nsupdate to enable DDNS support")
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index f0454bd8..db99bc97 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -37,6 +37,7 @@ if (HAVE_ROBUST_MUTEX)
     set(HAVE_ROBUST_MUTEX TRUE)
   else ()
     message(STATUS "Robust mutex support disabled by user")
+    unset(HAVE_ROBUST_MUTEX)
   endif ()
 endif ()
 
@@ -51,6 +52,7 @@ if (FUSE_LIBRARIES)
     set(HAVE_FUSE TRUE CACHE INTERNAL "")
   else ()
     message(STATUS "FUSE support disabled by user")
+    unset(HAVE_FUSE CACHE)
   endif ()
 else ()
   message(STATUS "Install FUSE version > 2.6 to enable RIB access")
@@ -79,6 +81,7 @@ if (LIBGCRYPT_LIBRARIES)
         set(HAVE_LIBGCRYPT TRUE CACHE INTERNAL "")
       else ()
         message(STATUS "libgcrypt support disabled by user")
+        unset(HAVE_LIBGCRYPT CACHE)
       endif()
     else ()
       message(STATUS "Install version > \"1.7.0\" to enable libgcrypt support "
@@ -100,6 +103,7 @@ if (OPENSSL_FOUND)
     set(HAVE_OPENSSL TRUE)
   else()
     message(STATUS "OpenSSL support disabled by user")
+    unset(HAVE_OPENSSL)
   endif()
 endif ()
 
@@ -117,6 +121,7 @@ else ()
     set(HAVE_SYS_RANDOM TRUE)
   else ()
     set(SYS_RND_HDR "")
+    unset(HAVE_SYS_RANDOM)
   endif ()
 endif()