diff options
| author | Derick Rethans <derick@php.net> | 2006-12-23 17:58:47 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2006-12-23 17:58:47 +0000 |
| commit | 7180422fdca85933594d58372271fe2ef7af62a9 (patch) | |
| tree | b73154e85535b931b3a359000e2f74eecc0385ad | |
| parent | 46b25155d230c95282d69fce512c5a719e39365f (diff) | |
| download | php-git-7180422fdca85933594d58372271fe2ef7af62a9.tar.gz | |
- Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores
--with-libdir).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mcrypt/config.m4 | 6 | ||||
| -rw-r--r-- | ext/mhash/config.m4 | 2 | ||||
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 4 | ||||
| -rw-r--r-- | ext/tidy/config.m4 | 2 |
5 files changed, 9 insertions, 7 deletions
@@ -16,6 +16,8 @@ PHP NEWS __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) diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4 index 5dc218ed08..683b260ac7 100644 --- a/ext/mcrypt/config.m4 +++ b/ext/mcrypt/config.m4 @@ -45,13 +45,13 @@ if test "$PHP_MCRYPT" != "no"; then ],[ 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) diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4 index e4efbc055a..54903c44a0 100644 --- a/ext/mhash/config.m4 +++ b/ext/mhash/config.m4 @@ -15,7 +15,7 @@ if test "$PHP_MHASH" != "no"; then 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) diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 2f1d35af7e..3d7c20e2a3 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -54,12 +54,12 @@ if test "$PHP_PDO_SQLITE" != "no"; then 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]) diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index 8f83238402..675498c8ce 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -27,7 +27,7 @@ if test "$PHP_TIDY" != "no"; then 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) |