Per ITS#419, don't require SLAPD_RLOOKUPS when HAVE_TCPD

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 97433dc490a0301624d1d12ce6b3e4eec6e7c35d..bef40b837332320187844a04889990749deca1c6 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -14,8 +14,8 @@ SRCS  = main.c daemon.c connection.c search.c filter.c add.c charray.c \
                dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
                value.c ava.c bind.c unbind.c abandon.c filterentry.c \
                phonetic.c acl.c str2filter.c aclparse.c init.c user.c \
-               repl.c lock.c controls.c extended.c \
-               schema.c schemaparse.c monitor.c configinfo.c \
+               repl.c lock.c controls.c extended.c kerberos.c passwd.c \
+               schema.c schemaparse.c monitor.c configinfo.c starttls.c \
                root_dse.c sasl.c module.c suffixalias.c $(@PLAT@_SRCS)
 
 OBJS   = main.o daemon.o connection.o search.o filter.o add.o charray.o \
@@ -23,8 +23,8 @@ OBJS  = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
                value.o ava.o bind.o unbind.o abandon.o filterentry.o \
                phonetic.o acl.o str2filter.o aclparse.o init.o user.o \
-               repl.o lock.o controls.o extended.o \
-               schema.o schemaparse.o monitor.o configinfo.o \
+               repl.o lock.o controls.o extended.o kerberos.o passwd.o \
+               schema.o schemaparse.o monitor.o configinfo.o starttls.o \
                root_dse.o sasl.o module.o suffixalias.o $(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include
@@ -47,11 +47,7 @@ BUILD_SRV = @BUILD_SLAPD@
 
 all-local-srv: all-cffiles
 
-NT_GEN_DEFS = -DLIBLUTIL_DECL=dllexport -DLIBAVL_DECL=dllexport \
-             -DLIBLDBM_DECL=dllexport -DLIBLDIF_DECL=dllexport
-
-NT_DYN_DEFS  = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport $(NT_GEN_DEFS)
-NT_STAT_DEFS = -DLIBLBER_DECL=dllexport -DLIBLDAP_DECL=dllexport $(NT_GEN_DEFS)
+NT_DYN_DEFS  = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport
 
 DEFINES = $(@PLAT@_@LIB_LINKAGE@_DEFS)
 
@@ -152,7 +148,7 @@ veryclean-local-srv: FORCE
                fi; \
        done
 
-install-local-srv: install-slapd install-conf install-tools
+install-local-srv: install-slapd install-conf install-schema install-tools
 
 install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
@@ -180,6 +176,19 @@ all-cffiles: slapd
        done
        touch all-cffiles
 
+install-schema: FORCE
+       @-$(MKDIR) $(DESTDIR)$(sysconfdir)/schema
+       @for i in schema/*.schema schema/*.conf ; do \
+               if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+                       echo "installing $$i in $(sysconfdir)"; \
+                       echo $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(sysconfdir)/$$i; \
+                       $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(sysconfdir)/$$i; \
+               else \
+                       echo "PRESERVING EXISTING SCHEMA FILE $(DESTDIR)$(sysconfdir)/$$i"; \
+               fi; \
+               $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(sysconfdir)/$$i.default ; \
+       done
+
 install-conf: FORCE
        @-$(MKDIR) $(DESTDIR)$(sysconfdir)
        @for i in $(CFFILES); do \