]> git.sur5r.net Git - bacula/bacula/commitdiff
Tweak configure so output of openssl test is somewhat cleaner.
authorMarco van Wieringen <mvw@planets.elm.net>
Mon, 29 Aug 2011 20:18:01 +0000 (22:18 +0200)
committerKern Sibbald <kern@sibbald.com>
Sat, 20 Apr 2013 12:50:00 +0000 (14:50 +0200)
bacula/autoconf/configure.in

index 80d6a979a89dc5a8581b3b9d4ffb57c6e088dec8..479accd9be04ef52e553bc84cfa88ec5ad0bfd9c 100644 (file)
@@ -835,7 +835,7 @@ if test x$support_conio = xyes; then
       support_readline=no
       AC_DEFINE(HAVE_CONIO, 1, [Set if Bacula conio support enabled]) 
    else
-      echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "],
+      echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "
    fi
 fi
 
@@ -1171,6 +1171,7 @@ if test "x$with_openssl_directory" != "xno"; then
       ]
    )
 
+   AC_MSG_RESULT([$support_tls])
    if test "$support_tls" = "yes"; then
       AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL library is available])
       AC_DEFINE(HAVE_TLS, 1, [Define if TLS support should be enabled])
@@ -1194,19 +1195,13 @@ if test "x$with_openssl_directory" != "xno"; then
 else
    support_tls="no"
    support_crypto="no"
-   OPENSSL_LIBS=""
-   OPENSSL_INC=""
+   AC_MSG_RESULT([$support_tls])
 fi
-AC_MSG_RESULT([$support_tls])
 
-if test "$support_tls" = "no"; then
+if test "$support_tls" = "no" -o "$support_crypto" = "no"; then
    OPENSSL_LIBS=""
    OPENSSL_INC=""
-fi  
-if test "$support_crypto" = "no"; then
-   OPENSSL_LIBS=""
-   OPENSSL_INC=""
-fi  
+fi
 
 AC_SUBST(OPENSSL_LIBS)
 AC_SUBST(OPENSSL_INC)