diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-26 23:52:26 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-26 23:52:26 -0500 |
| commit | 360e56ec622617a2b121c7ec51e3381ad89f0eab (patch) | |
| tree | e74250415c5e21080779befbb7898bd151039d63 /~mtjm/cups-usblp/cups-no-gcrypt.patch | |
| parent | 34b4025bc7b0c6d8d47988decd140df38b1d98ac (diff) | |
| parent | b1c14cd929ca53e06945a5cda3965dc6fcd9d6b7 (diff) | |
| download | abslibre-360e56ec622617a2b121c7ec51e3381ad89f0eab.tar.gz abslibre-360e56ec622617a2b121c7ec51e3381ad89f0eab.tar.bz2 abslibre-360e56ec622617a2b121c7ec51e3381ad89f0eab.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to '~mtjm/cups-usblp/cups-no-gcrypt.patch')
| -rwxr-xr-x | ~mtjm/cups-usblp/cups-no-gcrypt.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/~mtjm/cups-usblp/cups-no-gcrypt.patch b/~mtjm/cups-usblp/cups-no-gcrypt.patch deleted file mode 100755 index 42f71d0d4..000000000 --- a/~mtjm/cups-usblp/cups-no-gcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4 ---- cups-1.5.0.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100 -+++ cups-1.5.0/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200 -@@ -96,7 +96,6 @@ - dnl Then look for GNU TLS... - if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then - AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) -- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) - if $PKGCONFIG --exists gnutls; then - have_ssl=1 - SSLLIBS=`$PKGCONFIG --libs gnutls` -@@ -110,16 +109,6 @@ - AC_DEFINE(HAVE_SSL) - AC_DEFINE(HAVE_GNUTLS) - fi -- -- if test $have_ssl = 1; then -- if $PKGCONFIG --exists gcrypt; then -- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" -- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" -- elif test "x$LIBGCRYPTCONFIG" != x; then -- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" -- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" -- fi -- fi - fi - - dnl Check for the OpenSSL library last... ---- cups-1.5.0.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100 -+++ cups-1.5.0/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200 -@@ -93,7 +93,6 @@ - # elif defined HAVE_GNUTLS - # include <gnutls/gnutls.h> - # include <gnutls/x509.h> --# include <gcrypt.h> - # elif defined(HAVE_CDSASSL) - # include <CoreFoundation/CoreFoundation.h> - # include <Security/Security.h> |