b2a234
diff -up cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls cups-1.4.4/config-scripts/cups-ssl.m4
b2a234
--- cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls	2010-09-15 16:49:22.343502552 +0100
b2a234
+++ cups-1.4.4/config-scripts/cups-ssl.m4	2010-09-15 16:49:42.347502595 +0100
b2a234
@@ -65,23 +65,21 @@ if test x$enable_ssl != xno; then
b2a234
 	if $PKGCONFIG --exists gnutls; then
b2a234
 	    if test "x$have_pthread" = xyes; then
b2a234
 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
b2a234
-	    else
b2a234
-	        have_ssl=1
b2a234
-	        SSLLIBS=`$PKGCONFIG --libs gnutls`
b2a234
-	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
b2a234
-	        AC_DEFINE(HAVE_SSL)
b2a234
-	        AC_DEFINE(HAVE_GNUTLS)
b2a234
 	    fi
b2a234
+	    have_ssl=1
b2a234
+	    SSLLIBS=`$PKGCONFIG --libs gnutls`
b2a234
+	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
b2a234
+	    AC_DEFINE(HAVE_SSL)
b2a234
+	    AC_DEFINE(HAVE_GNUTLS)
b2a234
 	elif test "x$LIBGNUTLSCONFIG" != x; then
b2a234
 	    if test "x$have_pthread" = xyes; then
b2a234
 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
b2a234
-	    else
b2a234
-	        have_ssl=1
b2a234
-	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
b2a234
-	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
b2a234
-	        AC_DEFINE(HAVE_SSL)
b2a234
-	        AC_DEFINE(HAVE_GNUTLS)
b2a234
 	    fi
b2a234
+	    have_ssl=1
b2a234
+	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
b2a234
+	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
b2a234
+	    AC_DEFINE(HAVE_SSL)
b2a234
+	    AC_DEFINE(HAVE_GNUTLS)
b2a234
 	fi
b2a234
 
b2a234
 	if test $have_ssl = 1; then
b2a234
diff -up cups-1.4.4/configure.force-gnutls cups-1.4.4/configure
b2a234
--- cups-1.4.4/configure.force-gnutls	2010-06-17 19:25:47.000000000 +0100
b2a234
+++ cups-1.4.4/configure	2010-09-15 16:50:01.689503165 +0100
b2a234
@@ -17542,36 +17542,34 @@ fi
b2a234
 	    if test "x$have_pthread" = xyes; then
b2a234
 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
b2a234
 echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
b2a234
-	    else
b2a234
-	        have_ssl=1
b2a234
-	        SSLLIBS=`$PKGCONFIG --libs gnutls`
b2a234
-	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
b2a234
-	        cat >>confdefs.h <<\_ACEOF
b2a234
+	    fi
b2a234
+	    have_ssl=1
b2a234
+	    SSLLIBS=`$PKGCONFIG --libs gnutls`
b2a234
+	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
b2a234
+	    cat >>confdefs.h <<\_ACEOF
b2a234
 #define HAVE_SSL 1
b2a234
 _ACEOF
b2a234
 
b2a234
-	        cat >>confdefs.h <<\_ACEOF
b2a234
+	    cat >>confdefs.h <<\_ACEOF
b2a234
 #define HAVE_GNUTLS 1
b2a234
 _ACEOF
b2a234
 
b2a234
-	    fi
b2a234
 	elif test "x$LIBGNUTLSCONFIG" != x; then
b2a234
 	    if test "x$have_pthread" = xyes; then
b2a234
 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
b2a234
 echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
b2a234
-	    else
b2a234
-	        have_ssl=1
b2a234
-	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
b2a234
-	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
b2a234
-	        cat >>confdefs.h <<\_ACEOF
b2a234
+	    fi
b2a234
+	    have_ssl=1
b2a234
+	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
b2a234
+	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
b2a234
+	    cat >>confdefs.h <<\_ACEOF
b2a234
 #define HAVE_SSL 1
b2a234
 _ACEOF
b2a234
 
b2a234
-	        cat >>confdefs.h <<\_ACEOF
b2a234
+	    cat >>confdefs.h <<\_ACEOF
b2a234
 #define HAVE_GNUTLS 1
b2a234
 _ACEOF
b2a234
 
b2a234
-	    fi
b2a234
 	fi
b2a234
 
b2a234
 	if test $have_ssl = 1; then