From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 22 Jul 2009 15:02:15 +0000 (+0000)
Subject: Fix bug #1337 Console tries to build with SSL when libssl-dev not installed
X-Git-Tag: Release-5.0.0~477
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=12337177644c6b72f8ad9301b51f6f8c9ced8b0c;p=bacula%2Fbacula

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 886f4088b8..67519956f4 100644
--- 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 4caae70a98..a165700550 100755
--- 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 8a261b8bd5..a30511997a 100644
--- 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