Fix bug #10563

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 57166d710e9634e0383fbeb1db35348379a5dad2..500aa4a87ec06950020938d878067474cb5d0738 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -474,10 +474,10 @@ if test -n "$ODBC_TYPE"; then
   fi
   AC_DEFINE(HAVE_UODBC,1,[ ])
   PHP_SUBST(ODBC_INCDIR)
-  PHP_SUBST(ODBC_INCLUDE)
   PHP_SUBST(ODBC_LIBDIR)
-  PHP_SUBST(ODBC_LIBS)
-  PHP_SUBST(ODBC_LFLAGS)
+  PHP_SUBST_OLD(ODBC_INCLUDE)
+  PHP_SUBST_OLD(ODBC_LIBS)
+  PHP_SUBST_OLD(ODBC_LFLAGS)
   PHP_SUBST_OLD(ODBC_TYPE)
   PHP_EXTENSION(odbc, $shared)
 fi

diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index 347e75d476817ab932803312ff3a9a362a2baaf7..58e3d4a209b6c40c00b9b6ada34c3137caff1511 100644 (file)
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -45,10 +45,13 @@
 #define PHP_MSQL_INCLUDE       ""
 #define PHP_MSQL_LFLAGS                ""
 #define PHP_MSQL_LIBS          ""
-#define PHP_MYSQL_INCLUDE      ""
-#define PHP_MYSQL_LFLAGS       ""
-#define PHP_MYSQL_LIBS         ""
-#define PHP_ODBC_TYPE       "@ODBC_TYPE@"
+#define PHP_MYSQL_INCLUDE      "@MYSQL_INCLUDE@"
+#define PHP_MYSQL_LIBS         "@MYSQL_LIBS@"
+#define PHP_MYSQL_TYPE         "@MYSQL_MODULE_TYPE@"
+#define PHP_ODBC_INCLUDE       "@ODBC_INCLUDE@"
+#define PHP_ODBC_LFLAGS                "@ODBC_LFLAGS@"
+#define PHP_ODBC_LIBS          "@ODBC_LIBS@"
+#define PHP_ODBC_TYPE          "@ODBC_TYPE@"
 #define PHP_OCI8_SHARED_LIBADD         "@OCI8_SHARED_LIBADD@"
 #define PHP_OCI8_DIR                   "@OCI8_DIR@"
 #define PHP_OCI8_VERSION               "@OCI8_VERSION@"