1 |
slords |
1.1 |
--- php-5.2.4/acinclude.m4.norpath |
2 |
|
|
+++ php-5.2.4/acinclude.m4 |
3 |
|
|
@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[ |
4 |
|
|
dnl internal, don't use |
5 |
|
|
AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[ |
6 |
|
|
PHP_RUN_ONCE(LIBPATH, $1, [ |
7 |
|
|
+ test "x$PHP_RPATH" != "xno" && |
8 |
|
|
test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1" |
9 |
|
|
LDFLAGS="$LDFLAGS -L$1" |
10 |
|
|
PHP_RPATHS="$PHP_RPATHS $1" |
11 |
|
|
@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[ |
12 |
|
|
],[ |
13 |
|
|
if test "$ext_shared" = "yes"; then |
14 |
|
|
$2="-L$ai_p [$]$2" |
15 |
|
|
+ test "x$PHP_RPATH" != "xno" && \ |
16 |
|
|
test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2" |
17 |
|
|
else |
18 |
|
|
_PHP_ADD_LIBPATH_GLOBAL([$ai_p]) |