diff options
Diffstat (limited to 'config-scripts')
-rw-r--r-- | config-scripts/cups-common.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-compiler.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-defaults.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-directories.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-dnssd.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-gssapi.m4 | 37 | ||||
-rw-r--r-- | config-scripts/cups-largefile.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-launchd.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-libtool.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-manpages.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-network.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-opsys.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-pam.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-scripting.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-sharedlibs.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-ssl.m4 | 4 | ||||
-rw-r--r-- | config-scripts/cups-threads.m4 | 4 |
17 files changed, 36 insertions, 65 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 27be08f0d..a67f5aba4 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $" +dnl "$Id$" dnl dnl Common configuration stuff for CUPS. dnl @@ -462,5 +462,5 @@ esac AC_SUBST(BUILDDIRS) dnl -dnl End of "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 252f2aa25..3c85abc14 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $" +dnl "$Id$" dnl dnl Compiler stuff for CUPS. dnl @@ -296,5 +296,5 @@ case $uname in esac dnl -dnl End of "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 173cfeac8..02f9870a0 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $" +dnl "$Id$" dnl dnl Default cupsd configuration settings for CUPS. dnl @@ -400,5 +400,5 @@ AC_SUBST(CUPS_WEBIF) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF) dnl -dnl End of "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index eec3dec02..45665a13f 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $" +dnl "$Id$" dnl dnl Directory stuff for CUPS. dnl @@ -427,5 +427,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") AC_SUBST(CUPS_STATEDIR) dnl -dnl End of "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 02974ef8a..9207d616f 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $" +dnl "$Id$" dnl dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. dnl @@ -82,5 +82,5 @@ AC_SUBST(IPPFIND_BIN) AC_SUBST(IPPFIND_MAN) dnl -dnl End of "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index d378bbfab..690d36c7c 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -3,7 +3,7 @@ dnl "$Id$" dnl dnl GSSAPI/Kerberos library detection for CUPS. dnl -dnl Copyright 2007-2012 by Apple Inc. +dnl Copyright 2007-2013 by Apple Inc. dnl Copyright 2006-2007 by Easy Software Products. dnl dnl This file contains Kerberos support code, copyright 2006 by @@ -71,38 +71,9 @@ if test x$enable_gssapi != xno; then if test "x$LIBGSSAPI" != x; then AC_CHECK_HEADER(krb5.h, AC_DEFINE(HAVE_KRB5_H)) if test -d /System/Library/Frameworks/GSS.framework; then - gssdir="/System/Library/Frameworks/GSS.framework" - AC_MSG_CHECKING(for GSS/gssapi.h presence) - if test -f $gssdir/Headers/gssapi.h; then - AC_DEFINE(HAVE_GSS_GSSAPI_H) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - AC_MSG_CHECKING(for GSS/gssapi_generic.h presence) - if test -f $gssdir/Headers/gssapi_generic.h; then - AC_DEFINE(HAVE_GSSAPI_GENERIC_H) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - AC_MSG_CHECKING(for GSS/gssapi_spi.h presence) - if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then - AC_MSG_RESULT(yes) - AC_MSG_CHECKING(for GSS/gssapi_spi.h usability) - if test -s $gssdir/PrivateHeaders/gssapi_spi.h; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H) - else - AC_MSG_RESULT(no) - fi - else - AC_MSG_RESULT(no) - if test $uversion -ge 110 -a $uversion -lt 120; then - # Broken public headers in 10.7.x... - AC_MSG_ERROR(Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.) - fi - fi + AC_CHECK_HEADER(GSS/gssapi.h, AC_DEFINE(HAVE_GSS_GSSAPI_H)) + AC_CHECK_HEADER(GSS/gssapi_generic.h, AC_DEFINE(HAVE_GSS_GSSAPI_GENERIC_H)) + AC_CHECK_HEADER(GSS/gssapi_spi.h, AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H)) else AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H)) AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H)) diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index 8243de787..6ef4b81e1 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $" +dnl "$Id$" dnl dnl Large file support stuff for CUPS. dnl @@ -48,5 +48,5 @@ fi AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) dnl -dnl End of "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-launchd.m4 index 23a229516..8db35d43d 100644 --- a/config-scripts/cups-launchd.m4 +++ b/config-scripts/cups-launchd.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $" +dnl "$Id$" dnl dnl launchd stuff for CUPS. dnl @@ -39,5 +39,5 @@ AC_SUBST(DEFAULT_LAUNCHD_CONF) AC_SUBST(LAUNCHDLIBS) dnl -dnl End of "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index d6026b24b..5fc0d6e3c 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $" +dnl "$Id$" dnl dnl Libtool stuff for CUPS. dnl @@ -35,5 +35,5 @@ if test x$LIBTOOL != x; then fi dnl -dnl End of "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 16246838c..fd1d8c791 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $" +dnl "$Id$" dnl dnl Manpage stuff for CUPS. dnl @@ -78,5 +78,5 @@ AC_SUBST(MAN8EXT) AC_SUBST(MAN8DIR) dnl -dnl End of "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index b97fb4a49..697cfb5b3 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $" +dnl "$Id$" dnl dnl Networking stuff for CUPS. dnl @@ -70,5 +70,5 @@ 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 7918 2008-09-08 22:03:01Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index acf5b51a3..700a284d0 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $" +dnl "$Id$" dnl dnl Operating system stuff for CUPS. dnl @@ -35,5 +35,5 @@ case "$uname" in esac dnl -dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $" +dnl "$Id$" dnl diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index 72bf32fc3..aa554d1b7 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $" +dnl "$Id$" dnl dnl PAM stuff for CUPS. dnl @@ -98,5 +98,5 @@ AC_SUBST(PAMMOD) AC_SUBST(PAMMODAUTH) dnl -dnl End of "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index d4ed98850..af97a94dc 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $" +dnl "$Id$" dnl dnl Scripting configuration stuff for CUPS. dnl @@ -85,5 +85,5 @@ if test "x$CUPS_PYTHON" != x; then fi dnl -dnl End of "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index ef2c71424..2313a2ae4 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $" +dnl "$Id$" dnl dnl Shared library support for CUPS. dnl @@ -234,5 +234,5 @@ AC_SUBST(IMGLIBS) AC_SUBST(EXPORT_LDFLAGS) dnl -dnl End of "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index f3dc0595f..faa9cc68e 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $" +dnl "$Id$" dnl dnl OpenSSL/GNUTLS stuff for CUPS. dnl @@ -157,5 +157,5 @@ EXPORT_SSLLIBS="$SSLLIBS" AC_SUBST(EXPORT_SSLLIBS) dnl -dnl End of "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index b95c79fa4..bd5c69867 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $" +dnl "$Id$" dnl dnl Threading stuff for CUPS. dnl @@ -50,5 +50,5 @@ fi AC_SUBST(PTHREAD_FLAGS) dnl -dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $". +dnl End of "$Id$". dnl |