diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-02-23 16:20:21 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-02-23 16:20:21 +0000 |
commit | 975038c912b76c56c552ae51bac8a36f0c3bd160 (patch) | |
tree | 66aca76efc7f40af2047117eea3dae40b9a6f5d1 | |
parent | 9de013a2b0571e5e748237e40fd849e2692d4e79 (diff) | |
download | mailutils-975038c912b76c56c552ae51bac8a36f0c3bd160.tar.gz mailutils-975038c912b76c56c552ae51bac8a36f0c3bd160.tar.bz2 |
Updated
-rw-r--r-- | ChangeLog | 204 | ||||
-rw-r--r-- | lib/Makefile.am | 71 | ||||
-rw-r--r-- | m4/mu_libobj.m4 | 2 | ||||
-rw-r--r-- | mailbox/Makefile.am | 79 |
4 files changed, 334 insertions, 22 deletions
@@ -1,6 +1,210 @@ +2005-02-23 Sergey Poznyakoff + + Synchronized with the recent gnulib. Provide a way to + facilitate further synchronizations. + + * gnulib.modules: New file + * scripts/gnulib-sync: New file. Script for synchronizing + mailutils tree with gnulib. + * configure.ac: Updated to use new gnulib files. + * m4/mu_libobj.m4 (MU_LIBSOURCES,MU_REPLACE_FUNCS): New defun. + (MU_CHECK_FUNCS): Removed. + + * Makefile.am: Remove headers/ + * frm/frm.c (parse_opt): Bugfix. Was using optarg instead of arg + * mail.local/main.c: Likewise + * pop3d/popauth.c: Likewise + * readmsg/readmsg.c: Likewise + * include/mailutils/argp.h: Include errno.h + * include/mailutils/gnu/Makefile.am: Remove posix/regex.h + * libsieve/argp.c (sieve_argp_option): Use N_() + * mailbox/message.c: Use new md5 calls + * mailbox/pop/mbox.c: Likewise + * mailbox/pop/pop3_apop.c: Likewise + * mailbox/message.c: Likewise + * mh/mh_error.c: Include mailutils/argp.h + * mh/mh_getopt.c: Include string.h + * pop3d/Makefile.am (INCLUDES): Add $(top_srcdir)/mailbox + * pop3d/pop3d.h: Minor fix + + * lib/xalloc_die.c: New file + * m4/gnulib.m4: New file + + * headers/.cvsignore + * headers/Makefile.am + * headers/getopt.h + * headers/regex.h + * headers/argp.h + * headers/posix/.cvsignore + * headers/posix/Makefile.am + * headers/posix/regex.h + * headers/posix + + Update by gnulib-sync. + + * lib/asprintf.c: New file + * mailbox/alloca.h: New file + * mailbox/argp.h: New file + * mailbox/getopt.h: New file + * lib/allocsa.c: Added to the repository + * lib/allocsa.h: Added to the repository + * lib/allocsa.valgrind: Added to the repository + * lib/asprintf.c: Updated + * lib/error.c: Added to the repository + * lib/error.h: Updated + * lib/exit.h: Added to the repository + * lib/exitfail.c: Added to the repository + * lib/exitfail.h: Added to the repository + * lib/fnmatch.c: Updated + * lib/fnmatch_.h: Added to the repository + * lib/fnmatch_loop.c: Added to the repository + * lib/getpass.c: Updated + * lib/getpass.h: Added to the repository + * lib/malloc.c: Updated + * lib/obstack.c: Updated + * lib/obstack.h: Updated + * lib/realloc.c: Updated + * lib/setenv.c: Updated + * lib/setenv.h: Added to the repository + * lib/snprintf.c: Updated + * lib/snprintf.h: Updated + * lib/stdbool_.h: Added to the repository + * lib/unsetenv.c: Added to the repository + * lib/vasprintf.c: Updated + * lib/vasprintf.h: Added to the repository + * lib/xalloc.h: Updated + * lib/xmalloc.c: Updated + * lib/xsize.h: Added to the repository + * lib/xstrtol.c: Updated + * lib/xstrtol.h: Updated + * lib/xstrtoul.c: Added to the repository + * m4/alloca.m4: Added to the repository + * m4/allocsa.m4: Added to the repository + * m4/argp.m4: Added to the repository + * m4/eealloc.m4: Added to the repository + * m4/eoverflow.m4: Added to the repository + * m4/error.m4: Added to the repository + * m4/exitfail.m4: Added to the repository + * m4/extensions.m4: Added to the repository + * m4/fnmatch.m4: Added to the repository + * m4/getline.m4: Added to the repository + * m4/getndelim2.m4: Added to the repository + * m4/getopt.m4: Updated + * m4/getpass.m4: Added to the repository + * m4/gettext_gl.m4: Added to the repository + * m4/glibc21_gl.m4: Added to the repository + * m4/iconv.m4: Added to the repository + * m4/intmax.m4: Added to the repository + * m4/intmax_t.m4: Added to the repository + * m4/intmax_t.m4: Added to the repository + * m4/inttypes.m4: Added to the repository + * m4/inttypes_h_gl.m4: Added to the repository + * m4/inttypes_h_gl.m4: Added to the repository + * m4/lib-ld_gl.m4: Added to the repository + * m4/lib-prefix_gl.m4: Added to the repository + * m4/longdouble.m4: Added to the repository + * m4/longdouble.m4: Added to the repository + * m4/longlong_gl.m4: Added to the repository + * m4/longlong_gl.m4: Added to the repository + * m4/mailbox-link.m4: Added to the repository + * m4/mbstate_t.m4: Added to the repository + * m4/md5.m4: Added to the repository + * m4/mempcpy.m4: Added to the repository + * m4/nls.m4: Added to the repository + * m4/obstack.m4: Added to the repository + * m4/onceonly.m4: Added to the repository + * m4/onceonly.m4: Added to the repository + * m4/po_gl.m4: Added to the repository + * m4/printf-posix.m4: Added to the repository + * m4/progtest.m4: Added to the repository + * m4/regex.m4: Updated + * m4/restrict.m4: Added to the repository + * m4/setenv.m4: Added to the repository + * m4/signed.m4: Added to the repository + * m4/size_max.m4: Added to the repository + * m4/size_max.m4: Added to the repository + * m4/snprintf.m4: Added to the repository + * m4/ssize_t.m4: Added to the repository + * m4/stdbool.m4: Added to the repository + * m4/stdint_h_gl.m4: Added to the repository + * m4/stdint_h_gl.m4: Added to the repository + * m4/strcase.m4: Added to the repository + * m4/strchrnul.m4: Added to the repository + * m4/strerror_r.m4: Added to the repository + * m4/strndup.m4: Added to the repository + * m4/strnlen.m4: Added to the repository + * m4/strtok_r.m4: Added to the repository + * m4/sysexits.m4: Added to the repository + * m4/uint32_t.m4: Added to the repository + * m4/uintmax_t_gl.m4: Added to the repository + * m4/uintmax_t_gl.m4: Added to the repository + * m4/ulonglong_gl.m4: Added to the repository + * m4/ulonglong_gl.m4: Added to the repository + * m4/vasnprintf.m4: Added to the repository + * m4/vasprintf.m4: Added to the repository + * m4/vsnprintf.m4: Added to the repository + * m4/wchar_t.m4: Added to the repository + * m4/wint_t.m4: Added to the repository + * m4/xalloc.m4: Added to the repository + * m4/xsize.m4: Added to the repository + * m4/xsize.m4: Added to the repository + * m4/xstrtol.m4: Added to the repository + * mailbox/alloca.c: Added to the repository + * mailbox/alloca_.h: Added to the repository + * mailbox/argp-ba.c: Updated + * mailbox/argp-eexst.c: Updated + * mailbox/argp-fmtstream.c: Updated + * mailbox/argp-fmtstream.h: Updated + * mailbox/argp-fs-xinl.c: Updated + * mailbox/argp-help.c: Updated + * mailbox/argp-namefrob.h: Updated + * mailbox/argp-parse.c: Updated + * mailbox/argp-pv.c: Updated + * mailbox/argp-pvh.c: Updated + * mailbox/argp-xinl.c: Updated + * mailbox/argp.h: Updated + * mailbox/asnprintf.c: Added to the repository + * mailbox/getline.c: Updated + * mailbox/getline.h: Updated + * mailbox/getndelim2.c: Added to the repository + * mailbox/getndelim2.h: Added to the repository + * mailbox/getopt.c: Updated + * mailbox/getopt1.c: Updated + * mailbox/getopt_.h: Added to the repository + * mailbox/getopt_int.h: Added to the repository + * mailbox/gettext.h: Added to the repository + * mailbox/md5.c: Updated + * mailbox/md5.h: Updated + * mailbox/mempcpy.c: Added to the repository + * mailbox/mempcpy.h: Added to the repository + * mailbox/minmax.h: Added to the repository + * mailbox/printf-args.c: Added to the repository + * mailbox/printf-args.h: Added to the repository + * mailbox/printf-parse.c: Added to the repository + * mailbox/printf-parse.h: Added to the repository + * mailbox/regex.c: Updated + * mailbox/regex.h: Added to the repository + * mailbox/strcase.h: Added to the repository + * mailbox/strcasecmp.c: Added to the repository + * mailbox/strchrnul.c: Updated + * mailbox/strchrnul.h: Added to the repository + * mailbox/strncasecmp.c: Added to the repository + * mailbox/strndup.c: Updated + * mailbox/strndup.h: Added to the repository + * mailbox/strnlen.c: Updated + * mailbox/strtok_r.c: Updated + * mailbox/strtok_r.h: Added to the repository + * mailbox/sysexit_.h: Added to the repository + * mailbox/vasnprintf.c: Added to the repository + * mailbox/vasnprintf.h: Added to the repository + * mailbox/vsnprintf.c: Added to the repository + * mailbox/vsnprintf.h: Added to the repository + * mailbox/xsize.h: Added to the repository + * scripts/config.rpath: Added to the repository + 2005-02-21 Sergey Poznyakoff * libsieve/actions.c: Further unification of diagnostic style. * libsieve/argp.c: Likewise. * mail/mail.c: Likewise. * mail.local/mailquota.c: Likewise. diff --git a/lib/Makefile.am b/lib/Makefile.am index f09f3c0ee..8d1707879 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,9 +1,9 @@ ## Process this file with GNU Automake to create Makefile.in -## Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +## Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. ## ## GNU Mailutils is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public License as ## published by the Free Software Foundation; either version 2, or (at ## your option) any later version. ## @@ -16,27 +16,72 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA noinst_LTLIBRARIES = libmailutils.la -INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_builddir}/include/mailutils/gnu @INTLINCS@ libmailutils_la_SOURCES = \ - basename.c\ daemon.c\ - md5.c\ mu_dbm.c\ - xstrdup.c\ - xmalloc.c + xalloc_die.c -EXTRA_DIST = alloca.c fnmatch.c getpass.c malloc.c obstack.c \ - realloc.c setenv.c snprintf.c strncasecmp.c \ - strcasecmp.c strsignal.c xstrtol.c vasprintf.c vsyslog.c \ - utmp.c +EXTRA_DIST = utmp.c -noinst_HEADERS = error.h fnmatch.h md5.h \ +noinst_HEADERS =\ mu_dbm.h\ - snprintf.h xalloc.h xstrtol.h obstack.h \ mu_asprintf.h -libmailutils_la_LIBADD = @LTLIBOBJS@ @ALLOCA@ +libmailutils_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 +EXTRA_DIST += allocsa.valgrind + + +libmailutils_la_SOURCES += exit.h + +libmailutils_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) +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 + +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) +fnmatch.h: fnmatch_.h + cp $(srcdir)/fnmatch_.h $@-t + mv $@-t $@ +MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t + +libmailutils_la_SOURCES += getpass.h + + + + +libmailutils_la_SOURCES += setenv.h + +libmailutils_la_SOURCES += snprintf.h + +libmailutils_la_SOURCES += xstrtol.h xstrtol.c xstrtoul.c + +libmailutils_la_SOURCES += vasprintf.h + +libmailutils_la_SOURCES += xsize.h diff --git a/m4/mu_libobj.m4 b/m4/mu_libobj.m4 index 4d5d43044..2b1d8830b 100644 --- a/m4/mu_libobj.m4 +++ b/m4/mu_libobj.m4 @@ -1,8 +1,8 @@ dnl This file is part of GNU mailutils. -dnl Copyright (C) 2001 Free Software Foundation, Inc. +dnl Copyright (C) 2001, 2005 Free Software Foundation, Inc. dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2 of the License, or dnl (at your option) any later version. dnl diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am index 8ddd09e3b..a4d42079e 100644 --- a/mailbox/Makefile.am +++ b/mailbox/Makefile.am @@ -29,19 +29,13 @@ SUBDIRS = include mbox pop nntp imap mh maildir testsuite lib_LTLIBRARIES = libmailbox.la bin_PROGRAMS = mailutils-config localedir = $(datadir)/locale DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -EXTRA_DIST = errors muerrno.cin strtok_r.c \ - strndup.c strnlen.c strchrnul.c argp-ba.c argp-eexst.c \ - argp-fmtstream.c argp-fs-xinl.c argp-help.c argp-parse.c argp-pv.c \ - argp-pvh.c argp-xinl.c getline.c getline.h parsedate.y pin.c regex.c \ - fgetpwent.c getopt.c getopt1.c - -noinst_HEADERS = argp-fmtstream.h argp-namefrob.h md5.h +EXTRA_DIST = errors muerrno.cin parsedate.y pin.c fgetpwent.c libmailbox_la_SOURCES = \ address.c \ amd.c \ argcv.c \ attachment.c \ @@ -65,13 +59,12 @@ locale.c \ locker.c \ mailbox.c \ mailcap.c \ mailer.c \ mapfile_stream.c \ mbx_default.c \ -md5.c \ message.c \ memory_stream.c \ mime.c \ monitor.c \ mu_argp.c \ mu_auth.c \ @@ -95,12 +88,13 @@ ticket.c \ url.c \ url_sendmail.c \ url_smtp.c \ wicket.c BUILT_SOURCES = parsedate.c muerrno.c +MOSTLYCLEANFILES= parsedate.c: $(srcdir)/parsedate.y $(YLWRAP) "$(YACC) $(AM_YFLAGS)" $< \ y.tab.c parsedate.c y.output parsedate.y.output \ -- -yy pd_yy @@ -119,6 +113,75 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ -DLINK_FLAGS="\"-L$(libdir)\"" \ -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \ -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \ -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \ -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\"" +##:## EOF marker for gnulib-sync script. Please, do not remove ##:## +## Do not change anything below this line ## + +BUILT_SOURCES += $(ALLOCA_H) +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) +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 \ + 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 +EXTRA_DIST += getndelim2.h getndelim2.c + +libmailbox_la_SOURCES += regex.h + +libmailbox_la_SOURCES += strtok_r.h + +libmailbox_la_SOURCES += md5.h md5.c + + +BUILT_SOURCES += $(GETOPT_H) +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) +getopt.h: getopt_.h + cp $(srcdir)/getopt_.h $@-t + mv $@-t $@ +MOSTLYCLEANFILES += getopt.h getopt.h-t + +libmailbox_la_SOURCES += gettext.h + + +libmailbox_la_SOURCES += minmax.h + + +libmailbox_la_SOURCES += strcase.h + +libmailbox_la_SOURCES += strchrnul.h + +libmailbox_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) +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 += printf-args.h printf-parse.h vasnprintf.h + +libmailbox_la_SOURCES += vsnprintf.h + +libmailbox_la_SOURCES += xsize.h + +EXTRA_DIST += getline.c getline.c getndelim2.c getndelim2.c getopt.c getopt1.c mempcpy.c mempcpy.h mempcpy.c regex.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 |