diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | mailbox/Makefile.am | 33 |
2 files changed, 22 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index fc0268bbf..fbee4a26a 100644 --- a/configure.ac +++ b/configure.ac @@ -344,7 +344,7 @@ AC_ARG_WITH([included-argp], [USE_INCLUDED_ARGP=${withval}], [AC_CHECK_FUNCS(argp_parse, :, [USE_INCLUDED_ARGP=yes])]) -if test $USE_INCLUDED_ARGP = yes; then +if test "$USE_INCLUDED_ARGP" = yes; then MU_LIBOBJ(argp-ba) MU_LIBOBJ(argp-eexst) MU_LIBOBJ(argp-fmtstream) @@ -667,6 +667,11 @@ AC_CONFIG_FILES([Makefile mailutils.spec lib/Makefile lib/posix/Makefile testsuite/Makefile mailbox/Makefile + mailbox/mbox/Makefile + mailbox/mh/Makefile + mailbox/maildir/Makefile + mailbox/pop/Makefile + mailbox/imap/Makefile mailbox/testsuite/Makefile examples/Makefile auth/Makefile diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am index e8e1f5a2b..6ffd9d7b0 100644 --- a/mailbox/Makefile.am +++ b/mailbox/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@ AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" -SUBDIRS = include testsuite +SUBDIRS = include mbox pop imap mh maildir testsuite lib_LTLIBRARIES = libmailbox.la bin_PROGRAMS = mailutils-config @@ -28,7 +28,7 @@ bin_PROGRAMS = mailutils-config localedir = $(datadir)/locale DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -EXTRA_DIST = mbx_mboxscan.c strtok_r.c \ +EXTRA_DIST = strtok_r.c \ strndup.c strnlen.c strchrnul.c argp-ba.c argp-eexst.c \ argp-fmtstream.c argp-fs-xinl.c argp-help.c argp-parse.c argp-pv.c \ argp-pvh.c argp-xinl.c getline.c getline.h pin.c @@ -50,10 +50,6 @@ filter.c \ filter_rfc822.c \ filter_trans.c \ folder.c \ -folder_imap.c \ -folder_mbox.c \ -folder_mh.c \ -folder_pop.c \ header.c \ iterator.c \ list.c \ @@ -64,11 +60,6 @@ mailer.c \ mapfile_stream.c \ mbx_default.c \ mbx_file.c \ -mbx_imap.c \ -mbx_maildir.c \ -mbx_mbox.c \ -mbx_mh.c \ -mbx_pop.c \ md5.c \ message.c \ memory_stream.c \ @@ -93,17 +84,25 @@ tcp.c \ ticket.c \ url.c \ url_file.c \ -url_imap.c \ -url_mbox.c \ -url_mh.c \ url_path.c \ -url_pop.c \ url_sendmail.c \ url_smtp.c \ wicket.c -libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@ -libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@ +libmailbox_la_DEPENDENCIES = \ + mbox/libmbox.la\ + pop/libpop.la\ + imap/libimap.la\ + mh/libmh.la\ + maildir/libmaildir.la\ + @MU_LTLIBOBJS@ +libmailbox_la_LIBADD = \ + mbox/libmbox.la\ + pop/libpop.la\ + imap/libimap.la\ + mh/libmh.la\ + maildir/libmaildir.la\ + @MU_LTLIBOBJS@ @LTLIBINTL@ libmailbox_la_LDFLAGS = -version-info 0:0:0 mailutils_config_SOURCES = mailutils-config.c |