Use IPV6_V6ONLY on IPv6 sockets if available. This way we only get IPv6

[openldap] / servers / slapd / tools / Makefile.in

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index e95847692585d9c7f4a8fe1ee6249476a7d3bdfd..1e8f1525d345e777f4a1af068084319f890dd7b8 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -15,17 +15,15 @@
 #       Stand alone LDAP server tools makefile
 #
 #-----------------------------------------------------------------------------
-BUILD_LDBM = @BUILD_LDBM@
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
 
 SLAP_DIR=../
-SLAPD_MODULES = @SLAPD_MODULES_LIST@
 XDEFS = $(MODULES_CPPFLAGS)
-XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
+XLDFLAGS = $(MODULES_LDFLAGS)
 
-XLIBS = -lavl -lldif @LDBM_LIB@ -llutil -llunicode -lldap_r -llber
+XLIBS = $(SLAPD_L) $(LDBM_LIBS)
 XXLIBS = $(SLAPD_LIBS) \
        $(LDBM_LIBS) $(SECURITY_LIBS) \
        $(LDIF_LIBS) $(LUTIL_LIBS)
@@ -55,16 +53,16 @@ build-progs: $(PROGRAMS)
 #
 # SLAP Tools
 #
-slapadd:       slapadd.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
+slapadd:       slapadd.o ../libbackends.a $(SLAPOBJS) $(SLAPD_L) 
        $(LTLINK) -o $@ slapadd.o $(SLAPOBJS) ../libbackends.a $(LIBS)
 
-slapcat:       slapcat.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
+slapcat:       slapcat.o ../libbackends.a $(SLAPOBJS) $(SLAPD_L) 
        $(LTLINK) -o $@ slapcat.o $(SLAPOBJS) ../libbackends.a $(LIBS)
 
-slapindex:     slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
+slapindex:     slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_L) 
        $(LTLINK) -o $@ slapindex.o $(SLAPOBJS) ../libbackends.a $(LIBS)
 
-slappasswd:            slappasswd.o $(SLAPD_LIBDEPEND) 
+slappasswd:            slappasswd.o $(SLAPD_L) 
        $(LTLINK) -o $@ slappasswd.o $(LIBS)
 
 clean-local: FORCE
@@ -73,11 +71,7 @@ clean-local: FORCE
 depend-local: FORCE
        $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
 
-install-local: install-ldbm-$(BUILD_LDBM)
-
-install-ldbm-no:
-
-install-ldbm-yes install-ldbm-mod: FORCE
+install-local: FORCE
        -$(MKDIR) $(DESTDIR)$(sbindir)
        @for bin in $(PROGRAMS); do \
                $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \