Index: server/common/oursrc/tokensys/Makefile.in
===================================================================
--- server/common/oursrc/tokensys/Makefile.in	(revision 10)
+++ server/common/oursrc/tokensys/Makefile.in	(revision 36)
@@ -2,9 +2,2 @@
 CFLAGS = @CFLAGS@
 prefix = @prefix@
-
-preauto: 
-	rm -f configure config.* Makefile renew
-	rm -rf auto*.cache
-
-ready: preauto
-	autoconf
Index: server/common/oursrc/tokensys/configure.in
===================================================================
--- server/common/oursrc/tokensys/configure.in	(revision 10)
+++ server/common/oursrc/tokensys/configure.in	(revision 36)
@@ -1,9 +1,25 @@
 AC_INIT()
 
-AC_PATH_PROG(kinit_path, kinit)
+AC_ARG_WITH(kinit,
+[  --with-kinit[=PATH]       kinit is located at PATH],[
+  if test "$withval" != "no" -a "$withval" != "yes"; then
+    kinit_path="$withval"
+  fi
+])
 AC_SUBST(kinit_path)
+if test "$kinit_path" = ""; then
+        AC_ERROR(Cannot find kinit)
+fi
 
-AC_PATH_PROG(aklog_path, aklog)
+AC_ARG_WITH(aklog,
+[  --with-aklog[=PATH]       aklog is located at PATH],[
+  if test "$withval" != "no" -a "$withval" != "yes"; then
+    aklog_path="$withval"
+  fi
+])
 AC_SUBST(aklog_path)
+if test "$aklog_path" = ""; then
+        AC_ERROR(Cannot find aklog)
+fi
 
 AC_OUTPUT(Makefile)
Index: server/common/oursrc/tokensys/mrproper
===================================================================
--- server/common/oursrc/tokensys/mrproper	(revision 36)
+++ server/common/oursrc/tokensys/mrproper	(revision 36)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+rm -f configure config.* Makefile renew
+rm -rf auto*.cache