More fixes to Makefile.in

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1843 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/Makefile.in b/regress/Makefile.in
index dbb6c3b5b51810572377a8033ee94ca74900429b..6eafb617016ddae4648710e80c946506c77cd0ec 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -14,8 +14,6 @@
 # suck in user's configuration
 @CONFIG@
 
-WHICHDB?="--with-sqlite=${SQLITE_DIR}"
-
 first_rule: all
 
 all:
@@ -27,44 +25,44 @@ setup: bacula
 #  is in weird-files, so we load and run it only on Linux machines.
 #
 bacula: all   
-       @rm -rf bin build weird-files tmp
-       (if test x`uname` = xLinux -o x`uname` = xFreeBSD ; then \
-          tar xfz weird-files.tar.gz ;\
-        fi)
-       rm -rf tmp working
-       mkdir tmp working
-       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}
-       scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
+        @rm -rf bin build weird-files tmp
+        (if test x`uname` = xLinux -o x`uname` = xFreeBSD ; then \
+           tar xfz weird-files.tar.gz ;\
+         fi)
+        rm -rf tmp working
+        mkdir tmp working
+        scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}
+        scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
 
 # Run all non-root userid tests
 test: 
-       ./all-non-root-tests
+        ./all-non-root-tests
 
 # run all file and tape tests
 full_test:
-       ./all-tape-and-file-tests
+        ./all-tape-and-file-tests
 
 # These tests require you to run as root
 root_test:
-       ./all-root-tests
+        ./all-root-tests
 
 clean:
-       scripts/cleanup
-       rm -f /tmp/file-list
-       rm -f tmp/* working/*
-       rm -f test.out
-       rm -f diff
-       rm -f 1 2 3 scripts/1 scripts/2 scripts/3 tests/1 tests/2 tests/3
-       @find . -name .#* -exec $(RMF) {} \;
+        scripts/cleanup
+        rm -f /tmp/file-list
+        rm -f tmp/* working/*
+        rm -f test.out
+        rm -f diff
+        rm -f 1 2 3 scripts/1 scripts/2 scripts/3 tests/1 tests/2 tests/3
+        @find . -name .#* -exec $(RMF) {} \;
 
 # Reset our userid after running as root
 reset:
-       chown -R ${USER}:${USER} . tmp working
-       scripts/cleanup
-       rm -f /tmp/file-list tmp/file-list
-       rm -f tmp/* working/*
+        chown -R ${USER}:${USER} . tmp working
+        scripts/cleanup
+        rm -f /tmp/file-list tmp/file-list
+        rm -f tmp/* working/*
 
 distclean: clean
-       rm -rf bin build weird-files weird-files weird-files2 tmp working
-       rm -f scripts/*.conf
-                     
+        rm -rf bin build weird-files weird-files weird-files2 tmp working
+        rm -f scripts/*.conf
+                      

diff --git a/regress/kern.conf b/regress/kern.conf
index dbe0c96ca4dad4e2c74b6f4655fce020a146b5b0..866014cabf15aaf1f85009d3c93a3a91d6878fc7 100644 (file)
--- a/regress/kern.conf
+++ b/regress/kern.conf
@@ -13,3 +13,11 @@ AUTOCHANGER="/dev/sg0"
 
 # This must be the path to the autochanger including its name
 AUTOCHANGER_PATH="/usr/local/bin/mtx"
+
+# Set your database here
+WHICHDB="--with-sqlite=${SQLITE_DIR}"
+#WHICHDB="--with-mysql=${HOME}/mysql"
+
+# Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
+TCPWRAPPERS="--with-tcp-wrappers"
+