Use MU_COMMON_LIBRARIES

@@ -27,4 +27,4 @@ comsatd_LDADD = \
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @LTLIBINTL@
+ @MU_COMMON_LIBRARIES@

@@ -21,7 +21,7 @@ INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gn
 
 bin_PROGRAMS = dotlock
 
-dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
 
 install-exec-hook:
 	for i in $(bin_PROGRAMS); do\

@@ -22,6 +22,7 @@ noinst_PROGRAMS = \
  listop\
  url-parse\
  sfrom\
+ iconv\
  mimetest\
  murun\
  muemail\
@@ -43,7 +44,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
  -I$(top_builddir)/include/mailutils/gnu\
  -I$(top_srcdir)/mailbox @INTLINCS@
 
-AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la
+AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
 
 numaddr_la_SOURCES = numaddr.c
 numaddr_la_LIBADD = ../libsieve/libsieve.la 

@@ -31,4 +31,4 @@ frm_LDADD = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -30,4 +30,4 @@ from_LDADD = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -35,4 +35,4 @@ guimb_LDADD = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @GUILE_LIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@

@@ -67,7 +67,7 @@ imap4d_LDADD = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @SERV_AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
 ## dependency. Think about better approach         --gray

@@ -30,7 +30,7 @@ mail_local_LDADD = \
  ../mailbox/libmailbox.la \
  @AUTHLIBS@\
  ../libsieve/libsieve.la\
- ../lib/libmailutils.la @LTLIBINTL@
+ ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
 
 install-exec-hook:
 	for i in $(libexec_PROGRAMS); do\

@@ -29,5 +29,5 @@ mail_remote_SOURCES = mail.remote.c
 mail_remote_LDADD = \
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @LTLIBINTL@\
+ @MU_COMMON_LIBRARIES@\
  @AUTHLIBS@

@@ -31,7 +31,7 @@ mail_LDADD = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
 
 EXTRA_DIST = msgset.c
 

@@ -54,6 +54,7 @@ debug.c \
 envelope.c \
 file_stream.c \
 filter.c \
+filter_iconv.c \
 filter_rfc822.c \
 filter_trans.c \
 folder.c \
@@ -104,15 +105,16 @@ parsedate.c: $(srcdir)/parsedate.y
                   -- -yy pd_yy
 
 libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@
-libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@
+libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@
 libmailbox_la_LDFLAGS = -version-info 0:0:0
 
 mailutils_config_SOURCES = mailutils-config.c
-mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
   -I$(top_srcdir)/intl \
   -I${top_srcdir}/lib \
   -DLINK_FLAGS="\"-L$(libdir)\"" \
+  -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \
   -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
   -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \
   -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\""

@@ -31,4 +31,4 @@ messages_LDADD =\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -131,7 +131,7 @@ mh_LIBS = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@
 LDADD = $(mh_LIBS)
 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
 pick_SOURCES = pick.c pick.h pick-gram.c pick-gram.h

@@ -28,4 +28,4 @@ movemail_LDADD = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -34,7 +34,7 @@ pop3d_LDADD = \
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 popauth_SOURCES = popauth.c
-popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@

@@ -32,4 +32,4 @@ readmsg_LDADD =\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -31,7 +31,7 @@ sieve_LDADD =\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailbox.la\
  ../lib/libmailutils.la\
- @AUTHLIBS@ @LTLIBINTL@
+ @AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 sieve_LDFLAGS = -export-dynamic