diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-05-02 15:40:02 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-09-08 16:06:59 +0300 |
commit | fa54cb19078773382fb1db24bbf450a9962e186d (patch) | |
tree | 71c09f01f8fdc8d814b0d5f472275f0d352f5d7e /examples | |
parent | dfea400b082c5eff4f31c4fd0ac9e57756a04866 (diff) | |
download | mailutils-fa54cb19078773382fb1db24bbf450a9962e186d.tar.gz mailutils-fa54cb19078773382fb1db24bbf450a9962e186d.tar.bz2 |
Fix conditional compilation.
* .gitignore: Add git-describe and git-describe.h.
* Makefile.am (MU_COND_LIBMU_CPP): Replaced with MU_COND_SUPPORT_CXX
(SUBDIRS): Begin with .
(EXTRA_DIST, BUILT_SOURCES): Add git-describe and git-describe.h.
(git-describe, git-describe.h): New rules.
(alpha, alphacheck): Use git-describe to produce additional suffix.
* enable.m4 (MU_ENABLE_SUPPORT): Create an Automake condition.
* configure.ac: Fix MU_ENABLE_SUPPORT calls.
(--without-python): Replace with --disable-python.
* examples/Makefile.am: Disable components based on MU_COND conditions.
* libproto/Makefile.am: Likewise.
* include/mailutils/Makefile.am (MU_COND_LIBMU_CPP): Replace with
MU_COND_SUPPORT_CXX.
* mailbox/nullrec.c: New file.
* mailbox/Makefile.am (libmailutils_la_SOURCES): Add nullrec.c.
* mail/decode.c: Remove unused variable.
* mailbox/streamref.c: Likewise.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/Makefile.am | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index cb2415bcc..2db72b44b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -18,7 +18,19 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -SUBDIRS = config cpp python scheme +if MU_COND_SUPPORT_POP + POP3CLIENT = pop3client +endif + +if MU_COND_SUPPORT_NNTP + NNTPCLIENT = nntpclient +endif + +if MU_COND_SUPPORT_CXX + CPP_DIR = cpp +endif + +SUBDIRS = config $(CPP_DIR) python scheme noinst_PROGRAMS = \ aclck\ @@ -40,11 +52,13 @@ noinst_PROGRAMS = \ muauth\ muemail\ murun\ - nntpclient\ - pop3client \ + $(NNTPCLIENT)\ + $(POP3CLIENT)\ sfrom\ url-parse +EXTRA_PROGRAMS = pop3client nntpclient + ## NOTE: Numaddr must be an installable target, otherwise libtool ## will not create a shared library and `make check' will fail in ## sieve. Pity. |