Prepend added libraries and separate LDFLAGS handling

diff --git a/acinclude.m4 b/acinclude.m4
index 6df68e5fdd0134b6e82f1ea08b78ae39b71424a7..a8a5c68ad4106fd81953ca4b5dfa34f6d1b37fe1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -78,7 +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, [
-      LIBS="$LIBS -L$ai_p"
+      LDFLAGS="$LDFLAGS -L$ai_p"
       PHP_RPATHS="$PHP_RPATHS $ai_p"
     ])
   fi
@@ -121,7 +121,7 @@ dnl add a library to the link line
 dnl
 AC_DEFUN(AC_ADD_LIBRARY,[
   AC_PHP_ONCE(LIBRARY, $1, [
-    LIBS="$LIBS -l$1"
+    LIBS="-l$1 $LIBS"
   ])
 ])
 

diff --git a/configure.in b/configure.in
index 6b9d7db1b06ad0c171b9a8f477b484b2d2555f14..03a0506b5b2b7cc8e4478844f9f29df5e76c2411 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -737,8 +737,10 @@ phplibdir="`pwd`/modules"
 phptempdir="`pwd`/libs"
 AC_SUBST(phplibdir)
 AC_SUBST(phptempdir)
-EXTRA_LIBS="$LIBS $EXTRA_LIBS"
+EXTRA_LIBS="$EXTRA_LIBS $LIBS"
 LIBS=""
+EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
+LDFLAGS=""
 
 AC_SUBST(CFLAGS)
 AC_SUBST(PROG_SENDMAIL)