Merge changes from CUPS 1.5svn-r9631.

[thirdparty/cups.git] / config-scripts / cups-ssl.m4

diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index f8c8697558d8f3e6a54d516bd7c7dec6953a3b67..ce62dfd450a692ad64560c50d4cbcec91ad1deec 100644 (file)
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -3,7 +3,7 @@ dnl "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for CUPS.
 dnl
-dnl   Copyright 2007-2010 by Apple Inc.
+dnl   Copyright 2007-2011 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
@@ -30,7 +30,7 @@ have_ssl=0
 
 if test x$enable_ssl != xno; then
     dnl Look for CDSA...
-    if test $have_ssl = 0 -a "x${enable_cdsassl}" != "xno"; then
+    if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then
        if test $uname = Darwin; then
            AC_CHECK_HEADER(Security/SecureTransport.h, [
                have_ssl=1
@@ -38,6 +38,12 @@ if test x$enable_ssl != xno; then
                AC_DEFINE(HAVE_CDSASSL)
 
                dnl Check for the various security headers...
+               AC_CHECK_HEADER(Security/SecCertificate.h,
+                   AC_DEFINE(HAVE_SECCERTIFICATE_H))
+               AC_CHECK_HEADER(Security/SecItem.h,
+                   AC_DEFINE(HAVE_SECITEM_H))
+               AC_CHECK_HEADER(Security/SecItemPriv.h,
+                   AC_DEFINE(HAVE_SECITEMPRIV_H))
                AC_CHECK_HEADER(Security/SecPolicy.h,
                    AC_DEFINE(HAVE_SECPOLICY_H))
                AC_CHECK_HEADER(Security/SecPolicyPriv.h,
@@ -47,6 +53,15 @@ if test x$enable_ssl != xno; then
                AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h,
                    AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))
 
+               dnl Check for SecCertificateCopyData..
+               AC_MSG_CHECKING(for SecCertificateCopyData)
+               if test $uversion -ge 100; then
+                   AC_DEFINE(HAVE_SECCERTIFICATECOPYDATA)
+                   AC_MSG_RESULT(yes)
+               else
+                   AC_MSG_RESULT(no)
+               fi
+
                dnl Check for SecIdentitySearchCreateWithPolicy...
                AC_MSG_CHECKING(for SecIdentitySearchCreateWithPolicy)
                if test $uversion -ge 80; then
@@ -54,33 +69,52 @@ if test x$enable_ssl != xno; then
                    AC_MSG_RESULT(yes)
                else
                    AC_MSG_RESULT(no)
+               fi
+
+               dnl Check for SecPolicyCreateSSL...
+               AC_MSG_CHECKING(for SecPolicyCreateSSL)
+               if test $uversion -ge 110; then
+                   AC_DEFINE(HAVE_SECPOLICYCREATESSL)
+                   AC_MSG_RESULT(yes)
+               else
+                   AC_MSG_RESULT(no)
                fi])
+
+               AC_DEFINE(HAVE_CSSMERRORSTRING)
        fi
     fi
 
     dnl Then look for GNU TLS...
-    if test $have_ssl = 0 -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
+    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`
-           SSLFLAGS=`$PKGCONFIG --cflags gnutls`
-           AC_DEFINE(HAVE_SSL)
-           AC_DEFINE(HAVE_GNUTLS)
-       elif "x$LIBGNUTLSCONFIG" != x; then
-           have_ssl=1
-           SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-           SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-           AC_DEFINE(HAVE_SSL)
-           AC_DEFINE(HAVE_GNUTLS)
+           if test "x$have_pthread" = xyes; then
+               AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+           else
+               have_ssl=1
+               SSLLIBS=`$PKGCONFIG --libs gnutls`
+               SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+               AC_DEFINE(HAVE_SSL)
+               AC_DEFINE(HAVE_GNUTLS)
+           fi
+       elif test "x$LIBGNUTLSCONFIG" != x; then
+           if test "x$have_pthread" = xyes; then
+               AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+           else
+               have_ssl=1
+               SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+               SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
+               AC_DEFINE(HAVE_SSL)
+               AC_DEFINE(HAVE_GNUTLS)
+           fi
        fi
 
        if test $have_ssl = 1; then
             if $PKGCONFIG --exists gcrypt; then
                SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
                SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
-           elif "x$LIBGCRYPTCONFIG" != x; then
+           elif test "x$LIBGCRYPTCONFIG" != x; then
                SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
                SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
            fi
@@ -88,7 +122,7 @@ if test x$enable_ssl != xno; then
     fi
 
     dnl Check for the OpenSSL library last...
-    if test $have_ssl = 0 -a "x${enable_openssl}" != "xno"; then
+    if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then
        AC_CHECK_HEADER(openssl/ssl.h,
            dnl Save the current libraries so the crypto stuff isn't always
            dnl included...
@@ -125,6 +159,8 @@ fi
 if test $have_ssl = 1; then
     AC_MSG_RESULT([    Using SSLLIBS="$SSLLIBS"])
     AC_MSG_RESULT([    Using SSLFLAGS="$SSLFLAGS"])
+elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes -o x$enable_openssl = xyes; then
+    AC_MSG_ERROR([Unable to enable SSL support.])
 fi
 
 AC_SUBST(SSLFLAGS)