Don't generate certificates that expire on Feb 29th (Issue #5643)

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

diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index 9a88aa8f033ebc84d81040d25d89f55fdf3b8667..2854708b5c77e3342a4a7006f55c7000f8660f95 100644 (file)
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -1,19 +1,18 @@
 dnl
-dnl "$Id: cups-network.m4 7127 2007-12-17 18:05:32Z mike $"
+dnl Networking stuff for CUPS.
 dnl
-dnl   Networking stuff for the Common UNIX Printing System (CUPS).
+dnl Copyright 2007-2016 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
-dnl   Copyright 1997-2005 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_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H))
+AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H),,[
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>])
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyaddr, nsl)
 AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
@@ -25,7 +24,7 @@ AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT),
 
 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
-if test "$uname" != "OSF1"; then
+if test "$host_os_name" != "osf1"; then
        AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
        AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
 fi
@@ -42,9 +41,9 @@ AC_ARG_WITH(domainsocket, [  --with-domainsocket     set unix domain socket name
 
 if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then
        if test "x$default_domainsocket" = x; then
-               case "$uname" in
-                       Darwin*)
-                               # Darwin and MaxOS X do their own thing...
+               case "$host_os_name" in
+                       darwin*)
+                               # Darwin and macOS do their own thing...
                                CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
                                ;;
                        *)
@@ -65,10 +64,3 @@ fi
 
 AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
-
-AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
-       [#include <netat/appletalk.h>])
-
-dnl
-dnl End of "$Id: cups-network.m4 7127 2007-12-17 18:05:32Z mike $".
-dnl