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