This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=24333ac926f4412737d618dbff6d3ca0c70809ec The branch, master has been updated via 24333ac926f4412737d618dbff6d3ca0c70809ec (commit) via 7dd1756826cdabb704b705da0fe2bcc83141caf6 (commit) from c84e1f2193b205d399ec89da3bf27a2aa60d4fbb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 24333ac926f4412737d618dbff6d3ca0c70809ec Author: Sergey Poznyakoff <g...@gnu.org.ua> Date: Mon Jun 4 18:27:24 2012 +0300 Don't use disabled features in mailutils.scm * libmu_scm/mailutils/Makefile.am (DISTCLEANFILES): Rename to CLEANFILES: mailutils.scm should be cleaned as a usual object file. (MU_FEATURES): New variable, constructed depending on MU_COND_ variables. (mailutils.scm goal): Use the value of MU_FEATURES as m4 command line. * libmu_scm/mailutils/mailutils.scm.in: Include only supported libraries. commit 7dd1756826cdabb704b705da0fe2bcc83141caf6 Author: Sergey Poznyakoff <g...@gnu.org.ua> Date: Mon Jun 4 18:26:46 2012 +0300 Bugfix * libmailutils/base/symlink.c (mu_readlink): Fix initialization of size. ----------------------------------------------------------------------- Summary of changes: libmailutils/base/symlink.c | 2 +- libmu_scm/mailutils/Makefile.am | 33 ++++++++++++++++++++++++++++----- libmu_scm/mailutils/mailutils.scm.in | 12 ++++++++---- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/libmailutils/base/symlink.c b/libmailutils/base/symlink.c index 5b85821..ee5cba1 100644 --- a/libmailutils/base/symlink.c +++ b/libmailutils/base/symlink.c @@ -37,7 +37,7 @@ mu_readlink (const char *name, char **pbuf, size_t *psize, size_t *plen) { size_t status = 0; char *buf = *pbuf; - size_t size = *plen; + size_t size = *psize; ssize_t linklen; while (1) diff --git a/libmu_scm/mailutils/Makefile.am b/libmu_scm/mailutils/Makefile.am index 6fa617c..5eacd2d 100644 --- a/libmu_scm/mailutils/Makefile.am +++ b/libmu_scm/mailutils/Makefile.am @@ -17,15 +17,38 @@ EXTRA_DIST=mailutils.scm.in -DISTCLEANFILES=\ +CLEANFILES=\ mailutils.scm sitedir = @GUILE_SITE@/$(PACKAGE) site_DATA = mailutils.scm +MU_FEATURES=\ + -DVERSION=$(VERSION)\ + -DLIBDIR=$(libdir)\ + -DSITEDIR=$(sitedir)\ + -DBUILDDIR=$(top_builddir)/libmu_scm + +if MU_COND_SUPPORT_POP + MU_FEATURES += -DMU_SUPPORT_POP +endif + +if MU_COND_SUPPORT_IMAP + MU_FEATURES += -DMU_SUPPORT_IMAP +endif + +if MU_COND_SUPPORT_NNTP + MU_FEATURES += -DMU_SUPPORT_NNTP +endif + +if MU_COND_SUPPORT_MH + MU_FEATURES += -DMU_SUPPORT_MH +endif + +if MU_COND_SUPPORT_MAILDIR + MU_FEATURES += -DMU_SUPPORT_MAILDIR +endif + mailutils.scm: mailutils.scm.in - $(AM_V_GEN)m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \ - -DSITEDIR=$(sitedir) \ - -DBUILDDIR=$(top_builddir)/libmu_scm \ - $(srcdir)/mailutils.scm.in > $@ + $(AM_V_GEN)m4 $(MU_FEATURES) $(srcdir)/mailutils.scm.in > $@ diff --git a/libmu_scm/mailutils/mailutils.scm.in b/libmu_scm/mailutils/mailutils.scm.in index c4187d3..7c91d13 100644 --- a/libmu_scm/mailutils/mailutils.scm.in +++ b/libmu_scm/mailutils/mailutils.scm.in @@ -27,10 +27,14 @@ changequote([,])dnl (define mu-libs (list (cons "libmailutils" "libmailutils") (cons "libmu_auth" "libmu_auth") (cons "libproto/mbox" "libmu_mbox") - (cons "libproto/mh" "libmu_mh") - (cons "libproto/maildir" "libmu_maildir") - (cons "libproto/pop" "libmu_pop") - (cons "libproto/imap" "libmu_imap"))) +ifdef([MU_SUPPORT_MH],dnl + [(cons "libproto/mh" "libmu_mh")]) +ifdef([MU_SUPPORT_MAILDIR],dnl + [(cons "libproto/maildir" "libmu_maildir")]) +ifdef([MU_SUPPORT_POP],dnl + [(cons "libproto/pop" "libmu_pop")]) +ifdef([MU_SUPPORT_IMAP],dnl + [(cons "libproto/imap" "libmu_imap")]))) (cond ((getenv "MAILUTILS_SCM_LIBRARY_ROOT") => hooks/post-receive -- GNU Mailutils _______________________________________________ Commit-mailutils mailing list Commit-mailutils@gnu.org https://lists.gnu.org/mailman/listinfo/commit-mailutils
