License change: Apache License, Version 2.0.

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

diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index f5f8d6405b75040c6c51e0d8ea2fde5805ebd6d7..957e0b08afaee893261018eda62ea600ca65443f 100644 (file)
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -1,16 +1,10 @@
 dnl
-dnl "$Id$"
-dnl
 dnl TLS stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2017 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
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 dnl
 
 AC_ARG_ENABLE(ssl, [  --disable-ssl           disable SSL/TLS support])
@@ -25,7 +19,7 @@ CUPS_SERVERKEYCHAIN=""
 if test x$enable_ssl != xno; then
     dnl Look for CDSA...
     if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then
-       if test $uname = Darwin; then
+       if test $host_os_name = darwin; then
            AC_CHECK_HEADER(Security/SecureTransport.h, [
                have_ssl=1
                AC_DEFINE(HAVE_SSL)
@@ -53,13 +47,16 @@ if test x$enable_ssl != xno; then
 
                AC_DEFINE(HAVE_CSSMERRORSTRING)
                AC_DEFINE(HAVE_SECKEYCHAINOPEN)])
+
+               if test $host_os_version -ge 150; then
+                       AC_DEFINE(HAVE_SSLSETENABLEDCIPHERS)
+               fi
        fi
     fi
 
     dnl Then look for GNU TLS...
     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
        AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
-       AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
        if $PKGCONFIG --exists gnutls; then
            have_ssl=1
            SSLLIBS=`$PKGCONFIG --libs gnutls`
@@ -102,7 +99,3 @@ AC_SUBST(SSLLIBS)
 
 EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
-
-dnl
-dnl End of "$Id$".
-dnl