Add OpenSSL config option (defaults to off)

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index fb73118a865313aa5cb987083377356a9fbe4b06..b1fc696d4fbead0d6c65485b104b32cdb18d09e1 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -31,8 +31,8 @@ bacula: all
         fi)
        rm -rf tmp working
        mkdir tmp working
-       echo "Doing: scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}"
-       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${SMTP_HOST}
+       echo "Doing: scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${OPENSSL}"
+       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${SMTP_HOST} ${OPENSSL}
 
 sed:
        echo "Doing: scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1} ${SMTP_HOST}"

diff --git a/regress/freebsd.conf b/regress/freebsd.conf
index 3d41bd0f1ef29f3efdf140e9a3d88dab524ff9a5..823eb9cbbfcf59cc89ae9eb8a5e5aa50c7541361 100644 (file)
--- a/regress/freebsd.conf
+++ b/regress/freebsd.conf
@@ -24,3 +24,8 @@ WHICHDB?="--with-sqlite=${SQLITE_DIR}"
 
 # Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
 TCPWRAPPERS="--with-tcp-wrappers"
+
+# Set this to "" to disable OpenSSL support, "--with-openssl=yes"
+# to enable it, or provide the path to the OpenSSL installation,
+# eg "--with-openssl=/usr/local"
+OPENSSL=""

diff --git a/regress/kern.conf b/regress/kern.conf
index 05ce1ac2e7b561e9bc61e730a88343c8811bb6cd..45335617f0eb118657f7545331fd08e726971227 100644 (file)
--- a/regress/kern.conf
+++ b/regress/kern.conf
@@ -27,3 +27,7 @@ WHICHDB?="--with-sqlite=${SQLITE_DIR}"
 # Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
 TCPWRAPPERS="--with-tcp-wrappers"
 
+# Set this to "" to disable OpenSSL support, "--with-openssl=yes"
+# to enable it, or provide the path to the OpenSSL installation,
+# eg "--with-openssl=/usr/local"
+OPENSSL=""

diff --git a/regress/prototype.conf b/regress/prototype.conf
index 28f5d3ee5eadeaf767c2907055685c47b9587bcd..21068789c76240bafac8ab168ba6b990153de25e 100644 (file)
--- a/regress/prototype.conf
+++ b/regress/prototype.conf
@@ -44,3 +44,8 @@ WHICHDB?="--with-sqlite=${SQLITE_DIR}"
 
 # Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
 TCPWRAPPERS="--with-tcp-wrappers"
+
+# Set this to "" to disable OpenSSL support, "--with-openssl=yes"
+# to enable it, or provide the path to the OpenSSL installation,
+# eg "--with-openssl=/usr/local"
+OPENSSL=""

diff --git a/regress/scripts/regress-config b/regress/scripts/regress-config
index 2fa59ffbcd9cc7ee0fbf13b530724eff8a6ed62c..7fdae76929a38a362aa3ed31ebde46b73aa917ca 100755 (executable)
--- a/regress/scripts/regress-config
+++ b/regress/scripts/regress-config
@@ -18,6 +18,7 @@ CFLAGS="-g -O2 -Wall" \
     --with-smtp-host=$5 \
     $3 \
     --with-baseport=8101 \
-    $4
+    $4 \
+    $6
 
 exit 0

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 7da37826955590a519e767708f817e443c2f2c05..8b15d75c62be8f4a5539a950edb2aa65e442027b 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -3,7 +3,7 @@
 # Script to setup running Bacula regression tests
 #
 cwd=`pwd`
-if [ $# != 5 ] ; then
+if [ $# != 6 ] ; then
    echo "Incorrect number of arguments. Got $#. Need:"
    echo "setup bacula-src email-address --with-DBNAME --with-tcp-wrappers"
    echo " "
@@ -22,7 +22,7 @@ cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache
 # Run Bacula configuration, make, install
-./regress-config ${cwd} $2 $3 $4 $5
+./regress-config ${cwd} $2 $3 $4 $5 $6
 make
 make install
 cp src/tools/testls ../bin