derick Sat Dec 23 17:58:47 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/mcrypt config.m4
/php-src/ext/mhash config.m4
/php-src/ext/pdo_sqlite config.m4
/php-src/ext/tidy config.m4
Log:
- Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores
--with-libdir).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.454&r2=1.2027.2.547.2.455&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.454 php-src/NEWS:1.2027.2.547.2.455
--- php-src/NEWS:1.2027.2.547.2.454 Fri Dec 22 15:37:48 2006
+++ php-src/NEWS Sat Dec 23 17:58:47 2006
@@ -16,6 +16,8 @@
__inet_pton() and inet_ntop() was named __inet_ntop(). (Hannes)
- Fixed the validate email filter so that the letter "v" can also be used in
the user part of the email address. (Derick)
+- Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores
+ --with-libdir). (judas dot iscariote at gmail dot com, Derick)
- Fixed bug #39903 (Notice message when executing __halt_compiler() more than
once). (Tony)
- Fixed bug #39898 (FILTER_VALIDATE_URL validates \r\n\t etc). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/config.m4?r1=1.31&r2=1.31.4.1&diff_format=u
Index: php-src/ext/mcrypt/config.m4
diff -u php-src/ext/mcrypt/config.m4:1.31 php-src/ext/mcrypt/config.m4:1.31.4.1
--- php-src/ext/mcrypt/config.m4:1.31 Sun May 29 23:16:41 2005
+++ php-src/ext/mcrypt/config.m4 Sat Dec 23 17:58:47 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.31 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.31.4.1 2006/12/23 17:58:47 derick Exp $
dnl
AC_DEFUN([PHP_MCRYPT_CHECK_VERSION],[
@@ -45,13 +45,13 @@
],[
AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version
you have installed.])
],[
- -L$MCRYPT_DIR/lib
+ -L$MCRYPT_DIR/$PHP_LIBDIR
])
],[
- -L$MCRYPT_DIR/lib -lltdl
+ -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
])
- PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/$PHP_LIBDIR,
MCRYPT_SHARED_LIBADD)
PHP_ADD_INCLUDE($MCRYPT_DIR/include)
PHP_SUBST(MCRYPT_SHARED_LIBADD)
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/config.m4?r1=1.15&r2=1.15.4.1&diff_format=u
Index: php-src/ext/mhash/config.m4
diff -u php-src/ext/mhash/config.m4:1.15 php-src/ext/mhash/config.m4:1.15.4.1
--- php-src/ext/mhash/config.m4:1.15 Sun May 29 23:16:41 2005
+++ php-src/ext/mhash/config.m4 Sat Dec 23 17:58:47 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.15 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.15.4.1 2006/12/23 17:58:47 derick Exp $
dnl
PHP_ARG_WITH(mhash, for mhash support,
@@ -15,7 +15,7 @@
fi
PHP_ADD_INCLUDE($MHASH_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/$PHP_LIBDIR, MHASH_SHARED_LIBADD)
PHP_NEW_EXTENSION(mhash, mhash.c, $ext_shared)
PHP_SUBST(MHASH_SHARED_LIBADD)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.2&r2=1.26.2.9.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.2
php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.3
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.2 Sat Sep 9 21:14:05 2006
+++ php-src/ext/pdo_sqlite/config.m4 Sat Dec 23 17:58:47 2006
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.9.2.2 2006/09/09 21:14:05 bjori Exp $
+dnl $Id: config.m4,v 1.26.2.9.2.3 2006/12/23 17:58:47 derick Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -54,12 +54,12 @@
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
[
- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $PDO_SQLITE_DIR/lib,
PDO_SQLITE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $PDO_SQLITE_DIR/$PHP_LIBDIR,
PDO_SQLITE_SHARED_LIBADD)
AC_DEFINE(HAVE_PDO_SQLITELIB,1,[ ])
],[
AC_MSG_ERROR([wrong sqlite lib version or lib not found])
],[
- -L$PDO_SQLITE_DIR/lib -lm
+ -L$PDO_SQLITE_DIR/$PHP_LIBDIR -lm
])
PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[
AC_DEFINE(HAVE_SQLITE3_KEY,1, [have commercial sqlite3 with crypto
support])
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/config.m4?r1=1.5&r2=1.5.4.1&diff_format=u
Index: php-src/ext/tidy/config.m4
diff -u php-src/ext/tidy/config.m4:1.5 php-src/ext/tidy/config.m4:1.5.4.1
--- php-src/ext/tidy/config.m4:1.5 Sun May 29 23:16:45 2005
+++ php-src/ext/tidy/config.m4 Sat Dec 23 17:58:47 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.5 2005/05/29 23:16:45 sniper Exp $
+dnl $Id: config.m4,v 1.5.4.1 2006/12/23 17:58:47 derick Exp $
dnl
PHP_ARG_WITH(tidy,for TIDY support,
@@ -27,7 +27,7 @@
AC_MSG_ERROR(Cannot find libtidy)
fi
- TIDY_LIBDIR=$TIDY_DIR/lib
+ TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
PHP_ADD_INCLUDE($TIDY_INCDIR)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
