Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit aaab8814 aaab88142c8193f1e2c0ce4c572dfea67e5a0b43 by Sergey Poznyakoff
Options

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

1 parent c3967af2
Inline Side-by-side
Showing 28 changed files with 138 additions and 122 deletions
1 2005-08-16 Sergey Poznyakoff <gray@gnu.org.ua> 1 2005-08-16 Sergey Poznyakoff <gray@gnu.org.ua>
2 2
3 * README-alpha,gnulib.modules,comsat/Makefile.am,
4 config/Makefile.am,config/mailutils-config.c,dotlock/Makefile.am,
5 examples/Makefile.am,frm/Makefile.am,guimb/Makefile.am,
6 imap4d/Makefile.am,lib/.cvsignore,lib/Makefile.am,
7 libsieve/extensions/Makefile.am,mail/Makefile.am,
8 mail.local/Makefile.am,mail.remote/Makefile.am,
9 mailbox/Makefile.am,mailbox/imap/folder.c,mapi/Makefile.am,
10 messages/Makefile.am,mh/Makefile.am,mimeview/Makefile.am,
11 movemail/Makefile.am,readmsg/Makefile.am,scripts/gnulib-sync,
12 sieve/Makefile.am: Rename libmailbox to libmailutils. Rename
13 the convenience library (lib/libmailutils) to libmuaux
14
3 * auth/lbuf.h,comsat/comsat.c,examples/mta.c,guimb/guimb.h, 15 * auth/lbuf.h,comsat/comsat.c,examples/mta.c,guimb/guimb.h,
4 imap4d/auth_gsasl.c,imap4d/fetch.c,imap4d/imap4d.c, 16 imap4d/auth_gsasl.c,imap4d/fetch.c,imap4d/imap4d.c,
5 imap4d/imap4d.h,imap4d/list.c,imap4d/namespace.c,imap4d/search.c, 17 imap4d/imap4d.h,imap4d/list.c,imap4d/namespace.c,imap4d/search.c,
......
...@@ -93,8 +93,8 @@ Now set your breakpoints and proceed as usual. ...@@ -93,8 +93,8 @@ Now set your breakpoints and proceed as usual.
93 * Importing gnulib files 93 * Importing gnulib files
94 94
95 Mailutils imports several source files from gnulib. These go 95 Mailutils imports several source files from gnulib. These go
96 mainly to the conventional library libmailutils (directory lib/), but 96 mainly to the conventional library libmuaux (directory lib/), but
97 several of them are incorporated into the main library libmailbox 97 several of them are incorporated into the main library libmailutils
98 (directory mailbox/). The imported sources are kept in the CVS 98 (directory mailbox/). The imported sources are kept in the CVS
99 repository to avoid using eventually unstable versions appearing in 99 repository to avoid using eventually unstable versions appearing in
100 the main gnulib CVS. Once in a time we update the sources. The update 100 the main gnulib CVS. Once in a time we update the sources. The update
...@@ -115,9 +115,9 @@ CVS. ...@@ -115,9 +115,9 @@ CVS.
115 115
116 If you need to add more gnulib modules to mailutils, add their 116 If you need to add more gnulib modules to mailutils, add their
117 names to gnulib.modules file, following the instructions in its 117 names to gnulib.modules file, following the instructions in its
118 heading comment. Please avoid placing modules in :mailbox section, as 118 heading comment. Please avoid placing modules in :mailutils section, as
119 this may lead to unwanted name clashes when linking user programs with 119 this may lead to unwanted name clashes when linking user programs with
120 libmailbox. 120 libmailutils.
121 121
122 * Copyright information: 122 * Copyright information:
123 123
......
...@@ -25,6 +25,6 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h ...@@ -25,6 +25,6 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
25 25
26 comsatd_LDADD = \ 26 comsatd_LDADD = \
27 ../mailbox/mbox/libmu_mbox.la\ 27 ../mailbox/mbox/libmu_mbox.la\
28 ../mailbox/libmailbox.la\ 28 ../mailbox/libmailutils.la\
29 ../lib/libmailutils.la\ 29 ../lib/libmuaux.la\
30 @MU_COMMON_LIBRARIES@ 30 @MU_COMMON_LIBRARIES@
......
...@@ -25,8 +25,8 @@ bin_PROGRAMS = mailutils-config ...@@ -25,8 +25,8 @@ bin_PROGRAMS = mailutils-config
25 25
26 mailutils_config_SOURCES = mailutils-config.c 26 mailutils_config_SOURCES = mailutils-config.c
27 mailutils_config_LDADD = \ 27 mailutils_config_LDADD = \
28 ../lib/libmailutils.la \ 28 ../lib/libmuaux.la \
29 ../mailbox/libmailbox.la \ 29 ../mailbox/libmailutils.la \
30 @MU_COMMON_LIBRARIES@ 30 @MU_COMMON_LIBRARIES@
31 31
32 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ 32 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
......
...@@ -184,7 +184,7 @@ main (int argc, char **argv) ...@@ -184,7 +184,7 @@ main (int argc, char **argv)
184 184
185 add_entry (-1, LINK_FLAGS); 185 add_entry (-1, LINK_FLAGS);
186 add_entry (100, LINK_POSTFLAGS); 186 add_entry (100, LINK_POSTFLAGS);
187 add_entry (1, "-lmailbox"); 187 add_entry (1, "-lmailutils");
188 #ifdef ENABLE_NLS 188 #ifdef ENABLE_NLS
189 if (sizeof (I18NLIBS) > 1) 189 if (sizeof (I18NLIBS) > 1)
190 add_entry (10, I18NLIBS); 190 add_entry (10, I18NLIBS);
......
...@@ -21,7 +21,7 @@ INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gn ...@@ -21,7 +21,7 @@ INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gn
21 21
22 bin_PROGRAMS = dotlock 22 bin_PROGRAMS = dotlock
23 23
24 dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ 24 dotlock_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
25 25
26 install-exec-hook: 26 install-exec-hook:
27 for i in $(bin_PROGRAMS); do\ 27 for i in $(bin_PROGRAMS); do\
......
...@@ -50,11 +50,11 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ ...@@ -50,11 +50,11 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
50 -I$(top_builddir)/include/mailutils/gnu\ 50 -I$(top_builddir)/include/mailutils/gnu\
51 -I$(top_srcdir)/mailbox @INTLINCS@ 51 -I$(top_srcdir)/mailbox @INTLINCS@
52 52
53 AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ 53 AM_LDFLAGS = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
54 54
55 argcv_LDADD =\ 55 argcv_LDADD =\
56 ../mailbox/libmailbox.la\ 56 ../mailbox/libmailutils.la\
57 ../lib/libmailutils.la 57 ../lib/libmuaux.la
58 58
59 numaddr_la_SOURCES = numaddr.c 59 numaddr_la_SOURCES = numaddr.c
60 numaddr_la_LIBADD = ../libsieve/libsieve.la 60 numaddr_la_LIBADD = ../libsieve/libsieve.la
...@@ -64,14 +64,14 @@ mimetest_LDADD =\ ...@@ -64,14 +64,14 @@ mimetest_LDADD =\
64 ../mailbox/mbox/libmu_mbox.la\ 64 ../mailbox/mbox/libmu_mbox.la\
65 ../mailbox/imap/libmu_imap.la\ 65 ../mailbox/imap/libmu_imap.la\
66 ../mailbox/pop/libmu_pop.la\ 66 ../mailbox/pop/libmu_pop.la\
67 ../mailbox/libmailbox.la\ 67 ../mailbox/libmailutils.la\
68 ../lib/libmailutils.la\ 68 ../lib/libmuaux.la\
69 @AUTHLIBS@ 69 @AUTHLIBS@
70 70
71 mta_LDADD =\ 71 mta_LDADD =\
72 ../mailbox/mbox/libmu_mbox.la\ 72 ../mailbox/mbox/libmu_mbox.la\
73 ../mailbox/libmailbox.la\ 73 ../mailbox/libmailutils.la\
74 ../lib/libmailutils.la 74 ../lib/libmuaux.la
75 75
76 sfrom_LDADD =\ 76 sfrom_LDADD =\
77 ../mailbox/mbox/libmu_mbox.la\ 77 ../mailbox/mbox/libmu_mbox.la\
...@@ -80,19 +80,19 @@ sfrom_LDADD =\ ...@@ -80,19 +80,19 @@ sfrom_LDADD =\
80 ../mailbox/nntp/libmu_nntp.la\ 80 ../mailbox/nntp/libmu_nntp.la\
81 ../mailbox/mh/libmu_mh.la\ 81 ../mailbox/mh/libmu_mh.la\
82 ../mailbox/maildir/libmu_maildir.la\ 82 ../mailbox/maildir/libmu_maildir.la\
83 ../mailbox/libmailbox.la\ 83 ../mailbox/libmailutils.la\
84 ../lib/libmailutils.la\ 84 ../lib/libmuaux.la\
85 @AUTHLIBS@ 85 @AUTHLIBS@
86 86
87 pop3client_LDADD = \ 87 pop3client_LDADD = \
88 ../mailbox/pop/libmu_pop.la\ 88 ../mailbox/pop/libmu_pop.la\
89 ../mailbox/libmailbox.la\ 89 ../mailbox/libmailutils.la\
90 ../lib/libmailutils.la\ 90 ../lib/libmuaux.la\
91 @AUTHLIBS@ @READLINE_LIBS@ 91 @AUTHLIBS@ @READLINE_LIBS@
92 92
93 nntpclient_LDADD = \ 93 nntpclient_LDADD = \
94 ../mailbox/nntp/libmu_nntp.la\ 94 ../mailbox/nntp/libmu_nntp.la\
95 ../mailbox/libmailbox.la\ 95 ../mailbox/libmailutils.la\
96 ../lib/libmailutils.la\ 96 ../lib/libmuaux.la\
97 @AUTHLIBS@ @READLINE_LIBS@ 97 @AUTHLIBS@ @READLINE_LIBS@
98 98
......
...@@ -36,7 +36,7 @@ common_ldadd = \ ...@@ -36,7 +36,7 @@ common_ldadd = \
36 ../mailbox/nntp/libmu_nntp.la\ 36 ../mailbox/nntp/libmu_nntp.la\
37 ../mailbox/mh/libmu_mh.la\ 37 ../mailbox/mh/libmu_mh.la\
38 ../mailbox/maildir/libmu_maildir.la\ 38 ../mailbox/maildir/libmu_maildir.la\
39 ../mailbox/libmailbox.la\ 39 ../mailbox/libmailutils.la\
40 ../lib/libmailutils.la\ 40 ../lib/libmuaux.la\
41 @AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@ 41 @AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
42 42
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
6 # in corresponding directory. The file is processed by scripts/gnulib-sync 6 # in corresponding directory. The file is processed by scripts/gnulib-sync
7 # to synchronize mailtutils tree with gnulib. 7 # to synchronize mailtutils tree with gnulib.
8 8
9 :mailbox 9 :mailutils
10 argp 10 argp
11 getline 11 getline
12 regex 12 regex
13 strtok_r 13 strtok_r
14 md5 14 md5
15 15
16 :lib 16 :muaux
17 xalloc 17 xalloc
18 alloca 18 alloca
19 fnmatch 19 fnmatch
......
...@@ -34,6 +34,6 @@ guimb_LDADD = \ ...@@ -34,6 +34,6 @@ guimb_LDADD = \
34 ../mailbox/nntp/libmu_nntp.la\ 34 ../mailbox/nntp/libmu_nntp.la\
35 ../mailbox/mh/libmu_mh.la\ 35 ../mailbox/mh/libmu_mh.la\
36 ../mailbox/maildir/libmu_maildir.la\ 36 ../mailbox/maildir/libmu_maildir.la\
37 ../mailbox/libmailbox.la\ 37 ../mailbox/libmailutils.la\
38 ../lib/libmailutils.la\ 38 ../lib/libmuaux.la\
39 @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@ 39 @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -67,8 +67,8 @@ imap4d_LDADD = \ ...@@ -67,8 +67,8 @@ imap4d_LDADD = \
67 ../mailbox/mbox/libmu_mbox.la\ 67 ../mailbox/mbox/libmu_mbox.la\
68 ../mailbox/mh/libmu_mh.la\ 68 ../mailbox/mh/libmu_mh.la\
69 ../mailbox/maildir/libmu_maildir.la\ 69 ../mailbox/maildir/libmu_maildir.la\
70 ../mailbox/libmailbox.la\ 70 ../mailbox/libmailutils.la\
71 ../lib/libmailutils.la\ 71 ../lib/libmuaux.la\
72 @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ 72 @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
73 73
74 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS 74 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
...@@ -80,7 +80,7 @@ imap4d_DEPENDENCIES = \ ...@@ -80,7 +80,7 @@ imap4d_DEPENDENCIES = \
80 @IMAP_AUTHOBJS@\ 80 @IMAP_AUTHOBJS@\
81 @AUTHLIBS_DEPENDENCY@\ 81 @AUTHLIBS_DEPENDENCY@\
82 ../mailbox/mbox/libmu_mbox.la\ 82 ../mailbox/mbox/libmu_mbox.la\
83 ../mailbox/libmailbox.la\ 83 ../mailbox/libmailutils.la\
84 ../lib/libmailutils.la 84 ../lib/libmuaux.la
85 85
86 EXTRA_DIST=auth_gss.c auth_gsasl.c 86 EXTRA_DIST=auth_gss.c auth_gsasl.c
......
...@@ -3,4 +3,4 @@ Makefile ...@@ -3,4 +3,4 @@ Makefile
3 .deps 3 .deps
4 .libs 4 .libs
5 *.lo 5 *.lo
6 libmailutils.la 6 libmuaux.la
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
17 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 17 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
18 ## 02110-1301 USA 18 ## 02110-1301 USA
19 19
20 noinst_LTLIBRARIES = libmailutils.la 20 noinst_LTLIBRARIES = libmuaux.la
21 21
22 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_builddir}/include/mailutils/gnu @INTLINCS@ 22 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_builddir}/include/mailutils/gnu @INTLINCS@
23 libmailutils_la_SOURCES = \ 23 libmuaux_la_SOURCES = \
24 daemon.c\ 24 daemon.c\
25 mailcap.c\ 25 mailcap.c\
26 mu_dbm.c\ 26 mu_dbm.c\
...@@ -32,59 +32,59 @@ noinst_HEADERS =\ ...@@ -32,59 +32,59 @@ noinst_HEADERS =\
32 mu_dbm.h\ 32 mu_dbm.h\
33 mu_asprintf.h 33 mu_asprintf.h
34 34
35 libmailutils_la_LIBADD = @LTLIBOBJS@ 35 libmuaux_la_LIBADD = @LTLIBOBJS@
36 36
37 BUILT_SOURCES= 37 BUILT_SOURCES=
38 MOSTLYCLEANFILES= 38 MOSTLYCLEANFILES=
39 39
40 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:## 40 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
41 ## Do not change anything below this line ## 41 ## Do not change anything below this line ##
42 libmailutils_la_SOURCES += allocsa.h allocsa.c 42 libmuaux_la_SOURCES += allocsa.h allocsa.c
43 EXTRA_DIST += allocsa.valgrind 43 EXTRA_DIST += allocsa.valgrind
44 44
45 45
46 libmailutils_la_SOURCES += exit.h 46 libmuaux_la_SOURCES += exit.h
47 47
48 libmailutils_la_SOURCES += exitfail.h exitfail.c 48 libmuaux_la_SOURCES += exitfail.h exitfail.c
49 49
50 BUILT_SOURCES += $(STDBOOL_H) 50 BUILT_SOURCES += $(STDBOOL_H)
51 EXTRA_DIST += stdbool_.h 51 EXTRA_DIST += stdbool_.h
52 52
53 # We need the following in order to create an <stdbool.h> when the system 53 # We need the following in order to create an <stdbool.h> when the system
54 # doesn't have one that works. 54 # doesn't have one that works.
55 all-local $(libmailutils_la_OBJECTS): $(STDBOOL_H) 55 all-local $(libmuaux_la_OBJECTS): $(STDBOOL_H)
56 stdbool.h: stdbool_.h 56 stdbool.h: stdbool_.h
57 sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t 57 sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
58 mv $@-t $@ 58 mv $@-t $@
59 MOSTLYCLEANFILES += stdbool.h stdbool.h-t 59 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
60 60
61 libmailutils_la_SOURCES += xalloc.h xmalloc.c 61 libmuaux_la_SOURCES += xalloc.h xmalloc.c
62 62
63 BUILT_SOURCES += $(FNMATCH_H) 63 BUILT_SOURCES += $(FNMATCH_H)
64 EXTRA_DIST += fnmatch_.h fnmatch_loop.c 64 EXTRA_DIST += fnmatch_.h fnmatch_loop.c
65 65
66 # We need the following in order to create an <fnmatch.h> when the system 66 # We need the following in order to create an <fnmatch.h> when the system
67 # doesn't have one that supports the required API. 67 # doesn't have one that supports the required API.
68 all-local $(libmailutils_la_OBJECTS): $(FNMATCH_H) 68 all-local $(libmuaux_la_OBJECTS): $(FNMATCH_H)
69 fnmatch.h: fnmatch_.h 69 fnmatch.h: fnmatch_.h
70 cp $(srcdir)/fnmatch_.h $@-t 70 cp $(srcdir)/fnmatch_.h $@-t
71 mv $@-t $@ 71 mv $@-t $@
72 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t 72 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
73 73
74 libmailutils_la_SOURCES += getpass.h 74 libmuaux_la_SOURCES += getpass.h
75 75
76 76
77 libmailutils_la_SOURCES += mbswidth.h mbswidth.c 77 libmuaux_la_SOURCES += mbswidth.h mbswidth.c
78 78
79 79
80 80
81 libmailutils_la_SOURCES += setenv.h 81 libmuaux_la_SOURCES += setenv.h
82 82
83 libmailutils_la_SOURCES += snprintf.h 83 libmuaux_la_SOURCES += snprintf.h
84 84
85 libmailutils_la_SOURCES += xstrtol.h xstrtol.c xstrtoul.c 85 libmuaux_la_SOURCES += xstrtol.h xstrtol.c xstrtoul.c
86 86
87 libmailutils_la_SOURCES += vasprintf.h 87 libmuaux_la_SOURCES += vasprintf.h
88 88
89 libmailutils_la_SOURCES += xsize.h 89 libmuaux_la_SOURCES += xsize.h
90 90
......
...@@ -24,7 +24,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ ...@@ -24,7 +24,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
24 -I$(top_builddir)/include/mailutils/gnu\ 24 -I$(top_builddir)/include/mailutils/gnu\
25 -I$(top_srcdir)/mailbox @INTLINCS@ 25 -I$(top_srcdir)/mailbox @INTLINCS@
26 26
27 AM_LDFLAGS = ../../mailbox/libmailbox.la ../../lib/libmailutils.la 27 AM_LDFLAGS = ../../mailbox/libmailutils.la ../../lib/libmuaux.la
28 28
29 timestamp_la_SOURCES = timestamp.c 29 timestamp_la_SOURCES = timestamp.c
30 timestamp_la_LIBADD = ../libsieve.la 30 timestamp_la_LIBADD = ../libsieve.la
......
...@@ -28,9 +28,9 @@ mail_local_LDADD = \ ...@@ -28,9 +28,9 @@ mail_local_LDADD = \
28 @LIBMU_SCM_DEPS@\ 28 @LIBMU_SCM_DEPS@\
29 @AUTHLIBS@\ 29 @AUTHLIBS@\
30 ../mailbox/mbox/libmu_mbox.la \ 30 ../mailbox/mbox/libmu_mbox.la \
31 ../mailbox/libmailbox.la \ 31 ../mailbox/libmailutils.la \
32 ../libsieve/libsieve.la\ 32 ../libsieve/libsieve.la\
33 ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ 33 ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
34 34
35 install-exec-hook: 35 install-exec-hook:
36 for i in $(libexec_PROGRAMS); do\ 36 for i in $(libexec_PROGRAMS); do\
......
...@@ -27,7 +27,7 @@ libexec_PROGRAMS = @BUILD_SMTP_PROGRAMS@ ...@@ -27,7 +27,7 @@ libexec_PROGRAMS = @BUILD_SMTP_PROGRAMS@
27 mail_remote_SOURCES = mail.remote.c 27 mail_remote_SOURCES = mail.remote.c
28 28
29 mail_remote_LDADD = \ 29 mail_remote_LDADD = \
30 ../mailbox/libmailbox.la\ 30 ../mailbox/libmailutils.la\
31 ../lib/libmailutils.la\ 31 ../lib/libmuaux.la\
32 @MU_COMMON_LIBRARIES@\ 32 @MU_COMMON_LIBRARIES@\
33 @AUTHLIBS@ 33 @AUTHLIBS@
......
...@@ -24,14 +24,14 @@ AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\" ...@@ -24,14 +24,14 @@ AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
24 bin_PROGRAMS = mail 24 bin_PROGRAMS = mail
25 25
26 mail_LDADD = \ 26 mail_LDADD = \
27 ../lib/libmailutils.la\ 27 ../lib/libmuaux.la\
28 ../mailbox/mbox/libmu_mbox.la\ 28 ../mailbox/mbox/libmu_mbox.la\
29 ../mailbox/imap/libmu_imap.la\ 29 ../mailbox/imap/libmu_imap.la\
30 ../mailbox/pop/libmu_pop.la\ 30 ../mailbox/pop/libmu_pop.la\
31 ../mailbox/nntp/libmu_nntp.la\ 31 ../mailbox/nntp/libmu_nntp.la\
32 ../mailbox/mh/libmu_mh.la\ 32 ../mailbox/mh/libmu_mh.la\
33 ../mailbox/maildir/libmu_maildir.la\ 33 ../mailbox/maildir/libmu_maildir.la\
34 ../mailbox/libmailbox.la\ 34 ../mailbox/libmailutils.la\
35 @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@ 35 @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
36 36
37 EXTRA_DIST = msgset.c 37 EXTRA_DIST = msgset.c
......
...@@ -27,14 +27,14 @@ AM_YFLAGS=-vt ...@@ -27,14 +27,14 @@ AM_YFLAGS=-vt
27 27
28 SUBDIRS = include mbox pop nntp imap mh maildir testsuite 28 SUBDIRS = include mbox pop nntp imap mh maildir testsuite
29 29
30 lib_LTLIBRARIES = libmailbox.la 30 lib_LTLIBRARIES = libmailutils.la
31 31
32 localedir = $(datadir)/locale 32 localedir = $(datadir)/locale
33 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" 33 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
34 34
35 EXTRA_DIST = errors muerrno.cin parsedate.y pin.c fgetpwent.c 35 EXTRA_DIST = errors muerrno.cin parsedate.y pin.c fgetpwent.c
36 36
37 libmailbox_la_SOURCES = \ 37 libmailutils_la_SOURCES = \
38 address.c \ 38 address.c \
39 amd.c \ 39 amd.c \
40 argcv.c \ 40 argcv.c \
...@@ -101,9 +101,9 @@ parsedate.c: $(srcdir)/parsedate.y ...@@ -101,9 +101,9 @@ parsedate.c: $(srcdir)/parsedate.y
101 muerrno.c: errors muerrno.cin 101 muerrno.c: errors muerrno.cin
102 $(AWK) -f $(top_srcdir)/scripts/generr.awk $^ > $@ 102 $(AWK) -f $(top_srcdir)/scripts/generr.awk $^ > $@
103 103
104 libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@ 104 libmailutils_la_DEPENDENCIES = @MU_LTLIBOBJS@
105 libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@ 105 libmailutils_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@
106 libmailbox_la_LDFLAGS = -version-info 0:0:0 106 libmailutils_la_LDFLAGS = -version-info 0:0:0
107 107
108 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:## 108 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
109 ## Do not change anything below this line ## 109 ## Do not change anything below this line ##
...@@ -113,24 +113,24 @@ EXTRA_DIST += alloca_.h ...@@ -113,24 +113,24 @@ EXTRA_DIST += alloca_.h
113 113
114 # We need the following in order to create an <alloca.h> when the system 114 # We need the following in order to create an <alloca.h> when the system
115 # doesn't have one that works with the given compiler. 115 # doesn't have one that works with the given compiler.
116 all-local $(libmailbox_la_OBJECTS): $(ALLOCA_H) 116 all-local $(libmailutils_la_OBJECTS): $(ALLOCA_H)
117 alloca.h: alloca_.h 117 alloca.h: alloca_.h
118 cp $(srcdir)/alloca_.h $@-t 118 cp $(srcdir)/alloca_.h $@-t
119 mv $@-t $@ 119 mv $@-t $@
120 MOSTLYCLEANFILES += alloca.h alloca.h-t 120 MOSTLYCLEANFILES += alloca.h alloca.h-t
121 121
122 libmailbox_la_SOURCES += argp.h argp-ba.c argp-eexst.c \ 122 libmailutils_la_SOURCES += argp.h argp-ba.c argp-eexst.c \
123 argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c \ 123 argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c \
124 argp-namefrob.h argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c 124 argp-namefrob.h argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c
125 125
126 libmailbox_la_SOURCES += getline.h 126 libmailutils_la_SOURCES += getline.h
127 EXTRA_DIST += getndelim2.h getndelim2.c 127 EXTRA_DIST += getndelim2.h getndelim2.c
128 128
129 libmailbox_la_SOURCES += regex.h 129 libmailutils_la_SOURCES += regex.h
130 130
131 libmailbox_la_SOURCES += strtok_r.h 131 libmailutils_la_SOURCES += strtok_r.h
132 132
133 libmailbox_la_SOURCES += md5.h md5.c 133 libmailutils_la_SOURCES += md5.h md5.c
134 134
135 135
136 BUILT_SOURCES += $(GETOPT_H) 136 BUILT_SOURCES += $(GETOPT_H)
...@@ -138,41 +138,41 @@ EXTRA_DIST += getopt_.h getopt_int.h ...@@ -138,41 +138,41 @@ EXTRA_DIST += getopt_.h getopt_int.h
138 138
139 # We need the following in order to create an <getopt.h> when the system 139 # We need the following in order to create an <getopt.h> when the system
140 # doesn't have one that works with the given compiler. 140 # doesn't have one that works with the given compiler.
141 all-local $(libmailbox_la_OBJECTS): $(GETOPT_H) 141 all-local $(libmailutils_la_OBJECTS): $(GETOPT_H)
142 getopt.h: getopt_.h 142 getopt.h: getopt_.h
143 cp $(srcdir)/getopt_.h $@-t 143 cp $(srcdir)/getopt_.h $@-t
144 mv $@-t $@ 144 mv $@-t $@
145 MOSTLYCLEANFILES += getopt.h getopt.h-t 145 MOSTLYCLEANFILES += getopt.h getopt.h-t
146 146
147 libmailbox_la_SOURCES += gettext.h 147 libmailutils_la_SOURCES += gettext.h
148 148
149 149
150 libmailbox_la_SOURCES += minmax.h 150 libmailutils_la_SOURCES += minmax.h
151 151
152 152
153 libmailbox_la_SOURCES += strcase.h 153 libmailutils_la_SOURCES += strcase.h
154 154
155 libmailbox_la_SOURCES += strchrnul.h 155 libmailutils_la_SOURCES += strchrnul.h
156 156
157 libmailbox_la_SOURCES += strndup.h 157 libmailutils_la_SOURCES += strndup.h
158 158
159 159
160 EXTRA_DIST += sysexit_.h 160 EXTRA_DIST += sysexit_.h
161 161
162 # We need the following in order to create a <sysexits.h> when the system 162 # We need the following in order to create a <sysexits.h> when the system
163 # doesn't have one that works with the given compiler. 163 # doesn't have one that works with the given compiler.
164 all-local $(libmailbox_la_OBJECTS): $(SYSEXITS_H) 164 all-local $(libmailutils_la_OBJECTS): $(SYSEXITS_H)
165 sysexits.h: sysexit_.h 165 sysexits.h: sysexit_.h
166 cp $(srcdir)/sysexit_.h sysexits.h-t 166 cp $(srcdir)/sysexit_.h sysexits.h-t
167 mv sysexits.h-t sysexits.h 167 mv sysexits.h-t sysexits.h
168 MOSTLYCLEANFILES += sysexits.h sysexits.h-t 168 MOSTLYCLEANFILES += sysexits.h sysexits.h-t
169 169
170 libmailbox_la_SOURCES += unlocked-io.h 170 libmailutils_la_SOURCES += unlocked-io.h
171 171
172 libmailbox_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h 172 libmailutils_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h
173 173
174 libmailbox_la_SOURCES += vsnprintf.h 174 libmailutils_la_SOURCES += vsnprintf.h
175 175
176 libmailbox_la_SOURCES += xsize.h 176 libmailutils_la_SOURCES += xsize.h
177 177
178 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 178 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 = ...@@ -82,7 +82,7 @@ static struct _record _imap_record =
82 via the register entry/record. */ 82 via the register entry/record. */
83 record_t imap_record = &_imap_record; 83 record_t imap_record = &_imap_record;
84 84
85 #ifndef HAVE_STRTOK_R 85 #ifndef HAVE_DECL_STRTOK_R
86 char *strtok_r (char *, const char *, char **); 86 char *strtok_r (char *, const char *, char **);
87 #endif 87 #endif
88 88
......
...@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libmapi.la ...@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libmapi.la
26 /* FIXME: This should be part of the default includes. */ 26 /* FIXME: This should be part of the default includes. */
27 EXTRA_DIST = mapi.h 27 EXTRA_DIST = mapi.h
28 28
29 libmapi_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 29 libmapi_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la
30 30
31 libmapi_la_SOURCES = \ 31 libmapi_la_SOURCES = \
32 MAPIAddress.c \ 32 MAPIAddress.c \
......
...@@ -31,6 +31,6 @@ messages_LDADD =\ ...@@ -31,6 +31,6 @@ messages_LDADD =\
31 ../mailbox/nntp/libmu_nntp.la\ 31 ../mailbox/nntp/libmu_nntp.la\
32 ../mailbox/mh/libmu_mh.la\ 32 ../mailbox/mh/libmu_mh.la\
33 ../mailbox/maildir/libmu_maildir.la\ 33 ../mailbox/maildir/libmu_maildir.la\
34 ../mailbox/libmailbox.la\ 34 ../mailbox/libmailutils.la\
35 ../lib/libmailutils.la\ 35 ../lib/libmuaux.la\
36 @AUTHLIBS@ @MU_COMMON_LIBRARIES@ 36 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -130,8 +130,8 @@ mh_LIBS = \ ...@@ -130,8 +130,8 @@ mh_LIBS = \
130 ../mailbox/mh/libmu_mh.la\ 130 ../mailbox/mh/libmu_mh.la\
131 ../mailbox/nntp/libmu_nntp.la\ 131 ../mailbox/nntp/libmu_nntp.la\
132 ../mailbox/maildir/libmu_maildir.la\ 132 ../mailbox/maildir/libmu_maildir.la\
133 ../mailbox/libmailbox.la\ 133 ../mailbox/libmailutils.la\
134 ../lib/libmailutils.la\ 134 ../lib/libmuaux.la\
135 @AUTHLIBS@ @MU_COMMON_LIBRARIES@ 135 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
136 LDADD = $(mh_LIBS) 136 LDADD = $(mh_LIBS)
137 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ 137 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
......
...@@ -49,7 +49,7 @@ mimetypes-lex.c: $(srcdir)/mimetypes.l mimetypes-decl.h ...@@ -49,7 +49,7 @@ mimetypes-lex.c: $(srcdir)/mimetypes.l mimetypes-decl.h
49 BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h 49 BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h
50 50
51 mimeview_LDADD = \ 51 mimeview_LDADD = \
52 ../lib/libmailutils.la \ 52 ../lib/libmuaux.la \
53 ../mailbox/libmailbox.la\ 53 ../mailbox/libmailutils.la\
54 @LTLIBINTL@ 54 @LTLIBINTL@
55 55
......
...@@ -27,6 +27,6 @@ movemail_LDADD = \ ...@@ -27,6 +27,6 @@ movemail_LDADD = \
27 ../mailbox/nntp/libmu_nntp.la\ 27 ../mailbox/nntp/libmu_nntp.la\
28 ../mailbox/mh/libmu_mh.la\ 28 ../mailbox/mh/libmu_mh.la\
29 ../mailbox/maildir/libmu_maildir.la\ 29 ../mailbox/maildir/libmu_maildir.la\
30 ../mailbox/libmailbox.la\ 30 ../mailbox/libmailutils.la\
31 ../lib/libmailutils.la\ 31 ../lib/libmuaux.la\
32 @AUTHLIBS@ @MU_COMMON_LIBRARIES@ 32 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -33,16 +33,16 @@ pop3d_LDADD = \ ...@@ -33,16 +33,16 @@ pop3d_LDADD = \
33 ../mailbox/mbox/libmu_mbox.la\ 33 ../mailbox/mbox/libmu_mbox.la\
34 ../mailbox/mh/libmu_mh.la\ 34 ../mailbox/mh/libmu_mh.la\
35 ../mailbox/maildir/libmu_maildir.la\ 35 ../mailbox/maildir/libmu_maildir.la\
36 ../mailbox/libmailbox.la\ 36 ../mailbox/libmailutils.la\
37 ../lib/libmailutils.la\ 37 ../lib/libmuaux.la\
38 @MU_COMMON_LIBRARIES@ 38 @MU_COMMON_LIBRARIES@
39 39
40 popauth_SOURCES = popauth.c 40 popauth_SOURCES = popauth.c
41 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ 41 popauth_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
42 pop3d_DEPENDENCIES = \ 42 pop3d_DEPENDENCIES = \
43 @AUTHLIBS_DEPENDENCY@ \ 43 @AUTHLIBS_DEPENDENCY@ \
44 ../mailbox/mbox/libmu_mbox.la\ 44 ../mailbox/mbox/libmu_mbox.la\
45 ../mailbox/mh/libmu_mh.la\ 45 ../mailbox/mh/libmu_mh.la\
46 ../mailbox/maildir/libmu_maildir.la\ 46 ../mailbox/maildir/libmu_maildir.la\
47 ../mailbox/libmailbox.la\ 47 ../mailbox/libmailutils.la\
48 ../lib/libmailutils.la 48 ../lib/libmuaux.la
......
...@@ -32,6 +32,6 @@ readmsg_LDADD =\ ...@@ -32,6 +32,6 @@ readmsg_LDADD =\
32 ../mailbox/nntp/libmu_nntp.la\ 32 ../mailbox/nntp/libmu_nntp.la\
33 ../mailbox/mh/libmu_mh.la\ 33 ../mailbox/mh/libmu_mh.la\
34 ../mailbox/maildir/libmu_maildir.la\ 34 ../mailbox/maildir/libmu_maildir.la\
35 ../mailbox/libmailbox.la\ 35 ../mailbox/libmailutils.la\
36 ../lib/libmailutils.la\ 36 ../lib/libmuaux.la\
37 @AUTHLIBS@ @MU_COMMON_LIBRARIES@ 37 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -112,7 +112,7 @@ get_modules() { ...@@ -112,7 +112,7 @@ get_modules() {
112 \#*) ;; 112 \#*) ;;
113 :*) variable=`echo $NAME | cut -c2-` 113 :*) variable=`echo $NAME | cut -c2-`
114 case $variable in 114 case $variable in
115 lib|mailbox) ;; 115 muaux|mailutils) ;;
116 *) echo "Unknown variable $variable" >&2 116 *) echo "Unknown variable $variable" >&2
117 exit 1;; 117 exit 1;;
118 esac;; 118 esac;;
...@@ -159,9 +159,15 @@ do_copy() { ...@@ -159,9 +159,15 @@ do_copy() {
159 echo $2 >> $CVSFILES 159 echo $2 >> $CVSFILES
160 } 160 }
161 161
162 # copy_files dir 162 # copy_files dir libname
163 copy_files() { 163 copy_files() {
164 eval list="\$${1}_modules" 164 if [ $# -eq 1 ]; then
165 libname=$1
166 else
167 libname=$2
168 fi
169 eval list="\$${libname}_modules"
170 libname=lib$libname
165 files=`$GNULIB_SRCDIR/gnulib-tool --extract-filelist $list | sort -u` 171 files=`$GNULIB_SRCDIR/gnulib-tool --extract-filelist $list | sort -u`
166 172
167 echo "$files" | sed 's,/[^/]*$,,' | sort -u | 173 echo "$files" | sed 's,/[^/]*$,,' | sort -u |
...@@ -197,17 +203,13 @@ copy_files() { ...@@ -197,17 +203,13 @@ copy_files() {
197 esac 203 esac
198 204
199 rm -f $dest && 205 rm -f $dest &&
200 do_copy $GNULIB_SRCDIR/$file $dest $2 206 do_copy $GNULIB_SRCDIR/$file $dest $3
201 done 207 done
202 } 208 }
203 209
204 create_m4_wrapper() { 210 create_m4_wrapper() {
205 (eval list="\$${1}_modules" 211 (eval list="\$${1}_modules"
206 if [ $# -eq 1 ]; then 212 libname=lib$libname
207 libname=lib$1
208 else
209 libname=$2
210 fi
211 echo "AC_DEFUN([${libname}_GNULIB],[" 213 echo "AC_DEFUN([${libname}_GNULIB],["
212 for module in $list 214 for module in $list
213 do 215 do
...@@ -217,13 +219,15 @@ create_m4_wrapper() { ...@@ -217,13 +219,15 @@ create_m4_wrapper() {
217 echo "])") | sed '/AM_GNU_GETTEXT/d' 219 echo "])") | sed '/AM_GNU_GETTEXT/d'
218 } 220 }
219 221
222 # update_makefile_am dir [libname]
220 update_makefile_am() { 223 update_makefile_am() {
221 eval list="\$${1}_modules"
222 if [ $# -eq 1 ]; then 224 if [ $# -eq 1 ]; then
223 libname=lib$1 225 libname=$1
224 else 226 else
225 libname=$2 227 libname=$2
226 fi 228 fi
229 eval list="\$${libname}_modules"
230 libname=lib$libname
227 cat $1/Makefile.am | sed '/##:##.*##:##/,$d' 231 cat $1/Makefile.am | sed '/##:##.*##:##/,$d'
228 echo "##:## EOF marker for gnulib-sync script. Please, do not remove ##:##" 232 echo "##:## EOF marker for gnulib-sync script. Please, do not remove ##:##"
229 echo "## Do not change anything below this line ##" 233 echo "## Do not change anything below this line ##"
...@@ -291,12 +295,12 @@ trap cleanup 1 2 13 15 ...@@ -291,12 +295,12 @@ trap cleanup 1 2 13 15
291 get_modules gnulib.modules 295 get_modules gnulib.modules
292 296
293 expand_modules lib_modules 297 expand_modules lib_modules
294 expand_modules mailbox_modules 298 expand_modules mailutils_modules
295 299
296 MODLIST= 300 MODLIST=
297 for mod in $lib_modules 301 for mod in $lib_modules
298 do 302 do
299 if echo "$mailbox_modules" | grep -q " $mod " -; then 303 if echo "$mailutils_modules" | grep -q " $mod " -; then
300 : 304 :
301 else 305 else
302 MODLIST="$MODLIST $mod" 306 MODLIST="$MODLIST $mod"
...@@ -304,23 +308,23 @@ do ...@@ -304,23 +308,23 @@ do
304 done 308 done
305 309
306 lib_modules=`echo $MODLIST | sort -u` 310 lib_modules=`echo $MODLIST | sort -u`
307 mailbox_modules=`echo $mailbox_modules | sort -u` 311 mailutils_modules=`echo $mailutils_modules | sort -u`
308 312
309 copy_files lib 313 copy_files lib muaux
310 copy_files mailbox 's/AC_LIBSOURCES/MU_LIBSOURCES/;s/AC_REPLACE_FUNCS/MU_REPLACE_FUNCS/;s/AC_LIBOBJ/MU_LIBOBJ/' 314 copy_files mailbox mailutils 's/AC_LIBSOURCES/MU_LIBSOURCES/;s/AC_REPLACE_FUNCS/MU_REPLACE_FUNCS/;s/AC_LIBOBJ/MU_LIBOBJ/'
311 315
312 if [ -n "$DRY_RUN" ]; then 316 if [ -n "$DRY_RUN" ]; then
313 echo "-----BEGIN gnulib.m4 FILE-----" 317 echo "-----BEGIN gnulib.m4 FILE-----"
314 create_m4_wrapper lib mailutils 318 create_m4_wrapper muaux
315 create_m4_wrapper mailbox 319 create_m4_wrapper mailutils
316 echo "-----END gnulib.m4 FILE-----" 320 echo "-----END gnulib.m4 FILE-----"
317 echo "" 321 echo ""
318 echo "-----BEGIN lib/Makefile.am FILE-----" 322 echo "-----BEGIN lib/Makefile.am FILE-----"
319 update_makefile_am lib libmailutils 323 update_makefile_am lib muaux
320 echo "-----END lib/Makefile.am FILE-----" 324 echo "-----END lib/Makefile.am FILE-----"
321 echo "" 325 echo ""
322 echo "-----BEGIN mailbox/Makefile.am FILE-----" 326 echo "-----BEGIN mailbox/Makefile.am FILE-----"
323 update_makefile_am mailbox 327 update_makefile_am mailbox mailutils
324 update_extra_dist mailbox m4/*.m4 328 update_extra_dist mailbox m4/*.m4
325 echo "-----END mailbox/Makefile.am FILE-----" 329 echo "-----END mailbox/Makefile.am FILE-----"
326 echo "-----BEGIN CVS COMMANDS-----" 330 echo "-----BEGIN CVS COMMANDS-----"
...@@ -333,15 +337,15 @@ else ...@@ -333,15 +337,15 @@ else
333 verbose "Creating gnulib.m4" 337 verbose "Creating gnulib.m4"
334 (echo "# This file is generated automatically. Please, do not edit." 338 (echo "# This file is generated automatically. Please, do not edit."
335 echo "#" 339 echo "#"
336 create_m4_wrapper lib libmailutils 340 create_m4_wrapper muaux
337 create_m4_wrapper mailbox) > m4/gnulib.m4 341 create_m4_wrapper mailutils) > m4/gnulib.m4
338 342
339 verbose "Creating lib/Makefile.am" 343 verbose "Creating lib/Makefile.am"
340 update_makefile_am lib libmailutils > lib/Makefile.am.$$ 344 update_makefile_am lib muaux > lib/Makefile.am.$$
341 mv lib/Makefile.am.$$ lib/Makefile.am 345 mv lib/Makefile.am.$$ lib/Makefile.am
342 346
343 verbose "Creating mailbox/Makefile.am" 347 verbose "Creating mailbox/Makefile.am"
344 (update_makefile_am mailbox 348 (update_makefile_am mailbox mailutils
345 update_extra_dist mailbox m4/*.m4) > mailbox/Makefile.am.$$ 349 update_extra_dist mailbox m4/*.m4) > mailbox/Makefile.am.$$
346 mv mailbox/Makefile.am.$$ mailbox/Makefile.am 350 mv mailbox/Makefile.am.$$ mailbox/Makefile.am
347 351
......
...@@ -30,8 +30,8 @@ sieve_LDADD =\ ...@@ -30,8 +30,8 @@ sieve_LDADD =\
30 ../mailbox/nntp/libmu_nntp.la\ 30 ../mailbox/nntp/libmu_nntp.la\
31 ../mailbox/mh/libmu_mh.la\ 31 ../mailbox/mh/libmu_mh.la\
32 ../mailbox/maildir/libmu_maildir.la\ 32 ../mailbox/maildir/libmu_maildir.la\
33 ../mailbox/libmailbox.la\ 33 ../mailbox/libmailutils.la\
34 ../lib/libmailutils.la\ 34 ../lib/libmuaux.la\
35 @AUTHLIBS@ @MU_COMMON_LIBRARIES@ 35 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
36 36
37 sieve_LDFLAGS = -export-dynamic 37 sieve_LDFLAGS = -export-dynamic
......