X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fltmain.sh;h=cc95125f0275f3dfefd6f267110cb8f5174ed3e7;hb=f682ee0918d4e1c5c347073c8d3a6948d1c8bf2e;hp=adad23fb8d566b9ffcf9a66d47e34078338dd09a;hpb=a3141da1106a5ae5390ea16556b9e6990c85b961;p=openldap

diff --git a/build/ltmain.sh b/build/ltmain.sh
index adad23fb8d..cc95125f02 100755
--- 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
@@ -61,7 +71,7 @@ modename="$progname"
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 VERSION=1.4.3-OpenLDAP
-TIMESTAMP=' ($Id$)'
+TIMESTAMP=""
 
 default_mode=
 help="Try \`$progname --help' for more information."
@@ -1410,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
@@ -1909,6 +1919,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