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
old mode 100644 (file)
new mode 100755 (executable)
index db54892..d31cd0e
--- a/regress/scripts/regress-config.in
+++ b/regress/scripts/regress-config.in
@@ -1,47 +1,38 @@
 #!/bin/sh
 #
-# This is the configuration script for regression testing
-#
-
-. ${1}/config
-
-CFLAGS="-g -O2 -Wall" \
- ./configure \
-    --sbindir=${1}/bin \
-    --sysconfdir=${1}/bin \
-    --mandir=${1}/bin \
-    --with-pid-dir=${1}/working \
-    --with-subsys-dir=${1}/working \
-    --enable-smartalloc \
-    --disable-readline \
-    --with-working-dir=${1}/working \
-    --with-archivedir=${1}/tmp \
-    --with-dump-email=${EMAIL} \
-    --with-job-email=${EMAIL} \
-    --with-smtp-host=${SMTP_HOST} \
-    --with-db-name=@db_name@ \
-    --with-db-user=@db_user@ \
-    ${OPENSSL} \
-    ${TCPWRAPPERS} \
-    ${WHICHDB} \
-    --with-baseport=${BASEPORT}
-
-exit 0
-#!/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@"
+fi
+
+if [ -z "${CFLAGS}" ]; then
+   CFLAGS="-g -O2 -Wall"
+   export CFLAGS
+fi
 
-CFLAGS="-g -O2 -Wall" \
- ./configure \
+./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 \
@@ -50,9 +41,13 @@ CFLAGS="-g -O2 -Wall" \
     --with-smtp-host=${SMTP_HOST} \
     --with-db-name=@db_name@ \
     --with-db-user=@db_user@ \
+    ${PASSWD} \
     ${OPENSSL} \
     ${TCPWRAPPERS} \
     ${WHICHDB} \
     --with-baseport=${BASEPORT}
 
+LD_LIBRARY_PATH=${1}/bin:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+
 exit 0