Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 8672f9f0 8672f9f048ee10a7298f17ec6273025607ffba43 by Sergey Poznyakoff
Options

Finish switching to new gnulib (see 52d2552d). 

* configure.ac: Use libmuaux.a instead of libmuaux.la.
* examples/Makefile.am: Likewise.
* examples/cpp/Makefile.am: Likewise.
* imap4d/Makefile.am: Likewise.
* mapi/Makefile.am: Likewise.
* mh/Makefile.am: Likewise.
* pop3d/Makefile.am: Likewise.

Remove old files from POTFILES.in (see c42bddb0).

* po/POTFILES.in: Remove comsat/oldcfg.c.

Build testsuites after the programs they are to test.

* frm/Makefile.am (SUBDIRS): Put . before tests.
* messages/Makefile.am: Likewise.
* readmsg/Makefile.am: Likewise.
* sieve/Makefile.am: Likewise.

Remove leftovers from CVS times:

* .cvsignore: Remove.
* am/.cvsignore: Remove.
* lib/.cvsignore: Remove.
* po/.cvsignore
1 parent 92ea03b0
Inline Side-by-side
Showing 16 changed files with 18 additions and 370 deletions
1 .bootstrap
2 ABOUT-NLS
3 COPYING
4 INSTALL
5 Makefile
6 Makefile.in
7 _*
8 aclocal.m4
9 autom4te.cache
10 config.h
11 config.h.in
12 config.log
13 config.status
14 configure
15 intl
16 libtool
17 stamp-h1
1 Makefile
2 Makefile.in
3 absolute-header.m4
4 alloca.m4
5 argp.m4
6 autobuild.m4
7 canonicalize-lgpl.m4
8 chdir-long.m4
9 chown.m4
10 codeset.m4
11 d-ino.m4
12 d-type.m4
13 des.m4
14 dirfd.m4
15 dirname.m4
16 dos.m4
17 double-slash-root.m4
18 dup2.m4
19 eealloc.m4
20 environ.m4
21 eoverflow.m4
22 errno_h.m4
23 error.m4
24 exitfail.m4
25 extensions.m4
26 fchdir.m4
27 fcntl-safer.m4
28 fcntl_h.m4
29 float_h.m4
30 fnmatch.m4
31 fseeko.m4
32 getcwd-abort-bug.m4
33 getcwd-path-max.m4
34 getcwd.m4
35 getdelim.m4
36 getline.m4
37 getlogin_r.m4
38 getopt.m4
39 getpass.m4
40 gettext.m4
41 glibc21.m4
42 glob.m4
43 gnulib-cache.m4
44 gnulib-common.m4
45 gnulib-comp.m4
46 gnulib-tool.m4
47 iconv.m4
48 include_next.m4
49 inline.m4
50 intl.m4
51 intldir.m4
52 intlmacosx.m4
53 intmax.m4
54 intmax_t.m4
55 inttostr.m4
56 inttypes-h.m4
57 inttypes-pri.m4
58 inttypes_h.m4
59 lchown.m4
60 lib-ld.m4
61 lib-link.m4
62 lib-prefix.m4
63 localcharset.m4
64 longdouble.m4
65 longlong.m4
66 lseek.m4
67 lstat.m4
68 malloc.m4
69 malloca.m4
70 mbrtowc.m4
71 mbstate_t.m4
72 mbswidth.m4
73 mempcpy.m4
74 memrchr.m4
75 openat.m4
76 pathmax.m4
77 po.m4
78 printf.m4
79 progtest.m4
80 rawmemchr.m4
81 readlink.m4
82 realloc.m4
83 regex.m4
84 save-cwd.m4
85 setenv.m4
86 signed.m4
87 size_max.m4
88 sleep.m4
89 snprintf.m4
90 ssize_t.m4
91 stdbool.m4
92 stdint.m4
93 stdint_h.m4
94 stdio_h.m4
95 stdlib_h.m4
96 strcase.m4
97 strchrnul.m4
98 strdup.m4
99 strerror.m4
100 string_h.m4
101 strings_h.m4
102 strndup.m4
103 strnlen.m4
104 strtok_r.m4
105 sys_stat_h.m4
106 sysexits.m4
107 threadlib.m4
108 unistd-safer.m4
109 unistd_h.m4
110 vasnprintf.m4
111 vasprintf.m4
112 vsnprintf.m4
113 wchar.m4
114 wchar_t.m4
115 wctype.m4
116 wcwidth.m4
117 wint_t.m4
118 xalloc.m4
119 xgetcwd.m4
120 xsize.m4
121 xstrndup.m4
...@@ -58,7 +58,7 @@ AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux') ...@@ -58,7 +58,7 @@ AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux')
58 AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)') 58 AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
59 59
60 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)') 60 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
61 AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.la') 61 AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.a')
62 62
63 # There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used 63 # There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used
64 # by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications. 64 # by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications.
...@@ -1083,7 +1083,7 @@ GINT_INIT([gint],[1.8 with-guile], ...@@ -1083,7 +1083,7 @@ GINT_INIT([gint],[1.8 with-guile],
1083 MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules' 1083 MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'
1084 MU_GUILE_SIEVE_MOD_DATA='$(MU_GUILE_SIEVE_MOD_DATA_X)' 1084 MU_GUILE_SIEVE_MOD_DATA='$(MU_GUILE_SIEVE_MOD_DATA_X)'
1085 GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}' 1085 GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}'
1086 GINT_LDADD=../lib/libmuaux.la 1086 GINT_LDADD=../lib/libmuaux.a
1087 ],[useguile=no]) 1087 ],[useguile=no])
1088 1088
1089 AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"]) 1089 AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"])
......
...@@ -64,7 +64,7 @@ mod_LTLIBRARIES = numaddr.la ...@@ -64,7 +64,7 @@ mod_LTLIBRARIES = numaddr.la
64 INCLUDES = @MU_LIB_COMMON_INCLUDES@ 64 INCLUDES = @MU_LIB_COMMON_INCLUDES@
65 65
66 LDADD = \ 66 LDADD = \
67 ../lib/libmuaux.la\ 67 ../lib/libmuaux.a\
68 ${MU_LIB_MAILUTILS}\ 68 ${MU_LIB_MAILUTILS}\
69 @MU_COMMON_LIBRARIES@ 69 @MU_COMMON_LIBRARIES@
70 70
...@@ -73,20 +73,20 @@ numaddr_la_LIBADD = ${MU_LIB_SIEVE} ...@@ -73,20 +73,20 @@ numaddr_la_LIBADD = ${MU_LIB_SIEVE}
73 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)' 73 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)'
74 74
75 msg_send_LDADD =\ 75 msg_send_LDADD =\
76 ../lib/libmuaux.la\ 76 ../lib/libmuaux.a\
77 ${MU_LIB_MAILER}\ 77 ${MU_LIB_MAILER}\
78 @MU_AUTHLIBS@\ 78 @MU_AUTHLIBS@\
79 ${MU_LIB_MAILUTILS} 79 ${MU_LIB_MAILUTILS}
80 80
81 mta_CPPFLAGS=-I${top_srcdir}/lib -I${top_builddir}/lib 81 mta_CPPFLAGS=-I${top_srcdir}/lib -I${top_builddir}/lib
82 mta_LDADD =\ 82 mta_LDADD =\
83 ../lib/libmuaux.la\ 83 ../lib/libmuaux.a\
84 ${MU_LIB_MBOX}\ 84 ${MU_LIB_MBOX}\
85 ${MU_LIB_MAILER}\ 85 ${MU_LIB_MAILER}\
86 ${MU_LIB_MAILUTILS} 86 ${MU_LIB_MAILUTILS}
87 87
88 sfrom_LDADD =\ 88 sfrom_LDADD =\
89 ../lib/libmuaux.la\ 89 ../lib/libmuaux.a\
90 ${MU_LIB_MBOX}\ 90 ${MU_LIB_MBOX}\
91 ${MU_LIB_IMAP}\ 91 ${MU_LIB_IMAP}\
92 ${MU_LIB_POP}\ 92 ${MU_LIB_POP}\
...@@ -99,7 +99,7 @@ sfrom_LDADD =\ ...@@ -99,7 +99,7 @@ sfrom_LDADD =\
99 99
100 pop3client_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 100 pop3client_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
101 pop3client_LDADD = \ 101 pop3client_LDADD = \
102 ../lib/libmuaux.la\ 102 ../lib/libmuaux.a\
103 ${MU_LIB_POP}\ 103 ${MU_LIB_POP}\
104 ${MU_LIB_AUTH}\ 104 ${MU_LIB_AUTH}\
105 @MU_AUTHLIBS@\ 105 @MU_AUTHLIBS@\
...@@ -107,7 +107,7 @@ pop3client_LDADD = \ ...@@ -107,7 +107,7 @@ pop3client_LDADD = \
107 @READLINE_LIBS@ 107 @READLINE_LIBS@
108 108
109 nntpclient_LDADD = \ 109 nntpclient_LDADD = \
110 ../lib/libmuaux.la\ 110 ../lib/libmuaux.a\
111 ${MU_LIB_NNTP}\ 111 ${MU_LIB_NNTP}\
112 ${MU_LIB_AUTH}\ 112 ${MU_LIB_AUTH}\
113 @MU_AUTHLIBS@\ 113 @MU_AUTHLIBS@\
......
...@@ -37,7 +37,7 @@ noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@ ...@@ -37,7 +37,7 @@ noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@
37 INCLUDES = @MU_LIB_COMMON_INCLUDES@ 37 INCLUDES = @MU_LIB_COMMON_INCLUDES@
38 38
39 AM_LDFLAGS = \ 39 AM_LDFLAGS = \
40 ../../lib/libmuaux.la\ 40 ../../lib/libmuaux.a\
41 ../../libmu_cpp/libmu_cpp.la\ 41 ../../libmu_cpp/libmu_cpp.la\
42 ${MU_LIB_MAILUTILS}\ 42 ${MU_LIB_MAILUTILS}\
43 @MU_COMMON_LIBRARIES@ 43 @MU_COMMON_LIBRARIES@
...@@ -55,7 +55,7 @@ sfrom_SOURCES = sfrom.cc ...@@ -55,7 +55,7 @@ sfrom_SOURCES = sfrom.cc
55 url_parse_SOURCES = url-parse.cc 55 url_parse_SOURCES = url-parse.cc
56 56
57 LDADD =\ 57 LDADD =\
58 ../../lib/libmuaux.la\ 58 ../../lib/libmuaux.a\
59 ../../libmu_cpp/libmu_cpp.la\ 59 ../../libmu_cpp/libmu_cpp.la\
60 ${MU_LIB_MBOX}\ 60 ${MU_LIB_MBOX}\
61 ${MU_LIB_IMAP}\ 61 ${MU_LIB_IMAP}\
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 INCLUDES = @MU_APP_COMMON_INCLUDES@ 21 INCLUDES = @MU_APP_COMMON_INCLUDES@
22 22
23 SUBDIRS = tests 23 SUBDIRS = . tests
24 24
25 bin_PROGRAMS = frm from 25 bin_PROGRAMS = frm from
26 frm_SOURCES = frm.c common.c frm.h 26 frm_SOURCES = frm.c common.c frm.h
......
...@@ -83,7 +83,7 @@ imap4d_LDADD = \ ...@@ -83,7 +83,7 @@ imap4d_LDADD = \
83 imap4d_DEPENDENCIES = \ 83 imap4d_DEPENDENCIES = \
84 @IMAP_AUTHOBJS@\ 84 @IMAP_AUTHOBJS@\
85 @MU_AUTHLIBS_DEPENDENCY@\ 85 @MU_AUTHLIBS_DEPENDENCY@\
86 ../lib/libmuaux.la\ 86 ../lib/libmuaux.a\
87 ${MU_LIB_MBOX}\ 87 ${MU_LIB_MBOX}\
88 ${MU_LIB_MAILUTILS} 88 ${MU_LIB_MAILUTILS}
89 89
......
1 *.lo
2 .deps
3 .libs
4 Makefile
5 Makefile.in
6 alloca.c
7 alloca.h
8 alloca.in.h
9 argp-ba.c
10 argp-eexst.c
11 argp-fmtstream.c
12 argp-fmtstream.h
13 argp-fs-xinl.c
14 argp-help.c
15 argp-namefrob.h
16 argp-parse.c
17 argp-pin.c
18 argp-pv.c
19 argp-pvh.c
20 argp-xinl.c
21 argp.h
22 asnprintf.c
23 asprintf.c
24 at-func.c
25 basename.c
26 canonicalize-lgpl.c
27 canonicalize.h
28 chdir-long.c
29 chdir-long.h
30 chown.c
31 config.charset
32 creat-safer.c
33 des.c
34 des.h
35 dirent.h
36 dirent.in.h
37 dirfd.c
38 dirfd.h
39 dirname.c
40 dirname.h
41 dup-safer.c
42 dup2.c
43 errno.h
44 errno.in.h
45 error.c
46 error.h
47 exitfail.c
48 exitfail.h
49 fchdir.c
50 fchmodat.c
51 fchown-stub.c
52 fchownat.c
53 fcntl--.h
54 fcntl-safer.h
55 fcntl.h
56 fcntl.in.h
57 fd-safer.c
58 float+.h
59 float.h
60 float.in.h
61 fnmatch.c
62 fnmatch.h
63 fnmatch.in.h
64 fnmatch_loop.c
65 fseeko.c
66 fstatat.c
67 getcwd.c
68 getdelim.c
69 getline.c
70 getlogin_r.c
71 getopt.c
72 getopt.h
73 getopt.in.h
74 getopt1.c
75 getopt_int.h
76 getpass.c
77 getpass.h
78 gettext.h
79 glob-libc.h
80 glob.c
81 glob.h
82 glob.in.h
83 gnulib.mk
84 intprops.h
85 lchown.c
86 libmailutils.la
87 libmuaux.la
88 localcharset.c
89 localcharset.h
90 lseek.c
91 lstat.c
92 lstat.h
93 malloc.c
94 malloca.c
95 malloca.h
96 malloca.valgrind
97 mbswidth.c
98 mbswidth.h
99 mempcpy.c
100 memrchr.c
101 mkdirat.c
102 obstack.c
103 obstack.h
104 open-safer.c
105 openat-die.c
106 openat-priv.h
107 openat-proc.c
108 openat.c
109 openat.h
110 pathmax.h
111 pipe-safer.c
112 printf-args.c
113 printf-args.h
114 printf-parse.c
115 printf-parse.h
116 rawmemchr.c
117 rawmemchr.valgrind
118 readlink.c
119 realloc.c
120 ref-add.sed
121 ref-add.sin
122 ref-del.sed
123 ref-del.sin
124 regcomp.c
125 regex.c
126 regex.h
127 regex_internal.c
128 regex_internal.h
129 regexec.c
130 same-inode.h
131 save-cwd.c
132 save-cwd.h
133 setenv.c
134 setenv.h
135 size_max.h
136 sleep.c
137 snprintf.c
138 stdbool.h
139 stdbool.in.h
140 stdint.h
141 stdint.in.h
142 stdio-impl.h
143 stdio-write.c
144 stdio.h
145 stdio.in.h
146 stdlib.h
147 stdlib.in.h
148 strcasecmp.c
149 strchrnul.c
150 strchrnul.valgrind
151 strdup.c
152 streq.h
153 strerror.c
154 string.h
155 string.in.h
156 strings.h
157 strings.in.h
158 stripslash.c
159 strncasecmp.c
160 strndup.c
161 strnlen.c
162 strtok_r.c
163 sys
164 sys_stat.h
165 sys_stat.in.h
166 sysexits.h
167 sysexits.in.h
168 unistd--.h
169 unistd-safer.h
170 unistd.h
171 unistd.in.h
172 unitypes.h
173 uniwidth.h
174 unsetenv.c
175 vasnprintf.c
176 vasnprintf.h
177 vasprintf.c
178 vsnprintf.c
179 wchar.h
180 wchar.in.h
181 wctype.h
182 wctype.in.h
183 wcwidth.c
184 xalloc-die.c
185 xalloc.h
186 xgetcwd.c
187 xgetcwd.h
188 xmalloc.c
189 xsize.h
190 xstrndup.c
191 xstrndup.h
...@@ -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 = ../lib/libmuaux.la ${MU_LIB_MAILUTILS} 29 libmapi_LDADD = ../lib/libmuaux.a ${MU_LIB_MAILUTILS}
30 30
31 libmapi_la_SOURCES = \ 31 libmapi_la_SOURCES = \
32 MAPIAddress.c \ 32 MAPIAddress.c \
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 INCLUDES = @MU_APP_COMMON_INCLUDES@ 21 INCLUDES = @MU_APP_COMMON_INCLUDES@
22 22
23 SUBDIRS = tests 23 SUBDIRS = . tests
24 24
25 bin_PROGRAMS = messages 25 bin_PROGRAMS = messages
26 messages_SOURCES = messages.c 26 messages_SOURCES = messages.c
......
...@@ -96,7 +96,7 @@ INCLUDES = @MU_APP_COMMON_INCLUDES@ ...@@ -96,7 +96,7 @@ INCLUDES = @MU_APP_COMMON_INCLUDES@
96 AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\" 96 AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
97 mh_LIBS = \ 97 mh_LIBS = \
98 ./libmh.a\ 98 ./libmh.a\
99 ../lib/libmuaux.la\ 99 ../lib/libmuaux.a\
100 ${MU_LIB_MBOX}\ 100 ${MU_LIB_MBOX}\
101 ${MU_LIB_IMAP}\ 101 ${MU_LIB_IMAP}\
102 ${MU_LIB_POP}\ 102 ${MU_LIB_POP}\
......
1 *.gmo
2 *.mo
3 *.po
4 .reference
5 LINGUAS
6 Makefile
7 Makefile.in
8 Makefile.in.in
9 Makevars
10 Makevars.template
11 POTFILES
12 Rules-quot
13 boldquot.sed
14 en@boldquot.header
15 en@quot.header
16 insert-header.sed
17 insert-header.sin
18 mailutils.pot
19 quot.sed
20 remove-potcdate.sed
21 remove-potcdate.sin
22 stamp-po
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
5 # 5 #
6 6
7 comsat/action.c 7 comsat/action.c
8 comsat/oldcfg.c
9 comsat/comsat.c 8 comsat/comsat.c
10 9
11 config/mailutils-config.c 10 config/mailutils-config.c
......
...@@ -64,7 +64,7 @@ popauth_SOURCES = popauth.c ...@@ -64,7 +64,7 @@ popauth_SOURCES = popauth.c
64 popauth_LDADD = ${MU_APP_LIBRARIES} ${MU_LIB_MAILUTILS} @MU_COMMON_LIBRARIES@ 64 popauth_LDADD = ${MU_APP_LIBRARIES} ${MU_LIB_MAILUTILS} @MU_COMMON_LIBRARIES@
65 pop3d_DEPENDENCIES = \ 65 pop3d_DEPENDENCIES = \
66 @MU_AUTHLIBS_DEPENDENCY@ \ 66 @MU_AUTHLIBS_DEPENDENCY@ \
67 ../lib/libmuaux.la \ 67 ../lib/libmuaux.a \
68 ${MU_LIB_MBOX}\ 68 ${MU_LIB_MBOX}\
69 ${MU_LIB_MH}\ 69 ${MU_LIB_MH}\
70 ${MU_LIB_MAILDIR}\ 70 ${MU_LIB_MAILDIR}\
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 INCLUDES = @MU_APP_COMMON_INCLUDES@ 21 INCLUDES = @MU_APP_COMMON_INCLUDES@
22 22
23 SUBDIRS = tests 23 SUBDIRS = . tests
24 24
25 bin_PROGRAMS = readmsg 25 bin_PROGRAMS = readmsg
26 readmsg_SOURCES = readmsg.c msglist.c readmsg.h 26 readmsg_SOURCES = readmsg.c msglist.c readmsg.h
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 ## 02110-1301 USA 18 ## 02110-1301 USA
19 19
20 INCLUDES = @MU_APP_COMMON_INCLUDES@ 20 INCLUDES = @MU_APP_COMMON_INCLUDES@
21 SUBDIRS = tests 21 SUBDIRS = . tests
22 EXTRA_DIST = examples 22 EXTRA_DIST = examples
23 23
24 bin_PROGRAMS = sieve 24 bin_PROGRAMS = sieve
......