Separate CMake and Autoconf logic

Author: k0ekk0ek

CMakeLists.txt

@@ -168,15 +168,27 @@ target_include_directories(
 target_link_libraries(zone-bench PRIVATE zone)
 
 check_include_file(endian.h HAVE_ENDIAN_H)
-
 check_include_file(unistd.h HAVE_UNISTD_H)
-check_symbol_exists(getopt "stdio.h;unistd.h" HAVE_GETOPT)
-if(NOT HAVE_UNISTD_H OR NOT HAVE_GETOPT)
+
+set(CMAKE_REQUIRED_DEFINITIONS "-D_DEFAULT_SOURCE")
+check_symbol_exists(getopt "stdlib.h;unistd.h" HAVE_GETOPT)
+unset(CMAKE_REQUIRED_DEFINITIONS)
+if(NOT HAVE_GETOPT)
   target_include_directories(
     zone-bench PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/compat>)
   target_sources(zone-bench PRIVATE compat/getopt.c)
 endif()
 
+if(NOT WIN32)
+  # _fullpath is used on Microsoft Windows.
+  set(CMAKE_REQUIRED_DEFINITIONS "-D_DEFAULT_SOURCE")
+  check_symbol_exists(realpath "stdlib.h" HAVE_REALPATH)
+  unset(CMAKE_REQUIRED_DEFINITIONS)
+  if(NOT HAVE_REALPATH)
+    message(FATAL_ERROR "realpath is not available")
+  endif()
+endif()
+
 # Multiple instruction sets may be supported by a specific architecture.
 # e.g. x86_64 may (or may not) support any of SSE42, AVX2 and AVX-512. The
 # best instruction set is automatically selected at runtime, but the compiler
@@ -223,41 +235,7 @@ if(architecture STREQUAL "x86_64" OR architecture STREQUAL "amd64")
 endif()
 
 
-# Autoconf is supported for easy inclusion of simdzone in NSD. To avoid having
-# to maintain multiple configuration headers, instead of using configure_file,
-# read configure.ac and replace occurences of "AC_SUBST([<define>])". If an
-# instance of AC_SUBST does not match expectations, throw an error.
-file(READ configure.ac template)
-
-set(pattern "(^|\n)[ \t]*AC_SUBST\([^\n]*)[ \t]*(\n|$)")
-string(REGEX MATCHALL "${pattern}" matches "${template}")
-foreach(match ${matches})
-  if (match MATCHES "[ \t]*AC_SUBST\\(\\[([a-zA-Z0-9_]+)\\]\\)[ \t]*")
-    set(variable "${CMAKE_MATCH_1}")
-    # Ignore any variables that do not start with HAVE_
-    if (variable MATCHES "^HAVE_")
-      if(NOT DEFINED ${variable} OR NOT ${variable} OR
-         ${variable} MATCHES "^[Ff][Aa][Ll][Ss][Ee]$" OR
-         ${variable} MATCHES "^[Oo][Ff][Ff]")
-        string(APPEND header "/* #undef ${variable} */\n")
-      elseif(${variable} MATCHES "^[Tt][Rr][Uu][Ee]$" OR
-             ${variable} MATCHES "^[Oo][Nn]$")
-        string(APPEND header "#define ${variable} 1\n")
-      elseif(${variable} MATCHES "^[01234567890]+$")
-        string(APPEND header "#define ${variable} ${${variable}}\n")
-      else()
-        string(APPEND header "#define ${variable} \"${${variable}}\"\n")
-      endif()
-    else()
-      continue()
-    endif()
-
-  else()
-    message(FATAL_ERROR "Found AC_SUBST that not match expression")
-  endif()
-endforeach()
-
-file(GENERATE OUTPUT config.h CONTENT "${header}")
+configure_file(src/config.h.in config.h)
 
 if(BUILD_TESTING)
   add_subdirectory(tests)

configure.ac

@@ -18,7 +18,7 @@ AC_CONFIG_FILES([Makefile])
 m4_include(m4/ax_check_compile_flag.m4)
 m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_STDC])
 
-AC_CHECK_HEADER(endian.h, AC_DEFINE(HAVE_ENDIAN_H, 1, [Wether or not have the <endian.h> header file]))
+AC_CHECK_HEADER(endian.h, AC_DEFINE(HAVE_ENDIAN_H, 1, [Define to 1 if you have the <endian.h> header file.]))
 
 AC_ARG_ENABLE(westmere, AS_HELP_STRING([--disable-westmere],[Disable Westmere (SSE4.2) kernel]))
 case "$enable_westmere" in
@@ -95,8 +95,17 @@ if test $x86_64 = "yes"; then
   fi
 fi
 
+AC_CHECK_FUNCS([realpath],,[AC_MSG_ERROR([realpath is not available])])
+
 AC_SUBST([HAVE_ENDIAN_H])
 AC_SUBST([HAVE_WESTMERE])
 AC_SUBST([HAVE_HASWELL])
 
+AH_BOTTOM([
+/* Defines _XOPEN_SOURCE and _POSIX_C_SOURCE implicitly in features.h */
+#ifndef _DEFAULT_SOURCE
+# define _DEFAULT_SOURCE 1
+#endif
+])
+
 AC_OUTPUT

src/config.h.in

@@ -0,0 +1,29 @@
+/*
+ * config.h.in -- comment
+ *
+ * Copyright (c) 2024, NLnet Labs. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/* Define to 1 if you have the <endian.h> header file. */
+#cmakedefine HAVE_ENDIAN_H 1
+
+/* Define to 1 if you have the `getopt' function. */
+#cmakedefine HAVE_GETOPT 1
+
+/* Wether or not to compile support for AVX2 */
+#cmakedefine HAVE_HASWELL 1
+
+/* Wether or not to compile support for SSE4.2 */
+#cmakedefine HAVE_WESTMERE 1
+
+/* Defines _XOPEN_SOURCE and _POSIX_C_SOURCE implicitly in features.h */
+#ifndef _DEFAULT_SOURCE
+# define _DEFAULT_SOURCE 1
+#endif
+
+#endif // CONFIG_H

src/generic/endian.h

@@ -11,6 +11,8 @@
 
 #include "config.h"
 
+// https://www.austingroupbugs.net/view.php?id=162#c665
+
 #if _WIN32
 #include <stdlib.h>
 

src/zone.c

@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
@@ -38,7 +40,6 @@ typedef zone_file_t file_t;
 
 static const char not_a_file[] = "<string>";
 
-#include "config.h"
 #include "isadetection.h"
 
 #ifndef PATH_MAX

tests/include.c

@@ -526,11 +526,10 @@ void include_relative(void **state)
   options.default_class = 1;
   options.include_limit = 1;
 
-#if _WIN32
-  int pid = _getpid();
-#else
-  pid_t pid = getpid();
-#endif
+diagnostic_push()
+msvc_diagnostic_ignored(4996)
+  unsigned int pid = getpid();
+diagnostic_pop()
 
   char* inc1file = "content.inc";
   char* inc2file = "example.com.zone";