From 3ee9304cd934199d3d06752fa549cdfa7988d425 Mon Sep 17 00:00:00 2001
From: "Thies C. Arntzen" <thies@php.net>
Date: Mon, 8 May 2000 08:27:48 +0000
Subject: support empty libpath in AC_ADD_LIBRARY_WITH_PATH make sure the
 link-order for shared and static builds are the same

---
 acinclude.m4 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index e64294013b..0715502483 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -426,8 +426,10 @@ dnl shared-libadd will be assigned the library information
 dnl
 AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[
 ifelse($3,,[
-  AC_ADD_LIBPATH($2)
-  AC_ADD_LIBRARY($1)
+  if test -n "$2"; then
+    AC_ADD_LIBPATH($2)
+  fi
+  AC_ADD_LIBRARY($1,1)
 ],[
   if test "$ext_shared" = "yes"; then
     if test -n "$2"; then
@@ -435,8 +437,10 @@ ifelse($3,,[
     fi
     $3="[$]$3 -l$1"
   else
-   AC_ADD_LIBPATH($2)
-   AC_ADD_LIBRARY($1)
+    if test -n "$2"; then
+      AC_ADD_LIBPATH($2)
+	fi
+    AC_ADD_LIBRARY($1,1)
  fi
 ])
 ])
-- 
cgit v1.2.1