summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-02-25 08:44:01 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-02-26 07:03:29 (GMT)
commit15722cc4d1409a798a717eecf2c04297fe61e196 (patch) (side-by-side diff)
tree6113a75a1f767bc1458974f138b261500ae95dbc
parent4e66a6a9e5f5696d60f7df875175f2e0ad8f7376 (diff)
downloadmailutils-15722cc4d1409a798a717eecf2c04297fe61e196.tar.gz
mailutils-15722cc4d1409a798a717eecf2c04297fe61e196.tar.bz2
New autoconf macro for activating mailbox format support
* am/enable.m4 (MU_ENABLE_SUPPORT) (MU_ENABLE_BUILD): Use m4_-prefixed directives. (MU_ENABLE_MAILBOX_FORMAT) (MU_ENABLE_LOCAL_MAILBOX_FORMAT_ (MU_ENABLE_REMOTE_MAILBOX_FORMAT): New macros. (MU_LIB_MAILBOX) (MU_LIB_LOCAL_MAILBOX) (MU_LIB_REMOTE_MAILBOX): New substitution variables. * configure.ac: Use new macros to enable mailbox formats * libproto/Makefile.am: Augment SUBDIRS instead of using Makefile variables. * comsat/Makefile.am: Use MU_LIB_.*MAILBOX macros to link in the necessary libraries. * examples/Makefile.am: Likewise. * examples/cpp/Makefile.am: Likewise. * frm/Makefile.am: Likewise. * imap4d/Makefile.am: Likewise. * include/mailutils/sys/Makefile.am: Likewise. * libmu_scm/Makefile.am: Likewise. * libproto/Makefile.am: Likewise. * maidag/Makefile.am: Likewise. * mail/Makefile.am: Likewise. * messages/Makefile.am: Likewise. * mh/Makefile.am: Likewise. * movemail/Makefile.am: Likewise. * mu/libexec/Makefile.am: Likewise. * pop3d/Makefile.am: Likewise. * python/2/libmu_py/Makefile.am: Likewise. * python/3/libmu_py/Makefile.am: Likewise. * readmsg/Makefile.am: Likewise. * sieve/Makefile.am: Likewise. * testsuite/Makefile.am: Likewise.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--am/enable.m470
-rw-r--r--comsat/Makefile.am7
-rw-r--r--configure.ac36
-rw-r--r--examples/Makefile.am28
-rw-r--r--examples/cpp/Makefile.am7
-rw-r--r--frm/Makefile.am7
-rw-r--r--imap4d/Makefile.am4
-rw-r--r--include/mailutils/sys/Makefile.am1
-rw-r--r--libmu_scm/Makefile.am7
-rw-r--r--libproto/Makefile.am14
-rw-r--r--maidag/Makefile.am7
-rw-r--r--mail/Makefile.am7
-rw-r--r--messages/Makefile.am7
-rw-r--r--mh/Makefile.am14
-rw-r--r--movemail/Makefile.am7
-rw-r--r--mu/libexec/Makefile.am7
-rw-r--r--pop3d/Makefile.am8
-rw-r--r--python/2/libmu_py/Makefile.am7
-rw-r--r--python/3/libmu_py/Makefile.am7
-rw-r--r--readmsg/Makefile.am7
-rw-r--r--sieve/Makefile.am7
-rw-r--r--testsuite/Makefile.am7
22 files changed, 91 insertions, 182 deletions
diff --git a/am/enable.m4 b/am/enable.m4
index 7dc6d7e..82e872d 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -18,11 +18,11 @@ dnl MU_ENABLE_SUPPORT(feature, [action-if-true], [action-if-false],
dnl [additional-cond], [default-value])
AC_DEFUN([MU_ENABLE_SUPPORT], [
- pushdef([mu_upcase],translit($1,[a-z+-],[A-ZX_]))
- pushdef([mu_cache_var],[mu_cv_enable_]translit($1,[+-],[x_]))
- pushdef([mu_cond],[MU_COND_SUPPORT_]mu_upcase)
+ m4_pushdef([mu_upcase],m4_translit($1,[a-z+-],[A-ZX_]))
+ m4_pushdef([mu_cache_var],[mu_cv_enable_]m4_translit($1,[+-],[x_]))
+ m4_pushdef([mu_cond],[MU_COND_SUPPORT_]mu_upcase)
- ifelse([$4],,,[if test $4; then])
+ m4_if([$4],,,[if test $4; then])
AC_ARG_ENABLE($1,
AC_HELP_STRING([--disable-]$1,
[disable ]$1[ support]),
@@ -32,31 +32,31 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [
no) mu_cache_var=no;;
*) AC_MSG_ERROR([bad value ${enableval} for --disable-$1]) ;;
esac],
- [mu_cache_var=ifelse([$5],,yes,[$5])])
+ [mu_cache_var=m4_if([$5],,yes,[$5])])
if test "[$]mu_cache_var" = "yes"; then
- ifelse([$2],,:,[$2])
- ifelse([$3],,,else
+ m4_if([$2],,:,[$2])
+ m4_if([$3],,,else
[$3])
fi
- ifelse([$4],,,[else
+ m4_if([$4],,,[else
mu_cache_var=no
fi])
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 "[$]mu_cache_var" = "yes"])
- popdef([mu_cond])
- popdef([mu_cache_var])
- popdef([mu_upcase])
+ m4_popdef([mu_cond])
+ m4_popdef([mu_cache_var])
+ m4_popdef([mu_upcase])
])
dnl MU_ENABLE_BUILD(feature, [action-if-true], [action-if-false],
dnl [additional-cond], [default-value], [listvar])
AC_DEFUN([MU_ENABLE_BUILD], [
- pushdef([mu_upcase],translit($1,[a-z+-],[A-ZX_]))
- pushdef([mu_cache_var],[mu_cv_enable_build_]translit($1,[+-],[x_]))
- pushdef([mu_cond],[MU_COND_]mu_upcase)
+ m4_pushdef([mu_upcase],m4_translit($1,[a-z+-],[A-ZX_]))
+ m4_pushdef([mu_cache_var],[mu_cv_enable_build_]m4_translit($1,[+-],[x_]))
+ m4_pushdef([mu_cond],[MU_COND_]mu_upcase)
AC_ARG_ENABLE(build-$1,
AC_HELP_STRING([--disable-build-]$1,
@@ -67,7 +67,7 @@ AC_DEFUN([MU_ENABLE_BUILD], [
no) mu_cache_var=no;;
*) AC_MSG_ERROR([bad value ${enableval} for --disable-$1]) ;;
esac],
- [ifelse([$4],,[mu_cache_var=ifelse([$5],,yes,[$5])],
+ [m4_if([$4],,[mu_cache_var=m4_if([$5],,yes,[$5])],
[if test $4; then
mu_cache_var=yes
else
@@ -75,9 +75,9 @@ AC_DEFUN([MU_ENABLE_BUILD], [
fi])])
if test "[$]mu_cache_var" = "yes"; then
- ifelse([$2],,:,[$2])
- ifelse([$6],,,[$6="$[]$6 $1"])
- ifelse([$3],,,else
+ m4_if([$2],,:,[$2])
+ m4_if([$6],,,[$6="$[]$6 $1"])
+ m4_if([$3],,,else
[$3])
fi
if test "[$]mu_cache_var" = "yes"; then
@@ -87,9 +87,37 @@ AC_DEFUN([MU_ENABLE_BUILD], [
AM_CONDITIONAL(mu_cond,
[test "[$]mu_cache_var" = "yes"])
- popdef([mu_upcase])
- popdef([mu_cache_var])
- popdef([mu_cond])
+ m4_popdef([mu_upcase])
+ m4_popdef([mu_cache_var])
+ m4_popdef([mu_cond])
])
+AC_CONFIG_COMMANDS_PRE([
+AC_SUBST([MU_LIB_LOCAL_MAILBOX])
+AC_SUBST([MU_LIB_REMOTE_MAILBOX])
+AC_SUBST([MU_LIB_MAILBOX],['$(MU_LIB_LOCAL_MAILBOX) $(MU_LIB_REMOTE_MAILBOX)'])
+])
+
+dnl MU_ENABLE_MAILBOX_FORMAT([CATEGORY], [SCHEME],
+dnl [action-if-true], [action-if-false],
+dnl [additional-cond], [default-value])
+
+AC_DEFUN([MU_ENABLE_MAILBOX_FORMAT], [
+ m4_pushdef([LIBNAME],[[MU_LIB_]translit($2,[a-z+-],[A-ZX_])])
+ AC_SUBST(LIBNAME)
+ MU_ENABLE_SUPPORT([$2],
+ [LIBNAME='${top_builddir}/libproto/$2/libmu_$2.la'
+ $3],
+ m4_shift(m4_shift(m4_shift($@))))
+ AC_CONFIG_FILES([libproto/$2/Makefile])
+ m4_syscmd([test -f libproto/$2/tests/Makefile.am -a -f libproto/$2/tests/atlocal.in])
+ m4_if(sysval,0,[MU_CONFIG_TESTSUITE([libproto/$2])])
+ [MU_LIB_]$1[_MAILBOX]="${[MU_LIB_]$1[_MAILBOX]} \$(LIBNAME)"
+ m4_popdef([LIBNAME])
+])
+
+AC_DEFUN([MU_ENABLE_LOCAL_MAILBOX_FORMAT],
+ [MU_ENABLE_MAILBOX_FORMAT([LOCAL],$@)])
+AC_DEFUN([MU_ENABLE_REMOTE_MAILBOX_FORMAT],
+ [MU_ENABLE_MAILBOX_FORMAT([REMOTE],$@)])
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index de27bc5..5d124c5 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -31,12 +31,7 @@ biff.rc.h: $(top_srcdir)/comsat/biff.rc
comsatd_LDADD = \
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_MAILUTILS}\
@MU_COMMON_LIBRARIES@
diff --git a/configure.ac b/configure.ac
index 725a25d..0c154ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,13 +39,8 @@ dnl Library paths
AC_SUBST(MU_LIB_AUTH,'${top_builddir}/libmu_auth/libmu_auth.la')
AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/libmailutils/libmailutils.la')
AC_SUBST(MU_LIB_SQL,'${top_builddir}/sql/libsql.la')
-AC_SUBST(MU_LIB_IMAP)
-AC_SUBST(MU_LIB_MAILDIR)
AC_SUBST(MU_LIB_MAILER,'${top_builddir}/libproto/mailer/libmu_mailer.la')
AC_SUBST(MU_LIB_MBOX,'${top_builddir}/libproto/mbox/libmu_mbox.la')
-AC_SUBST(MU_LIB_MH)
-AC_SUBST(MU_LIB_NNTP)
-AC_SUBST(MU_LIB_POP)
AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libmu_sieve/libmu_sieve.la')
AC_SUBST(MU_LIB_SCM)
AC_SUBST(MU_LIB_CPP)
@@ -1001,18 +996,16 @@ AC_ARG_WITH([virtual-pwddir],
*) SITE_VIRTUAL_PWDDIR="\$(sysconfdir)/${withval}";;
esac],
[SITE_VIRTUAL_PWDDIR="\$(sysconfdir)/domain"])
-
-MU_ENABLE_SUPPORT([imap],
- [MU_LIB_IMAP='${top_builddir}/libproto/imap/libmu_imap.la'])
-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_build_experimental" = "yes"])
-MU_ENABLE_SUPPORT([mh],
- [MU_LIB_MH='${top_builddir}/libproto/mh/libmu_mh.la'])
-MU_ENABLE_SUPPORT([maildir],
- [MU_LIB_MAILDIR='${top_builddir}/libproto/maildir/libmu_maildir.la'])
+
+# Mailbox formats
+MU_LIB_LOCAL_MAILBOX='$(MU_LIB_MBOX)'
+MU_ENABLE_REMOTE_MAILBOX_FORMAT([imap])
+# This is not a full-fledged testsuite yet, but it might be useful anyways
+AC_CONFIG_FILES([libproto/imap/tests/Makefile])
+MU_ENABLE_REMOTE_MAILBOX_FORMAT([pop])
+MU_ENABLE_LOCAL_MAILBOX_FORMAT([nntp],[],[],["$mu_build_experimental" = "yes"])
+MU_ENABLE_LOCAL_MAILBOX_FORMAT([mh])
+MU_ENABLE_LOCAL_MAILBOX_FORMAT([maildir])
AC_SUBST(MU_SMTP_PROGRAMS_BUILD)
AC_SUBST(MU_SMTP_DEJATOOL)
@@ -1194,7 +1187,7 @@ GINT_INIT([gint],[2.2.0 with-guile],
GUILE_BINDIR="`guile-config info prefix`/bin"
fi
LIBMU_SCM=../libmu_scm/libmu_scm.la
- LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}'
+ LIBMU_SCM_DEPS='${MU_LIB_MAILBOX} ${MU_LIB_MAILER}'
MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'
GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}'
if test $REPLACE_STRERROR = 1; then
@@ -1526,13 +1519,6 @@ AC_CONFIG_FILES([
libmu_sieve/extensions/Makefile
libproto/Makefile
libproto/mbox/Makefile
- libproto/mh/Makefile
- libproto/maildir/Makefile
- libproto/mailer/Makefile
- libproto/pop/Makefile
- libproto/nntp/Makefile
- libproto/imap/Makefile
- libproto/imap/tests/Makefile
maidag/Makefile
mail/Makefile
mail/testsuite/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3517973..54e92f7 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -85,24 +85,14 @@ mta_LDADD =\
sfrom_LDADD =\
../lib/libmuaux.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}
mboxsize_LDADD =\
../lib/libmuaux.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}
@@ -116,12 +106,7 @@ nntpclient_LDADD = \
@READLINE_LIBS@
lsf_LDADD = \
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@ \
${MU_LIB_MAILUTILS}
@@ -141,12 +126,7 @@ muemail_LDADD = \
mboxidx_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
mboxidx_LDADD=\
../lib/libmuaux.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@ \
${MU_LIB_MAILUTILS}
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index 012ddbb..ee98fb0 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -53,12 +53,7 @@ url_parse_SOURCES = url-parse.cc
LDADD =\
../../lib/libmuaux.la\
../../libmu_cpp/libmu_cpp.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
${MU_LIB_MAILER}\
${MU_LIB_SIEVE}\
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 680b883..6213010 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -27,12 +27,7 @@ from_LDADD = $(common_ldadd)
common_ldadd = \
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}\
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index e23c2fb..2345191 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -72,9 +72,7 @@ imap4d_SOURCES = \
imap4d_LDADD = \
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_LOCAL_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@ \
${MU_LIB_MAILUTILS}\
diff --git a/include/mailutils/sys/Makefile.am b/include/mailutils/sys/Makefile.am
index 08d8756..7f31291 100644
--- a/include/mailutils/sys/Makefile.am
+++ b/include/mailutils/sys/Makefile.am
@@ -22,6 +22,7 @@ sysinclude_HEADERS = \
body.h\
dbm.h\
debcat.h\
+ dotmail.h\
envelope.h\
file_stream.h\
filter.h\
diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am
index 6badf70..98c348c 100644
--- a/libmu_scm/Makefile.am
+++ b/libmu_scm/Makefile.am
@@ -42,12 +42,7 @@ libmu_scm_la_SOURCES=\
libmu_scm_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_scm_la_LIBADD = \
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_MAILER}\
${MU_LIB_MAILUTILS}\
@GUILE_LIBS@
diff --git a/libproto/Makefile.am b/libproto/Makefile.am
index c2482c8..db296eb 100644
--- a/libproto/Makefile.am
+++ b/libproto/Makefile.am
@@ -14,25 +14,25 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+SUBDIRS = mbox mailer
+
if MU_COND_SUPPORT_POP
- POP_DIR = pop
+ SUBDIRS += pop
endif
if MU_COND_SUPPORT_IMAP
- IMAP_DIR = imap
+ SUBDIRS += imap
endif
if MU_COND_SUPPORT_NNTP
- NNTP_DIR = nntp
+ SUBDIRS += nntp
endif
if MU_COND_SUPPORT_MH
- MH_DIR = mh
+ SUBDIRS += mh
endif
if MU_COND_SUPPORT_MAILDIR
- MAILDIR_DIR = maildir
+ SUBDIRS += maildir
endif
-SUBDIRS = mbox $(POP_DIR) $(NNTP_DIR) $(IMAP_DIR) $(MH_DIR) $(MAILDIR_DIR) mailer
-
diff --git a/maidag/Makefile.am b/maidag/Makefile.am
index 705e19c..db53c09 100644
--- a/maidag/Makefile.am
+++ b/maidag/Makefile.am
@@ -34,12 +34,7 @@ maidag_LDADD = \
../lib/libmuscript.a\
${MU_APP_LIBRARIES}\
${MU_LIB_SIEVE}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
${MU_LIB_MAILER}\
@MU_AUTHLIBS@\
diff --git a/mail/Makefile.am b/mail/Makefile.am
index ba4af69..6e445c3 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -26,12 +26,7 @@ mailbin_PROGRAMS = mail
mail_LDADD = \
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_MAILER}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 4cf88c2..8c4f84b 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -22,12 +22,7 @@ bin_PROGRAMS = messages
messages_SOURCES = messages.c
messages_LDADD =\
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}\
diff --git a/mh/Makefile.am b/mh/Makefile.am
index 2ae471c..de562cd 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -107,12 +107,7 @@ AM_CPPFLAGS =\
mh_LIBS = \
./libmh.a\
../lib/libmuaux.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_MH}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_MAILER}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
@@ -133,12 +128,7 @@ inc_LDADD = \
@LIBMU_SCM_DEPS@\
@MU_LIB_PY@ @PYTHON_LIBS@\
${MU_LIB_SIEVE}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_MH}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_MAILER}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index 657c1a9..0dfc2e3 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -19,12 +19,7 @@ bin_PROGRAMS = movemail
movemail_LDADD = \
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
${MU_LIB_MAILER}\
@MU_AUTHLIBS@\
diff --git a/mu/libexec/Makefile.am b/mu/libexec/Makefile.am
index 0b7ea6b..b4f4302 100644
--- a/mu/libexec/Makefile.am
+++ b/mu/libexec/Makefile.am
@@ -97,12 +97,7 @@ mailutils_send_LDADD = \
mailutils_stat_SOURCES = stat.c
mailutils_stat_LDADD = \
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
$(MUTOOL_LIBRARIES_TAIL)
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index 19c0d20..06391cc 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -51,9 +51,7 @@ endif
pop3d_LDADD = \
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_LOCAL_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@ \
${MU_LIB_MAILUTILS}\
@@ -73,9 +71,7 @@ popauth_LDADD = \
pop3d_DEPENDENCIES = \
@MU_AUTHLIBS_DEPENDENCY@ \
../lib/libmuaux.la \
- ${MU_LIB_MBOX}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_LOCAL_MAILBOX}\
${MU_LIB_MAILUTILS}\
${LIBMU_DBM}
diff --git a/python/2/libmu_py/Makefile.am b/python/2/libmu_py/Makefile.am
index e537d68..cd1cee5 100644
--- a/python/2/libmu_py/Makefile.am
+++ b/python/2/libmu_py/Makefile.am
@@ -48,12 +48,7 @@ libmu_py_la_LDFLAGS = -rpath $(libdir) \
-export-symbols-regex '^(mu_py_|Py).*' \
-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_py_la_LIBADD = $(PYTHON_LIBS) @MU_COMMON_LIBRARIES@ \
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
${MU_LIB_MAILER}\
${MU_LIB_SIEVE}\
diff --git a/python/3/libmu_py/Makefile.am b/python/3/libmu_py/Makefile.am
index e537d68..cd1cee5 100644
--- a/python/3/libmu_py/Makefile.am
+++ b/python/3/libmu_py/Makefile.am
@@ -48,12 +48,7 @@ libmu_py_la_LDFLAGS = -rpath $(libdir) \
-export-symbols-regex '^(mu_py_|Py).*' \
-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_py_la_LIBADD = $(PYTHON_LIBS) @MU_COMMON_LIBRARIES@ \
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
${MU_LIB_MAILER}\
${MU_LIB_SIEVE}\
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index e5124c2..1792605 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -23,12 +23,7 @@ readmsg_SOURCES = readmsg.c msglist.c readmsg.h
readmsg_LDADD =\
${MU_APP_LIBRARIES}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}\
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 5262cc8..6ed4f91 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -23,12 +23,7 @@ sieve_SOURCES = sieve.c
sieve_LDADD =\
${MU_APP_LIBRARIES}\
${MU_LIB_SIEVE}\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_MAILER}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 86b843f..24acb1d 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -61,12 +61,7 @@ noinst_PROGRAMS = \
ufms
LDADD = \
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILBOX}\
${MU_LIB_MAILER}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\

Return to:

Send suggestions and report system problems to the System administrator.