From: Quanah Gibson-Mount Date: Tue, 20 Nov 2007 19:54:55 +0000 (+0000) Subject: ITS#5215 X-Git-Tag: OPENLDAP_REL_ENG_2_4_7~63 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1ddc0fcc82f009a51b5b1011e965a316a7b765e3;p=openldap ITS#5215 --- diff --git a/CHANGES b/CHANGES index fccc667e31..8df37a56a5 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,7 @@ OpenLDAP 2.4.7 Engineering Updated contrib addpartial module (ITS#3593) Build Environment Fixed liblber socket library linking (ITS#5224) + Fixed Windows slapd.def rules (ITS#5215) Documentation Fixed grammar errors (ITS#5223) Refint overlay doc contribution (ITS#5217) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index fcc9a4ce83..2131b4e048 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -138,7 +138,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS) # for functions, but it is required for variables. # # The symdummy.c file basically references EVERY symbol available to slapd.exe, -# including symbols that slapd.exe never actually refereneced. The file +# including symbols that slapd.exe never actually referenced. The file # is compiled and included at link time. Without this object file, slapd.exe # would NOT export symbols that it never referenced. The reason that these # symbols must still be exported is because a dynamic module may want to @@ -155,7 +155,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS) # on its own very long list of dependencies. # slapd.def: libbackends.a liboverlays.a version.o - @for i in $(LDFLAGS) ; do \ + @for i in XX $(LDFLAGS) ; do \ path=`expr "$$i" : "-L\(.*\)"`; \ if test $$? != 0; then continue; fi; \ paths="$$paths $$path"; \ @@ -167,7 +167,7 @@ slapd.def: libbackends.a liboverlays.a version.o -l*) \ done="" ;\ base=`expr "$$i" : "-l\(.*\)"`; \ - for p in $$paths ; do \ + for p in . $$paths ; do \ for ext in la dll dll.a a ; do \ path=$$p/lib$$base.$$ext; \ test ! -f $$path && continue; \