cvs: php-src / acinclude.m4
| From: | Jani Taskinen | Date: | Wed, 22 Jun 2005 06:50:27 +0000 |
| Subject: | cvs: php-src / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32456@lists.php.net to get a copy of this message | ||
sniper Wed Jun 22 02:50:27 2005 EDT
Modified files:
/php-src acinclude.m4
Log:
- Never ever add /usr/lib as libpath, even if --with-libdir is used
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.322&r2=1.323&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.322 php-src/acinclude.m4:1.323
--- php-src/acinclude.m4:1.322 Tue Jun 21 06:20:03 2005
+++ php-src/acinclude.m4 Wed Jun 22 02:50:24 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.322 2005/06/21 10:20:03 sniper Exp $
+dnl $Id: acinclude.m4,v 1.323 2005/06/22 06:50:24 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -441,7 +441,7 @@
dnl Adds a path to linkpath/runpath (LDFLAGS)
dnl
AC_DEFUN([PHP_ADD_LIBPATH],[
- if test "$1" != "/usr/$PHP_LIBDIR"; then
+ if test "$1" != "/usr/$PHP_LIBDIR" && test "$1" !=
"/usr/lib"; then
PHP_EXPAND_PATH($1, ai_p)
ifelse([$2],,[
_PHP_ADD_LIBPATH_GLOBAL([$ai_p])