cvs: php4(PHP_4_3) /ext/odbc config.m4
| From: | Jani Taskinen | Date: | Tue, 11 Mar 2003 03:11:52 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/odbc config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19525@lists.php.net to get a copy of this message | ||
sniper Mon Mar 10 22:11:52 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/odbc config.m4
Log:
MFH: - Fixed bug #20715 (odbc could not be compiled as shared extension)
Index: php4/ext/odbc/config.m4
diff -u php4/ext/odbc/config.m4:1.55.2.2 php4/ext/odbc/config.m4:1.55.2.3
--- php4/ext/odbc/config.m4:1.55.2.2 Thu Mar 6 23:32:49 2003
+++ php4/ext/odbc/config.m4 Mon Mar 10 22:11:52 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.55.2.2 2003/03/07 04:32:49 sniper Exp $
+dnl $Id: config.m4,v 1.55.2.3 2003/03/11 03:11:52 sniper Exp $
dnl
dnl
@@ -536,11 +536,12 @@
if test -n "$ODBC_TYPE"; then
if test "$ODBC_TYPE" != "dbmaker"; then
- if test "$shared" != "yes"; then
- PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
- fi
+ ext_shared=$shared
+ PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
fi
+
AC_DEFINE(HAVE_UODBC,1,[ ])
+ PHP_SUBST(ODBC_SHARED_LIBADD)
PHP_SUBST(ODBC_INCDIR)
PHP_SUBST(ODBC_LIBDIR)
PHP_SUBST_OLD(ODBC_INCLUDE)
@@ -548,5 +549,5 @@
PHP_SUBST_OLD(ODBC_LFLAGS)
PHP_SUBST_OLD(ODBC_TYPE)
- PHP_NEW_EXTENSION(odbc, php_odbc.c, $shared,, $ODBC_INCLUDE)
+ PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, $ODBC_INCLUDE)
fi