Fix bug #1337 Console tries to build with SSL when libssl-dev not installed

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 886f4088b8a2ca9514c06bb501dcdd6eac09ad9e..67519956f41db7682fb573e2921b1ea3d7dc0bc3 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1164,6 +1164,11 @@ else
    OPENSSL_INC=""
 fi
 
+if test "$support_tls" = "no"; then
+   OPENSSL_LIBS=""
+   OPENSSL_INC=""
+fi  
+
 AC_MSG_RESULT([$support_tls])
 AC_SUBST(OPENSSL_LIBS)
 AC_SUBST(OPENSSL_INC)

diff --git a/bacula/configure b/bacula/configure
index 4caae70a98bf7936c4d62497134544c84990d3fb..a165700550a98c96c9b415f2840939ccda1dd9ed 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -27258,6 +27258,11 @@ else
    OPENSSL_INC=""
 fi
 
+if test "$support_tls" = "no"; then
+   OPENSSL_LIBS=""
+   OPENSSL_INC=""
+fi
+
 { echo "$as_me:$LINENO: result: $support_tls" >&5
 echo "${ECHO_T}$support_tls" >&6; }
 

diff --git a/bacula/technotes b/bacula/technotes
index 8a261b8bd5380173b1870448668b7940c118b59d..a30511997a0ceed655acbb2c139543cbf7cb0361 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,8 @@
           
 General:
 
+22Jul09
+kes  Fix bug #1337 Console tries to build with SSL when libssl-dev not installed. 
 21Jul09
 kes  Add setJobStatus method to JCR class.
 kes  Modify setJobStatus so cancel has same priority as fatal errors