From 9417570dc1f31a0e3ddb9f6736a547c87ce7cfba Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Sun, 5 Dec 1999 16:24:20 +0000
Subject: [PATCH] Prepend added libraries and separate LDFLAGS handling

---
 acinclude.m4 | 4 ++--
 configure.in | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 6df68e5fdd..a8a5c68ad4 100644
--- 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 6b9d7db1b0..03a0506b5b 100644
--- 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)
-- 
2.40.0