cups/patches/cups-force-gnutls.patch

   1 diff -up cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls cups-1.4.4/config-scripts/cups-ssl.m4
   2 --- cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls  2010-09-15 16:49:22.343502552 +0100
   3 +++ cups-1.4.4/config-scripts/cups-ssl.m4       2010-09-15 16:49:42.347502595 +0100
   4 @@ -65,23 +65,21 @@ if test x$enable_ssl != xno; then
   5         if $PKGCONFIG --exists gnutls; then
   6             if test "x$have_pthread" = xyes; then
   7                 AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
   8 -           else
   9 -               have_ssl=1
  10 -               SSLLIBS=`$PKGCONFIG --libs gnutls`
  11 -               SSLFLAGS=`$PKGCONFIG --cflags gnutls`
  12 -               AC_DEFINE(HAVE_SSL)
  13 -               AC_DEFINE(HAVE_GNUTLS)
  14             fi
  15 +           have_ssl=1
  16 +           SSLLIBS=`$PKGCONFIG --libs gnutls`
  17 +           SSLFLAGS=`$PKGCONFIG --cflags gnutls`
  18 +           AC_DEFINE(HAVE_SSL)
  19 +           AC_DEFINE(HAVE_GNUTLS)
  20         elif test "x$LIBGNUTLSCONFIG" != x; then
  21             if test "x$have_pthread" = xyes; then
  22                 AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
  23 -           else
  24 -               have_ssl=1
  25 -               SSLLIBS=`$LIBGNUTLSCONFIG --libs`
  26 -               SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
  27 -               AC_DEFINE(HAVE_SSL)
  28 -               AC_DEFINE(HAVE_GNUTLS)
  29             fi
  30 +           have_ssl=1
  31 +           SSLLIBS=`$LIBGNUTLSCONFIG --libs`
  32 +           SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
  33 +           AC_DEFINE(HAVE_SSL)
  34 +           AC_DEFINE(HAVE_GNUTLS)
  35         fi
  36
  37         if test $have_ssl = 1; then
  38 diff -up cups-1.4.4/configure.force-gnutls cups-1.4.4/configure
  39 --- cups-1.4.4/configure.force-gnutls   2010-06-17 19:25:47.000000000 +0100
  40 +++ cups-1.4.4/configure        2010-09-15 16:50:01.689503165 +0100
  41 @@ -17542,36 +17542,34 @@ fi
  42             if test "x$have_pthread" = xyes; then
  43                 { echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
  44  echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
  45 -           else
  46 -               have_ssl=1
  47 -               SSLLIBS=`$PKGCONFIG --libs gnutls`
  48 -               SSLFLAGS=`$PKGCONFIG --cflags gnutls`
  49 -               cat >>confdefs.h <<\_ACEOF
  50 +           fi
  51 +           have_ssl=1
  52 +           SSLLIBS=`$PKGCONFIG --libs gnutls`
  53 +           SSLFLAGS=`$PKGCONFIG --cflags gnutls`
  54 +           cat >>confdefs.h <<\_ACEOF
  55  #define HAVE_SSL 1
  56  _ACEOF
  57
  58 -               cat >>confdefs.h <<\_ACEOF
  59 +           cat >>confdefs.h <<\_ACEOF
  60  #define HAVE_GNUTLS 1
  61  _ACEOF
  62
  63 -           fi
  64         elif test "x$LIBGNUTLSCONFIG" != x; then
  65             if test "x$have_pthread" = xyes; then
  66                 { echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
  67  echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
  68 -           else
  69 -               have_ssl=1
  70 -               SSLLIBS=`$LIBGNUTLSCONFIG --libs`
  71 -               SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
  72 -               cat >>confdefs.h <<\_ACEOF
  73 +           fi
  74 +           have_ssl=1
  75 +           SSLLIBS=`$LIBGNUTLSCONFIG --libs`
  76 +           SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
  77 +           cat >>confdefs.h <<\_ACEOF
  78  #define HAVE_SSL 1
  79  _ACEOF
  80
  81 -               cat >>confdefs.h <<\_ACEOF
  82 +           cat >>confdefs.h <<\_ACEOF
  83  #define HAVE_GNUTLS 1
  84  _ACEOF
  85
  86 -           fi
  87         fi
  88
  89         if test $have_ssl = 1; then