Add libtool fix to the mix

diff --git a/CHANGES b/CHANGES
index 6f060928a64734ee649e65e505deba7c615ab87c..ffddf84d9fadf3b6072e0a2f8834e90e7cff8788 100644 (file)
--- 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 9070f5413a82623110c857b4bf78136a14425e28..c654e165a5aecbc4adc6e994887ef5ec33e7982a 100755 (executable)
--- 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