The configure script incorrectly added libgcrypt as a GNU TLS dependency

(STR #4399)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11870 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 1fb268c661d73666332731c4fea7332f457508b6..de48160f4dfb2425a62791978a8acacf11903f6f 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -17,6 +17,8 @@ CHANGES IN CUPS V1.7.3
          holding a job using the lp command (STR #4405)
        - The CUPS headers incorrectly needed libdispatch for blocks support
          (STR #4397)
+       - The configure script incorrectly added libgcrypt as a GNU TLS
+         dependency (STR #4399)
 
 
 CHANGES IN CUPS V1.7.2

diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index 69bd8aad96782328a7916c4da785d6ea6f111816..d20daf9827dc38407a21da392a31e9ca84a4bd70 100644 (file)
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl TLS stuff for CUPS.
 dnl
-dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 2007-2014 by Apple Inc.
 dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl These coded instructions, statements, and computer programs are the
@@ -78,14 +78,6 @@ if test x$enable_ssl != xno; then
        if test $have_ssl = 1; then
            CUPS_SERVERCERT="ssl/server.crt"
            CUPS_SERVERKEY="ssl/server.key"
-
-            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
 fi