Merge changes from CUPS 1.7svn-r10791.

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

diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index 36c878cf07a109a77c96443279088faa3c1255e8..d378bbfabb6d9a48d7400d23bffcbf89e8186819 100644 (file)
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -86,13 +86,6 @@ if test x$enable_gssapi != xno; then
                        else
                                AC_MSG_RESULT(no)
                        fi
-                       AC_MSG_CHECKING(for GSS/gssapi_krb5.h presence)
-                       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/PrivateHeaders/gssapi_spi.h; then
                                AC_MSG_RESULT(yes)
@@ -105,16 +98,14 @@ 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
                else
                        AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H))
                        AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H))
-                       AC_CHECK_HEADER(gssapi/gssapi_generic.h, AC_DEFINE(HAVE_GSSAPI_GENERIC_H))
-                       AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_KRB5_H))
                fi
 
                SAVELIBS="$LIBS"