diff --git a/php5/acinclude.m4 b/php5/acinclude.m4
index d5af49b..888c167 100644
--- a/php5/acinclude.m4
+++ b/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"
@@ -450,8 +451,11 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
       _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
     ],[
       if test "$ext_shared" = "yes"; then
-        $2="-L$ai_p [$]$2"
+        if test "x$PHP_RPATH" = "xno"; then
+	  $2="-L$ai_p [$]$2"
+	else
         test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
+	fi
       else
         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
       fi