From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Wed, 19 Oct 2011 19:32:26 +0000 (+0000)
Subject: Fix GSS header check.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6cdbe41791a9a43f1da47edc6f5c2d0c201432d;p=thirdparty%2Fcups.git

Fix GSS header check.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10080 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index aee5699f4d..22bd43dc64 100644
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -71,33 +71,33 @@ 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/Headers"
+			gssdir="/System/Library/Frameworks/GSS.framework"
 			AC_MSG_CHECKING(for GSS/gssapi.h presence)
-			if test -f $gssdir/gssapi.h; then
+			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/gssapi_generic.h; then
+			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_krb5.h presence)
-			if test -f $gssdir/gssapi_krb5.h; then
+			if test -f $gssdir/Headers/gssapi_krb5.h; then
 				AC_DEFINE(HAVE_GSSAPI_KRB5_H)
 				AC_MSG_RESULT(yes)
 			else
 				AC_MSG_RESULT(no)
 			fi
 			AC_MSG_CHECKING(for GSS/gssapi_spi.h presence)
-			if test -f $gssdir/gssapi_spi.h; then
+			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/gssapi_spi.h; then
+				if test -s $gssdir/PrivateHeaders/gssapi_spi.h; then
 					AC_MSG_RESULT(yes)
 					AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H)
 				else
@@ -107,7 +107,7 @@ if test x$enable_gssapi != xno; then
 				AC_MSG_RESULT(no)
 				if test $uversion -ge 110; then
 					# Broken public headers in 10.7...
-					AC_MSG_ERROR(Run 'sudo touch $gssdir/gssapi_spi.h' to build CUPS.)
+					AC_MSG_ERROR(Run 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.)
 				fi
 			fi
 		else