Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit c5f1126f c5f1126fe5883c0a8a22fb0ad8de18b8cfd6650e by Sergey Poznyakoff
Options

Mark unfinished interfaces as experimental so they're not built by default. 

* am/enable.m4 (MU_ENABLE_SUPPORT): Fix the usage of the last argument.
* configure.ac: Check for --enable-experimental before any other checks.
Mark cxx, python and nntp as experimental.
* mh/tests/mhn.at: Make sure all mailboxes are writable.
* mh/tests/testsuite.at (MTSTAILOR): Fix mailer URL.
* po/POTFILES.in: Comment out unused sources.
1 parent 074a1485
Inline Side-by-side
Showing 5 changed files with 38 additions and 20 deletions
......@@ -34,16 +34,15 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [
esac],
[mu_cache_var=ifelse([$4],,yes,[$4])])
if test x"[$]mu_cache_var" = x"yes"; then
if test "[$]mu_cache_var" = "yes"; then
ifelse([$2],,:,[$2])
ifelse([$3],,,else
[$3])
fi
if test x"[$]mu_cache_var" = x"yes"; then
if test "[$]mu_cache_var" = "yes"; then
AC_DEFINE([ENABLE_]mu_upcase,1,[Define this if you enable $1 support])
fi
AM_CONDITIONAL(mu_cond,
[test x"[$]mu_cache_var" = x"yes" ifelse($4,,,[&& $4])])
AM_CONDITIONAL(mu_cond, [test "[$]mu_cache_var" = "yes"])
popdef([mu_cond])
popdef([mu_cache_var])
popdef([mu_upcase])
......@@ -67,16 +66,16 @@ AC_DEFUN([MU_ENABLE_BUILD], [
esac],
[mu_cache_var=ifelse([$5],,yes,[$5])])
if test x"[$]mu_cache_var" = x"yes"; then
if test "[$]mu_cache_var" = "yes"; then
ifelse([$2],,:,[$2])
ifelse([$3],,,else
[$3])
fi
if test x"[$]mu_cache_var" = x"yes" ifelse($4,,,[&& $4]); then
if test "[$]mu_cache_var" = "yes"; then
AC_DEFINE([MU_BUILD_]mu_upcase,1,[Define this if you build $1])
fi
AM_CONDITIONAL(mu_cond,
[test x"[$]mu_cache_var" = x"yes" ifelse($4,,,[&& $4])])
[test "[$]mu_cache_var" = "yes"])
popdef([mu_upcase])
popdef([mu_cache_var])
......
......@@ -162,6 +162,13 @@ fi
MU_DEBUG_MODE
# For adventurous characters: enable experimental/unfinished/buggy stuff
AC_ARG_ENABLE([experimental],
AC_HELP_STRING([--enable-experimental],
[build experimental and/or unfinished utilities]),
[mu_build_experimental="${enableval}"],
[mu_build_experimental=no])
# Initialize authlibs
AC_SUBST(MU_AUTHLIBS)
......@@ -802,7 +809,8 @@ MU_ENABLE_SUPPORT([imap],
MU_ENABLE_SUPPORT([pop],
[MU_LIB_POP='${top_builddir}/libproto/pop/libmu_pop.la'])
MU_ENABLE_SUPPORT([nntp],
[MU_LIB_NNTP='${top_builddir}/libproto/nntp/libmu_nntp.la'])
[MU_LIB_NNTP='${top_builddir}/libproto/nntp/libmu_nntp.la'],[],
[$mu_build_experimental])
MU_ENABLE_SUPPORT([mh],
[MU_LIB_MH='${top_builddir}/libproto/mh/libmu_mh.la'])
MU_ENABLE_SUPPORT([maildir],
......@@ -826,12 +834,6 @@ MU_ENABLE_SUPPORT(radius,
mu_cv_enable_radius=yes],
[mu_cv_enable_radius=no])])
AC_ARG_ENABLE([experimental],
AC_HELP_STRING([--enable-experimental],
[build experimental and/or unfinished utilities]),
[mu_build_experimental="${enableval}"],
[mu_build_experimental=no])
if test x"$testpam" = x"yes"; then
AC_CHECK_HEADERS(security/pam_appl.h)
if test x"$ac_cv_header_security_pam_appl_h" = x"yes"; then
......@@ -1097,7 +1099,7 @@ case "${enableval}" in
yes) status_python=yes ;;
no) status_python=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;;
esac],[status_python=yes])
esac],[status_python=$mu_build_experimental])
AC_SUBST(PYTHON_LIBS)
AC_SUBST(PYTHON_INCLUDES)
......@@ -1137,7 +1139,9 @@ AM_CONDITIONAL([MU_COND_PYTHON], [test "$status_python" = yes])
AC_SUBST(MU_CXX_EXAMPLES_BUILD)
MU_ENABLE_SUPPORT(cxx,
[MU_CXX_EXAMPLES_BUILD='$(MU_CXX_EXAMPLES_LIST)'
MU_LIB_CPP='${top_builddir}/libmu_cpp/libmu_cpp.la'])
MU_LIB_CPP='${top_builddir}/libmu_cpp/libmu_cpp.la'],
[],
[$mu_build_experimental])
# Default mailbox record
# Note: 1. Support for mbox type is always enabled.
......@@ -1181,14 +1185,18 @@ MU_ENABLE_BUILD(comsat)
MU_ENABLE_BUILD(maidag)
MU_ENABLE_BUILD(mail)
MU_ENABLE_BUILD(sieve)
MU_ENABLE_BUILD(guimb,,,[test "$useguile" = yes])
if test "$useguile" = "yes"; then
MU_ENABLE_BUILD(guimb,,,[$useguile])
fi
MU_ENABLE_BUILD(messages)
MU_ENABLE_BUILD(readmsg)
MU_ENABLE_BUILD(dotlock)
MU_ENABLE_BUILD(movemail)
MU_ENABLE_BUILD(mimeview)
MU_ENABLE_BUILD(mh,,,[test "$mu_cv_enable_mh" = yes])
if test "$mu_cv_enable_mh" = yes; then
MU_ENABLE_BUILD(mh)
fi
AC_SUBST(MH_BIN_DIR)
......
......@@ -171,6 +171,7 @@ Allow me to sell you a couple?'
MH_CHECK([mhn-storage],[mhn06 mhn-store-auto],[
mkdir Mail/inbox
cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
chmod +w Mail/inbox/4
mkdir out
echo "mhn-storage: $curdir/out" >> $MH
......@@ -187,6 +188,8 @@ storing message 4 part 2.2.2 as file out/4.2.2.2.octet-stream
MH_CHECK([mhn-store-: all escapes],[mhn07 mhn-store_escapes],[
mkdir Mail/inbox
cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
chmod +w Mail/inbox/4
echo "mhn-store-application: %%-%m%P.%s-%p" >> $MH
mhn +inbox -store 4 | remove_curdir || exit $?
find . -name '%*'
......@@ -205,6 +208,8 @@ MH_CHECK([mhn-store-: absolute path],[mhn08 mhn-store_abspath],[
mkdir Mail/inbox
mkdir out
cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
chmod +w Mail/inbox/4
echo "mhn-store-application: $curdir/out/%m%P.%s" >> $MH
mhn +inbox -store 4 | remove_curdir || exit $?
],
......@@ -219,6 +224,8 @@ MH_CHECK([mhn-store-: +folder],[mhn09 mhn-store+folder],[
mkdir Mail/inbox
mkdir Mail/app
cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
chmod +w Mail/inbox/4
echo "mhn-store-application: +app" >> $MH
mhn +inbox -store 4 | remove_curdir || exit $?
],
......@@ -232,6 +239,8 @@ storing message 4 part 2.2.2 to folder +app as message 3
MH_CHECK([mhn-store-: +],[mhn10 mhn-store+],[
mkdir Mail/inbox
cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
chmod +w Mail/inbox/4
echo "Current-Folder: inbox" > Mail/context
cat >> $MH <<EOT
mhn-store-application/octet-stream: +
......@@ -245,6 +254,8 @@ mhn +inbox -store -part 2.2.1 4 | remove_curdir || exit $?
MH_CHECK([mhn-store-: pipe],[mhn11 mhn-store-pipe],[
mkdir Mail/inbox
cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
chmod +w Mail/inbox/4
echo "Current-Folder: inbox" > Mail/context
echo "mhn-store-text: | $abs_top_srcdir/mh/tests/mhed -" >> $MH
mhn +inbox -store -part 1 4 | sed "s|$abs_top_srcdir/mh/tests/||;s|(cd \(.*\)\;|(cd home\;|;s| *$||" || exit $?
......
......@@ -35,7 +35,7 @@ cat > $MTSTAILOR <<EOT
localname: darkstar
localdomain: example.net
username: mhtester
url: sendmail://$abs_top_srcdir/examples/mta
url: sendmail://$abs_top_builddir/examples/mta
EOT
MTA_DIAG=$curdir/mta.diag
......
......@@ -80,7 +80,7 @@ libmu_sieve/extensions/spamd.c
libmu_sieve/extensions/timestamp.c
libmu_sieve/extensions/vacation.c
libproto/imap/folder.c
# libproto/imap/folder.c
libproto/mbox/mbox.c
maidag/maidag.c
......