[23662] in Source-Commits
/svn/athena r23279 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Fri Jan 9 19:59:37 2009
Date: Fri, 9 Jan 2009 19:59:14 -0500 (EST)
From: broder@MIT.EDU
Message-Id: <200901100059.TAA06016@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-01-09 19:59:14 -0500 (Fri, 09 Jan 2009)
New Revision: 23279
Modified:
trunk/debathena/scripts/aclocal.m4
Log:
Use AC_REQUIRE to require AC_CANONICAL_TARGET instead of calling it
directly.
Modified: trunk/debathena/scripts/aclocal.m4
===================================================================
--- trunk/debathena/scripts/aclocal.m4 2009-01-10 00:23:41 UTC (rev 23278)
+++ trunk/debathena/scripts/aclocal.m4 2009-01-10 00:59:14 UTC (rev 23279)
@@ -194,7 +194,8 @@
dnl ----- Kerberos 4 -----
AC_DEFUN([ATHENA_KRB4_CHECK],
-[AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
+[AC_REQUIRE([AC_CANONICAL_TARGET])
+AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket))
AC_CHECK_LIB(gen, compile)
if test "$krb4" != yes; then
@@ -212,7 +213,6 @@
-ldes)],
-ldes425 -lkrb5 -lk5crypto -lcom_err)
if test "$KRB4_LIBS" != "" ; then
- AC_CANONICAL_TARGET
case "$target_os" in
darwin*) KRB4_LIBS="$KRB4_LIBS -framework Kerberos"
esac
@@ -242,7 +242,8 @@
dnl ----- Kerberos 5 -----
AC_DEFUN([ATHENA_KRB5_CHECK],
-[AC_SEARCH_LIBS(gethostbyname, nsl)
+[AC_REQUIRE([AC_CANONICAL_TARGET])
+AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(socket, socket)
AC_CHECK_LIB(gen, compile)
if test "$krb5" != yes; then
@@ -261,7 +262,6 @@
ATHENA_KRB5_CHECK
KRB5_LIBS="-lkrb5 -lk5crypto -lcom_err"
if test "$KRB5_LIBS" != "" ; then
- AC_CANONICAL_TARGET
case "$target_os" in
darwin*) KRB5_LIBS="$KRB5_LIBS -framework Kerberos"
esac
