Merge changes from CUPS 1.6svn-r10112.

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

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index d7239434b6f3acd95b13d508d513ddbd2e558ed3..2417da8f83749ef0505a1c8e1c255d38a976cc76 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -389,7 +389,17 @@ case $uname in
 
                dnl Check for sandbox/Seatbelt support
                if test $uversion -ge 100; then
-                   AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
+                       AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
+               fi
+               if test $uversion -ge 110; then
+                       # Broken public headers in 10.7...
+                       AC_MSG_CHECKING(for sandbox/private.h presence)
+                       if test -f /usr/local/include/sandbox/private.h; then
+                               AC_MSG_RESULT(yes)
+                       else
+                               AC_MSG_RESULT(no)
+                               AC_MSG_ERROR(Run 'sudo mkdir -p /usr/local/include/sandbox' and 'sudo touch /usr/local/include/sandbox/private.h' to build CUPS.)
+                       fi
                fi
 
                dnl Check for XPC support