1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
|
From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Date: Sat, 2 May 2015 10:26:55 +0200
Subject: php-5.2.4-norpath
---
acinclude.m4 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/acinclude.m4 b/acinclude.m4
index 2f07db0..734fe73 100644
--- a/acinclude.m4
+++ b/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])
|