浏览代码

2008-11-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed error when SSL library is not found.
	* configure.ac
Tatsuhiro Tsujikawa 17 年之前
父节点
当前提交
9a581e2cab
共有 3 个文件被更改,包括 23 次插入0 次删除
  1. 5 0
      ChangeLog
  2. 16 0
      configure
  3. 2 0
      configure.ac

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-11-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed error when SSL library is not found.
+	* configure.ac
+
 2008-11-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Cross referenced among -s, -C and -j options.

+ 16 - 0
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

+ 2 - 0
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" ])