Rework libldap to not attempt to set LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE

[openldap] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 400a349952dac8ea0df992818605cf6b09e83a7d..bbbbc87fefed2ba882884ed7ec9e812a6769ba62 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,23 +1,25 @@
 # $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
 ##
 ## tests Makefile.in for OpenLDAP
 SUBDIRS= progs
 BUILD_LDBM=@BUILD_LDBM@
+BUILD_BDB=@BUILD_BDB@
+BUILD_MONITOR=@BUILD_MONITOR@
 
 test: tests
-tests: ldbm
+tests: bdb ldbm
 
 bdb: test-bdb
 test-bdb:      FORCE
        @-$(LN_S) $(srcdir)/data .
        @-$(LN_S) $(top_srcdir)/servers/slapd/schema .
-       @-$(LN_S) ../libraries/liblunicode/ucdata .
-       @if test "$(BUILD_LDBM)" = "yes" ; then \
+       @-$(LN_S) ../libraries/liblunicode ucdata
+       @if test "$(BUILD_BDB)" = "yes" ; then \
                echo "Initiating LDAP tests for BDB..." ; \
                $(MKDIR) test-db test-repl || true; \
-               $(srcdir)/scripts/all $(srcdir) bdb ; \
+               $(srcdir)/scripts/all $(srcdir) bdb $(BUILD_MONITOR) ; \
        else \
                echo "run configure with --enable-bdb" ; \
        fi
@@ -26,11 +28,11 @@ ldbm: test-ldbm
 test-ldbm:     FORCE
        @-$(LN_S) $(srcdir)/data .
        @-$(LN_S) $(top_srcdir)/servers/slapd/schema .
-       @-$(LN_S) ../libraries/liblunicode/ucdata .
+       @-$(LN_S) ../libraries/liblunicode ucdata
        @if test "$(BUILD_LDBM)" = "yes" ; then \
                echo "Initiating LDAP tests for LDBM..." ; \
                $(MKDIR) test-db test-repl || true; \
-               $(srcdir)/scripts/all $(srcdir) ldbm ; \
+               $(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_MONITOR); \
        else \
                echo "run configure with --enable-ldbm" ; \
        fi
@@ -39,7 +41,7 @@ passwd: test-passwd
 test-passwd: FORCE
        @-$(LN_S) $(srcdir)/data .
        @-$(LN_S) $(top_srcdir)/servers/slapd/schema .
-       @-$(LN_S) ../libraries/liblunicode/ucdata .
+       @-$(LN_S) ../libraries/liblunicode ucdata
        @echo "Initiating LDAP tests..."
        @-$(MKDIR) test-db test-repl || true
        @$(srcdir)/scripts/passwd-search $(srcdir) passwd
@@ -48,7 +50,7 @@ test-nis-schema:        test-nis-schema-ldbm
 test-nis-schema-ldbm:
        @-$(LN_S) $(srcdir)/data .
        @-$(LN_S) $(top_srcdir)/servers/slapd/schema .
-       @-$(LN_S) ../libraries/liblunicode/ucdata .
+       @-$(LN_S) ../libraries/liblunicode ucdata
        @echo "Initiating LDAP server with NIS schema & ldbm backend..."; \
        $(MKDIR) test-db test-repl ; \
        $(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) ldbm