diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 2a8660e6..06ba24df 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -114,7 +114,7 @@ set(SELECT_TYPE_ARG5 "(struct timeval *)")
 set(STDC_HEADERS 1)
 
 
-check_include_files(sys/time.h time.h TIME_WITH_SYS_TIME)
+check_include_files("sys/time.h;time.h" TIME_WITH_SYS_TIME)
 
 
 # If the compiler supports a TLS storage class define it to that here
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 3c1f19cb..683efe8f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -2,19 +2,18 @@ find_program(XMLTO_EXECUTABLE NAMES xmlto)
 find_program(ASCIIDOC_EXECUTABLE NAMES asciidoc asciidoc.py)
 
 # Opt-in doc build option
-if (XMLTO_EXECUTABLE-NOTFOUND OR ASCIIDOC_EXECUTABLE-NOTFOUND)
+if (NOT XMLTO_EXECUTABLE OR NOT ASCIIDOC_EXECUTABLE)
     option(WITH_DOC_MAN "Build manpage doc" OFF)
 else ()
     option(WITH_DOC_MAN "Build manpage doc" ON)
 endif ()
 
-if (ASCIIDOC_EXECUTABLE-NOTFOUND)
+if (NOT ASCIIDOC_EXECUTABLE)
     option(WITH_DOC_HTML "Build html doc" OFF)
 else ()
     option(WITH_DOC_HTML "Build html doc" ON)
 endif ()
 
-
 # NOTE For brew user, we have to setup this env var. see `brew info asciidoc'
 set(XMLTO_ENV)
 set(XMLTO_CATALOG_DIR_MACOS /usr/local/etc/xml/catalog)