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