From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 29 May 2007 23:57:47 +0000 (+0000)
Subject: import rev 1.46, ITS#4988: --disable-overlays broke Makefile.
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=28981ce85c4430dedb9a94d04ffe9437e143d937;p=openldap

import rev 1.46, ITS#4988: --disable-overlays broke Makefile.
---

diff --git a/CHANGES b/CHANGES
index 8bcdcae38d..a1280c73e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,8 @@ OpenLDAP 2.3.36 Engineering
 	Fixed slapo-chain RFC3062 passwd exop handling (ITS#4964)
 	Fixed libldap response code handling on rebind (ITS#4924)
 	Fixed libldap SASL_MAX_BUFF_SIZE (ITS#4935)
+	Build Environment
+		Fixed --disable-overlays Makefile problem (ITS#4988)
 	Documentation
 		Updated slapadd(8) with details on -s option
 		Updated slapo-ppolicy(5) for pwdAccountLockedTime zero example (ITS#4978)
diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index bc239afd54..fd3218b8ab 100644
--- a/servers/slapd/overlays/Makefile.in
+++ b/servers/slapd/overlays/Makefile.in
@@ -29,9 +29,9 @@ SRCS = overlays.c \
 	translucent.c \
 	unique.c \
 	valsort.c
-OBJS = overlays.o \
-	statover.o \
-	@SLAPD_STATIC_OVERLAYS@
+OBJS = statover.o \
+	@SLAPD_STATIC_OVERLAYS@ \
+	overlays.o
 
 # Add here the objs that are needed by overlays, but do not make it
 # into SLAPD_STATIC_OVERLAYS...