summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-05-30 09:59:45 +0300
committerSergey Poznyakoff <gray@gnu.org>2019-05-30 10:09:36 +0300
commitc7b2964d7b4a5e3437b1481f6474a38879cd9a8e (patch)
tree2860cc58e3a99f19be5989ec506310ef87516702
parent20daef8388c97873f1d33c749e94ae558403f055 (diff)
downloadmailutils-c7b2964d7b4a5e3437b1481f6474a38879cd9a8e.tar.gz
mailutils-c7b2964d7b4a5e3437b1481f6474a38879cd9a8e.tar.bz2
Fix conditional compilation; add dotmail support to libmu_scm
* configure.ac: Accept dotmail as a value for MU_DEFAULT_SCHEME. Display dotmail support status at the end of the run. * libmailutils/base/nullrec.c: Provide placeholder for disabled dotmail. * libmu_scm/mu_scm.c (format_table): Add dotmail. * libmu_scm/tests/testsuite.at: Don't assume mbox as the default. Load it explicitly.
-rw-r--r--configure.ac6
-rw-r--r--libmailutils/base/nullrec.c4
-rw-r--r--libmu_scm/mu_scm.c1
-rw-r--r--libmu_scm/tests/testsuite.at1
4 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 498014197..d49efad08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1273,3 +1273,3 @@ MU_ENABLE_SUPPORT(cxx,
AC_ARG_VAR([MU_DEFAULT_SCHEME],
- [Default mailbox record. Allowed values are: mbox (default), mh, and maildir.])
+ [Default mailbox record. Allowed values are: mbox (default), dotmail, mh, and maildir.])
if test -z "$MU_DEFAULT_SCHEME"; then
@@ -1280,3 +1280,3 @@ mbox)
;;
-mh|maildir)
+mh|maildir|dotmail)
eval testval=\$mu_cv_enable_$MU_DEFAULT_SCHEME
@@ -1429,2 +1429,3 @@ MH ............................ $status_mh
maildir ....................... $status_maildir
+dotmail ....................... $status_dotmail
@@ -1472,2 +1473,3 @@ status_mh=$mu_cv_enable_mh
status_maildir=$mu_cv_enable_maildir
+status_dotmail=$mu_cv_enable_dotmail
status_smtp=$mu_cv_enable_smtp
diff --git a/libmailutils/base/nullrec.c b/libmailutils/base/nullrec.c
index d274cb8b0..a793e1562 100644
--- a/libmailutils/base/nullrec.c
+++ b/libmailutils/base/nullrec.c
@@ -48,2 +48,6 @@ mu_record_t mu_maildir_record = NULL;
+#ifndef ENABLE_DOTMAIL
+mu_record_t mu_dotmail_record = NULL;
+#endif
+
#ifndef WITH_TLS
diff --git a/libmu_scm/mu_scm.c b/libmu_scm/mu_scm.c
index 21aa14a73..f7ca1e72a 100644
--- a/libmu_scm/mu_scm.c
+++ b/libmu_scm/mu_scm.c
@@ -51,2 +51,3 @@ static struct format_record format_table[] = {
{ "maildir", &mu_maildir_record },
+ { "dotmail", &mu_dotmail_record },
{ "pop", &mu_pop_record },
diff --git a/libmu_scm/tests/testsuite.at b/libmu_scm/tests/testsuite.at
index 514b727a2..6bd194757 100644
--- a/libmu_scm/tests/testsuite.at
+++ b/libmu_scm/tests/testsuite.at
@@ -16,2 +16,3 @@ m4_define([MU_GUILE_CHECK],
((mailutils ancilla)))
+(mu-register-format "mbox")
[$1]

Return to:

Send suggestions and report system problems to the System administrator.