summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--README-alpha8
-rw-r--r--comsat/Makefile.am4
-rw-r--r--config/Makefile.am4
-rw-r--r--config/mailutils-config.c2
-rw-r--r--dotlock/Makefile.am2
-rw-r--r--examples/Makefile.am26
-rw-r--r--frm/Makefile.am4
-rw-r--r--gnulib.modules4
-rw-r--r--guimb/Makefile.am4
-rw-r--r--imap4d/Makefile.am8
-rw-r--r--lib/.cvsignore2
-rw-r--r--lib/Makefile.am32
-rw-r--r--libsieve/extensions/Makefile.am2
-rw-r--r--mail.local/Makefile.am4
-rw-r--r--mail.remote/Makefile.am4
-rw-r--r--mail/Makefile.am4
-rw-r--r--mailbox/Makefile.am44
-rw-r--r--mailbox/imap/folder.c2
-rw-r--r--mapi/Makefile.am2
-rw-r--r--messages/Makefile.am4
-rw-r--r--mh/Makefile.am4
-rw-r--r--mimeview/Makefile.am4
-rw-r--r--movemail/Makefile.am4
-rw-r--r--pop3d/Makefile.am10
-rw-r--r--readmsg/Makefile.am4
-rwxr-xr-xscripts/gnulib-sync52
-rw-r--r--sieve/Makefile.am4
28 files changed, 138 insertions, 122 deletions
diff --git a/ChangeLog b/ChangeLog
index 93c040031..27cb9cf13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,2 +2,14 @@
+ * 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,
diff --git a/README-alpha b/README-alpha
index 1d4ba4b7d..53926ffb0 100644
--- a/README-alpha
+++ b/README-alpha
@@ -95,4 +95,4 @@ Now set your breakpoints and proceed as usual.
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
@@ -117,5 +117,5 @@ CVS.
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.
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index cc25a35ef..56c0612ce 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -27,4 +27,4 @@ comsatd_LDADD = \
../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@MU_COMMON_LIBRARIES@
diff --git a/config/Makefile.am b/config/Makefile.am
index 6f999fafa..dfb09a3ec 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -27,4 +27,4 @@ mailutils_config_SOURCES = mailutils-config.c
mailutils_config_LDADD = \
- ../lib/libmailutils.la \
- ../mailbox/libmailbox.la \
+ ../lib/libmuaux.la \
+ ../mailbox/libmailutils.la \
@MU_COMMON_LIBRARIES@
diff --git a/config/mailutils-config.c b/config/mailutils-config.c
index 9cad8ffb6..85d6c3869 100644
--- a/config/mailutils-config.c
+++ b/config/mailutils-config.c
@@ -186,3 +186,3 @@ main (int argc, char **argv)
add_entry (100, LINK_POSTFLAGS);
- add_entry (1, "-lmailbox");
+ add_entry (1, "-lmailutils");
#ifdef ENABLE_NLS
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 4c8077e53..be2134172 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -23,3 +23,3 @@ 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@
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4611273a3..acb34cf15 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -52,7 +52,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
-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
@@ -66,4 +66,4 @@ mimetest_LDADD =\
../mailbox/pop/libmu_pop.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@
@@ -72,4 +72,4 @@ mta_LDADD =\
../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la
@@ -82,4 +82,4 @@ sfrom_LDADD =\
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@
@@ -88,4 +88,4 @@ pop3client_LDADD = \
../mailbox/pop/libmu_pop.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @READLINE_LIBS@
@@ -94,4 +94,4 @@ nntpclient_LDADD = \
../mailbox/nntp/libmu_nntp.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @READLINE_LIBS@
diff --git a/frm/Makefile.am b/frm/Makefile.am
index a1e0d93e9..f9badea35 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -38,4 +38,4 @@ common_ldadd = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
diff --git a/gnulib.modules b/gnulib.modules
index 8e42d278e..0c2a2c118 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -8,3 +8,3 @@
-:mailbox
+:mailutils
argp
@@ -15,3 +15,3 @@ md5
-:lib
+:muaux
xalloc
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index 7b30fbd20..51dfa26ec 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -36,4 +36,4 @@ guimb_LDADD = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 270dc6218..330223f95 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -69,4 +69,4 @@ imap4d_LDADD = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
@@ -82,4 +82,4 @@ imap4d_DEPENDENCIES = \
../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 080637bf9..d2ef6f5d8 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -5,2 +5,2 @@ Makefile
*.lo
-libmailutils.la
+libmuaux.la
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 20dda5f8d..f39b479f9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,6 +19,6 @@
-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\
@@ -34,3 +34,3 @@ noinst_HEADERS =\
-libmailutils_la_LIBADD = @LTLIBOBJS@
+libmuaux_la_LIBADD = @LTLIBOBJS@
@@ -41,3 +41,3 @@ MOSTLYCLEANFILES=
## 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
@@ -45,5 +45,5 @@ 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
@@ -54,3 +54,3 @@ EXTRA_DIST += stdbool_.h
# doesn't have one that works.
-all-local $(libmailutils_la_OBJECTS): $(STDBOOL_H)
+all-local $(libmuaux_la_OBJECTS): $(STDBOOL_H)
stdbool.h: stdbool_.h
@@ -60,3 +60,3 @@ MOSTLYCLEANFILES += stdbool.h stdbool.h-t
-libmailutils_la_SOURCES += xalloc.h xmalloc.c
+libmuaux_la_SOURCES += xalloc.h xmalloc.c
@@ -67,3 +67,3 @@ EXTRA_DIST += fnmatch_.h fnmatch_loop.c
# 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
@@ -73,6 +73,6 @@ 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
@@ -80,11 +80,11 @@ libmailutils_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
diff --git a/libsieve/extensions/Makefile.am b/libsieve/extensions/Makefile.am
index cc4972d50..dd32cb503 100644
--- a/libsieve/extensions/Makefile.am
+++ b/libsieve/extensions/Makefile.am
@@ -26,3 +26,3 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
-AM_LDFLAGS = ../../mailbox/libmailbox.la ../../lib/libmailutils.la
+AM_LDFLAGS = ../../mailbox/libmailutils.la ../../lib/libmuaux.la
diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am
index 9be34b1ba..f04943492 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -30,5 +30,5 @@ mail_local_LDADD = \
../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@
diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am
index 881b4e8d4..f80b1bad2 100644
--- a/mail.remote/Makefile.am
+++ b/mail.remote/Makefile.am
@@ -29,4 +29,4 @@ mail_remote_SOURCES = mail.remote.c
mail_remote_LDADD = \
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@MU_COMMON_LIBRARIES@\
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 39a037be7..28bf5c21f 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -26,3 +26,3 @@ bin_PROGRAMS = mail
mail_LDADD = \
- ../lib/libmailutils.la\
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
@@ -33,3 +33,3 @@ mail_LDADD = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
+ ../mailbox/libmailutils.la\
@AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am
index d2da17ae0..9c4398a13 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -29,3 +29,3 @@ SUBDIRS = include mbox pop nntp imap mh maildir testsuite
-lib_LTLIBRARIES = libmailbox.la
+lib_LTLIBRARIES = libmailutils.la
@@ -36,3 +36,3 @@ EXTRA_DIST = errors muerrno.cin parsedate.y pin.c fgetpwent.c
-libmailbox_la_SOURCES = \
+libmailutils_la_SOURCES = \
address.c \
@@ -103,5 +103,5 @@ muerrno.c: errors muerrno.cin
-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
@@ -115,3 +115,3 @@ EXTRA_DIST += alloca_.h
# 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
@@ -121,3 +121,3 @@ 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 \
@@ -125,10 +125,10 @@ libmailbox_la_SOURCES += argp.h argp-ba.c argp-eexst.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
@@ -140,3 +140,3 @@ EXTRA_DIST += getopt_.h getopt_int.h
# 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
@@ -146,13 +146,13 @@ 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
@@ -163,3 +163,3 @@ EXTRA_DIST += sysexit_.h
# 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
@@ -169,9 +169,9 @@ 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
diff --git a/mailbox/imap/folder.c b/mailbox/imap/folder.c
index b210fd6c5..8a6b08df4 100644
--- a/mailbox/imap/folder.c
+++ b/mailbox/imap/folder.c
@@ -84,3 +84,3 @@ record_t imap_record = &_imap_record;
-#ifndef HAVE_STRTOK_R
+#ifndef HAVE_DECL_STRTOK_R
char *strtok_r (char *, const char *, char **);
diff --git a/mapi/Makefile.am b/mapi/Makefile.am
index 661ac29b7..8aa83d298 100644
--- a/mapi/Makefile.am
+++ b/mapi/Makefile.am
@@ -28,3 +28,3 @@ EXTRA_DIST = mapi.h
-libmapi_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
+libmapi_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 2edcc9aa7..c8398657e 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -33,4 +33,4 @@ messages_LDADD =\
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
diff --git a/mh/Makefile.am b/mh/Makefile.am
index 26bb19f2c..398eaa7ad 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -132,4 +132,4 @@ mh_LIBS = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am
index a3926722c..0b2756e6d 100644
--- a/mimeview/Makefile.am
+++ b/mimeview/Makefile.am
@@ -51,4 +51,4 @@ 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@
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index 7630912e5..964c60c0e 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -29,4 +29,4 @@ movemail_LDADD = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index 791eb3c3c..bf998e040 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -35,4 +35,4 @@ pop3d_LDADD = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@MU_COMMON_LIBRARIES@
@@ -40,3 +40,3 @@ pop3d_LDADD = \
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 = \
@@ -46,3 +46,3 @@ pop3d_DEPENDENCIES = \
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index 2d9fb4e7a..ecb8c1751 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -34,4 +34,4 @@ readmsg_LDADD =\
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
diff --git a/scripts/gnulib-sync b/scripts/gnulib-sync
index a81edf0ef..c5b573683 100755
--- a/scripts/gnulib-sync
+++ b/scripts/gnulib-sync
@@ -114,3 +114,3 @@ get_modules() {
case $variable in
- lib|mailbox) ;;
+ muaux|mailutils) ;;
*) echo "Unknown variable $variable" >&2
@@ -161,5 +161,11 @@ do_copy() {
-# 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`
@@ -199,3 +205,3 @@ copy_files() {
rm -f $dest &&
- do_copy $GNULIB_SRCDIR/$file $dest $2
+ do_copy $GNULIB_SRCDIR/$file $dest $3
done
@@ -205,7 +211,3 @@ 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],["
@@ -219,6 +221,6 @@ create_m4_wrapper() {
+# update_makefile_am dir [libname]
update_makefile_am() {
- eval list="\$${1}_modules"
if [ $# -eq 1 ]; then
- libname=lib$1
+ libname=$1
else
@@ -226,2 +228,4 @@ update_makefile_am() {
fi
+ eval list="\$${libname}_modules"
+ libname=lib$libname
cat $1/Makefile.am | sed '/##:##.*##:##/,$d'
@@ -293,3 +297,3 @@ get_modules gnulib.modules
expand_modules lib_modules
-expand_modules mailbox_modules
+expand_modules mailutils_modules
@@ -298,3 +302,3 @@ for mod in $lib_modules
do
- if echo "$mailbox_modules" | grep -q " $mod " -; then
+ if echo "$mailutils_modules" | grep -q " $mod " -; then
:
@@ -306,6 +310,6 @@ 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/'
@@ -313,4 +317,4 @@ 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-----"
@@ -318,3 +322,3 @@ if [ -n "$DRY_RUN" ]; then
echo "-----BEGIN lib/Makefile.am FILE-----"
- update_makefile_am lib libmailutils
+ update_makefile_am lib muaux
echo "-----END lib/Makefile.am FILE-----"
@@ -322,3 +326,3 @@ if [ -n "$DRY_RUN" ]; then
echo "-----BEGIN mailbox/Makefile.am FILE-----"
- update_makefile_am mailbox
+ update_makefile_am mailbox mailutils
update_extra_dist mailbox m4/*.m4
@@ -335,7 +339,7 @@ else
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
@@ -343,3 +347,3 @@ else
verbose "Creating mailbox/Makefile.am"
- (update_makefile_am mailbox
+ (update_makefile_am mailbox mailutils
update_extra_dist mailbox m4/*.m4) > mailbox/Makefile.am.$$
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 013e430e4..a1cc57a04 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -32,4 +32,4 @@ sieve_LDADD =\
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailbox.la\
- ../lib/libmailutils.la\
+ ../mailbox/libmailutils.la\
+ ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@

Return to:

Send suggestions and report system problems to the System administrator.