|
 |
5e7041 |
diff -up cups-1.6.2/config-scripts/cups-ssl.m4.no-gcry cups-1.6.2/config-scripts/cups-ssl.m4
|
|
|
5e7041 |
--- cups-1.6.2/config-scripts/cups-ssl.m4.no-gcry 2013-06-26 17:26:41.415750243 +0100
|
|
|
5e7041 |
+++ cups-1.6.2/config-scripts/cups-ssl.m4 2013-06-26 17:26:41.467750445 +0100
|
|
|
5e7041 |
@@ -93,7 +93,6 @@ if test x$enable_ssl != xno; then
|
|
|
5e7041 |
dnl Then look for GNU TLS...
|
|
|
5e7041 |
if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
|
|
|
5e7041 |
AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
|
|
|
5e7041 |
- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
|
|
|
5e7041 |
if $PKGCONFIG --exists gnutls; then
|
|
|
5e7041 |
have_ssl=1
|
|
|
5e7041 |
SSLLIBS=`$PKGCONFIG --libs gnutls`
|
|
|
5e7041 |
@@ -111,14 +110,6 @@ if test x$enable_ssl != xno; then
|
|
|
5e7041 |
if test $have_ssl = 1; then
|
|
|
5e7041 |
CUPS_SERVERCERT="ssl/server.crt"
|
|
|
5e7041 |
CUPS_SERVERKEY="ssl/server.key"
|
|
|
5e7041 |
-
|
|
|
5e7041 |
- if $PKGCONFIG --exists gcrypt; then
|
|
|
5e7041 |
- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
|
|
|
5e7041 |
- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
|
|
|
5e7041 |
- elif test "x$LIBGCRYPTCONFIG" != x; then
|
|
|
5e7041 |
- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
|
|
|
5e7041 |
- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
|
|
|
5e7041 |
- fi
|
|
|
5e7041 |
fi
|
|
|
5e7041 |
fi
|
|
|
5e7041 |
|
|
|
5e7041 |
diff -up cups-1.6.2/cups/http-private.h.no-gcry cups-1.6.2/cups/http-private.h
|
|
|
5e7041 |
--- cups-1.6.2/cups/http-private.h.no-gcry 2012-12-17 22:17:08.000000000 +0000
|
|
|
5e7041 |
+++ cups-1.6.2/cups/http-private.h 2013-06-26 17:26:41.468750449 +0100
|
|
|
5e7041 |
@@ -78,7 +78,6 @@ typedef int socklen_t;
|
|
|
5e7041 |
# elif defined HAVE_GNUTLS
|
|
|
5e7041 |
# include <gnutls/gnutls.h>
|
|
|
5e7041 |
# include <gnutls/x509.h>
|
|
|
5e7041 |
-# include <gcrypt.h>
|
|
|
5e7041 |
# elif defined(HAVE_CDSASSL)
|
|
|
5e7041 |
# include <CoreFoundation/CoreFoundation.h>
|
|
|
5e7041 |
# include <Security/Security.h>
|