cvs: php4 /ext/odbc config.m4 /main build-defs.h.in

sniper Tue May 1 16:22:55 2001 EDT Modified files: /php4/ext/odbc config.m4 /php4/main build-defs.h.in Log: Fix bug #10563 Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.39 php4/ext/odbc/config.m4:1.40 --- php4/ext/odbc/config.m4:1.39 Tue Apr 10 09:26:27 2001 +++ php4/ext/odbc/config.m4 Tue May 1 16:22:55 2001 @@ -474,10 +474,10 @@ 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 Index: php4/main/build-defs.h.in diff -u php4/main/build-defs.h.in:1.5 php4/main/build-defs.h.in:1.6 --- php4/main/build-defs.h.in:1.5 Sat Apr 21 18:09:13 2001 +++ php4/main/build-defs.h.in Tue May 1 16:22:55 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: build-defs.h.in,v 1.5 2001/04/22 01:09:13 ssb Exp $ */ +/* $Id: build-defs.h.in,v 1.6 2001/05/01 23:22:55 sniper Exp $ */ #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@" #define PHP_ADA_INCLUDE "" @@ -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@"