Improve/fix handling of --disable-rpath

Might or might not fix #18374

diff --git a/acinclude.m4 b/acinclude.m4
index dd0f336e56c3103db9be36d0674c8229207a9235..ce15247f1e064ed0f2f15a124c5746498e1ecf58 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -884,19 +884,26 @@ AC_DEFUN(PHP_ADD_LIBPATH,[
 ])
 
 dnl
-dnl PHP_BUILD_RPATH()
+dnl PHP_UTILIZE_RPATHS()
 dnl
-dnl builds RPATH from PHP_RPATHS
+dnl builds RPATHS/LDFLAGS from PHP_RPATHS
 dnl
-AC_DEFUN(PHP_BUILD_RPATH,[
-  if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then
-    OLD_RPATHS=$PHP_RPATHS
+AC_DEFUN(PHP_UTILIZE_RPATHS,[
+  OLD_RPATHS=$PHP_RPATHS
+  unset PHP_RPATHS
+
+  for i in $OLD_RPATHS; do
+dnl Can be passed to native cc/libtool
+    PHP_LDFLAGS="$PHP_LDFLAGS -L$i"
+dnl Libtool-specific
+    PHP_RPATHS="$PHP_RPATHS -R $i"
+dnl cc-specific
+    NATIVE_RPATHS="$NATIVE_RPATHS $ld_runpath_switch$i"
+  done
+
+  if test "$PHP_RPATH" = "no"; then
     unset PHP_RPATHS
-    for i in $OLD_RPATHS; do
-      PHP_LDFLAGS="$PHP_LDFLAGS -L$i"
-      PHP_RPATHS="$PHP_RPATHS -R $i"
-      NATIVE_RPATHS="$NATIVE_RPATHS $ld_runpath_switch$i"
-    done
+    unset NATIVE_RPATHS
   fi
 ])
 

diff --git a/configure.in b/configure.in
index 398dc60ba81c3a890037348f64eb1d092d7c1443..89eeb4813e61d71db46ee80c7988f8953d5cc6a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -892,7 +892,7 @@ AC_SUBST(EXPANDED_SYSCONFDIR)
 AC_SUBST(EXPANDED_LOCALSTATEDIR)
 AC_SUBST(EXPANDED_PHP_CONFIG_FILE_PATH)
 
-PHP_BUILD_RPATH
+PHP_UTILIZE_RPATHS
 
 PHP_REMOVE_USR_LIB(PHP_LDFLAGS)
 PHP_REMOVE_USR_LIB(LDFLAGS)