[24052] in Source-Commits
/svn/athena r23657 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (Evan Broder)
Sun Mar 29 13:34:13 2009
Date: Sun, 29 Mar 2009 13:33:52 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903291733.n2THXq3i001063@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-29 13:33:52 -0400 (Sun, 29 Mar 2009)
New Revision: 23657
Modified:
trunk/debathena/scripts/aclocal.m4
Log:
Change the ATHENA_KRB4 autoconf macro to not bail if --with-krb4 is
passed but krb4 isn't available.
I'm handling this at the autoconf level instead of at the debian/rules
level because autoconf is in a much better position to detect if krb4
is actually present.
discuss and lert are the only two packages that use ATHENA_KRB4
instead of ATHENA_KRB4_REQUIRED, and both of those packages can deal
with only having krb5.
Modified: trunk/debathena/scripts/aclocal.m4
===================================================================
--- trunk/debathena/scripts/aclocal.m4 2009-03-29 17:33:38 UTC (rev 23656)
+++ trunk/debathena/scripts/aclocal.m4 2009-03-29 17:33:52 UTC (rev 23657)
@@ -209,7 +209,7 @@
[KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
[AC_CHECK_LIB(krb, krb_rd_req,
[KRB4_LIBS="-lkrb -ldes"],
- [AC_MSG_ERROR(Kerberos 4 libraries not found)],
+ [AC_MSG_WARN(--with-krb4 specified but Kerberos 4 libraries not found)],
-ldes)],
-ldes425 -lkrb5 -lk5crypto -lcom_err)
if test "$KRB4_LIBS" != "" ; then
@@ -224,7 +224,9 @@
[krb4="$withval"], [krb4=no])
if test "$krb4" != no; then
ATHENA_KRB4_CHECK
- AC_DEFINE(HAVE_KRB4)
+ if test "$KRB4_LIBS" != ""; then
+ AC_DEFINE(HAVE_KRB4)
+ fi
fi
AC_SUBST(KRB4_LIBS)])
@@ -234,6 +236,9 @@
[krb4="$withval"], [krb4=yes])
if test "$krb4" != no; then
ATHENA_KRB4_CHECK
+ if test "$KRB4_LIBS" = ""; then
+ AC_MSG_ERROR(This package requires Kerberos 4.)
+ fi
AC_SUBST(KRB4_LIBS)
else
AC_MSG_ERROR(This package requires Kerberos 4.)
