Fix IRIX sc_mask conflict

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index e70470b6f81a7e9322a5c8ecabcc42717f1c9b9b..4171610221fb96c9abcd8652f955708491c3d022 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -17,9 +17,9 @@ SRCS  = main.c daemon.c connection.c search.c filter.c add.c charray.c \
                repl.c lock.c controls.c extended.c kerberos.c passwd.c \
                schema.c schema_check.c schema_init.c schema_prep.c \
                schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \
-               configinfo.c starttls.c index.c sets.c referral.c \
+               oidm.c starttls.c index.c sets.c referral.c \
                root_dse.c sasl.c module.c suffixalias.c mra.c mods.c \
-               limits.c backglue.c \
+               limits.c backglue.c operational.c matchedValues.c \
                $(@PLAT@_SRCS)
 
 OBJS   = main.o daemon.o connection.o search.o filter.o add.o charray.o \
@@ -30,24 +30,22 @@ OBJS        = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                repl.o lock.o controls.o extended.o kerberos.o passwd.o \
                schema.o schema_check.o schema_init.o schema_prep.o \
                schemaparse.o ad.o at.o mr.o syntax.o oc.o saslauthz.o \
-               configinfo.o starttls.o index.o sets.o referral.o \
+               oidm.o starttls.o index.o sets.o referral.o \
                root_dse.o sasl.o module.o suffixalias.o mra.o mods.o \
-               limits.o backglue.o \
+               limits.o backglue.o operational.o matchedValues.o \
                $(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_MODULES=@SLAPD_MODULES_LIST@
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
 
 XDEFS = $(MODULES_CPPFLAGS)
-XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
+XLDFLAGS = $(MODULES_LDFLAGS)
 
-# $(LTHREAD_LIBS) must be last
-XLIBS = libbackends.a -lavl @LDBM_LIB@ -lldif -llutil -llunicode -lldap_r -llber
+XLIBS = libbackends.a $(SLAPD_L)
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS)
 
@@ -59,7 +57,7 @@ all-local-srv: all-cffiles
 NT_SLAPD_DEPENDS = slapd.exp
 NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o
 
-UNIX_SLAPD_DEPENDS = libbackends.a version.o
+UNIX_SLAPD_DEPENDS = libbackends.a version.o $(SLAPD_L)
 UNIX_SLAPD_OBJECTS = $(OBJS) version.o
 
 SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS)
@@ -137,9 +135,9 @@ slapd.def: libbackends.a version.o
        done; \
        objs=""; \
        for i in $(OBJS) version.o $(LIBS) ; do \
+           obj="" ; \
            case $$i in \
                -l*) \
-                   obj="" ; \
                    done="" ;\
                    base=`expr "$$i" : "-l\(.*\)"`; \
                    for p in $$paths ; do \
@@ -337,11 +335,11 @@ install-slapd: FORCE
 all-cffiles: slapd
        @if test $(PLAT) = NT; then \
            sysconfdir=`cygpath -w $(sysconfdir) | \
-               $(SED) -e 's/\\\\/\\\\\\\\/g'`; \
+               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
            localstatedir=`cygpath -w $(localstatedir) | \
-               $(SED) -e 's/\\\\/\\\\\\\\/g'`; \
+               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
            moduledir=`cygpath -w $(moduledir) | \
-               $(SED) -e 's/\\\\/\\\\\\\\/g'`; \
+               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
        else \
            sysconfdir=$(sysconfdir); \
            localstatedir=$(localstatedir); \
@@ -370,7 +368,7 @@ install-schema: FORCE
 
 install-conf: FORCE
        @-$(MKDIR) $(DESTDIR)$(sysconfdir)
-       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-ldbm
+       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
        $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
        if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
                echo "installing slapd.conf in $(sysconfdir)"; \