diff options
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | examples/Makefile.am | 14 | ||||
-rw-r--r-- | examples/cpp/Makefile.am | 4 | ||||
-rw-r--r-- | imap4d/Makefile.am | 2 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | mapi/Makefile.am | 2 | ||||
-rw-r--r-- | mh/Makefile.am | 2 | ||||
-rw-r--r-- | pop3d/Makefile.am | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 7d9e21810..cd13eaddf 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,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.la') +AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.a') # 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. @@ -98,7 +98,7 @@ status_tcpwrap=maybe dnl Internationalization macros. AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.17) +AM_GNU_GETTEXT_VERSION(0.18) AM_ICONV AC_CHECK_HEADERS(iconv.h) AC_CHECK_TYPE(iconv_t,:, @@ -1077,7 +1077,7 @@ GINT_INIT([gint],[1.8 with-guile], MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules' MU_GUILE_SIEVE_MOD_DATA='$(MU_GUILE_SIEVE_MOD_DATA_X)' GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}' - GINT_LDADD=../lib/libmuaux.la + GINT_LDADD=../lib/libmuaux.a ],[useguile=no]) AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"]) diff --git a/examples/Makefile.am b/examples/Makefile.am index cb2415bcc..63e9a9c0d 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -55,7 +55,7 @@ mod_LTLIBRARIES = numaddr.la INCLUDES = @MU_LIB_COMMON_INCLUDES@ LDADD = \ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ @@ -64,7 +64,7 @@ numaddr_la_LIBADD = ${MU_LIB_SIEVE} numaddr_la_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)' mimetest_LDADD =\ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_MBOX}\ ${MU_LIB_IMAP}\ ${MU_LIB_POP}\ @@ -73,20 +73,20 @@ mimetest_LDADD =\ ${MU_LIB_MAILUTILS} msg_send_LDADD =\ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_MAILER}\ @MU_AUTHLIBS@\ ${MU_LIB_MAILUTILS} mta_CPPFLAGS=-I${top_srcdir}/lib -I${top_builddir}/lib mta_LDADD =\ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_MBOX}\ ${MU_LIB_MAILER}\ ${MU_LIB_MAILUTILS} sfrom_LDADD =\ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_MBOX}\ ${MU_LIB_IMAP}\ ${MU_LIB_POP}\ @@ -98,7 +98,7 @@ sfrom_LDADD =\ ${MU_LIB_MAILUTILS} pop3client_LDADD = \ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_POP}\ ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ @@ -106,7 +106,7 @@ pop3client_LDADD = \ @READLINE_LIBS@ nntpclient_LDADD = \ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_NNTP}\ ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am index 32da62fd3..8176c6ce8 100644 --- a/examples/cpp/Makefile.am +++ b/examples/cpp/Makefile.am @@ -37,7 +37,7 @@ noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@ INCLUDES = @MU_LIB_COMMON_INCLUDES@ AM_LDFLAGS = \ - ../../lib/libmuaux.la\ + ../../lib/libmuaux.a\ ../../libmu_cpp/libmu_cpp.la\ ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ @@ -55,7 +55,7 @@ sfrom_SOURCES = sfrom.cc url_parse_SOURCES = url-parse.cc LDADD =\ - ../../lib/libmuaux.la\ + ../../lib/libmuaux.a\ ../../libmu_cpp/libmu_cpp.la\ ${MU_LIB_MBOX}\ ${MU_LIB_IMAP}\ diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am index 0d5572889..322304443 100644 --- a/imap4d/Makefile.am +++ b/imap4d/Makefile.am @@ -82,7 +82,7 @@ imap4d_LDADD = \ imap4d_DEPENDENCIES = \ @IMAP_AUTHOBJS@\ @MU_AUTHLIBS_DEPENDENCY@\ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_MBOX}\ ${MU_LIB_MAILUTILS} diff --git a/lib/Makefile.am b/lib/Makefile.am index d4c3b3caa..4f7ad1719 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,7 +22,7 @@ include gnulib.mk INCLUDES = @MU_LIB_COMMON_INCLUDES@ -libmuaux_la_SOURCES += \ +libmuaux_a_SOURCES += \ daemon.c\ mailcap.c\ mu_dbm.c\ diff --git a/mapi/Makefile.am b/mapi/Makefile.am index 9682f7a5f..fddc3bfaf 100644 --- a/mapi/Makefile.am +++ b/mapi/Makefile.am @@ -26,7 +26,7 @@ lib_LTLIBRARIES = libmapi.la /* FIXME: This should be part of the default includes. */ EXTRA_DIST = mapi.h -libmapi_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS} +libmapi_LDADD = ../lib/libmuaux.a ${MU_LIB_MAILUTILS} libmapi_la_SOURCES = \ MAPIAddress.c \ diff --git a/mh/Makefile.am b/mh/Makefile.am index 2fdb48730..8cb3f0901 100644 --- a/mh/Makefile.am +++ b/mh/Makefile.am @@ -96,7 +96,7 @@ INCLUDES = @MU_APP_COMMON_INCLUDES@ AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\" mh_LIBS = \ ./libmh.a\ - ../lib/libmuaux.la\ + ../lib/libmuaux.a\ ${MU_LIB_MBOX}\ ${MU_LIB_IMAP}\ ${MU_LIB_POP}\ diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am index 8a73ede44..171733f1a 100644 --- a/pop3d/Makefile.am +++ b/pop3d/Makefile.am @@ -64,7 +64,7 @@ popauth_SOURCES = popauth.c popauth_LDADD = ${MU_APP_LIBRARIES} ${MU_LIB_MAILUTILS} @MU_COMMON_LIBRARIES@ pop3d_DEPENDENCIES = \ @MU_AUTHLIBS_DEPENDENCY@ \ - ../lib/libmuaux.la \ + ../lib/libmuaux.a \ ${MU_LIB_MBOX}\ ${MU_LIB_MH}\ ${MU_LIB_MAILDIR}\ |