From ccacfda1cc0bb9a67e214197ed99ffdb06a4d816 Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Tue, 1 Jun 2010 10:17:37 -0700
Subject: [PATCH] dont pass --no-unlog if afs is not configured. Patch partly
 from Eray Asian

---
 configure.ac           | 1 +
 tests/bin/Makefile.am  | 3 ++-
 tests/bin/setup-env.in | 1 +
 tests/kdc/check-cc.in  | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8672ed982..34a405794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,6 +246,7 @@ AC_ARG_ENABLE([afs-support],
 if test "$enable_afs_support" = no; then
 	AC_DEFINE(NO_AFS, 1, [Define if you don't wan't support for AFS.])
 fi
+AC_SUBST(NO_AFS)dnl
 
 rk_DB
 
diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am
index 49accb079..3d54a97ad 100644
--- a/tests/bin/Makefile.am
+++ b/tests/bin/Makefile.am
@@ -8,7 +8,8 @@ do_subst = \
 	sed $(do_dlopen) \
 	-e "s,[@]EGREP[@],$(EGREP),g" \
 	-e "s,[@]top_srcdir[@],$${top_srcdir},g" \
-	-e "s,[@]top_builddir[@],$${top_builddir},g"
+	-e "s,[@]top_builddir[@],$${top_builddir},g" \
+	-e "s,[@]NO_AFS[@],$${NO_AFS},g"
 
 setup-env: setup-env.in Makefile
 	$(do_subst) < $(srcdir)/setup-env.in > setup-env.tmp
diff --git a/tests/bin/setup-env.in b/tests/bin/setup-env.in
index a84848285..a8ffa6746 100644
--- a/tests/bin/setup-env.in
+++ b/tests/bin/setup-env.in
@@ -6,6 +6,7 @@ unset KRB5CCNAME
 top_builddir="@top_builddir@"
 top_srcdir="@top_srcdir@"
 EGREP="@EGREP@"
+NO_AFS="@NO_AFS@"
 
 # Meant to be sourced (source or .) by the tester application, offers
 # most commands in heimdal as variables
diff --git a/tests/kdc/check-cc.in b/tests/kdc/check-cc.in
index 0a3770387..66473c6eb 100644
--- a/tests/kdc/check-cc.in
+++ b/tests/kdc/check-cc.in
@@ -52,7 +52,7 @@ port=@port@
 pwport=@pwport@
 
 kinit="${kinit} --password-file=${objdir}/foopassword --no-afslog"
-kdestroy="${kdestroy} --no-unlog"
+test ! "${NO_AFS}" && kdestroy="${kdestroy} --no-unlog"
 kadmin="${kadmin} -l -r $R"
 kdc="${kdc} --addresses=localhost -P $port"