diff --git a/m4.include/vfs/mc-vfs-samba.m4 b/m4.include/vfs/mc-vfs-samba.m4
index 4e3a05af2..9314ecfad 100644
--- a/m4.include/vfs/mc-vfs-samba.m4
+++ b/m4.include/vfs/mc-vfs-samba.m4
@@ -2,7 +2,16 @@ dnl Samba support
 AC_DEFUN([AC_MC_VFS_SMB],
 [
     AC_ARG_ENABLE([vfs-smb],
-		AC_HELP_STRING([--enable-vfs-smb], [Support for SMB filesystem [[no]]]))
+		AC_HELP_STRING([--enable-vfs-smb], [Support for SMB filesystem [[no]]]),
+		[
+		    if test "x$enableval" = "xno"; then
+			enable_vfs_smb=no
+		    else
+			enable_vfs_smb=yes
+		    fi
+		],
+		[enable_vfs_smb=no])
+
     if test "$enable_vfs" != "no" -a x"$enable_vfs_smb" != x"no"; then
 	enable_vfs_smb="yes"
 	AC_MC_VFS_ADDNAME([smb])
@@ -36,11 +45,10 @@ AC_DEFUN([AC_MC_VFS_SMB],
 		esac
 	])
 
-
 	AC_SUBST(configdir)
 	AC_SUBST(codepagedir)
-
     fi
+
     AC_CONFIG_SUBDIRS([lib/vfs/mc-vfs/samba])
 
     AM_CONDITIONAL([ENABLE_VFS_SMB], [test x"$enable_vfs_smb" = x"yes"])