archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores

Browse source 
--with-libdir).
This commit is contained in:
Derick Rethans 2006-12-23 17:58:47 +00:00
parent 46b25155d2
commit 7180422fdc
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -16,6 +16,8 @@ PHP NEWS
__inet_pton() and inet_ntop() was named __inet_ntop(). (Hannes) __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 - Fixed the validate email filter so that the letter "v" can also be used in
the user part of the email address. (Derick) 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 - Fixed bug #39903 (Notice message when executing __halt_compiler() more than
once). (Tony) once). (Tony)
- Fixed bug #39898 (FILTER_VALIDATE_URL validates \r\n\t etc). (Ilia) - Fixed bug #39898 (FILTER_VALIDATE_URL validates \r\n\t etc). (Ilia)

6
ext/mcrypt/config.m4
View file

@ -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.]) 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_ADD_INCLUDE($MCRYPT_DIR/include)
PHP_SUBST(MCRYPT_SHARED_LIBADD) PHP_SUBST(MCRYPT_SHARED_LIBADD)

2
ext/mhash/config.m4
View file

@ -15,7 +15,7 @@ if test "$PHP_MHASH" != "no"; then
fi fi
PHP_ADD_INCLUDE($MHASH_DIR/include) 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_NEW_EXTENSION(mhash, mhash.c, $ext_shared)
PHP_SUBST(MHASH_SHARED_LIBADD) PHP_SUBST(MHASH_SHARED_LIBADD)

4
ext/pdo_sqlite/config.m4
View file

@ -54,12 +54,12 @@ if test "$PHP_PDO_SQLITE" != "no"; then
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, 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_DEFINE(HAVE_PDO_SQLITELIB,1,[ ])
],[ ],[
AC_MSG_ERROR([wrong sqlite lib version or lib not found]) 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,[ PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[
AC_DEFINE(HAVE_SQLITE3_KEY,1, [have commercial sqlite3 with crypto support]) AC_DEFINE(HAVE_SQLITE3_KEY,1, [have commercial sqlite3 with crypto support])

2
ext/tidy/config.m4
View file

@ -27,7 +27,7 @@ if test "$PHP_TIDY" != "no"; then
AC_MSG_ERROR(Cannot find libtidy) AC_MSG_ERROR(Cannot find libtidy)
fi 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_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
PHP_ADD_INCLUDE($TIDY_INCDIR) PHP_ADD_INCLUDE($TIDY_INCDIR)