Use MU_LIB_.* variables instead of referring to the libraries by their relative paths.

@@ -34,6 +34,6 @@ libmuauth_la_SOURCES = \
  tls.c\
  virtual.c 
 
-libmuauth_la_LIBADD = @SQLLIB@ @LTLIBINTL@
+libmuauth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
 libmuauth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
 libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 

@@ -25,8 +25,8 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
 
 comsatd_LDADD = \
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
 CFLOW_FLAGS=-i^s --brief -v

@@ -25,7 +25,7 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1
 mailutils_config_SOURCES = mailutils-config.c
 mailutils_config_LDADD = \
  ../lib/libmuaux.la \
- ../mailbox/libmailutils.la \
+ ${MU_LIB_MAILUTILS} \
  @MU_COMMON_LIBRARIES@
 
 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
@@ -33,6 +33,6 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
   -I${top_srcdir}/lib \
   -DLINK_FLAGS="\"-L$(libdir)\"" \
   -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \
-  -DAUTHLIBS="\"`echo $(MU_AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
+  -DAUTHLIBS="\"$(MU_AUTHLIBS)\"" \
   -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \
   -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\""

@@ -21,7 +21,10 @@ INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
 
 bin_PROGRAMS = dotlock
 
-dotlock_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
+dotlock_LDADD = \
+ ../lib/libmuaux.la\
+ ${MU_LIB_MAILUTILS}\
+ @MU_COMMON_LIBRARIES@
 
 install-exec-hook:
 	for i in $(bin_PROGRAMS); do\

@@ -49,61 +49,69 @@ mod_LTLIBRARIES = numaddr.la
 
 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
 
-AM_LDFLAGS = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
+AM_LDFLAGS = \
+ ../lib/libmuaux.la\
+ ${MU_LIB_MAILUTILS}\
+ @MU_COMMON_LIBRARIES@
 
 argcv_LDADD =\
  ../lib/libmuaux.la\
- ../mailbox/libmailutils.la
+ ${MU_LIB_MAILUTILS}
 
 numaddr_la_SOURCES = numaddr.c
-numaddr_la_LIBADD = ../libsieve/libsieve.la
+numaddr_la_LIBADD = ${MU_LIB_SIEVE}
 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined
 
 mimetest_LDADD =\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la
+ ${MU_LIB_MAILUTILS}
 
 mta_LDADD =\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailutils.la
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_MAILUTILS}
 
 sfrom_LDADD =\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la
+ ${MU_LIB_MAILUTILS}
 
 pop3client_LDADD = \
  ../lib/libmuaux.la\
- ../mailbox/pop/libmu_pop.la\
+ ${MU_LIB_POP}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @READLINE_LIBS@
 
 nntpclient_LDADD = \
  ../lib/libmuaux.la\
- ../mailbox/nntp/libmu_nntp.la\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @READLINE_LIBS@
 
 lsf_LDADD = \
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@ \
- ../mailbox/libmailutils.la
+ ${MU_LIB_MAILUTILS}
 

@@ -30,14 +30,15 @@ from_LDADD = $(common_ldadd)
 
 common_ldadd = \
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
 
 CFLOW_FLAGS=-i^s --brief -v

@@ -27,12 +27,13 @@ guimb_SOURCES=main.c collect.c util.c guimb.h
 guimb_LDADD = \
  ../lib/libmuaux.la\
  ../libmu_scm/libmu_scm.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @GUILE_LIBS@ @MU_COMMON_LIBRARIES@

@@ -62,11 +62,12 @@ imap4d_SOURCES = \
 imap4d_LDADD = \
  @IMAP_AUTHOBJS@\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@ \
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
@@ -78,8 +79,8 @@ imap4d_DEPENDENCIES = \
  @IMAP_AUTHOBJS@\
  @MU_AUTHLIBS_DEPENDENCY@\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailutils.la
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_MAILUTILS}
 
 EXTRA_DIST=auth_gss.c auth_gsasl.c
 

@@ -38,6 +38,15 @@ libmu_scm_la_SOURCES=\
  mu_scm.h
 
 libmu_scm_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
+libmu_scm_la_LIBADD = \
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILUTILS}\
+ @GUILE_LIBS@
 
 EXTRA_DIST=mailutils.scm mailutils.scm.in
 

@@ -42,7 +42,8 @@ libsieve_la_SOURCES = \
  sieve-lex.c\
  tests.c\
  util.c
-libsieve_la_LIBADD = @LTDL_LIB@
+libsieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
+libsieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
 
 noinst_HEADERS = sieve.h
 

@@ -27,7 +27,7 @@ mod_LTLIBRARIES = \
 
 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
 
-AM_LDFLAGS = ../../lib/libmuaux.la ../../mailbox/libmailutils.la 
+AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS} 
 
 list_la_SOURCES = list.c
 list_la_LIBADD = ../libsieve.la 

@@ -27,10 +27,11 @@ mail_local_LDADD = \
  @LIBMU_SCM@ @GUILE_LIBS@\
  @LIBMU_SCM_DEPS@\
  ../lib/libmuaux.la \
- ../libsieve/libsieve.la\
- ../mailbox/mbox/libmu_mbox.la\
+ ${MU_LIB_SIEVE}\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la \
+ ${MU_LIB_MAILUTILS} \
  @MU_COMMON_LIBRARIES@
 
 install-exec-hook:

@@ -28,6 +28,7 @@ mail_remote_SOURCES = mail.remote.c
 
 mail_remote_LDADD = \
  ../lib/libmuaux.la\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@

@@ -25,14 +25,15 @@ bin_PROGRAMS = mail
 
 mail_LDADD = \
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
 
 EXTRA_DIST = msgset.c

@@ -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 ../mailbox/libmailutils.la 
+libmapi_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS} 
 
 libmapi_la_SOURCES = \
  MAPIAddress.c \

@@ -25,14 +25,15 @@ bin_PROGRAMS = messages
 messages_SOURCES = messages.c
 messages_LDADD =\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
 CFLOW_FLAGS=-i^s --brief -v

@@ -129,14 +129,15 @@ AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
 mh_LIBS = \
  ./libmh.a\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 LDADD = $(mh_LIBS)
 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@

@@ -50,6 +50,6 @@ BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h
 
 mimeview_LDADD = \
  ../lib/libmuaux.la \
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @LTLIBINTL@
  

@@ -23,14 +23,15 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1
 
 movemail_LDADD = \
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
 CFLOW_FLAGS=-i^s --brief -v

@@ -30,22 +30,23 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
 
 pop3d_LDADD = \
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@ \
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
 popauth_SOURCES = popauth.c
-popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
+popauth_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS} @MU_COMMON_LIBRARIES@
 pop3d_DEPENDENCIES = \
  @MU_AUTHLIBS_DEPENDENCY@ \
  ../lib/libmuaux.la \
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailutils.la
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILUTILS}
 
 CFLOW_FLAGS=-i^s --brief -v
 pop3d_CFLOW_INPUT=$(pop3d_OBJECTS:.$(OBJEXT)=.c)

@@ -26,12 +26,13 @@ readmsg_SOURCES = readmsg.c msglist.c readmsg.h
 
 readmsg_LDADD =\
  ../lib/libmuaux.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@

@@ -24,15 +24,16 @@ bin_PROGRAMS = sieve
 sieve_SOURCES = sieve.c
 sieve_LDADD =\
  ../lib/libmuaux.la\
- ../libsieve/libsieve.la\
- ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/imap/libmu_imap.la\
- ../mailbox/pop/libmu_pop.la\
- ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/mh/libmu_mh.la\
- ../mailbox/maildir/libmu_maildir.la\
+ ${MU_LIB_SIEVE}\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@\
- ../mailbox/libmailutils.la\
+ ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
 sieve_LDFLAGS = -export-dynamic