[23659] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r23277 - trunk/debathena/scripts

daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Fri Jan 9 19:06:34 2009

Date: Fri, 9 Jan 2009 19:06:07 -0500 (EST)
From: broder@MIT.EDU
Message-Id: <200901100006.TAA05138@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:06:06 -0500 (Fri, 09 Jan 2009)
New Revision: 23277

Modified:
   trunk/debathena/scripts/aclocal.m4
Log:
Add "-framework Kerberos" to KRB4_LIBS and KRB5_LIBS if the build
target is Mac OS X.


Modified: trunk/debathena/scripts/aclocal.m4
===================================================================
--- trunk/debathena/scripts/aclocal.m4	2009-01-09 21:11:46 UTC (rev 23276)
+++ trunk/debathena/scripts/aclocal.m4	2009-01-10 00:06:06 UTC (rev 23277)
@@ -210,7 +210,13 @@
 			   [KRB4_LIBS="-lkrb -ldes"],
 			   [AC_MSG_ERROR(Kerberos 4 libraries not found)],
 			   -ldes)],
-	     -ldes425 -lkrb5 -lk5crypto -lcom_err)])
+	     -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
+fi])
 
 AC_DEFUN([ATHENA_KRB4],
 [AC_ARG_WITH(krb4,
@@ -254,6 +260,12 @@
 if test "$krb5" != no; then
 	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
+	fi
 	AC_DEFINE(HAVE_KRB5)
 fi
 AC_SUBST(KRB5_LIBS)])


home help back first fref pref prev next nref lref last post