cvs: php-src(PHP_5_2) /ext/pdo_mysql config.m4
| From: | Antony Dovgal | Date: | Wed, 07 Mar 2007 09:36:22 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/pdo_mysql config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-43450@lists.php.net to get a copy of this message | ||
tony2001 Wed Mar 7 09:36:22 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_mysql config.m4
Log:
fix small typo
add --with-zlib-dir option (and simple automagic zlib detection)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7.2.3&r2=1.25.2.7.2.4&diff_format=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.3 php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.4
--- php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.3 Mon Aug 14 20:11:31 2006
+++ php-src/ext/pdo_mysql/config.m4 Wed Mar 7 09:36:22 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.7.2.3 2006/08/14 20:11:31 tony2001 Exp $
+dnl $Id: config.m4,v 1.25.2.7.2.4 2007/03/07 09:36:22 tony2001 Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -8,7 +8,7 @@
str="$PDO_MYSQL_DIR/$1/libmysqlclient*"
for j in
echo $str; do
if test -r $j; then
- PDO_MYSQL_LIB_DIR=$MYSQL_DIR/$1
+ PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$1
break 2
fi
done
@@ -17,6 +17,11 @@
PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO,
[ --with-pdo-mysql[=DIR] PDO: MySQL support. DIR is the MySQL base directory])
+if test -z "$PHP_ZLIB_DIR"; then
+ PHP_ARG_WITH(zlib-dir, for the location of libz,
+ [ --with-zlib-dir[=DIR] PDO_MySQL: Set the path to libz install prefix], no, no)
+fi
+
if test "$PHP_PDO_MYSQL" != "no"; then
AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
@@ -99,7 +104,26 @@
PHP_EVAL_INCLINE($PDO_MYSQL_INCLUDE)
PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD)
],[
- AC_MSG_ERROR([mysql_query missing!?])
+ if test "$PHP_ZLIB_DIR" != "no"; then
+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, PDO_MYSQL_SHARED_LIBADD)
+ PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query, [], [
+ AC_MSG_ERROR([PDO_MYSQL configure failed. Please check config.log for more information.])
+ ], [
+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR
+ ])
+ PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
+ else
+ PHP_ADD_LIBRARY(z,, PDO_MYSQL_SHARED_LIBADD)
+ PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query, [], [
+ AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more
information.])
+ ], [
+ -L$PDO_MYSQL_LIB_DIR
+ ])
+ PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz"
+ fi
+
+ PHP_EVAL_INCLINE($PDO_MYSQL_INCLUDE)
+ PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD)
],[
$PDO_MYSQL_LIBS
])