Improve build-defs.h configuration

This adds a CMake-related template for generating the
`main/build-defs.h` header.

The ODBC build configuration is moved to its own config.h (or
php_config.h) header.

Author: petk

cmake/ext/odbc/CMakeLists.txt

@@ -273,11 +273,6 @@ if(PHP_EXT_ODBC_VERSION AND NOT PHP_EXT_ODBC_VERSION MATCHES "^0x[0-9A-Fa-f]+$")
   )
 endif()
 
-unset(PHP_ODBC_CFLAGS CACHE)
-unset(PHP_ODBC_LFLAGS CACHE)
-unset(PHP_ODBC_LIBS CACHE)
-unset(PHP_ODBC_TYPE CACHE)
-
 if(NOT PHP_EXT_ODBC)
   return()
 endif()
@@ -332,7 +327,7 @@ if(PHP_EXT_ODBC_TYPE STREQUAL "ibm-db2" AND TARGET ODBC::ODBC)
 endif()
 
 ################################################################################
-# Set variables for main/build-defs.h and config.h file.
+# Configure config.h file.
 ################################################################################
 
 # Set PHP_ODBC_TYPE for configuration header value.
@@ -430,15 +425,14 @@ if(TARGET ODBC::ODBC)
     list(JOIN ldflags " " ldflags)
     list(JOIN libs " " libs)
 
-    set(PHP_ODBC_CFLAGS "${cflags}" CACHE INTERNAL "ODBC CFLAGS")
-    set(PHP_ODBC_LFLAGS "${ldflags}" CACHE INTERNAL "ODBC linker flags")
-    set(PHP_ODBC_LIBS "${libs}" CACHE INTERNAL "ODBC libraries")
-    set(PHP_ODBC_TYPE "${PHP_ODBC_TYPE}" CACHE INTERNAL "ODBC type")
+    set(PHP_ODBC_CFLAGS "${cflags}")
+    set(PHP_ODBC_LFLAGS "${ldflags}")
+    set(PHP_ODBC_LIBS "${libs}")
+    set(PHP_ODBC_TYPE "${PHP_ODBC_TYPE}")
 
-    if(
-      NOT ODBC_DRIVER STREQUAL "Windows"
-      AND NOT EXISTS ${PHP_SOURCE_DIR}/main/build-defs.h.in
-    )
+    set(PHP_ODBC_BUILD_DEFINITIONS_CODE "")
+
+    if(NOT ODBC_DRIVER STREQUAL "Windows")
       set(
         PHP_ODBC_BUILD_DEFINITIONS_CODE
         [[

cmake/main/CMakeLists.txt

@@ -347,12 +347,8 @@ function(_php_main_create_files)
     set(PHP_CONFIG_H_WINDOWS 1)
     set(file config.w32.h)
   else()
-    set(ODBC_CFLAGS "${PHP_ODBC_CFLAGS}")
-    set(ODBC_LFLAGS "${PHP_ODBC_LFLAGS}")
-    set(ODBC_LIBS "${PHP_ODBC_LIBS}")
-    set(ODBC_TYPE "${PHP_ODBC_TYPE}")
     message(STATUS "Creating main/build-defs.h")
-    file(READ main/build-defs.h.in content)
+    file(READ main/cmake/build-defs.h.in content)
     string(CONFIGURE "${content}" content @ONLY)
 
     # To be able to evaluate the generator expressions.
@@ -370,14 +366,10 @@ function(_php_main_create_files)
     phase. Needs to be adjusted further to rebuild PHP at such case.
     include(PHP/ConfigureFile)
     php_configure_file(
-      INPUT ${PHP_SOURCE_DIR}/main/build-defs.h.in
+      INPUT ${PHP_SOURCE_DIR}/main/cmake/build-defs.h.in
       OUTPUT ${PHP_BINARY_DIR}/main/build-defs.h
       VARIABLES
         CONFIGURE_COMMAND "cmake"
-        ODBC_CFLAGS "${PHP_ODBC_CFLAGS}"
-        ODBC_LFLAGS "${PHP_ODBC_LFLAGS}"
-        ODBC_LIBS "${PHP_ODBC_LIBS}"
-        ODBC_TYPE "${PHP_ODBC_TYPE}"
         PROG_SENDMAIL "${PROG_SENDMAIL}"
         EXPANDED_PEAR_INSTALLDIR "${EXPANDED_PEAR_INSTALLDIR}"
         INCLUDE_PATH "${INCLUDE_PATH}"

cmake/main/cmake/build-defs.h.in

@@ -0,0 +1,54 @@
+/* This file contains PHP build definitions. */
+
+/* Command used for configuring PHP at build phase. */
+#define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
+
+/* The path to the sendmail program. */
+#define PHP_PROG_SENDMAIL "@PROG_SENDMAIL@"
+
+/* The path to the PEAR installation directory. */
+#define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@"
+
+/* The default PHP include_path INI directive configuration. */
+#define PHP_INCLUDE_PATH "@INCLUDE_PATH@"
+
+/* The path to the directory containing PHP extensions. */
+#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
+
+/* The installation prefix used when installing PHP. */
+#define PHP_PREFIX "@prefix@"
+
+/* The path to the directory containing command-line executables (bin). */
+#define PHP_BINDIR "@EXPANDED_BINDIR@"
+
+/* The path to the directory containing system admin executables (sbin). */
+#define PHP_SBINDIR "@EXPANDED_SBINDIR@"
+
+/* The path to the directory containing man documentation. */
+#define PHP_MANDIR "@EXPANDED_MANDIR@"
+
+/* The path to the directory containing system libraries. */
+#define PHP_LIBDIR "@EXPANDED_LIBDIR@"
+
+/* The path to the directory containing architecture-independent data. */
+#define PHP_DATADIR "@EXPANDED_DATADIR@"
+
+/* The path to the directory containing read-only single-machine data. */
+#define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@"
+
+/* The path to the directory containing modifiable single-machine data. */
+#define PHP_LOCALSTATEDIR "@EXPANDED_LOCALSTATEDIR@"
+
+/* The path to the directory in which PHP looks for php.ini configuration
+   file. */
+#define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@"
+
+/* The path to the directory where PHP scans for additional INI configuration
+   files. */
+#define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
+
+/* The file extension of the shared PHP extensions (.so, .dll, etc.). */
+#define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@"
+
+/* The prefix for the shared library objects. */
+#define PHP_SHLIB_EXT_PREFIX ""

cmake/main/cmake/php_config.h.in

@@ -745,7 +745,7 @@
 /* The prefix for the shared library objects. */
 # define PHP_SHLIB_EXT_PREFIX "php_"
 
-/* The shared library objects extension. */
+/* The file extension of the shared PHP extensions (.so, .dll, etc.). */
 # define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@"
 
 /* The path to the etc directory. */