Separate libpaths into PHP_LDFLAGS, so that we can address them

separately (required for Apache build).

acinclude.m4

@@ -95,7 +95,8 @@ AC_DEFUN(AC_BUILD_RPATH,[
     OLD_RPATHS="$PHP_RPATHS"
 	PHP_RPATHS=""
 	for i in $OLD_RPATHS; do
-	    PHP_RPATHS="$PHP_RPATHS -R $i"
+        PHP_LDFLAGS="$PHP_LDFLAGS -L$i"
+        PHP_RPATHS="$PHP_RPATHS -R $i"
         NATIVE_RPATHS="$NATIVE_RPATHS ${ld_runpath_switch}$i"
 	  done
   fi

configure.in

@@ -737,10 +737,8 @@ phptempdir="`pwd`/libs"
 AC_SUBST(phplibdir)
 AC_SUBST(phptempdir)
 EXTRA_LIBS="$EXTRA_LIBS $LIBS"
+EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
 LIBS=""
-for i in $PHP_RPATHS; do
-	EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$i"
-done
 LDFLAGS=""
 
 AC_BUILD_RPATH
@@ -759,6 +757,7 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME")
 PHP_OS=`uname`
 AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS")
 
+AC_SUBST(PHP_LDFLAGS)
 AC_SUBST(PHP_LIBS)
 AC_SUBST(PHP_SAPI)
 AC_SUBST(INSTALL_IT)

sapi/apache/libphp4.module.in

@@ -1,7 +1,7 @@
 Name: php4_module
 ConfigStart
 	RULE_WANTHSREGEX=@APACHE_WANT_HSREGEX@
-	LIBS="@NATIVE_RPATHS@ @PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ $LIBS"
+	LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS"
 	RULE_HIDE=yes
 	CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@"
 ConfigEnd