diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-06-24 10:05:50 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-06-24 10:22:52 +0300 |
commit | a41e62b9eb33c46ec0897c6c956057d8b797883d (patch) | |
tree | 9f51b1f093e20296cbd74cc4cf0659b8ce69abb2 /configure.ac | |
parent | f572e5ac7cbcbc8cdf2bdaef9a873f63ec6b6e6f (diff) | |
download | mailutils-a41e62b9eb33c46ec0897c6c956057d8b797883d.tar.gz mailutils-a41e62b9eb33c46ec0897c6c956057d8b797883d.tar.bz2 |
Make libmuaux installable shared library.
This commit converts libmuaux into installable shared library that
includes selected modules from gnulib. Correspondingly,
lubmu_argp is also converted into installable shared library, which
is the main purpose of these changes. This should allow other packages
which depend on Mailutils to link against libmu_argp even on systems
that for some reason choose not to include static libraries in their
distribution (vide Debian). Another side effect is that such packages
won't need to bother about argp being present on the system, as it is
now included in libmuaux.so.
* bootstrap.conf: Don't create Makefile.am
Build gnulib using libtool and use mu_am_flags custom module
* lib/local/modules/mu_am_flags: New file.
* configure.ac (MU_APP_LIBRARIES): Use libmu_argp.la
(TCPWRAP_LIBRARIES): Add libmutcpwrap.a
* lib/Makefile.am: Make libmuaux installable shared library
New static library libmutcpwrap.a
* libmu_argp/Makefile.am: Make libmu_argp installable shared library
* examples/Makefile.am: Use libmu_argp.la
* examples/cpp/Makefile.am: Likewise.
* imap4d/Makefile.am: Likewise.
* mapi/Makefile.am: Likewise.
* mh/Makefile.am: Likewise,
* pop3d/Makefile.am: Likewise.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 648522724..99a60a0c0 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux') AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)') AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)') -AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.a') +AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/libmu_argp/libmu_argp.la ${top_builddir}/libmu_cfg/libmu_cfg.la') # There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used # by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications. @@ -220,7 +220,7 @@ esac LIBS=$saved_LIBS if test "$status_tcpwrap" = "yes"; then - AC_SUBST(TCPWRAP_LIBRARIES, "$TCPWRAP_LIBRARIES -lwrap") + AC_SUBST(TCPWRAP_LIBRARIES, "\${top_builddir}/lib/libmutcpwrap.a $TCPWRAP_LIBRARIES -lwrap") AC_DEFINE_UNQUOTED(WITH_LIBWRAP, 1, [Define to 1 to use tcp wrappers.]) fi @@ -1157,7 +1157,6 @@ GINT_INIT([gint],[1.8 with-guile], LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}' MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules' GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}' - GINT_LDADD=../lib/libmuaux.a ],[useguile=no]) AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"]) |