Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 56662f8135650f8f8f84b2c96c004eb0 > files > 6

php53-5.3.3-24.el5.src.rpm

--- php-5.2.4/acinclude.m4.norpath
+++ php-5.2.4/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])