diff options
| -rw-r--r-- | ext/odbc/config.m4 | 6 | ||||
| -rw-r--r-- | main/build-defs.h.in | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 57166d710e..500aa4a87e 100644 --- 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 347e75d476..58e3d4a209 100644 --- 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@" |