Revert libtool update

[openldap] / build / ltmain.sh

diff --git a/build/ltmain.sh b/build/ltmain.sh
index 92856318068bddfbabf9eb0487ade89d35c2b67c..d54be8d39d481e9dee7ca93b6a2f0a1dfe35faee 100755 (executable)
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -27,7 +27,17 @@
 # This file is distributed with OpenLDAP Software, which contains a
 # configuration script generated by Autoconf, and is distributable
 # under the same distributions terms as OpenLDAP inself.
-# See the OpenLDAP COPYRIGHT and LICENSE file for details.
+
+## Copyright 1998-2005 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -191,6 +201,22 @@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
+  --tag=*)
+       case "$optarg" in
+       CC)
+               ;;
+       disable-shared)
+               build_libtool_libs=no
+               ;;
+       disable-static)
+               build_old_libs=no
+               ;;
+       *)
+               echo "unknown tag"
+               exit 1;
+       esac
+       ;;
+
   --preserve-dup-deps) duplicate_deps="yes" ;;
 
   --quiet | --silent)
@@ -1410,14 +1436,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
@@ -1909,6 +1935,7 @@ compiler."
            else
              # We cannot seem to hardcode it, guess we'll fake it.
              add_dir="-L$libdir"
+             test -d "$ladir/.libs" && add_dir="-L$ladir/.libs $add_dir"
              add="-l$name"
            fi