From: mike Date: Tue, 8 Jan 2013 16:19:32 +0000 (+0000) Subject: Don't need ugly header hacks on OS X anymore... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16813979fb525fa4941ad8f2c48564478a0530c1;p=thirdparty%2Fcups.git Don't need ugly header hacks on OS X anymore... git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10784 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 7c449f09fc..fe51c2b994 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -403,8 +403,8 @@ case $uname in if test $uversion -ge 100; then AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H)) fi - if test $uversion -ge 110; then - # Broken public headers in 10.7... + if test $uversion -ge 110 -a $uversion -lt 120; then + # Broken public headers in 10.7.x... AC_MSG_CHECKING(for sandbox/private.h presence) if test -f /usr/local/include/sandbox/private.h; then AC_MSG_RESULT(yes) diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 4beea7efef..d378bbfabb 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -98,8 +98,8 @@ if test x$enable_gssapi != xno; then fi else AC_MSG_RESULT(no) - if test $uversion -ge 110; then - # Broken public headers in 10.7... + 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