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