summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2008-03-03 09:01:27 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2008-03-03 09:01:27 +0000
commita574e78fe079dc62e93f8b489053db4ded46aecb (patch)
tree1963c8a7363d6074f95414c3603cf89947b5bf3c
parenta077810f51fc86d320fcdfb4e5b15f62a366a2e3 (diff)
downloadmailutils-a574e78fe079dc62e93f8b489053db4ded46aecb.tar.gz
mailutils-a574e78fe079dc62e93f8b489053db4ded46aecb.tar.bz2
Fix bootstrapping with gettext 0.17.
* bootstrap.conf (avoided_gnulib_modules): Remove size_max (excluded_files): Remove m4/size_max.m4. (gnulib_extra_files): Add m4/inttostr.m4 * gnulib.modules: Add intprops and stdint. * m4/intmax.m4, m4/intmax_t.m4, m4/inttostr.m4, m4/inttypes-h.m4, m4/inttypes-pri.m4, m4/inttypes.m4, m4/inttypes_h.m4: Remove
-rw-r--r--ChangeLog12
-rw-r--r--bootstrap.conf9
-rw-r--r--gnulib.modules5
-rw-r--r--lib/.cvsignore1
-rw-r--r--m4/.cvsignore7
-rw-r--r--m4/intmax.m430
-rw-r--r--m4/intmax_t.m461
-rw-r--r--m4/inttostr.m432
-rw-r--r--m4/inttypes-h.m425
-rw-r--r--m4/inttypes-pri.m430
-rw-r--r--m4/inttypes.m427
-rw-r--r--m4/inttypes_h.m426
-rw-r--r--po/.cvsignore3
13 files changed, 34 insertions, 234 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ea2c88c4..05516e183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-03 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ Fix bootstrapping with gettext 0.17.
+
+ * bootstrap.conf (avoided_gnulib_modules): Remove size_max
+ (excluded_files): Remove m4/size_max.m4.
+ (gnulib_extra_files): Add m4/inttostr.m4
+ * gnulib.modules: Add intprops and stdint.
+
+ * m4/intmax.m4, m4/intmax_t.m4, m4/inttostr.m4, m4/inttypes-h.m4,
+ m4/inttypes-pri.m4, m4/inttypes.m4, m4/inttypes_h.m4: Remove
+
2008-03-02 Sergey Poznyakoff <gray@gnu.org.ua>
* bootstrap.conf (XGETTEXT_OPTIONS): Update flags.
diff --git a/bootstrap.conf b/bootstrap.conf
index 6b7096b1b..5590e516e 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
# Bootstrap configuration.
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@ build_aux=scripts
# includes them because of gettext dependencies.
avoided_gnulib_modules='
--avoid=lock
- --avoid=size_max
'
# gnulib modules used by this package.
@@ -73,11 +72,15 @@ excluded_files='
m4/lcmessage.m4
m4/lock.m4
m4/printf-posix.m4
- m4/size_max.m4
m4/uintmax_t.m4
m4/ulonglong.m4
m4/visibility.m4
'
+
+gnulib_extra_files="$gnulib_extra_files
+ m4/inttostr.m4
+"
+
# Read local configuration file
if [ -r .bootstrap ]; then
echo "$0: Reading configuration file .bootstrap"
diff --git a/gnulib.modules b/gnulib.modules
index 831e49515..ded3a547f 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -2,6 +2,9 @@
# A module name per line. Empty lines and comments are ignored.
# FIXME: regex and glob are used by libmailutils...
+# FIXME: intprops and stdint are not used directly, they are needed for
+# inttostr, which is included in mailbox. Another inttostr dependency,
+# m4/inttostr.m4, is set in bootstrap.conf.
alloca
argp
@@ -10,12 +13,14 @@ fnmatch
getline
getpass-gnu
gettext
+intprops
malloc
mbswidth
obstack
realloc
setenv
snprintf
+stdint
strcase
strtok_r
vasprintf
diff --git a/lib/.cvsignore b/lib/.cvsignore
index b01887cc1..f10a4dfea 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -126,6 +126,7 @@ save-cwd.c
save-cwd.h
setenv.c
setenv.h
+size_max.h
sleep.c
snprintf.c
stdbool.h
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 39741f152..e36910f7b 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -47,6 +47,12 @@ inline.m4
intl.m4
intldir.m4
intlmacosx.m4
+intmax.m4
+intmax_t.m4
+inttostr.m4
+inttypes-h.m4
+inttypes-pri.m4
+inttypes_h.m4
lchown.m4
lib-ld.m4
lib-link.m4
@@ -72,6 +78,7 @@ regex.m4
save-cwd.m4
setenv.m4
signed.m4
+size_max.m4
sleep.m4
snprintf.m4
ssize_t.m4
diff --git a/m4/intmax.m4 b/m4/intmax.m4
deleted file mode 100644
index d99c999fd..000000000
--- a/m4/intmax.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-# intmax.m4 serial 2 (gettext-0.14.2)
-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,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN([gt_TYPE_INTMAX_T],
-[
- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
- AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
- [AC_TRY_COMPILE([
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#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)])
- 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>.])
- fi
-])
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
deleted file mode 100644
index 17c7b0ae8..000000000
--- a/m4/intmax_t.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-# intmax_t.m4 serial 5
-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.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define intmax_t to 'long' or 'long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([gl_AC_TYPE_INTMAX_T],
-[
- dnl For simplicity, we assume that a header file defines 'intmax_t' if and
- dnl only if it defines 'uintmax_t'.
- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
- if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
- test $ac_cv_type_long_long = yes \
- && ac_type='long long' \
- || ac_type='long'
- AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
- [Define to long or long long if <inttypes.h> and <stdint.h> don't define.])
- else
- AC_DEFINE(HAVE_INTMAX_T, 1,
- [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
- fi
-])
-
-dnl An alternative would be to explicitly test for 'intmax_t'.
-
-AC_DEFUN([gt_AC_TYPE_INTMAX_T],
-[
- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
- AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
- [AC_TRY_COMPILE([
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-], [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>.])
- else
- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
- test $ac_cv_type_long_long = yes \
- && ac_type='long long' \
- || ac_type='long'
- AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
- [Define to long or long long if <stdint.h> and <inttypes.h> don't define.])
- fi
-])
diff --git a/m4/inttostr.m4 b/m4/inttostr.m4
deleted file mode 100644
index 53a3149d0..000000000
--- a/m4/inttostr.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-#serial 6
-dnl Copyright (C) 2004, 2005, 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.
-
-AC_DEFUN([gl_INTTOSTR],
-[
- MU_LIBOBJ([imaxtostr])
- MU_LIBOBJ([offtostr])
- MU_LIBOBJ([umaxtostr])
-
- gl_PREREQ_INTTOSTR
- gl_PREREQ_IMAXTOSTR
- gl_PREREQ_OFFTOSTR
- gl_PREREQ_UMAXTOSTR
-])
-
-# Prerequisites of lib/inttostr.h.
-AC_DEFUN([gl_PREREQ_INTTOSTR], [
- AC_REQUIRE([AC_TYPE_OFF_T])
- :
-])
-
-# Prerequisites of lib/imaxtostr.c.
-AC_DEFUN([gl_PREREQ_IMAXTOSTR], [:])
-
-# Prerequisites of lib/offtostr.c.
-AC_DEFUN([gl_PREREQ_OFFTOSTR], [:])
-
-# Prerequisites of lib/umaxtostr.c.
-AC_DEFUN([gl_PREREQ_UMAXTOSTR], [:])
diff --git a/m4/inttypes-h.m4 b/m4/inttypes-h.m4
deleted file mode 100644
index d7ec94c5a..000000000
--- a/m4/inttypes-h.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-# inttypes-h.m4 serial 1 (gettext-0.15)
-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,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gl_HEADER_INTTYPES_H],
-[
- AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
- [
- AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [], gl_cv_header_inttypes_h=yes, gl_cv_header_inttypes_h=no)
- ])
- if test $gl_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
- [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
- fi
-])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
deleted file mode 100644
index ef00da742..000000000
--- a/m4/inttypes-pri.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-# inttypes-pri.m4 serial 2 (gettext-0.15)
-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,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-# 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_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
- gt_cv_inttypes_pri_broken,
- [
- AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
- ])
- fi
- 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.])
- fi
-])
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
deleted file mode 100644
index ab370ffe0..000000000
--- a/m4/inttypes.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
- AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
- [
- AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
- ])
- if test $gt_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
- [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
- fi
-])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
deleted file mode 100644
index a5d075d96..000000000
--- a/m4/inttypes_h.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-# inttypes_h.m4 serial 6
-dnl Copyright (C) 1997-2004 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.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
-[
- AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
- [AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [uintmax_t i = (uintmax_t) -1;],
- gl_cv_header_inttypes_h=yes,
- gl_cv_header_inttypes_h=no)])
- if test $gl_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
- [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
- and declares uintmax_t. ])
- fi
-])
diff --git a/po/.cvsignore b/po/.cvsignore
index 59ec04feb..cd3a432c0 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,5 +1,8 @@
*.gmo
*.mo
+*.po
+.reference
+LINGUAS
Makefile
Makefile.in
Makefile.in.in

Return to:

Send suggestions and report system problems to the System administrator.