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 777e666a93ab57c1dc6fc41571ed2b88f7ba4e67..1e8f1525d345e777f4a1af068084319f890dd7b8 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 #-----------------------------------------------------------------------------
 # Portions Copyright (c) 1995 Regents of the University of Michigan.
@@ -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 -lldbm -llutil -llunicode -lldap_r -llber
+XLIBS = $(SLAPD_L) $(LDBM_LIBS)
 XXLIBS = $(SLAPD_LIBS) \
        $(LDBM_LIBS) $(SECURITY_LIBS) \
        $(LDIF_LIBS) $(LUTIL_LIBS)
@@ -33,21 +31,18 @@ XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS)
 
 PROGRAMS=slapadd slapcat slapindex slappasswd
 
-# CPPFLAGS will include the defines for dynamic libs in Mingw32.
-NT_DYN_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport
-CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_DEFS)
-
 SRCS = mimic.c slapcommon.c \
        slapadd.c slapcat.c slapindex.c slappasswd.c
 
 SLAPD_OBJS = ../config.o ../ch_malloc.o ../backend.o ../charray.o \
-               ../module.o ../aclparse.o ../filterentry.o \
-               ../schema.o ../schema_check.o ../schema_init.o ../schema_prep.o \
-               ../schemaparse.o ../ad.o ../at.o ../mr.o ../oc.o ../syntax.o \
-               ../acl.o ../phonetic.o ../attr.o ../value.o ../entry.o \
-               ../dn.o ../filter.o ../str2filter.o ../ava.o ../init.o \
-               ../controls.o ../kerberos.o ../passwd.o ../index.o \
-               ../extended.o ../starttls.o ../sets.o
+               ../module.o ../aclparse.o ../filterentry.o ../schema.o \
+               ../schema_check.o ../schema_init.o ../schema_prep.o \
+               ../schemaparse.o ../ad.o ../at.o ../mr.o ../oc.o \
+               ../syntax.o ../acl.o ../phonetic.o ../attr.o ../value.o \
+               ../entry.o ../dn.o ../filter.o ../str2filter.o ../ava.o \
+               ../init.o ../controls.o ../kerberos.o ../passwd.o \
+               ../index.o ../extended.o ../starttls.o ../sets.o ../mra.o \
+               ../referral.o ../backglue.o ../oidm.o ../mods.o
 
 SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o
 
@@ -58,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
@@ -76,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 \