cvs: php-src /ext/mcrypt config.m4 /ext/mhash config.m4 /ext/pdo_sqlite config.m4 /ext/tidy config.m4

derick Sat Dec 23 18:00:50 2006 UTC Modified files: /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: - MFB: Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores --with-libdir). http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/config.m4?r1=1.31&r2=1.32&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.32 --- php-src/ext/mcrypt/config.m4:1.31 Sun May 29 23:16:41 2005 +++ php-src/ext/mcrypt/config.m4 Sat Dec 23 18:00:49 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.32 2006/12/23 18:00:49 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.16&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.16 --- php-src/ext/mhash/config.m4:1.15 Sun May 29 23:16:41 2005 +++ php-src/ext/mhash/config.m4 Sat Dec 23 18:00:49 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.16 2006/12/23 18:00:49 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.31&r2=1.32&diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.31 php-src/ext/pdo_sqlite/config.m4:1.32 --- php-src/ext/pdo_sqlite/config.m4:1.31 Mon Aug 14 16:35:22 2006 +++ php-src/ext/pdo_sqlite/config.m4 Sat Dec 23 18:00:49 2006 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.31 2006/08/14 16:35:22 iliaa Exp $ +dnl $Id: config.m4,v 1.32 2006/12/23 18:00:49 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.6&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.6 --- php-src/ext/tidy/config.m4:1.5 Sun May 29 23:16:45 2005 +++ php-src/ext/tidy/config.m4 Sat Dec 23 18:00:49 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.6 2006/12/23 18:00:49 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)