INN commit: trunk (CONTRIBUTORS configure.ac)

[INN Commit]

    Date: Saturday, December 14, 2013 @ 10:59:12
  Author: iulius
Revision: 9585

auth_krb5:  do not try to build it when com_err header is not found

The new krb5.m4 used by INN does not guarantee that com_err.h
will exist because it's no longer part of the official Kerberos API.
Therefore, add a special check to clear KRB5_AUTH, KRB5_CPPFLAGS,
KRB5_LDFLAGS, and KRB5_LIBS if neither et/com_err.h nor com_err.h
can be found and --with-krb5 is not given.

Thanks to Jesse Rehmer for the bug report.

Modified:
  trunk/CONTRIBUTORS
  trunk/configure.ac

--------------+
 CONTRIBUTORS |    3 ++-
 configure.ac |   12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

Modified: CONTRIBUTORS
===================================================================
--- CONTRIBUTORS	2013-12-12 20:24:20 UTC (rev 9584)
+++ CONTRIBUTORS	2013-12-14 18:59:12 UTC (rev 9585)
@@ -275,4 +275,5 @@
 Lars Magne Ingebrigtsen, Sam Varshavchik, Matthew Vernon, Ian Jackson,
 Edmund H. Ramm, Raphael Barrois, Bo Lindbergh, Matthias Meyser,
 Dennis Preiser, Paolo Amoroso, Dennis Davis, River Tarnell, Jochen Schmitt,
-Tim Fardell, Remco Rijnders, David Binderman, Tony Evans, Christian Garbs
+Tim Fardell, Remco Rijnders, David Binderman, Tony Evans, Christian Garbs,
+Jesse Rehmer

Modified: configure.ac
===================================================================
--- configure.ac	2013-12-12 20:24:20 UTC (rev 9584)
+++ configure.ac	2013-12-14 18:59:12 UTC (rev 9585)
@@ -340,9 +340,17 @@
 INN_LIB_SASL_OPTIONAL
 
 dnl If Kerberos is found, define KRB5_AUTH to auth_krb5 so as to build
-dnl that program.
+dnl that program.  In case neither et/com_err.h nor com_err.h can be found
+dnl and --with-krb5 is not given, do not define KRB5_AUTH and clear the
+dnl other variables set for Kerberos support.
 AS_IF([test x"$KRB5_LIBS" != x],
-    [KRB5_AUTH=auth_krb5])
+    [AC_CHECK_HEADERS([et/com_err.h], [KRB5_AUTH=auth_krb5],
+         [AC_CHECK_HEADERS([com_err.h], [KRB5_AUTH=auth_krb5],
+              [AS_IF([test x"$with_krb5" = x],
+                   [KRB5_CPPFLAGS=
+                    KRB5_LDFLAGS=
+                    KRB5_LIBS=],
+                   [AC_MSG_ERROR([cannot find usable com_err header])])])])])
 AC_SUBST([KRB5_AUTH])
 
 dnl The dbm libraries are a special case.  If we're building with Berkeley DB,