diff --git a/lib/vfs/mc-vfs/samba/configure.ac b/lib/vfs/mc-vfs/samba/configure.ac
index 319fcba4f..b2d44b584 100644
--- a/lib/vfs/mc-vfs/samba/configure.ac
+++ b/lib/vfs/mc-vfs/samba/configure.ac
@@ -528,14 +528,14 @@ AC_ARG_WITH(ssl,
 #################################################
 # set configuration directory location
 configdir="\$(LIBDIR)"
-AC_ARG_WITH(configdir,
-[  --with-configdir=DIR    Where to put configuration files (\$libdir)],
+AC_ARG_WITH(smb-configdir,
+[  --with-smb-configdir=DIR    Where to put configuration files (\$libdir)],
 [ case "$withval" in
   yes|no)
   #
   # Just in case anybody does it
   #
-    AC_MSG_WARN([--with-configdir called without argument - will use default])
+    AC_MSG_WARN([--with-smb-configdir called without argument - will use default])
   ;;
   * )
     configdir="$withval"
@@ -547,14 +547,14 @@ AC_ARG_WITH(configdir,
 #################################################
 # set codepage directory location
 codepagedir="\$(LIBDIR)/codepages"
-AC_ARG_WITH(codepagedir,
-[  --with-codepagedir=DIR  Where to put codepage files (\$libdir/codepages)],
+AC_ARG_WITH(smb-codepagedir,
+[  --with-smb-codepagedir=DIR  Where to put codepage files (\$libdir/codepages)],
 [ case "$withval" in
   yes|no)
   #
   # Just in case anybody does it
   #
-    AC_MSG_WARN([--with-codepagedir called without argument - will use default])
+    AC_MSG_WARN([--with-smb-codepagedir called without argument - will use default])
   ;;
   * )
     codepagedir="$withval"
diff --git a/m4.include/vfs/mc-vfs-samba.m4 b/m4.include/vfs/mc-vfs-samba.m4
index db1ad8bc5..4e3a05af2 100644
--- a/m4.include/vfs/mc-vfs-samba.m4
+++ b/m4.include/vfs/mc-vfs-samba.m4
@@ -40,8 +40,8 @@ AC_DEFUN([AC_MC_VFS_SMB],
 	AC_SUBST(configdir)
 	AC_SUBST(codepagedir)
 
-	AC_CONFIG_SUBDIRS([lib/vfs/mc-vfs/samba])
     fi
+    AC_CONFIG_SUBDIRS([lib/vfs/mc-vfs/samba])
 
     AM_CONDITIONAL([ENABLE_VFS_SMB], [test x"$enable_vfs_smb" = x"yes"])
 ])