Fix make check if MU_DEFAULT_SCHEME value is other than mbox

* testsuite/testsuite.inc (MUT_DEFAULT_OPTIONS): New define.
* maidag/tests/testsuite.at: Add MUT_DEFAULT_OPTIONS to the
options passed to maidag
* mail/tests/cols00.at: Use MUT_MAIL_CMD
* mail/tests/cols01.at: Likewise.
* mail/tests/copy00.at: Likewise.
* mail/tests/nohome.at: Likewise.
* mail/tests/testsuite.at (MUT_MAIL_CMD): New define.  Pass
MUT_DEFAULT_OPTIONS to mail.
* sieve/tests/testsuite.at: Pass MUT_DEFAULT_OPTIONS to sieve.

@@ -17,8 +17,7 @@
 m4_include([testsuite.inc])
 
 m4_define([MAIDAG_OPTIONS],[dnl
---no-site-config dnl
---no-user-config dnl
+MUT_DEFAULT_OPTIONS dnl
 --set '|mailbox|mailbox-pattern='`pwd`/spool/'${user}' dnl
 --set .auth.authorization=system dnl
 --stderr])

@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols00])
 AT_CHECK([
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
-COLUMNS=26 mail -nH -E 'set columns=26' -f ./mbox
-COLUMNS=31 mail -nH -f ./mbox
+COLUMNS=26 MUT_MAIL_CMD -nH -E 'set columns=26' -f ./mbox
+COLUMNS=31 MUT_MAIL_CMD -nH -f ./mbox
 ],
 [0],
 [>N   1 Sergey Poznyakoff

@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols01])
 AT_CHECK([
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
-mail -nH -E 'set columns=26' -f ./mbox
-mail -nH -E 'set columns=31' -f ./mbox
+MUT_MAIL_CMD -nH -E 'set columns=26' -f ./mbox
+MUT_MAIL_CMD -nH -E 'set columns=31' -f ./mbox
 ],
 [0],
 [>N   1 Sergey Poznyakoff

@@ -26,7 +26,7 @@ AT_CHECK([
 test -f /dev/stdout || AT_SKIP_TEST
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
-echo 'copy 1 /dev/stdout' | mail -N -E 'set readonly' -f ./mbox | sed 's/  *$//;/^Held 1 message/d';
+echo 'copy 1 /dev/stdout' | MUT_MAIL_CMD -N -E 'set readonly' -f ./mbox | sed 's/  *$//;/^Held 1 message/d';
 ],
 [0],
 [From gray@example.net Tue Jul 16 12:11:35 2002

@@ -26,7 +26,7 @@ AT_CHECK([
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
 unset HOME
-MAIL=./mbox mail -nH
+MAIL=./mbox MUT_MAIL_CMD -nH
 ],
 [0],
 [>N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/390   MBOX

@@ -16,6 +16,8 @@
 
 m4_include([testsuite.inc])
 
+m4_define([MUT_MAIL_CMD],[mail MUT_DEFAULT_OPTIONS])
+
 AT_INIT
 AT_TESTED([mail])
 

@@ -27,10 +27,7 @@ AT_CLEANUP
 ])
 
 dnl ------------------------------------------------------------
-m4_define([MUT_SIEVE_DEFAULT_OPTIONS],[dnl
- --no-site-config dnl
- --no-user-config dnl
-])
+m4_define([MUT_SIEVE_DEFAULT_OPTIONS],MUT_DEFAULT_OPTIONS)
 
 dnl ------------------------------------------------------------
 dnl MUT_SIEVE_OPTIONS  -- additional command line options for Sieve

@@ -21,6 +21,15 @@ m4_version_prereq([2.52g])
 m4_define([AT_SKIP_TEST],[exit 77])
 
 dnl ------------------------------------------------------------
+dnl MUT_DEFAULT_OPTIONS -- produce default command line options
+dnl ------------------------------------------------------------
+m4_define([MUT_DEFAULT_OPTIONS],[dnl
+ --no-site-config dnl
+ --no-user-config dnl
+ --set '.mailbox.mailbox-type=mbox' dnl
+])
+
+dnl ------------------------------------------------------------
 dnl MUT_VERSION(TOOL)  -- checks the version output from TOOL
 dnl
 m4_define([MUT_VERSION],[