test-heimdal-20060217

Add a configure test for heimdal and use it to build asetkey or not.
Thanks to Derek Atkins for his helpful suggestions.

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index b50cf4d8abc1e411e5ccb6f2877842280a25a0ad..54a9b938fe750ee438a218e7240af74a26f6f6de 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -16,7 +16,7 @@ AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a \
 SRCS=  aklog.c aklog_main.c  krb_util.c linked_list.c
 OBJS=   aklog.o aklog_main.o krb_util.o linked_list.o
 
-all: aklog asetkey
+all: aklog @ASETKEY@
 
 aklog: ${OBJS} ${AFSLIBS}
        ${CC} -o $@ ${CFLAGS} ${OBJS} ${AKLIBS} ${AFSLIBS} ${XLIBS}
@@ -33,8 +33,8 @@ install: \
 ${DESTDIR}${bindir}/aklog: aklog
        ${INSTALL} $? $@
 
-${DESTDIR}${afssrvbindir}/asetkey: asetkey
-       ${INSTALL} $? $@
+${DESTDIR}${afssrvbindir}/asetkey: @ASETKEY@
+       if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
 
 dest: \
        ${DEST}/bin/aklog ${DEST}/root.server/usr/afs/bin/asetkey
@@ -42,8 +42,8 @@ dest: \
 ${DEST}/bin/aklog: aklog
        ${INSTALL} $? $@
 
-${DEST}/root.server/usr/afs/bin/asetkey: asetkey
-       ${INSTALL} $? $@
+${DEST}/root.server/usr/afs/bin/asetkey: @ASETKEY@
+       if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
 
 #
 # Misc. targets

diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index bc7737ee948e0703ee2972358c45666a3d9f52b8..c5add3317285a48df7d7d8a8ec79c9d0ad617007 100644 (file)
--- a/src/aklog/aklog_main.c
+++ b/src/aklog/aklog_main.c
@@ -10,6 +10,7 @@ static char *rcsid =
        "$Id$";
 #endif /* lint || SABER */
 
+#include <afsconfig.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -70,7 +71,7 @@ u_long ntohl(u_long x)
 
 #else /* !WINDOWS */
 #include <afs/stds.h>
-#ifndef AFS_OBSD_ENV
+#ifndef HAVE_KERBEROSV_HEIM_ERR_H
 #include <afs/com_err.h>
 #endif
 

diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index b9ab80ae8e99b3bf548e828db7b76fb90b7c65af..3898608adfca732e6ce86b01d5d68cbf8e05b1fa 100644 (file)
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -6,6 +6,7 @@
  * Updated for Kerberos 5
  */
 
+#include <afsconfig.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -32,9 +33,6 @@
 int
 main(int argc, char *argv[])
 {
-#ifdef AFS_OBSD_ENV
-    fprintf(stderr, "asetkey not implemented. Use kadmin instead.\n");
-#else
     struct afsconf_dir *tdir;
     register long code;
     const char *confdir;
@@ -137,6 +135,5 @@ main(int argc, char *argv[])
                "assistance\n", argv[0], argv[1], argv[0]);
        exit(1);
     }
-#endif
     exit(0);
 }

diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index 939d7f3bdc8a5e9d65e1fa11a086fbe61e854293..8ec840d2492eb8c3af423a4b9933b7ad59db3f49 100644 (file)
--- a/src/cf/kerberos.m4
+++ b/src/cf/kerberos.m4
@@ -60,6 +60,7 @@ if test X$conf_krb5 = XYES; then
        LIBS="$LIBS $KRB5LIBS"
        AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string krb5_524_convert_creds krb524_convert_creds_kdc])
        AC_CHECK_HEADERS([kerberosIV/krb.h])
+       AC_CHECK_HEADERS([kerberosV/heim_err.h])
 
 AC_MSG_CHECKING(for krb5_creds.keyblock existence)
 AC_CACHE_VAL(ac_cv_krb5_creds_keyblock_exists,
@@ -94,7 +95,16 @@ dnl  AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session],,, [#include <krb
        CPPFLAGS="$save_CPPFLAGS"
        LIBS="$save_LIBS"
 fi
+
+if test "$ac_cv_header_kerberosV_heim_err_h" = "yes"; then
+    ASETKEY=
+else
+    ASETKEY=asetkey
+fi
+
 AC_SUBST(BUILD_KRB5)
 AC_SUBST(KRB5CFLAGS)
 AC_SUBST(KRB5LIBS)
+AC_SUBST(ASETKEY)
+
 ])dnl