Backport from Bacula Enterprise

[bacula/bacula] / regress / scripts / regress-config.in

diff --git a/regress/scripts/regress-config.in b/regress/scripts/regress-config.in
index a9893691b3613494005e7c0d3efb99ed46339b1a..d31cd0e60d2358ef028389e7426b60363694e754 100755 (executable)
--- a/regress/scripts/regress-config.in
+++ b/regress/scripts/regress-config.in
@@ -1,23 +1,38 @@
 #!/bin/sh
 #
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 # This is the configuration script for regression testing
 #
 
+set -e
+
 . ${1}/config
 if test "x@db_password@" = "x"; then
   PASSWD=
 else
-  PASSWD="--with-db-password=\"@db_password@\""
+  PASSWD="--with-db-password=@db_password@"
 fi
 
-CFLAGS="-g -O2 -Wall" \
- ./configure \
+if [ -z "${CFLAGS}" ]; then
+   CFLAGS="-g -O2 -Wall"
+   export CFLAGS
+fi
+
+./configure \
     --sbindir=${1}/bin \
+    --libdir=${1}/bin \
     --sysconfdir=${1}/bin \
     --mandir=${1}/bin \
+    --docdir=${1}/bin/html \
+    --htmldir=${1}/bin/html \
     --with-pid-dir=${1}/working \
     --with-subsys-dir=${1}/working \
+    --with-plugindir=${1}/bin/plugins \
+    --with-logdir=${1}/working \
     --enable-smartalloc \
+    --enable-lockmgr \
     --disable-readline \
     --with-working-dir=${1}/working \
     --with-archivedir=${1}/tmp \
@@ -32,4 +47,7 @@ CFLAGS="-g -O2 -Wall" \
     ${WHICHDB} \
     --with-baseport=${BASEPORT}
 
+LD_LIBRARY_PATH=${1}/bin:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+
 exit 0