Sync with HEAD

diff --git a/configure b/configure
index 7d12d7c774b3fe7e054b97b163770c2557ac9ba2..39983a5ac2abdea3dedbcbc2d3aaa10007220ecc 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.560.2.8 2005/05/19 22:17:05 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.560.2.9 2005/06/10 15:11:24 kurt Exp  
 
 # This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #

diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index 2c49525f7274a73e2303b76f254e8780cf31a421..bd356d0c5f521ead71f028843f2a51571bbe1c4a 100644 (file)
--- a/servers/slapd/overlays/Makefile.in
+++ b/servers/slapd/overlays/Makefile.in
@@ -106,6 +106,14 @@ MKDEPFLAG = -l
 .c.lo:
        $(LTCOMPILE_MOD) $<
 
-$(LIBRARY): version.lo
+$(LIBRARY): $(OBJS) version.lo
        $(AR) rs $@ $(OBJS)
 
+# Must fixup depends for non-libtool objects
+depend-local:
+       @if test -n "$(OBJS)"; then \
+       OBJ2=`echo $(OBJS) | $(SED) -e 's/\.o//g'`; \
+       SCR=''; for i in $$OBJ2; do SCR="$$SCR -e s/^$$i.lo:/$$i.o:/"; done; \
+       mv Makefile Makefile.bak; $(SED) $$SCR Makefile.bak > Makefile && \
+       $(RM) Makefile.bak; fi
+