sniper Tue Nov 29 12:31:19 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql config.m4
Log:
cleanup + fix link problems with old mysql versions
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.4&r2=1.25.2.5&ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.4
php-src/ext/pdo_mysql/config.m4:1.25.2.5
--- php-src/ext/pdo_mysql/config.m4:1.25.2.4 Fri Nov 25 12:07:49 2005
+++ php-src/ext/pdo_mysql/config.m4 Tue Nov 29 12:31:13 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.4 2005/11/25 17:07:49 wez Exp $
+dnl $Id: config.m4,v 1.25.2.5 2005/11/29 17:31:13 sniper Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -33,7 +33,7 @@
fi
else
AC_MSG_RESULT([$PHP_PDO_MYSQL is not a directory])
- AC_MSG_ERROR([can't find mysql under the "$PHP_PDO_MYSQL" that you
specified])
+ AC_MSG_ERROR([can not find mysql under the "$PHP_PDO_MYSQL" that you
specified])
fi
else
for i in /usr/local /usr ; do
@@ -50,10 +50,9 @@
if test -n "$PDO_MYSQL_CONFIG" && test -x "$PDO_MYSQL_CONFIG" ; then
AC_MSG_RESULT($PDO_MYSQL_CONFIG)
- PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags`
- PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs`
- PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
- PHP_SUBST_OLD(PDO_MYSQL_LIBS)
+ PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
+ PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
+ PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
elif test -z "$PDO_MYSQL_DIR"; then
AC_MSG_RESULT([not found])
AC_MSG_ERROR([Cannot find MySQL header files under $PDO_MYSQL_DIR])
@@ -74,7 +73,7 @@
if test -r "$PDO_MYSQL_LIB_DIR"; then
AC_MSG_RESULT([libs under $PDO_MYSQL_LIB_DIR; seems promising])
else
- AC_MSG_RESULT([can't find it])
+ AC_MSG_RESULT([can not find it])
AC_MSG_ERROR([Unable to find your mysql installation])
fi
@@ -118,7 +117,7 @@
PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c,
$ext_shared,,-I$pdo_inc_path $PDO_MYSQL_INCLUDE)
ifdef([PHP_ADD_EXTENSION_DEP],
[
- PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
+ PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
])
PDO_MYSQL_MODULE_TYPE=external
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
