From 8c0a98220fa03f9f2bad50dc6fa215f06fe8ab96 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 21 Apr 2004 22:19:25 +0000
Subject: [PATCH] Add libtool fix to the mix

---
 CHANGES         |  4 +++-
 build/ltmain.sh | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6f060928a6..ffddf84d9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,9 @@ OpenLDAP 2.2.11 Engineering
 	Fixed slapd acl dn="" bug
 	Updated slapd limits handling
 	Build Environment
-		Fix MacOSX sl_free interop bug (ITS#3092)
+		Fixed MacOSX sl_free interop bug (ITS#3092)
+		Fixed libtool -static bug
+		Added Berkeley DB mismatch check
 
 OpenLDAP 2.2.10 Release
 	Build Environment
diff --git a/build/ltmain.sh b/build/ltmain.sh
index 9070f5413a..c654e165a5 100755
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -1420,14 +1420,14 @@ compiler."
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    # Search the libtool library
-	    lib="$searchdir/lib${name}.la"
-	    if test -f "$lib"; then
-	      found=yes
-	      break
-	    fi
-	  done
+#	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+#	    # Search the libtool library
+#	    lib="$searchdir/lib${name}.la"
+#	    if test -f "$lib"; then
+#	      found=yes
+#	      break
+#	    fi
+#	  done
 	  if test "$found" != yes; then
 	    # deplib doesn't seem to be a libtool library
 	    if test "$linkmode,$pass" = "prog,link"; then