ITS#5177 from HEAD

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index 766fc1f561338cd3195a14f94eba8346d445dc70..4db73e8c1769dfecef3f7909a69e055626bc26f5 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,8 @@ AC_relay=relay@BUILD_RELAY@
 AC_sql=sql@BUILD_SQL@
 
 # overlays
+AC_accesslog=accesslog@BUILD_ACCESSLOG@
+AC_dynlist=dynlist@BUILD_DYNLIST@
 AC_pcache=pcache@BUILD_PROXYCACHE@
 AC_ppolicy=ppolicy@BUILD_PPOLICY@
 AC_refint=refint@BUILD_REFINT@
@@ -49,31 +51,20 @@ AC_WITH_SASL=@WITH_SASL@
 AC_WITH_TLS=@WITH_TLS@
 AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@
 AC_ACI_ENABLED=aci@WITH_ACI_ENABLED@
+AC_THREADS=threads@BUILD_THREAD@
 
-export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql 
-export AC_pcache AC_ppolicy AC_refint AC_retcode AC_rwm AC_unique AC_syncprov
-export AC_translucent AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED
-export AC_valsort
-
-# need defines.sh for the definitions of the directories
-. $SRCDIR/scripts/defines.sh
+export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql \
+       AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode \
+       AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort \
+       AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED \
+       AC_THREADS
 
 if test ! -x ../servers/slapd/slapd ; then
        echo "Could not locate slapd(8)"
        exit 1
 fi
 
-if test $AC_bdb != no ; then
-       BACKEND=bdb
-elif test $AC_ldbm != no ; then
-       BACKEND=ldbm
-elif test $AC_hdb != no ; then
-       BACKEND=hdb
-else
-       echo "Not configured with a suitable database backend"
-       exit 1
-fi
-
+BACKEND=
 CLEAN=no
 WAIT=0
 KILLSERVERS=yes
@@ -119,6 +110,18 @@ while test $# -gt 0 ; do
        esac
 done
 
+if test -z "$BACKEND" ; then
+       for b in bdb ldbm hdb ; do
+               if eval "test \"\$AC_$b\" != no" ; then
+                       BACKEND=$b
+                       break
+               fi
+       done
+       if test -z "$BACKEND" ; then
+               echo "No suitable default database backend configured" >&2
+               exit 1
+       fi
+fi
 BACKENDTYPE=`eval 'echo $AC_'$BACKEND`
 if test "x$BACKENDTYPE" = "x" ; then
        BACKENDTYPE="unknown"
@@ -129,6 +132,9 @@ if test $# = 0 ; then
        echo "$USAGE"; exit 1
 fi
 
+# need defines.sh for the definitions of the directories
+. $SRCDIR/scripts/defines.sh
+
 SCRIPTDIR="${SRCDIR}/scripts"
 SCRIPTNAME="$1"
 shift