dont pass --no-unlog if afs is not configured. Patch partly from Eray Asian

This commit is contained in:
Love Hornquist Astrand
2010-06-01 10:17:37 -07:00
parent 29cf9c937e
commit ccacfda1cc
4 changed files with 5 additions and 2 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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"