sniper Tue Jun 24 23:53:17 2003 EDT
Modified files:
/php-src/ext/mysql config.m4
Log:
clean up a bit.
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.56 php-src/ext/mysql/config.m4:1.57
--- php-src/ext/mysql/config.m4:1.56 Sun Jun 22 21:10:58 2003
+++ php-src/ext/mysql/config.m4 Tue Jun 24 23:53:17 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.56 2003/06/23 01:10:58 sterling Exp $
+dnl $Id: config.m4,v 1.57 2003/06/25 03:53:17 sniper Exp $
dnl
AC_DEFUN(MYSQL_LIB_CHK, [
@@ -39,8 +39,7 @@
PHP_ARG_WITH(mysql, for MySQL support,
-[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory.
- If unspecified, the bundled MySQL library will be used.])
+[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory.])
PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
[ --with-mysql-sock[=DIR] MySQL: Location of the MySQL unix socket pointer.
@@ -55,7 +54,7 @@
if test "$PHP_MYSQL" != "no"; then
AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
- AC_MSG_CHECKING(for MySQL UNIX socket location)
+ AC_MSG_CHECKING([for MySQL UNIX socket location])
if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
MYSQL_SOCK=$PHP_MYSQL_SOCK
AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
@@ -65,21 +64,21 @@
else
AC_MSG_RESULT([no])
fi
-fi
-if test "$PHP_MYSQL" != "no"; then
- for i in /usr /usr/local $PHP_MYSQL; do
+ for i in $PHP_MYSQL /usr/local /usr; do
if test -r $i/include/mysql/mysql.h; then
MYSQL_DIR=$i
MYSQL_INC_DIR=$i/include/mysql
+ break
elif test -r $i/include/mysql.h; then
MYSQL_DIR=$i
MYSQL_INC_DIR=$i/include
+ break
fi
done
if test -z "$MYSQL_DIR"; then
- AC_MSG_ERROR(Cannot find MySQL header files under $PHP_MYSQL)
+ AC_MSG_ERROR([Cannot find MySQL header files under $PHP_MYSQL])
fi
for i in lib lib/mysql; do
@@ -87,7 +86,7 @@
done
if test -z "$MYSQL_LIB_DIR"; then
- AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR)
+ AC_MSG_ERROR([Cannot find libmysqlclient under $MYSQL_DIR])
fi
PHP_CHECK_LIBRARY(mysqlclient, mysql_close, [ ],
@@ -117,4 +116,13 @@
PHP_ADD_INCLUDE($MYSQL_INC_DIR)
PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
+
+ MYSQL_MODULE_TYPE=external
+ MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS"
+ MYSQL_INCLUDE=-I$MYSQL_INC_DIR
+
+ PHP_SUBST(MYSQL_SHARED_LIBADD)
+ PHP_SUBST_OLD(MYSQL_MODULE_TYPE)
+ PHP_SUBST_OLD(MYSQL_LIBS)
+ PHP_SUBST_OLD(MYSQL_INCLUDE)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
