Load libmuauth before libmailutils

@@ -24,7 +24,7 @@ sbin_PROGRAMS = comsatd
 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
 
 comsatd_LDADD = \
+ ../lib/libmuaux.la\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @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/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
+dotlock_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
 
 install-exec-hook:
 	for i in $(bin_PROGRAMS); do\

@@ -54,27 +54,28 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
 AM_LDFLAGS = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
 
 argcv_LDADD =\
- ../mailbox/libmailutils.la\
- ../lib/libmuaux.la
+ ../lib/libmuaux.la\
+ ../mailbox/libmailutils.la
 
 numaddr_la_SOURCES = numaddr.c
 numaddr_la_LIBADD = ../libsieve/libsieve.la
 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\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@
 
 mta_LDADD =\
+ ../lib/libmuaux.la\
  ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailutils.la\
- ../lib/libmuaux.la
+ ../mailbox/libmailutils.la
 
 sfrom_LDADD =\
+ ../lib/libmuaux.la\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/imap/libmu_imap.la\
  ../mailbox/pop/libmu_pop.la\
@@ -82,19 +83,18 @@ sfrom_LDADD =\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@
 
 pop3client_LDADD = \
+ ../lib/libmuaux.la\
  ../mailbox/pop/libmu_pop.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @READLINE_LIBS@
 
 nntpclient_LDADD = \
+ ../lib/libmuaux.la\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @READLINE_LIBS@
 
 lsf_LDADD = \

@@ -30,6 +30,7 @@ frm_LDADD =  $(common_ldadd)
 from_LDADD = $(common_ldadd)
 
 common_ldadd = \
+ ../lib/libmuaux.la\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/imap/libmu_imap.la\
  ../mailbox/pop/libmu_pop.la\
@@ -37,6 +38,5 @@ common_ldadd = \
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
 

@@ -27,6 +27,7 @@ bin_PROGRAMS=@GUIMB@
 EXTRA_PROGRAMS=guimb
 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\
@@ -35,5 +36,4 @@ guimb_LDADD = \
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@

@@ -63,12 +63,12 @@ imap4d_SOURCES = \
 
 imap4d_LDADD = \
  @IMAP_AUTHOBJS@\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ \
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS

@@ -27,10 +27,11 @@ mail_local_LDADD = \
  @LIBMU_SCM@ @GUILE_LIBS@\
  @LIBMU_SCM_DEPS@\
  @AUTHLIBS@\
+ ../lib/libmuaux.la \
  ../mailbox/mbox/libmu_mbox.la \
  ../mailbox/libmailutils.la \
  ../libsieve/libsieve.la\
- ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
 
 install-exec-hook:
 	for i in $(libexec_PROGRAMS); do\

@@ -27,7 +27,7 @@ libexec_PROGRAMS = @BUILD_SMTP_PROGRAMS@
 mail_remote_SOURCES = mail.remote.c 
 
 mail_remote_LDADD = \
- ../mailbox/libmailutils.la\
  ../lib/libmuaux.la\
+ ../mailbox/libmailutils.la\
  @MU_COMMON_LIBRARIES@\
  @AUTHLIBS@

@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libmapi.la
 /* FIXME:  This should be part of the default includes.  */
 EXTRA_DIST = mapi.h
 
-libmapi_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la
+libmapi_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la 
 
 libmapi_la_SOURCES = \
  MAPIAddress.c \

@@ -25,6 +25,7 @@ SUBDIRS = testsuite
 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\
@@ -32,5 +33,4 @@ messages_LDADD =\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -124,6 +124,7 @@ INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include
 AM_CPPFLAGS = -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\
@@ -131,7 +132,6 @@ mh_LIBS = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@
 LDADD = $(mh_LIBS)
 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@

@@ -21,6 +21,7 @@ INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include
 bin_PROGRAMS = movemail
 
 movemail_LDADD = \
+ ../lib/libmuaux.la\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/imap/libmu_imap.la\
  ../mailbox/pop/libmu_pop.la\
@@ -28,5 +29,4 @@ movemail_LDADD = \
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -30,15 +30,15 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
 
 pop3d_LDADD = \
  @AUTHLIBS@ \
+ ../lib/libmuaux.la\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @MU_COMMON_LIBRARIES@
 
 popauth_SOURCES = popauth.c
-popauth_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
+popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
 pop3d_DEPENDENCIES = \
  @AUTHLIBS_DEPENDENCY@ \
  ../mailbox/mbox/libmu_mbox.la\

@@ -26,6 +26,7 @@ bin_PROGRAMS = readmsg
 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\
@@ -33,5 +34,4 @@ readmsg_LDADD =\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -23,6 +23,7 @@ SUBDIRS  = testsuite
 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\
@@ -31,7 +32,6 @@ sieve_LDADD =\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 sieve_LDFLAGS = -export-dynamic