975ebd9
--- php-5.2.4/acinclude.m4.norpath
975ebd9
+++ php-5.2.4/acinclude.m4
975ebd9
@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
231013c
 dnl internal, don't use
231013c
 AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
231013c
   PHP_RUN_ONCE(LIBPATH, $1, [
231013c
+    test "x$PHP_RPATH" != "xno" &&
231013c
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
231013c
     LDFLAGS="$LDFLAGS -L$1"
231013c
     PHP_RPATHS="$PHP_RPATHS $1"
975ebd9
@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
231013c
     ],[
231013c
       if test "$ext_shared" = "yes"; then
975ebd9
         $2="-L$ai_p [$]$2"
975ebd9
+        test "x$PHP_RPATH" != "xno" && \
975ebd9
         test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
231013c
       else
231013c
         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])