diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-11-18 10:17:43 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-11-18 10:17:43 +0000 |
commit | bb377b15420cbd45ef91838cf7491d3453fcc32e (patch) | |
tree | 0ca37d26a33a2957181ef6854faa6d81603363ff /m4 | |
parent | 947065becbcd80599e4e4a38412479d263f462d1 (diff) | |
download | mailutils-bb377b15420cbd45ef91838cf7491d3453fcc32e.tar.gz mailutils-bb377b15420cbd45ef91838cf7491d3453fcc32e.tar.bz2 |
Make libmailutils independent from gnulib. Remove generated files
from the repository. Bootstrap directly from the gnulib CVS.
* configure.ac: Update.
* lib/Makefile.am: Update.
* mailbox/Makefile.am: Update.
* include/mailutils/Makefile.am (SUBDIRS): Remove gnu
* include/mailutils/gnu/Makefile.am: Remove
* examples/argcv.c, examples/mta.c, guimb/guimb.h,
imap4d/imap4d.h, libargp/mu_argp.c, libargp/tls.c,
maidag/maidag.h, mail/mail.h, mail/send.c,
mail.local/mail.local.h, mh/mh.h: Remove getline.h
* libproto/nntp/mbox.c: Include mailutils/md5.h
* libargp/cmdline.h: Include strings.h
* m4/debug.m4, m4/enable.m4, m4/gsasl.m4, m4/guile.m4,
m4/mu_libobj.m4: Minor fix
* m4/intmax.m4,m4/inttypes-pri.m4,m4/inttypes_h.m4: Update
* mailbox/alloca.h: Remove
* mailbox/mailbox.c: Include string.h
* mailbox/nls.c: Include locale.h
* po/Makevars: Remove.
* absolute-header.m4, alloca.m4, allocsa.m4, argp.m4, codeset.m4,
d-type.m4, eealloc.m4, eoverflow.m4, error.m4, exitfail.m4,
extensions.m4, fnmatch.m4, full-header-path.m4, getdelim.m4,
getline.m4, getlogin_r.m4, getndelim2.m4, getopt.m4, getpass.m4,
gettext.m4, glibc2.m4, glibc21.m4, glob.m4, gnulib.m4, iconv.m4,
intdiv0.m4, isc-posix.m4, lcmessage.m4, lib-ld.m4, lib-link.m4,
lib-prefix.m4, lock.m4, longdouble.m4, longlong.m4,
mailbox-link.m4, mbchar.m4, mbiter.m4, mbrtowc.m4, mbstate_t.m4,
mbswidth.m4, memchr.m4, mempcpy.m4, minmax.m4, obstack.m4,
onceonly.m4, po.m4, printf-posix.m4, progtest.m4, regex.m4,
restrict.m4, setenv.m4, signed.m4, size_max.m4, snprintf.m4,
ssize_t.m4, stat-macros.m4, stdbool.m4, stdint.m4, stdint_h.m4,
strcase.m4, strchrnul.m4, strdup.m4, strerror_r.m4, strndup.m4,
strnlen.m4, strtok_r.m4, sysexits.m4, uint32_t.m4, uintmax_t.m4,
ulonglong.m4, unistd_h.m4, unlocked-io.m4, vasnprintf.m4,
vasprintf.m4, visibility.m4, vsnprintf.m4, wchar_t.m4, wcwidth.m4,
wint_t.m4, xalloc.m4, xsize.m4: Remove.
* alloca.c, allocsa.c, allocsa.h, asprintf.c, basename.c, error.c,
error.h, exit.h, exitfail.c, exitfail.h, fnmatch.c, fnmatch_.h,
fnmatch_loop.c, getpass.c, getpass.h, intprops.h, malloc.c,
mbswidth.c, mbswidth.h, md5.c, md5.h, obstack.c, obstack.h,
realloc.c, setenv.c, setenv.h, snprintf.c, snprintf.h, stdbool.h,
stdbool_.h, strcasecmp.c, strncasecmp.c, strsignal.c, strtok_r.c,
unsetenv.c, utmp.c, vasprintf.c, vasprintf.h, vsyslog.c,
xalloc-die.c, xalloc.h, xalloc_die.c, xmalloc.c, xsize.h,
xstrdup.c: Remove.
* alloca.c, alloca_.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-pin.c, argp-pv.c, argp-pvh.c, argp-xinl.c,
argp.h, asnprintf.c, fnmatch.c, fnmatch_.h, fnmatch_loop.c,
getdelim.c, getdelim.h, getline.c, getline.h, getlogin_r.c,
getlogin_r.h, getndelim2.c, getndelim2.h, getopt.c, getopt.h,
getopt1.c, getopt_.h, getopt_int.h, gettext.h, glob-libc.h,
glob.c, glob_.h, malloc.c, mbchar.c, mbchar.h, mbuiter.h,
memchr.c, mempcpy.c, mempcpy.h, minmax.h, pin.c, printf-args.c,
printf-args.h, printf-parse.c, printf-parse.h, regcomp.c, regex.c,
regex.h, regex_internal.c, regex_internal.h, regexec.c,
stat-macros.h, stdbool_.h, stdint_.h, strcase.h, strcasecmp.c,
strchrnul.c, strchrnul.h, strdup.c, strdup.h, strncasecmp.c,
strndup.c, strndup.h, strnlen.c, strnlen.h, strnlen1.c,
strnlen1.h, strtok_r.c, strtok_r.h, sysexit_.h, unlocked-io.h,
vasnprintf.c, vasnprintf.h, vsnprintf.c, vsnprintf.h, wcwidth.h,
xsize.h: Remove.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/.cvsignore | 102 | ||||
-rw-r--r-- | m4/debug.m4 | 4 | ||||
-rw-r--r-- | m4/enable.m4 | 2 | ||||
-rw-r--r-- | m4/gsasl.m4 | 2 | ||||
-rw-r--r-- | m4/guile.m4 | 2 | ||||
-rw-r--r-- | m4/intmax.m4 | 7 | ||||
-rw-r--r-- | m4/inttypes-pri.m4 | 12 | ||||
-rw-r--r-- | m4/inttypes_h.m4 | 6 | ||||
-rw-r--r-- | m4/mu_libobj.m4 | 58 |
9 files changed, 124 insertions, 71 deletions
diff --git a/m4/.cvsignore b/m4/.cvsignore index 282522db0..45b64c307 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -1,2 +1,104 @@ Makefile Makefile.in +absolute-header.m4 +alloca.m4 +argp.m4 +canonicalize-lgpl.m4 +chdir-long.m4 +chown.m4 +codeset.m4 +d-ino.m4 +d-type.m4 +dirfd.m4 +dirname.m4 +dos.m4 +double-slash-root.m4 +dup2.m4 +eealloc.m4 +eoverflow.m4 +error.m4 +exitfail.m4 +extensions.m4 +fchdir.m4 +fcntl-safer.m4 +fcntl_h.m4 +float_h.m4 +fnmatch.m4 +getcwd-abort-bug.m4 +getcwd-path-max.m4 +getcwd.m4 +getdelim.m4 +getline.m4 +getlogin_r.m4 +getopt.m4 +getpass.m4 +gettext.m4 +glibc21.m4 +glob.m4 +gnulib-cache.m4 +gnulib-common.m4 +gnulib-comp.m4 +gnulib-tool.m4 +iconv.m4 +include_next.m4 +inline.m4 +intl.m4 +intldir.m4 +intlmacosx.m4 +lchown.m4 +lib-ld.m4 +lib-link.m4 +lib-prefix.m4 +localcharset.m4 +longdouble.m4 +longlong.m4 +lstat.m4 +malloc.m4 +malloca.m4 +mbrtowc.m4 +mbstate_t.m4 +mbswidth.m4 +mempcpy.m4 +memrchr.m4 +openat.m4 +pathmax.m4 +po.m4 +progtest.m4 +readlink.m4 +realloc.m4 +regex.m4 +save-cwd.m4 +setenv.m4 +signed.m4 +sleep.m4 +snprintf.m4 +ssize_t.m4 +stdbool.m4 +stdint.m4 +stdint_h.m4 +stdio_h.m4 +stdlib_h.m4 +strcase.m4 +strchrnul.m4 +strdup.m4 +strerror.m4 +string_h.m4 +strndup.m4 +strnlen.m4 +strtok_r.m4 +sys_stat_h.m4 +sysexits.m4 +unistd-safer.m4 +unistd_h.m4 +vasnprintf.m4 +vasprintf.m4 +vsnprintf.m4 +wchar.m4 +wchar_t.m4 +wctype.m4 +wcwidth.m4 +wint_t.m4 +xalloc.m4 +xgetcwd.m4 +xsize.m4 +xstrndup.m4 diff --git a/m4/debug.m4 b/m4/debug.m4 index 840f88bea..5e7de1b3c 100644 --- a/m4/debug.m4 +++ b/m4/debug.m4 @@ -15,10 +15,10 @@ dnl AC_DEFUN([MU_DEBUG_MODE], [AC_ARG_ENABLE(debug, - [ --enable-debug enable debugging mode], + AC_HELP_STRING([--enable-debug], [enable debugging mode]), [if test x"$enableval" = xyes; then if test x"$GCC" = xyes; then - AC_MSG_CHECKING(whether gcc accepts -ggdb) + AC_MSG_CHECKING([whether gcc accepts -ggdb]) save_CFLAGS=$CFLAGS CFLAGS="-ggdb -Wall" AC_TRY_COMPILE([],void f(){}, diff --git a/m4/enable.m4 b/m4/enable.m4 index 23721ef59..d0d6ad0f8 100644 --- a/m4/enable.m4 +++ b/m4/enable.m4 @@ -29,7 +29,7 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [ case "${enableval}" in yes) mu_cache_var=yes;; no) mu_cache_var=no;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-$1) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --disable-$1]) ;; esac], [mu_cache_var=yes]) diff --git a/m4/gsasl.m4 b/m4/gsasl.m4 index f4adb81b0..427bd9943 100644 --- a/m4/gsasl.m4 +++ b/m4/gsasl.m4 @@ -26,7 +26,7 @@ AC_DEFUN([MU_CHECK_GSASL], AC_HELP_STRING([--with-gsasl], [use libgsasl for SASL authentication]), [case $withval in yes|no) wantgsasl=$withval;; - *) AC_MSG_ERROR(bad value for --with-gsasl: $withval);; + *) AC_MSG_ERROR([bad value for --with-gsasl: $withval]);; esac], [wantgsasl=no]) diff --git a/m4/guile.m4 b/m4/guile.m4 index 26ad25e52..30fa29897 100644 --- a/m4/guile.m4 +++ b/m4/guile.m4 @@ -50,7 +50,7 @@ AC_DEFUN([MU_CHECK_GUILE], case "x$GUILE_VERSION" in x[[0-9]]*) if test $GUILE_VERSION -lt 14; then - AC_MSG_RESULT(Nope. Version number too low.) + AC_MSG_RESULT([Nope. Version number too low.]) mu_cv_lib_guile=no else AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION, diff --git a/m4/intmax.m4 b/m4/intmax.m4 index d99c999fd..ce7a8a49d 100644 --- a/m4/intmax.m4 +++ b/m4/intmax.m4 @@ -1,4 +1,4 @@ -# intmax.m4 serial 2 (gettext-0.14.2) +# intmax.m4 serial 3 (gettext-0.16) dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -22,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T], #if HAVE_INTTYPES_H_WITH_UINTMAX #include <inttypes.h> #endif -], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) +], [intmax_t x = -1; + return !x;], + gt_cv_c_intmax_t=yes, + gt_cv_c_intmax_t=no)]) if test $gt_cv_c_intmax_t = yes; then AC_DEFINE(HAVE_INTMAX_T, 1, [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index ef00da742..7c7f89401 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,4 +1,4 @@ -# inttypes-pri.m4 serial 2 (gettext-0.15) +# inttypes-pri.m4 serial 4 (gettext-0.16) dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,13 +6,15 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. +AC_PREREQ(2.52) + # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* # macros to non-string values. This is the case on AIX 4.3.3. AC_DEFUN([gt_INTTYPES_PRI], [ - AC_REQUIRE([gl_HEADER_INTTYPES_H]) - if test $gl_cv_header_inttypes_h = yes; then + AC_CHECK_HEADERS([inttypes.h]) + if test $ac_cv_header_inttypes_h = yes; then AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], gt_cv_inttypes_pri_broken, [ @@ -26,5 +28,9 @@ char *p = PRId32; if test "$gt_cv_inttypes_pri_broken" = yes; then AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, [Define if <inttypes.h> exists and defines unusable PRI* macros.]) + PRI_MACROS_BROKEN=1 + else + PRI_MACROS_BROKEN=0 fi + AC_SUBST([PRI_MACROS_BROKEN]) ]) diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index a5d075d96..edc8ecb2d 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ -# inttypes_h.m4 serial 6 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. +# inttypes_h.m4 serial 7 +dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H], [AC_TRY_COMPILE( [#include <sys/types.h> #include <inttypes.h>], - [uintmax_t i = (uintmax_t) -1;], + [uintmax_t i = (uintmax_t) -1; return !i;], gl_cv_header_inttypes_h=yes, gl_cv_header_inttypes_h=no)]) if test $gl_cv_header_inttypes_h = yes; then diff --git a/m4/mu_libobj.m4 b/m4/mu_libobj.m4 deleted file mode 100644 index 3b9b2244b..000000000 --- a/m4/mu_libobj.m4 +++ /dev/null @@ -1,58 +0,0 @@ -dnl This file is part of GNU mailutils. -dnl Copyright (C) 2001, 2005, 2007 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 3 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software Foundation, -dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl - -AC_SUBST(MU_LIBOBJS) -AC_SUBST(MU_EXTRA_DIST) - -AC_SUBST(MU_EXTRA_DIST) -m4_define([mu_extra_dist],[]) -AC_DEFUN([MU_LIBSOURCES],[ -m4_foreach(source, [$1], [m4_define([mu_extra_dist], mu_extra_dist source)])]) -AC_DEFUN([MU_LIBSOURCE],[m4_define([mu_extra_dist], mu_extra_dist [$1])]) - -AC_DEFUN([MU_FINISH],[ -[MU_EXTRA_DIST]="mu_extra_dist" -]) - -AC_DEFUN([MU_LIBOBJ],[ - MU_LIBOBJS="$MU_LIBOBJS $1.o"]) - -AC_DEFUN([MU_CHECK_FUNC],[ - AC_CHECK_FUNC($1,, - [MU_LIBOBJ($1)])]) - -AC_DEFUN([MU_REPLACE_FUNCS], -[AC_CHECK_FUNCS([$1], , [dnl - MU_LIBOBJ($ac_func) -])]) - -AC_SUBST(GNU_INCLS) -AC_DEFUN([MU_HEADER],[ - pushdef([mu_upcase],translit($1,[a-z-],[A-Z_])) - pushdef([mu_cache_var],[mu_cv_header_]translit($1,[-./],[___])) - - if test x"[$]mu_cache_var" != xyes; then - AC_CONFIG_LINKS(include/mailutils/gnu/$1:mailbox/ifelse($2,,$1,$2)) - GNU_INCLS="$GNU_INCLS $1" - mu_cache_var=yes - fi - - popdef([mu_upcase]) - popdef([mu_cache_var]) -]) - |