From 9a581e2cab7e67db8b6e57090716d21698c0da0c Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 11 Nov 2008 12:47:26 +0000 Subject: [PATCH] 2008-11-11 Tatsuhiro Tsujikawa Fixed error when SSL library is not found. * configure.ac --- ChangeLog | 5 +++++ configure | 16 ++++++++++++++++ configure.ac | 2 ++ 3 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9f286c9f..e0adb250 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-11 Tatsuhiro Tsujikawa + + Fixed error when SSL library is not found. + * configure.ac + 2008-11-11 Tatsuhiro Tsujikawa Cross referenced among -s, -C and -j options. diff --git a/configure b/configure index 50969bdf..8c0cc27e 100755 --- a/configure +++ b/configure @@ -7471,6 +7471,15 @@ else ENABLE_SSL_FALSE= fi +else + if false; then + ENABLE_SSL_TRUE= + ENABLE_SSL_FALSE='#' +else + ENABLE_SSL_TRUE='#' + ENABLE_SSL_FALSE= +fi + fi if test "x$have_libgnutls" = "xyes" ; then @@ -22213,6 +22222,13 @@ echo "$as_me: error: conditional \"ENABLE_SSL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_SSL_TRUE}" && test -z "${ENABLE_SSL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SSL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_SSL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_LIBGNUTLS_TRUE}" && test -z "${HAVE_LIBGNUTLS_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBGNUTLS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 diff --git a/configure.ac b/configure.ac index d85d7dad..6b292983 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,8 @@ fi if test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then AC_DEFINE([ENABLE_SSL], [1], [Define to 1 if ssl support is enabled.]) AM_CONDITIONAL([ENABLE_SSL], true) +else + AM_CONDITIONAL([ENABLE_SSL], false) fi AM_CONDITIONAL([HAVE_LIBGNUTLS], [ test "x$have_libgnutls" = "xyes" ])