Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a574e78f a574e78fe079dc62e93f8b489053db4ded46aecb by Sergey Poznyakoff
Options

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
1 parent a077810f
Inline Side-by-side
Showing 13 changed files with 34 additions and 234 deletions
1 2008-03-03 Sergey Poznyakoff <gray@gnu.org.ua>
2
3 Fix bootstrapping with gettext 0.17.
4
5 * bootstrap.conf (avoided_gnulib_modules): Remove size_max
6 (excluded_files): Remove m4/size_max.m4.
7 (gnulib_extra_files): Add m4/inttostr.m4
8 * gnulib.modules: Add intprops and stdint.
9
10 * m4/intmax.m4, m4/intmax_t.m4, m4/inttostr.m4, m4/inttypes-h.m4,
11 m4/inttypes-pri.m4, m4/inttypes.m4, m4/inttypes_h.m4: Remove
12
1 2008-03-02 Sergey Poznyakoff <gray@gnu.org.ua> 13 2008-03-02 Sergey Poznyakoff <gray@gnu.org.ua>
2 14
3 * bootstrap.conf (XGETTEXT_OPTIONS): Update flags. 15 * bootstrap.conf (XGETTEXT_OPTIONS): Update flags.
......
1 # Bootstrap configuration. 1 # Bootstrap configuration.
2 2
3 # Copyright (C) 2006, 2007 Free Software Foundation, Inc. 3 # Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
4 4
5 # This program is free software; you can redistribute it and/or modify 5 # This program is free software; you can redistribute it and/or modify
6 # it under the terms of the GNU General Public License as published by 6 # it under the terms of the GNU General Public License as published by
...@@ -24,7 +24,6 @@ build_aux=scripts ...@@ -24,7 +24,6 @@ build_aux=scripts
24 # includes them because of gettext dependencies. 24 # includes them because of gettext dependencies.
25 avoided_gnulib_modules=' 25 avoided_gnulib_modules='
26 --avoid=lock 26 --avoid=lock
27 --avoid=size_max
28 ' 27 '
29 28
30 # gnulib modules used by this package. 29 # gnulib modules used by this package.
...@@ -73,11 +72,15 @@ excluded_files=' ...@@ -73,11 +72,15 @@ excluded_files='
73 m4/lcmessage.m4 72 m4/lcmessage.m4
74 m4/lock.m4 73 m4/lock.m4
75 m4/printf-posix.m4 74 m4/printf-posix.m4
76 m4/size_max.m4
77 m4/uintmax_t.m4 75 m4/uintmax_t.m4
78 m4/ulonglong.m4 76 m4/ulonglong.m4
79 m4/visibility.m4 77 m4/visibility.m4
80 ' 78 '
79
80 gnulib_extra_files="$gnulib_extra_files
81 m4/inttostr.m4
82 "
83
81 # Read local configuration file 84 # Read local configuration file
82 if [ -r .bootstrap ]; then 85 if [ -r .bootstrap ]; then
83 echo "$0: Reading configuration file .bootstrap" 86 echo "$0: Reading configuration file .bootstrap"
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
2 # A module name per line. Empty lines and comments are ignored. 2 # A module name per line. Empty lines and comments are ignored.
3 3
4 # FIXME: regex and glob are used by libmailutils... 4 # FIXME: regex and glob are used by libmailutils...
5 # FIXME: intprops and stdint are not used directly, they are needed for
6 # inttostr, which is included in mailbox. Another inttostr dependency,
7 # m4/inttostr.m4, is set in bootstrap.conf.
5 8
6 alloca 9 alloca
7 argp 10 argp
...@@ -10,12 +13,14 @@ fnmatch ...@@ -10,12 +13,14 @@ fnmatch
10 getline 13 getline
11 getpass-gnu 14 getpass-gnu
12 gettext 15 gettext
16 intprops
13 malloc 17 malloc
14 mbswidth 18 mbswidth
15 obstack 19 obstack
16 realloc 20 realloc
17 setenv 21 setenv
18 snprintf 22 snprintf
23 stdint
19 strcase 24 strcase
20 strtok_r 25 strtok_r
21 vasprintf 26 vasprintf
......
...@@ -126,6 +126,7 @@ save-cwd.c ...@@ -126,6 +126,7 @@ save-cwd.c
126 save-cwd.h 126 save-cwd.h
127 setenv.c 127 setenv.c
128 setenv.h 128 setenv.h
129 size_max.h
129 sleep.c 130 sleep.c
130 snprintf.c 131 snprintf.c
131 stdbool.h 132 stdbool.h
......
...@@ -47,6 +47,12 @@ inline.m4 ...@@ -47,6 +47,12 @@ inline.m4
47 intl.m4 47 intl.m4
48 intldir.m4 48 intldir.m4
49 intlmacosx.m4 49 intlmacosx.m4
50 intmax.m4
51 intmax_t.m4
52 inttostr.m4
53 inttypes-h.m4
54 inttypes-pri.m4
55 inttypes_h.m4
50 lchown.m4 56 lchown.m4
51 lib-ld.m4 57 lib-ld.m4
52 lib-link.m4 58 lib-link.m4
...@@ -72,6 +78,7 @@ regex.m4 ...@@ -72,6 +78,7 @@ regex.m4
72 save-cwd.m4 78 save-cwd.m4
73 setenv.m4 79 setenv.m4
74 signed.m4 80 signed.m4
81 size_max.m4
75 sleep.m4 82 sleep.m4
76 snprintf.m4 83 snprintf.m4
77 ssize_t.m4 84 ssize_t.m4
......
1 # intmax.m4 serial 2 (gettext-0.14.2)
2 dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved.
6
7 dnl From Bruno Haible.
8 dnl Test whether the system has the 'intmax_t' type, but don't attempt to
9 dnl find a replacement if it is lacking.
10
11 AC_DEFUN([gt_TYPE_INTMAX_T],
12 [
13 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
14 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
15 AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
16 [AC_TRY_COMPILE([
17 #include <stddef.h>
18 #include <stdlib.h>
19 #if HAVE_STDINT_H_WITH_UINTMAX
20 #include <stdint.h>
21 #endif
22 #if HAVE_INTTYPES_H_WITH_UINTMAX
23 #include <inttypes.h>
24 #endif
25 ], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
26 if test $gt_cv_c_intmax_t = yes; then
27 AC_DEFINE(HAVE_INTMAX_T, 1,
28 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
29 fi
30 ])
1 # intmax_t.m4 serial 5
2 dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved.
6
7 dnl From Paul Eggert.
8
9 AC_PREREQ(2.13)
10
11 # Define intmax_t to 'long' or 'long long'
12 # if it is not already defined in <stdint.h> or <inttypes.h>.
13
14 AC_DEFUN([gl_AC_TYPE_INTMAX_T],
15 [
16 dnl For simplicity, we assume that a header file defines 'intmax_t' if and
17 dnl only if it defines 'uintmax_t'.
18 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
19 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
20 if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
21 AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
22 test $ac_cv_type_long_long = yes \
23 && ac_type='long long' \
24 || ac_type='long'
25 AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
26 [Define to long or long long if <inttypes.h> and <stdint.h> don't define.])
27 else
28 AC_DEFINE(HAVE_INTMAX_T, 1,
29 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
30 fi
31 ])
32
33 dnl An alternative would be to explicitly test for 'intmax_t'.
34
35 AC_DEFUN([gt_AC_TYPE_INTMAX_T],
36 [
37 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
38 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
39 AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
40 [AC_TRY_COMPILE([
41 #include <stddef.h>
42 #include <stdlib.h>
43 #if HAVE_STDINT_H_WITH_UINTMAX
44 #include <stdint.h>
45 #endif
46 #if HAVE_INTTYPES_H_WITH_UINTMAX
47 #include <inttypes.h>
48 #endif
49 ], [intmax_t x = -1; return !x;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
50 if test $gt_cv_c_intmax_t = yes; then
51 AC_DEFINE(HAVE_INTMAX_T, 1,
52 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
53 else
54 AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
55 test $ac_cv_type_long_long = yes \
56 && ac_type='long long' \
57 || ac_type='long'
58 AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
59 [Define to long or long long if <stdint.h> and <inttypes.h> don't define.])
60 fi
61 ])
1 #serial 6
2 dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved.
6
7 AC_DEFUN([gl_INTTOSTR],
8 [
9 MU_LIBOBJ([imaxtostr])
10 MU_LIBOBJ([offtostr])
11 MU_LIBOBJ([umaxtostr])
12
13 gl_PREREQ_INTTOSTR
14 gl_PREREQ_IMAXTOSTR
15 gl_PREREQ_OFFTOSTR
16 gl_PREREQ_UMAXTOSTR
17 ])
18
19 # Prerequisites of lib/inttostr.h.
20 AC_DEFUN([gl_PREREQ_INTTOSTR], [
21 AC_REQUIRE([AC_TYPE_OFF_T])
22 :
23 ])
24
25 # Prerequisites of lib/imaxtostr.c.
26 AC_DEFUN([gl_PREREQ_IMAXTOSTR], [:])
27
28 # Prerequisites of lib/offtostr.c.
29 AC_DEFUN([gl_PREREQ_OFFTOSTR], [:])
30
31 # Prerequisites of lib/umaxtostr.c.
32 AC_DEFUN([gl_PREREQ_UMAXTOSTR], [:])
1 # inttypes-h.m4 serial 1 (gettext-0.15)
2 dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved.
6
7 dnl From Paul Eggert.
8
9 # Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
10 # <sys/types.h>.
11
12 AC_DEFUN([gl_HEADER_INTTYPES_H],
13 [
14 AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
15 [
16 AC_TRY_COMPILE(
17 [#include <sys/types.h>
18 #include <inttypes.h>],
19 [], gl_cv_header_inttypes_h=yes, gl_cv_header_inttypes_h=no)
20 ])
21 if test $gl_cv_header_inttypes_h = yes; then
22 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
23 [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
24 fi
25 ])
1 # inttypes-pri.m4 serial 2 (gettext-0.15)
2 dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved.
6
7 dnl From Bruno Haible.
8
9 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
10 # macros to non-string values. This is the case on AIX 4.3.3.
11
12 AC_DEFUN([gt_INTTYPES_PRI],
13 [
14 AC_REQUIRE([gl_HEADER_INTTYPES_H])
15 if test $gl_cv_header_inttypes_h = yes; then
16 AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
17 gt_cv_inttypes_pri_broken,
18 [
19 AC_TRY_COMPILE([#include <inttypes.h>
20 #ifdef PRId32
21 char *p = PRId32;
22 #endif
23 ], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
24 ])
25 fi
26 if test "$gt_cv_inttypes_pri_broken" = yes; then
27 AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
28 [Define if <inttypes.h> exists and defines unusable PRI* macros.])
29 fi
30 ])
1 # inttypes.m4 serial 1 (gettext-0.11.4)
2 dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
3 dnl This file is free software, distributed under the terms of the GNU
4 dnl General Public License. As a special exception to the GNU General
5 dnl Public License, this file may be distributed as part of a program
6 dnl that contains a configuration script generated by Autoconf, under
7 dnl the same distribution terms as the rest of that program.
8
9 dnl From Paul Eggert.
10
11 # Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
12 # <sys/types.h>.
13
14 AC_DEFUN([gt_HEADER_INTTYPES_H],
15 [
16 AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
17 [
18 AC_TRY_COMPILE(
19 [#include <sys/types.h>
20 #include <inttypes.h>],
21 [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
22 ])
23 if test $gt_cv_header_inttypes_h = yes; then
24 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
25 [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
26 fi
27 ])
1 # inttypes_h.m4 serial 6
2 dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved.
6
7 dnl From Paul Eggert.
8
9 # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
10 # doesn't clash with <sys/types.h>, and declares uintmax_t.
11
12 AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
13 [
14 AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
15 [AC_TRY_COMPILE(
16 [#include <sys/types.h>
17 #include <inttypes.h>],
18 [uintmax_t i = (uintmax_t) -1;],
19 gl_cv_header_inttypes_h=yes,
20 gl_cv_header_inttypes_h=no)])
21 if test $gl_cv_header_inttypes_h = yes; then
22 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
23 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
24 and declares uintmax_t. ])
25 fi
26 ])
1 *.gmo 1 *.gmo
2 *.mo 2 *.mo
3 *.po
4 .reference
5 LINGUAS
3 Makefile 6 Makefile
4 Makefile.in 7 Makefile.in
5 Makefile.in.in 8 Makefile.in.in
......