diff --git a/ChangeLog b/ChangeLog
index 9f98a1ef9..c62d202cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-14  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Use AC_CHECK_TOOL for finding AR. Define
+	Automake conditional USE_SAMBA_FS if Samba is to be supported
+	in VFS.
+
 2001-03-07  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: Use AM_PROG_CC_STDC if AC_PROG_CC_STDC is not
diff --git a/configure.in b/configure.in
index 7c1b90766..dcd0c47a0 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ dnl It's needed until Autoconf 2.50 is released.
 ifdef([AC_PROG_CC_STDC], [AC_PROG_CC_STDC], [AM_PROG_CC_STDC])
 AC_HEADER_MAJOR
 AC_C_CONST
-AC_PATH_PROG(AR, ar, ar)
+AC_CHECK_TOOL(AR, ar, ar)
 
 AC_CHECK_PROGS(X11_WWW,netscape arena Mosaic chimera)
 if test x"$X11_WWW" = x; then
@@ -975,6 +975,8 @@ fi],
   AC_CONFIG_SUBDIRS([vfs/samba])
 fi])
 
+AM_CONDITIONAL([USE_SAMBA_FS], [test "x$SAMBAFILES" != x])
+
 AC_OUTPUT([
 Make.common 
 Makefile