20 lines
888 B
Diff
20 lines
888 B
Diff
|
diff -Naur cups-1.3.10/config-scripts/cups-ssl.m4 cups-1.3.10.new/config-scripts/cups-ssl.m4
|
||
|
|
--- cups-1.3.10/config-scripts/cups-ssl.m4 2007-07-11 23:46:42.000000000 +0200
|
||
|
|
+++ cups-1.3.10.new/config-scripts/cups-ssl.m4 2009-05-29 02:38:27.444267250 +0200
|
||
|
|
@@ -64,11 +64,11 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
dnl Then look for GNU TLS...
|
||
|
|
- if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
|
||
|
|
+ if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
|
||
|
|
AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
|
||
|
|
- if test "x$LIBGNUTLSCONFIG" != x; then
|
||
|
|
- SSLLIBS=`$LIBGNUTLSCONFIG --libs`
|
||
|
|
- SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
|
||
|
|
+ if $PKGCONFIG --exists gnutls; then
|
||
|
|
+ SSLLIBS=`$PKGCONFIG --libs gnutls`
|
||
|
|
+ SSLFLAGS=`$PKGCONFIG --cflags gnutls`
|
||
|
|
ENCRYPTION_REQUIRED=" Encryption Required"
|
||
|
|
AC_DEFINE(HAVE_SSL)
|
||
|
|
AC_DEFINE(HAVE_GNUTLS)
|