INN commit: trunk/m4 (krb5.m4)
INN Commit
rra at isc.org
Sun Nov 17 20:32:28 UTC 2013
Date: Sunday, November 17, 2013 @ 12:32:27
Author: iulius
Revision: 9569
krb5.m4: synchronize with latest rra-c-util 4.11 release
INN_LIB_KRB5_OPTIONAL now correctly configures the package to not use
Kerberos instead of failing if neither the new Kerberos error APIs nor
libcom_err could be found.
Also fix the AM_CONDITIONAL that determines whether Kerberos is linked
with libcom_err.
Modified:
trunk/m4/krb5.m4
---------+
krb5.m4 | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: krb5.m4
===================================================================
--- krb5.m4 2013-11-17 20:25:20 UTC (rev 9568)
+++ krb5.m4 2013-11-17 20:32:27 UTC (rev 9569)
@@ -45,7 +45,7 @@
dnl package, available at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
dnl
dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
+dnl Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013
dnl The Board of Trustees of the Leland Stanford Junior University
dnl
dnl This file is free software; the authors give unlimited permission to copy
@@ -132,7 +132,9 @@
[INN_INCLUDES_KRB5])],
[AC_CHECK_LIB([com_err], [com_err],
[KRB5_LIBS="$KRB5_LIBS -lcom_err"],
- [AC_MSG_ERROR([cannot find usable com_err library])])
+ [AS_IF([test x"$1" = xtrue],
+ [AC_MSG_ERROR([cannot find usable com_err library])],
+ [KRB5_LIBS=""])])
AC_CHECK_HEADERS([et/com_err.h])])])])])
INN_LIB_KRB5_RESTORE])
@@ -250,7 +252,7 @@
[_INN_LIB_KRB5_PATHS
_INN_LIB_KRB5_MANUAL([$1])])])
inn_krb5_uses_com_err=false
- AS_CASE([$LIBS], [*-lcom_err*], [inn_krb5_uses_com_err=true])
+ AS_CASE([$KRB5_LIBS], [*-lcom_err*], [inn_krb5_uses_com_err=true])
AM_CONDITIONAL([KRB5_USES_COM_ERR],
[test x"$inn_krb5_uses_com_err" = xtrue])])
More information about the inn-committers
mailing list