From 59180d315d5ff23ada9b90cce17fd2b99b63029b Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 4 Aug 2024 09:41:49 +0200
Subject: [PATCH] Refactor HAVE_SQLDATASOURCES check

On Windows, this preprocessor macro is moved to odbc extension, in
Autotools check CS is synced and some basic help text is added.
---
 ext/odbc/config.m4          | 13 +++++++------
 ext/odbc/config.w32         |  1 +
 win32/build/config.w32.h.in |  1 -
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 96262ecf4063..6b2e51629694 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -440,12 +440,13 @@ fi
 
 dnl Extension setup
 if test -n "$ODBC_TYPE"; then
-  if test "$ODBC_TYPE" != "dbmaker"; then
-    PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
-    if test "$ODBC_TYPE" != "solid"; then
-      AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ])
-    fi
-  fi
+  AS_VAR_IF([ODBC_TYPE], [dbmaker],, [
+    PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], [ODBC_SHARED_LIBADD])
+    AS_VAR_IF([ODBC_TYPE], [solid],,
+      [AC_DEFINE([HAVE_SQLDATASOURCES], [1],
+        [Define to 1 if ODBC library has 'SQLDataSources', as a function or
+        macro.])])
+  ])
 
   AC_DEFINE([HAVE_UODBC], [1],
     [Define to 1 if the PHP extension 'odbc' is available.])
diff --git a/ext/odbc/config.w32 b/ext/odbc/config.w32
index a5740bdaa6cd..15fb37102892 100644
--- a/ext/odbc/config.w32
+++ b/ext/odbc/config.w32
@@ -9,6 +9,7 @@ if (PHP_ODBC == "yes") {
 	&& CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_ODBC")) {
 		EXTENSION("odbc", "php_odbc.c odbc_utils.c", PHP_ODBC_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 		AC_DEFINE("HAVE_UODBC", 1, "Define to 1 if the PHP extension 'odbc' is available.");
+		AC_DEFINE("HAVE_SQLDATASOURCES", 1, "Define to 1 if ODBC library has 'SQLDataSources', as a function or macro.");
 		if ("no" == PHP_ODBCVER) {
 			AC_DEFINE("ODBCVER", "0x0350", "The highest supported ODBC version", false);
 		} else if ("0" != PHP_ODBCVER) {
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 2e3963cbc511..81ba1a0d6a05 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -95,7 +95,6 @@
 #define HAVE_GLOB
 #define PHP_SHLIB_SUFFIX "dll"
 #define PHP_SHLIB_EXT_PREFIX "php_"
-#define HAVE_SQLDATASOURCES
 
 /* Win32 supports socketpair by the emulation in win32/sockets.c */
 #define HAVE_SOCKETPAIR 1