Don't do AFS string-to-key tests when feature is disabled

configure.ac

@@ -282,7 +282,9 @@ AC_ARG_ENABLE(afs-string-to-key,
 
 if test "$enable_afs_string_to_key" = "yes"; then
 	AC_DEFINE(ENABLE_AFS_STRING_TO_KEY, 1, [Define if want to use the weak AFS string to key functions.])
+	ENABLE_AFS_STRING_TO_KEY=1
 fi
+AC_SUBST(ENABLE_AFS_STRING_TO_KEY)dnl
 
 
 rk_CHECK_MAN

tests/kdc/Makefile.am

@@ -59,6 +59,7 @@ do_subst = $(heim_verbose)sed $(do_dlopen) \
 	-e 's,[@]objdir[@],$(top_builddir)/tests/kdc,g' \
 	-e 's,[@]top_builddir[@],$(top_builddir),g' \
 	-e 's,[@]db_type[@],$(db_type),g' \
+        -e 's,[@]ENABLE_AFS_STRING_TO_KEY[@],$(ENABLE_AFS_STRING_TO_KEY),' \
 	-e 's,[@]EGREP[@],$(EGREP),g' 
 
 chmod = chmod

tests/kdc/check-keys.in

@@ -91,12 +91,14 @@ sed -e 's/@keys@/des:pw-salt:/' \
 	${sedvars} < ${CIN} > ${COUT}
 ${kadmin} cpw -p foo ${principal} || exit 1
 
-sed -e 's/@keys@/des-cbc-crc:afs3-salt:test.h5l.se/' \
-	${sedvars} < ${CIN} > ${COUT}
-${kadmin} cpw -p foo ${principal} || exit 1
+if [ 'X@ENABLE_AFS_STRING_TO_KEY@' = "X1" ]; then
+    sed -e 's/@keys@/des-cbc-crc:afs3-salt:test.h5l.se/' \
+            ${sedvars} < ${CIN} > ${COUT}
+    ${kadmin} cpw -p foo ${principal} || exit 1
 
-sed -e 's/@keys@/des:afs3-salt:test.h5l.se/' \
-	${sedvars} < ${CIN} > ${COUT}
-${kadmin} cpw -p foo ${principal} || exit 1
+    sed -e 's/@keys@/des:afs3-salt:test.h5l.se/' \
+            ${sedvars} < ${CIN} > ${COUT}
+    ${kadmin} cpw -p foo ${principal} || exit 1
+fi
 
 exit 0