Add rpaths to LDFLAGS during configure, drop them later.

diff --git a/acinclude.m4 b/acinclude.m4
index a8a5c68ad4106fd81953ca4b5dfa34f6d1b37fe1..ce8e69937a4d80eaf04cda23931679678fb1502f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -78,6 +78,7 @@ AC_DEFUN(AC_ADD_LIBPATH,[
   if test "$1" != "/usr/lib"; then
     AC_EXPAND_PATH($1, ai_p)
     AC_PHP_ONCE(LIBPATH, $ai_p, [
+      test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
       LDFLAGS="$LDFLAGS -L$ai_p"
       PHP_RPATHS="$PHP_RPATHS $ai_p"
     ])

diff --git a/configure.in b/configure.in
index 03a0506b5b2b7cc8e4478844f9f29df5e76c2411..d77730b0efbbb5dfb7987f4e4bfdcfde204e8ab9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -731,7 +731,6 @@ dnl test -n "$GCC" && CFLAGS="$CFLAGS -fpic"
 dnl add -fPIC option on Solaris if we are building dynamic extensions
 dnl PHP_SOLARIS_PIC_WEIRDNESS
 
-AC_BUILD_RPATH
 
 phplibdir="`pwd`/modules"
 phptempdir="`pwd`/libs"
@@ -739,9 +738,13 @@ AC_SUBST(phplibdir)
 AC_SUBST(phptempdir)
 EXTRA_LIBS="$EXTRA_LIBS $LIBS"
 LIBS=""
-EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
+for i in $PHP_RPATHS; do
+       EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$i"
+done
 LDFLAGS=""
 
+AC_BUILD_RPATH
+
 AC_SUBST(CFLAGS)
 AC_SUBST(PROG_SENDMAIL)
 AC_SUBST(PHP_RPATHS)