Load MU_AUTHLIBS before libmailutils. Fixes cygwin build

@@ -28,3 +28,11 @@ comsatd_LDADD = \
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/libmailutils.la\
  @MU_COMMON_LIBRARIES@
+
+CFLOW_FLAGS=-i^s --brief -v
+comsatd_CFLOW_INPUT=$(comsatd_OBJECTS:.$(OBJEXT)=.c)
+comsatd.cflow: $(comsatd_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(comsatd_CFLOW_INPUT)

@@ -34,6 +34,6 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
   -I${top_srcdir}/lib \
   -DLINK_FLAGS="\"-L$(libdir)\"" \
   -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \
-  -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
+  -DAUTHLIBS="\"`echo $(MU_AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
   -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \
   -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\""

@@ -66,8 +66,8 @@ mimetest_LDADD =\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/imap/libmu_imap.la\
  ../mailbox/pop/libmu_pop.la\
- ../mailbox/libmailutils.la\
- @AUTHLIBS@
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la
 
 mta_LDADD =\
  ../lib/libmuaux.la\
@@ -82,20 +82,22 @@ sfrom_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailutils.la\
- @AUTHLIBS@
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la
 
 pop3client_LDADD = \
  ../lib/libmuaux.la\
  ../mailbox/pop/libmu_pop.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@
+ @READLINE_LIBS@
 
 nntpclient_LDADD = \
  ../lib/libmuaux.la\
  ../mailbox/nntp/libmu_nntp.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@
+ @READLINE_LIBS@
 
 lsf_LDADD = \
  ../mailbox/mbox/libmu_mbox.la\
@@ -104,6 +106,6 @@ lsf_LDADD = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
-  @AUTHLIBS@ \
+ @MU_AUTHLIBS@ \
  ../mailbox/libmailutils.la
 

@@ -37,6 +37,14 @@ common_ldadd = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
+ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
 
+CFLOW_FLAGS=-i^s --brief -v
+frm_CFLOW_INPUT=$(frm_OBJECTS:.$(OBJEXT)=.c)
+frm.cflow: $(frm_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(frm_CFLOW_INPUT)

@@ -35,5 +35,6 @@ guimb_LDADD = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
+ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@

@@ -19,7 +19,7 @@
 
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \
  -I$(top_srcdir)/mailbox \
- -I${top_builddir}/include/mailutils/gnu @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
+ -I${top_builddir}/include/mailutils/gnu @MU_AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
 SUBDIRS = testsuite
 
 sbin_PROGRAMS =	imap4d
@@ -64,23 +64,31 @@ 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\
+ @MU_AUTHLIBS@ \
  ../mailbox/libmailutils.la\
  @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
-## and imap4d -> AUTHLIBS dependencies. Automake stupidly refuses to 
+## and imap4d -> MU_AUTHLIBS dependencies. Automake stupidly refuses to 
 ## include them.
 ## Same kludge appears in pop3d/Makefile.am and auth/Makefile.am
 ## Think about better approach         --gray
 imap4d_DEPENDENCIES = \
  @IMAP_AUTHOBJS@\
- @AUTHLIBS_DEPENDENCY@\
+ @MU_AUTHLIBS_DEPENDENCY@\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/libmailutils.la\
  ../lib/libmuaux.la
 
 EXTRA_DIST=auth_gss.c auth_gsasl.c
+
+CFLOW_FLAGS=-i^s --brief 
+imap4d_CFLOW_INPUT=$(imap4d_OBJECTS:.$(OBJEXT)=.c)
+imap4d.cflow: $(imap4d_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(imap4d_CFLOW_INPUT)

@@ -91,3 +91,11 @@ install-data-hook:
 		$(LN_S) -f libmu_scm.so libguile-mailutils-v-$(VERSION).so; \
 	 fi; \
 	 cd $$here
+
+CFLOW_FLAGS=-i^s --brief -v
+libmu_scm_CFLOW_INPUT=$(libmu_scm_la_OBJECTS:.lo=.c)
+libmu_scm.cflow: $(libmu_scm_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(libmu_scm_CFLOW_INPUT)

@@ -65,3 +65,11 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
 	          y.tab.c sieve-gram.c y.tab.h sieve-gram.h y.output y.output \
                   -- -yy mu_sieve_yy
 
+
+CFLOW_FLAGS=-i^s --brief -v
+libsieve_CFLOW_INPUT=$(libsieve_la_OBJECTS:.lo=.c)
+libsieve.cflow: $(libsieve_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(libsieve_CFLOW_INPUT)

@@ -26,11 +26,11 @@ mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
 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\
+ ../mailbox/mbox/libmu_mbox.la\
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la \
  @MU_COMMON_LIBRARIES@
 
 install-exec-hook:

@@ -28,6 +28,6 @@ mail_remote_SOURCES = mail.remote.c
 
 mail_remote_LDADD = \
  ../lib/libmuaux.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @MU_COMMON_LIBRARIES@\
- @AUTHLIBS@
+ @MU_COMMON_LIBRARIES@

@@ -18,7 +18,7 @@
 ##   02110-1301 USA
 
 AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@ 
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @MU_AUTHINCS@ 
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail
@@ -31,8 +31,9 @@ mail_LDADD = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
+ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
 
 EXTRA_DIST = msgset.c
 
@@ -94,3 +95,11 @@ mail_SOURCES = \
  z.c
 
 SUBDIRS = testsuite
+
+CFLOW_FLAGS=-i^s --brief -v
+mail_CFLOW_INPUT=$(mail_OBJECTS:.$(OBJEXT)=.c)
+mail.cflow: $(mail_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(mail_CFLOW_INPUT)

@@ -185,3 +185,11 @@ libmailutils_la_SOURCES += vsnprintf.h
 libmailutils_la_SOURCES += xsize.h
 
 EXTRA_DIST += getdelim.c getdelim.h getdelim.c getopt.c getopt1.c md5.c md5.h md5.c memchr.c mempcpy.c mempcpy.h mempcpy.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c getline.c getline.c getline.h getline.c getndelim2.c vsnprintf.c unlocked-io.h strchrnul.c regex.c strcasecmp.c strncasecmp.c strndup.c strndup.h strndup.c strnlen.c strnlen.h strnlen.c strtok_r.c
+
+CFLOW_FLAGS=-i^s --brief 
+mailutils_CFLOW_INPUT=$(libmailutils_la_OBJECTS:.lo=.c)
+mailutils.cflow: $(mailutils_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(mailutils_CFLOW_INPUT)

@@ -32,5 +32,14 @@ messages_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
+
+CFLOW_FLAGS=-i^s --brief -v
+messages_CFLOW_INPUT=$(messages_OBJECTS:.$(OBJEXT)=.c)
+messages.cflow: $(messages_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(messages_CFLOW_INPUT)

@@ -133,8 +133,9 @@ mh_LIBS = \
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
 LDADD = $(mh_LIBS)
 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
 pick_SOURCES = pick.c pick.h pick-gram.c pick-gram.h

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @MU_AUTHINCS@
 bin_PROGRAMS = movemail
 
 movemail_LDADD = \
@@ -28,5 +28,14 @@ movemail_LDADD = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
+
+CFLOW_FLAGS=-i^s --brief -v
+movemail_CFLOW_INPUT=$(movemail_OBJECTS:.$(OBJEXT)=.c)
+movemail.cflow: $(movemail_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(movemail_CFLOW_INPUT)

@@ -29,20 +29,28 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
  uidl.c user.c logindelay.c expire.c
 
 pop3d_LDADD = \
- @AUTHLIBS@ \
  ../lib/libmuaux.la\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@ \
  ../mailbox/libmailutils.la\
  @MU_COMMON_LIBRARIES@
 
 popauth_SOURCES = popauth.c
 popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
 pop3d_DEPENDENCIES = \
- @AUTHLIBS_DEPENDENCY@ \
+ @MU_AUTHLIBS_DEPENDENCY@ \
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
  ../mailbox/libmailutils.la\
  ../lib/libmuaux.la
+
+CFLOW_FLAGS=-i^s --brief -v
+pop3d_CFLOW_INPUT=$(pop3d_OBJECTS:.$(OBJEXT)=.c)
+pop3d.cflow: $(pop3d_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(pop3d_CFLOW_INPUT)

@@ -33,5 +33,6 @@ readmsg_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@

@@ -31,8 +31,16 @@ sieve_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
  ../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
 
 sieve_LDFLAGS = -export-dynamic
 
+CFLOW_FLAGS=-i^s --brief -v
+sieve_CFLOW_INPUT=$(sieve_OBJECTS:.$(OBJEXT)=.c)
+sieve.cflow: $(sieve_CFLOW_INPUT) Makefile
+	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+		$(CPPFLAGS) \
+	$(sieve_CFLOW_INPUT)