diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index ed72b777f5ded..c2e5c5c6ec90e 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -425,11 +425,16 @@ if test -n "$ODBC_TYPE"; then
 
   AC_DEFINE([HAVE_UODBC], [1],
     [Define to 1 if the PHP extension 'odbc' is available.])
+  AC_DEFINE_UNQUOTED([PHP_ODBC_CFLAGS], ["$ODBC_CFLAGS"],
+    [The compile options that PHP odbc extension was built with.])
+  AC_DEFINE_UNQUOTED([PHP_ODBC_LIBS], ["$ODBC_LIBS"],
+    [The libraries linker flags that PHP odbc extension was built with.])
+  AC_DEFINE_UNQUOTED([PHP_ODBC_LFLAGS], ["$ODBC_LFLAGS"],
+    [The linker flags that PHP odbc extension was built with.])
+  AC_DEFINE_UNQUOTED([PHP_ODBC_TYPE], ["$ODBC_TYPE"],
+    [The ODBC library used in the PHP odbc extension.])
+
   PHP_SUBST([ODBC_SHARED_LIBADD])
-  AC_SUBST([ODBC_CFLAGS])
-  AC_SUBST([ODBC_LIBS])
-  AC_SUBST([ODBC_LFLAGS])
-  AC_SUBST([ODBC_TYPE])
 
   PHP_NEW_EXTENSION([odbc],
     [php_odbc.c odbc_utils.c],
diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index f0cbdb631c0d5..72cd9c30fb743 100644
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -15,10 +15,6 @@
 */
 
 #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
-#define PHP_ODBC_CFLAGS	"@ODBC_CFLAGS@"
-#define PHP_ODBC_LFLAGS		"@ODBC_LFLAGS@"
-#define PHP_ODBC_LIBS		"@ODBC_LIBS@"
-#define PHP_ODBC_TYPE		"@ODBC_TYPE@"
 #define PHP_PROG_SENDMAIL	"@PROG_SENDMAIL@"
 #define PEAR_INSTALLDIR         "@EXPANDED_PEAR_INSTALLDIR@"
 #define PHP_INCLUDE_PATH	"@INCLUDE_PATH@"