[libsoup] Require explicit --disable-ssl to build without GNUTLS support

[Dan Winship <danw src gnome org>]

commit ead8e2f2ab8f2fb38a288e12e5f2d9b88c429cc4
Author: Dan Winship <danw gnome org>
Date:   Sun Jun 28 10:00:00 2009 -0400

    Require explicit --disable-ssl to build without GNUTLS support
    
    In general, if someone is trying to build without GNUTLS installed
    it's an accident, so bail out with an error.
    
    Inspired by http://bugzilla.gnome.org/show_bug.cgi?id=584955

 configure.in |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/configure.in b/configure.in
index 50554cd..316ffb6 100644
--- a/configure.in
+++ b/configure.in
@@ -143,22 +143,23 @@ dnl **********************************
 dnl Allow autogening even without AM_PATH_LIBGCRYPT available
 m4_ifdef([AM_PATH_LIBGCRYPT],,[m4_define(AM_PATH_LIBGCRYPT,)])
 AC_ARG_ENABLE(ssl, 
-	      AS_HELP_STRING([--enable-ssl], [Turn on Secure Sockets Layer support (default=yes)]),,
+	      AS_HELP_STRING([--disable-ssl], [Disable SSL/TLS support (not recommended)]),,
 	      enable_ssl=auto)
 
+have_ssl=no
 if test "$enable_ssl" != "no"; then
 	PKG_CHECK_MODULES(LIBGNUTLS, gnutls,
 		[AM_PATH_LIBGCRYPT([], have_ssl=yes, have_ssl=no)], have_ssl=no)
-	if test "$have_ssl" = "yes"; then
-		AC_DEFINE(HAVE_SSL, 1, [Defined if you have SSL support])
-		SSL_REQUIREMENT="gnutls"
+fi
+if test "$have_ssl" = "yes"; then
+	AC_DEFINE(HAVE_SSL, 1, [Defined if you have SSL support])
+	SSL_REQUIREMENT="gnutls"
+else
+	if test "$enable_ssl" = "no"; then
+		AC_MSG_WARN(Disabling SSL support);
 	else
-		if test "$enable_ssl" = "auto"; then
-			AC_MSG_WARN(Disabling SSL support);
-			enable_ssl=no;
-		else
-			AC_MSG_ERROR(Could not configure SSL support);
-		fi
+		AC_MSG_ERROR([Could not configure SSL support.
+Pass "--disable-ssl" if you really want to build without SSL support]);
 	fi
 fi