Rename libmailbox to libmailutils. Rename the convenience library (lib/libmailutils) to libmuaux.

 2005-08-16  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+	* README-alpha,gnulib.modules,comsat/Makefile.am,
+	config/Makefile.am,config/mailutils-config.c,dotlock/Makefile.am,
+	examples/Makefile.am,frm/Makefile.am,guimb/Makefile.am,
+	imap4d/Makefile.am,lib/.cvsignore,lib/Makefile.am,
+	libsieve/extensions/Makefile.am,mail/Makefile.am,
+	mail.local/Makefile.am,mail.remote/Makefile.am,
+	mailbox/Makefile.am,mailbox/imap/folder.c,mapi/Makefile.am,
+	messages/Makefile.am,mh/Makefile.am,mimeview/Makefile.am,
+	movemail/Makefile.am,readmsg/Makefile.am,scripts/gnulib-sync,
+	sieve/Makefile.am: Rename libmailbox to libmailutils. Rename
+	the convenience library (lib/libmailutils) to libmuaux
+
 	* auth/lbuf.h,comsat/comsat.c,examples/mta.c,guimb/guimb.h,
 	imap4d/auth_gsasl.c,imap4d/fetch.c,imap4d/imap4d.c,
 	imap4d/imap4d.h,imap4d/list.c,imap4d/namespace.c,imap4d/search.c,

@@ -93,8 +93,8 @@ Now set your breakpoints and proceed as usual.
 * Importing gnulib files
 
     Mailutils imports several source files from gnulib. These go
-mainly to the conventional library libmailutils (directory lib/), but
-several of them are incorporated into the main library libmailbox
+mainly to the conventional library libmuaux (directory lib/), but
+several of them are incorporated into the main library libmailutils
 (directory mailbox/). The imported sources are kept in the CVS
 repository to avoid using eventually unstable versions appearing in
 the main gnulib CVS. Once in a time we update the sources. The update
@@ -115,9 +115,9 @@ CVS.
 
     If you need to add more gnulib modules to mailutils, add their
 names to gnulib.modules file, following the instructions in its
-heading comment. Please avoid placing modules in :mailbox section, as
+heading comment. Please avoid placing modules in :mailutils section, as
 this may lead to unwanted name clashes when linking user programs with
-libmailbox. 
+libmailutils. 
 
 * Copyright information:
 

@@ -25,6 +25,6 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
 
 comsatd_LDADD = \
  ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @MU_COMMON_LIBRARIES@

@@ -25,8 +25,8 @@ bin_PROGRAMS = mailutils-config
 
 mailutils_config_SOURCES = mailutils-config.c
 mailutils_config_LDADD = \
- ../lib/libmailutils.la \
- ../mailbox/libmailbox.la \
+ ../lib/libmuaux.la \
+ ../mailbox/libmailutils.la \
  @MU_COMMON_LIBRARIES@
 
 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \

@@ -184,7 +184,7 @@ main (int argc, char **argv)
 	  
 	  add_entry (-1, LINK_FLAGS);
 	  add_entry (100, LINK_POSTFLAGS);
-	  add_entry (1, "-lmailbox");
+	  add_entry (1, "-lmailutils");
 #ifdef ENABLE_NLS
 	  if (sizeof (I18NLIBS) > 1)
 	    add_entry (10, I18NLIBS);

@@ -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 @MU_COMMON_LIBRARIES@
+dotlock_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
 
 install-exec-hook:
 	for i in $(bin_PROGRAMS); do\

@@ -50,11 +50,11 @@ 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 @MU_COMMON_LIBRARIES@
+AM_LDFLAGS = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
 
 argcv_LDADD =\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la
 
 numaddr_la_SOURCES = numaddr.c
 numaddr_la_LIBADD = ../libsieve/libsieve.la
@@ -64,14 +64,14 @@ mimetest_LDADD =\
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/imap/libmu_imap.la\
  ../mailbox/pop/libmu_pop.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@
 
 mta_LDADD =\
  ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la
 
 sfrom_LDADD =\
  ../mailbox/mbox/libmu_mbox.la\
@@ -80,19 +80,19 @@ sfrom_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@
 
 pop3client_LDADD = \
  ../mailbox/pop/libmu_pop.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @READLINE_LIBS@
 
 nntpclient_LDADD = \
  ../mailbox/nntp/libmu_nntp.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @READLINE_LIBS@
 

@@ -36,7 +36,7 @@ common_ldadd = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
 

@@ -6,14 +6,14 @@
 # in corresponding directory. The file is processed by scripts/gnulib-sync
 # to synchronize mailtutils tree with gnulib.
 
-:mailbox
+:mailutils
 argp
 getline
 regex
 strtok_r
 md5
 
-:lib
+:muaux
 xalloc
 alloca
 fnmatch

@@ -34,6 +34,6 @@ guimb_LDADD = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@

@@ -67,8 +67,8 @@ imap4d_LDADD = \
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
@@ -80,7 +80,7 @@ imap4d_DEPENDENCIES = \
  @IMAP_AUTHOBJS@\
  @AUTHLIBS_DEPENDENCY@\
  ../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la
 
 EXTRA_DIST=auth_gss.c auth_gsasl.c

@@ -3,4 +3,4 @@ Makefile
 .deps
 .libs
 *.lo
-libmailutils.la
+libmuaux.la

@@ -17,10 +17,10 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-noinst_LTLIBRARIES = libmailutils.la
+noinst_LTLIBRARIES = libmuaux.la
 
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_builddir}/include/mailutils/gnu @INTLINCS@
-libmailutils_la_SOURCES = \
+libmuaux_la_SOURCES = \
  daemon.c\
  mailcap.c\
  mu_dbm.c\
@@ -32,59 +32,59 @@ noinst_HEADERS =\
  mu_dbm.h\
  mu_asprintf.h
 
-libmailutils_la_LIBADD = @LTLIBOBJS@
+libmuaux_la_LIBADD = @LTLIBOBJS@
 
 BUILT_SOURCES=
 MOSTLYCLEANFILES=
 
 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
 ## Do not change anything below this line ##
-libmailutils_la_SOURCES += allocsa.h allocsa.c
+libmuaux_la_SOURCES += allocsa.h allocsa.c
 EXTRA_DIST += allocsa.valgrind
 
 
-libmailutils_la_SOURCES += exit.h
+libmuaux_la_SOURCES += exit.h
 
-libmailutils_la_SOURCES += exitfail.h exitfail.c
+libmuaux_la_SOURCES += exitfail.h exitfail.c
 
 BUILT_SOURCES += $(STDBOOL_H)
 EXTRA_DIST += stdbool_.h
 
 # We need the following in order to create an <stdbool.h> when the system
 # doesn't have one that works.
-all-local $(libmailutils_la_OBJECTS): $(STDBOOL_H)
+all-local $(libmuaux_la_OBJECTS): $(STDBOOL_H)
 stdbool.h: stdbool_.h
 	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
-libmailutils_la_SOURCES += xalloc.h xmalloc.c
+libmuaux_la_SOURCES += xalloc.h xmalloc.c
 
 BUILT_SOURCES += $(FNMATCH_H)
 EXTRA_DIST += fnmatch_.h fnmatch_loop.c
 
 # We need the following in order to create an <fnmatch.h> when the system
 # doesn't have one that supports the required API.
-all-local $(libmailutils_la_OBJECTS): $(FNMATCH_H)
+all-local $(libmuaux_la_OBJECTS): $(FNMATCH_H)
 fnmatch.h: fnmatch_.h
 	cp $(srcdir)/fnmatch_.h $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
-libmailutils_la_SOURCES += getpass.h
+libmuaux_la_SOURCES += getpass.h
 
 
-libmailutils_la_SOURCES += mbswidth.h mbswidth.c
+libmuaux_la_SOURCES += mbswidth.h mbswidth.c
 
 
 
-libmailutils_la_SOURCES += setenv.h
+libmuaux_la_SOURCES += setenv.h
 
-libmailutils_la_SOURCES += snprintf.h
+libmuaux_la_SOURCES += snprintf.h
 
-libmailutils_la_SOURCES += xstrtol.h xstrtol.c xstrtoul.c
+libmuaux_la_SOURCES += xstrtol.h xstrtol.c xstrtoul.c
 
-libmailutils_la_SOURCES += vasprintf.h
+libmuaux_la_SOURCES += vasprintf.h
 
-libmailutils_la_SOURCES += xsize.h
+libmuaux_la_SOURCES += xsize.h
 

@@ -24,7 +24,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/libmailutils.la ../../lib/libmuaux.la
 
 timestamp_la_SOURCES = timestamp.c
 timestamp_la_LIBADD = ../libsieve.la 

@@ -28,9 +28,9 @@ mail_local_LDADD = \
  @LIBMU_SCM_DEPS@\
  @AUTHLIBS@\
  ../mailbox/mbox/libmu_mbox.la \
- ../mailbox/libmailbox.la \
+ ../mailbox/libmailutils.la \
  ../libsieve/libsieve.la\
- ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
+ ../lib/libmuaux.la @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/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @MU_COMMON_LIBRARIES@\
  @AUTHLIBS@

@@ -24,14 +24,14 @@ AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 bin_PROGRAMS = mail
 
 mail_LDADD = \
- ../lib/libmailutils.la\
+ ../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\
- ../mailbox/libmailbox.la\
+ ../mailbox/libmailutils.la\
  @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
 
 EXTRA_DIST = msgset.c

@@ -27,14 +27,14 @@ AM_YFLAGS=-vt
 
 SUBDIRS = include mbox pop nntp imap mh maildir testsuite 
 
-lib_LTLIBRARIES = libmailbox.la
+lib_LTLIBRARIES = libmailutils.la
 
 localedir = $(datadir)/locale
 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
 
 EXTRA_DIST = errors muerrno.cin parsedate.y pin.c fgetpwent.c
 
-libmailbox_la_SOURCES = \
+libmailutils_la_SOURCES = \
 address.c \
 amd.c \
 argcv.c \
@@ -101,9 +101,9 @@ parsedate.c: $(srcdir)/parsedate.y
 muerrno.c: errors muerrno.cin
 	$(AWK) -f $(top_srcdir)/scripts/generr.awk $^ > $@
 
-libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@
-libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@
-libmailbox_la_LDFLAGS = -version-info 0:0:0
+libmailutils_la_DEPENDENCIES = @MU_LTLIBOBJS@
+libmailutils_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@
+libmailutils_la_LDFLAGS = -version-info 0:0:0
 
 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
 ## Do not change anything below this line ##
@@ -113,24 +113,24 @@ EXTRA_DIST += alloca_.h
 
 # We need the following in order to create an <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-all-local $(libmailbox_la_OBJECTS): $(ALLOCA_H)
+all-local $(libmailutils_la_OBJECTS): $(ALLOCA_H)
 alloca.h: alloca_.h
 	cp $(srcdir)/alloca_.h $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
-libmailbox_la_SOURCES += argp.h argp-ba.c argp-eexst.c \
+libmailutils_la_SOURCES += argp.h argp-ba.c argp-eexst.c \
            argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c \
            argp-namefrob.h argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c
 
-libmailbox_la_SOURCES += getline.h
+libmailutils_la_SOURCES += getline.h
 EXTRA_DIST += getndelim2.h getndelim2.c
 
-libmailbox_la_SOURCES += regex.h
+libmailutils_la_SOURCES += regex.h
 
-libmailbox_la_SOURCES += strtok_r.h
+libmailutils_la_SOURCES += strtok_r.h
 
-libmailbox_la_SOURCES += md5.h md5.c
+libmailutils_la_SOURCES += md5.h md5.c
 
 
 BUILT_SOURCES += $(GETOPT_H)
@@ -138,41 +138,41 @@ EXTRA_DIST += getopt_.h getopt_int.h
 
 # We need the following in order to create an <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-all-local $(libmailbox_la_OBJECTS): $(GETOPT_H)
+all-local $(libmailutils_la_OBJECTS): $(GETOPT_H)
 getopt.h: getopt_.h
 	cp $(srcdir)/getopt_.h $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
-libmailbox_la_SOURCES += gettext.h
+libmailutils_la_SOURCES += gettext.h
 
 
-libmailbox_la_SOURCES += minmax.h
+libmailutils_la_SOURCES += minmax.h
 
 
-libmailbox_la_SOURCES += strcase.h
+libmailutils_la_SOURCES += strcase.h
 
-libmailbox_la_SOURCES += strchrnul.h
+libmailutils_la_SOURCES += strchrnul.h
 
-libmailbox_la_SOURCES += strndup.h
+libmailutils_la_SOURCES += strndup.h
 
 
 EXTRA_DIST += sysexit_.h
 
 # We need the following in order to create a <sysexits.h> when the system
 # doesn't have one that works with the given compiler.
-all-local $(libmailbox_la_OBJECTS): $(SYSEXITS_H)
+all-local $(libmailutils_la_OBJECTS): $(SYSEXITS_H)
 sysexits.h: sysexit_.h
 	cp $(srcdir)/sysexit_.h sysexits.h-t
 	mv sysexits.h-t sysexits.h
 MOSTLYCLEANFILES += sysexits.h sysexits.h-t
 
-libmailbox_la_SOURCES += unlocked-io.h
+libmailutils_la_SOURCES += unlocked-io.h
 
-libmailbox_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h
+libmailutils_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h
 
-libmailbox_la_SOURCES += vsnprintf.h
+libmailutils_la_SOURCES += vsnprintf.h
 
-libmailbox_la_SOURCES += xsize.h
+libmailutils_la_SOURCES += xsize.h
 
 EXTRA_DIST += regex.c getline.c getline.c getndelim2.c getndelim2.c getopt.c getopt1.c mempcpy.c mempcpy.h mempcpy.c strcasecmp.c strncasecmp.c strchrnul.c strndup.c strnlen.c strtok_r.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c vsnprintf.c

@@ -82,7 +82,7 @@ static struct _record _imap_record =
    via the register entry/record.  */
 record_t imap_record = &_imap_record;
 
-#ifndef HAVE_STRTOK_R
+#ifndef HAVE_DECL_STRTOK_R
 char *strtok_r                      (char *, const char *, char **);
 #endif
 

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

@@ -31,6 +31,6 @@ messages_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -130,8 +130,8 @@ mh_LIBS = \
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@
 LDADD = $(mh_LIBS)
 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@

@@ -49,7 +49,7 @@ mimetypes-lex.c: $(srcdir)/mimetypes.l mimetypes-decl.h
 BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h
 
 mimeview_LDADD = \
- ../lib/libmailutils.la \
- ../mailbox/libmailbox.la\
+ ../lib/libmuaux.la \
+ ../mailbox/libmailutils.la\
  @LTLIBINTL@
  

@@ -27,6 +27,6 @@ movemail_LDADD = \
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -33,16 +33,16 @@ pop3d_LDADD = \
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @MU_COMMON_LIBRARIES@
 
 popauth_SOURCES = popauth.c
-popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
+popauth_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
 pop3d_DEPENDENCIES = \
  @AUTHLIBS_DEPENDENCY@ \
  ../mailbox/mbox/libmu_mbox.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la

@@ -32,6 +32,6 @@ readmsg_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@

@@ -112,7 +112,7 @@ get_modules() {
     \#*)	;;
     :*)	variable=`echo $NAME | cut -c2-`
 	case $variable in
-	lib|mailbox)	;;
+	muaux|mailutils)	;;
 	*) echo "Unknown variable $variable" >&2
 	   exit 1;;
 	esac;;
@@ -159,9 +159,15 @@ do_copy() {
   echo $2 >> $CVSFILES
 }			
 
-# copy_files dir
+# copy_files dir libname
 copy_files() {
-  eval list="\$${1}_modules"
+  if [ $# -eq 1 ]; then
+    libname=$1
+  else
+    libname=$2
+  fi
+  eval list="\$${libname}_modules"
+  libname=lib$libname
   files=`$GNULIB_SRCDIR/gnulib-tool --extract-filelist $list | sort -u`
 	
   echo "$files" | sed 's,/[^/]*$,,' | sort -u |
@@ -197,17 +203,13 @@ copy_files() {
      esac
 
      rm -f $dest &&
-       do_copy $GNULIB_SRCDIR/$file $dest $2
+       do_copy $GNULIB_SRCDIR/$file $dest $3
      done
 }	
 
 create_m4_wrapper() {
   (eval list="\$${1}_modules"
-   if [ $# -eq 1 ]; then
-     libname=lib$1
-   else
-     libname=$2
-   fi
+   libname=lib$libname
    echo "AC_DEFUN([${libname}_GNULIB],["
    for module in $list
    do
@@ -217,13 +219,15 @@ create_m4_wrapper() {
    echo "])") | sed '/AM_GNU_GETTEXT/d'
 }				
 
+# update_makefile_am dir [libname]
 update_makefile_am() {
-  eval list="\$${1}_modules"
   if [ $# -eq 1 ]; then
-    libname=lib$1
+    libname=$1
   else
     libname=$2
   fi
+  eval list="\$${libname}_modules"
+  libname=lib$libname
   cat $1/Makefile.am | sed '/##:##.*##:##/,$d'
   echo "##:## EOF marker for gnulib-sync script. Please, do not remove ##:##"
   echo "## Do not change anything below this line ##"
@@ -291,12 +295,12 @@ trap cleanup 1 2 13 15
 get_modules gnulib.modules
 
 expand_modules lib_modules
-expand_modules mailbox_modules
+expand_modules mailutils_modules
 
 MODLIST=
 for mod in $lib_modules
 do
-  if echo "$mailbox_modules" | grep -q " $mod " -; then
+  if echo "$mailutils_modules" | grep -q " $mod " -; then
     :
   else
     MODLIST="$MODLIST $mod"
@@ -304,23 +308,23 @@ do
 done      
 
 lib_modules=`echo $MODLIST | sort -u`
-mailbox_modules=`echo $mailbox_modules | sort -u`
+mailutils_modules=`echo $mailutils_modules | sort -u`
 
-copy_files lib
-copy_files mailbox 's/AC_LIBSOURCES/MU_LIBSOURCES/;s/AC_REPLACE_FUNCS/MU_REPLACE_FUNCS/;s/AC_LIBOBJ/MU_LIBOBJ/'
+copy_files lib muaux
+copy_files mailbox mailutils 's/AC_LIBSOURCES/MU_LIBSOURCES/;s/AC_REPLACE_FUNCS/MU_REPLACE_FUNCS/;s/AC_LIBOBJ/MU_LIBOBJ/'
 
 if [ -n "$DRY_RUN" ]; then
   echo "-----BEGIN gnulib.m4 FILE-----"
-  create_m4_wrapper lib mailutils
-  create_m4_wrapper mailbox
+  create_m4_wrapper muaux
+  create_m4_wrapper mailutils
   echo "-----END gnulib.m4 FILE-----"
   echo ""
   echo "-----BEGIN lib/Makefile.am FILE-----"
-  update_makefile_am lib libmailutils
+  update_makefile_am lib muaux
   echo "-----END lib/Makefile.am FILE-----"
   echo ""
   echo "-----BEGIN mailbox/Makefile.am FILE-----"
-  update_makefile_am mailbox
+  update_makefile_am mailbox mailutils
   update_extra_dist mailbox m4/*.m4
   echo "-----END mailbox/Makefile.am FILE-----"
   echo "-----BEGIN CVS COMMANDS-----"
@@ -333,15 +337,15 @@ else
   verbose "Creating gnulib.m4"
   (echo "# This file is generated automatically. Please, do not edit."
    echo "#"
-   create_m4_wrapper lib libmailutils
-   create_m4_wrapper mailbox) > m4/gnulib.m4
+   create_m4_wrapper muaux
+   create_m4_wrapper mailutils) > m4/gnulib.m4
 
   verbose "Creating lib/Makefile.am"
-  update_makefile_am lib libmailutils > lib/Makefile.am.$$
+  update_makefile_am lib muaux > lib/Makefile.am.$$
   mv lib/Makefile.am.$$ lib/Makefile.am
     
   verbose "Creating mailbox/Makefile.am"
-  (update_makefile_am mailbox
+  (update_makefile_am mailbox mailutils
    update_extra_dist mailbox m4/*.m4) > mailbox/Makefile.am.$$
   mv mailbox/Makefile.am.$$ mailbox/Makefile.am
 

@@ -30,8 +30,8 @@ sieve_LDADD =\
  ../mailbox/nntp/libmu_nntp.la\
  ../mailbox/mh/libmu_mh.la\
  ../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
  @AUTHLIBS@ @MU_COMMON_LIBRARIES@
 
 sieve_LDFLAGS = -export-dynamic