[OpenAFS-devel] OA-1.4.2b3 still fails to define KRB524_CONVERT_CREDS_KDC

[Derek Atkins]

--=-=-=

Hi,

1.4.2-beta3 still has problems with KRB524_CONVERT_CREDS_KDC.
I THINK the problem is that configure and/or autoheader don't
like the fact that the AC_DEFINE is nested so deeply.   SO...
Here's a patch to try to fix that.

Note that this patch is untested, because, well, my tests are
all using a modern auto-tools so they obviously don't work
"properly" because the openafs dist is made with ancient tools.
The patch does create a well-formed macro and modern auto-tools
think it's fine.

I'm hoping that by exctracting the AC_DEFINE in this way (see
attached patch) the older tools will accept it and create a valid
afsconfig.h.in.  But I can't tell from here -- I don't even have
autoconf-2.13 anymore on my systems.

-derek


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=oa-krb.patch
Content-Description: OpenAFS krb524 macro patch

--- src/cf/kerberos.m4-orig	2006-06-24 12:22:13.000000000 -0400
+++ src/cf/kerberos.m4	2006-08-04 10:15:23.000000000 -0400
@@ -52,6 +52,7 @@
 
 BUILD_KRB5=no
 if test X$conf_krb5 = XYES; then
+	define_krb524_convert_creds_kdc=no
 	AC_MSG_RESULT([Configuring support for Kerberos 5 utilities])
 	BUILD_KRB5=yes
 	save_CPPFLAGS="$CPPFLAGS"
@@ -64,10 +65,14 @@
 		[AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
 		    [LIBS="-lkrb524 $LIBS"
 		     KRB5LIBS="-lkrb524 $LIBS"
-		     AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1,
-			 [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])])
+		     define_krb524_convert_creds_kdc=yes
+	])])])
 	AC_CHECK_HEADERS([kerberosIV/krb.h])
 	AC_CHECK_HEADERS([kerberosV/heim_err.h])
+	if test "x$define_krb524_convert_creds_kdc" = "xyes" ; then
+		AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1,
+			  [Define to 1 if you have the `krb524_convert_creds_kdc' function.])
+	fi
 
 AC_MSG_CHECKING(for krb5_creds.keyblock existence)
 AC_CACHE_VAL(ac_cv_krb5_creds_keyblock_exists,

--=-=-=


-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord@MIT.EDU                        PGP key available

--=-=-=--