diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-05-21 13:17:30 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:16:05 +0200 |
| commit | 0c2ad4029d93f75e98688932f62a7f5ecc3bcd00 (patch) | |
| tree | 403ade693cd939e280a4a8e25123796131fd6457 /gettext-runtime/m4 | |
| parent | 8e8b9ed24d7221b562f3d479bad1d0b285179dda (diff) | |
| download | external_gettext-0c2ad4029d93f75e98688932f62a7f5ecc3bcd00.zip external_gettext-0c2ad4029d93f75e98688932f62a7f5ecc3bcd00.tar.gz external_gettext-0c2ad4029d93f75e98688932f62a7f5ecc3bcd00.tar.bz2 | |
Update from gnulib.
Diffstat (limited to 'gettext-runtime/m4')
| -rw-r--r-- | gettext-runtime/m4/ChangeLog | 11 | ||||
| -rw-r--r-- | gettext-runtime/m4/size_max.m4 | 17 |
2 files changed, 23 insertions, 5 deletions
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 94f7e7d..4901297 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,14 @@ +2009-05-21 Bruno Haible <bruno@clisp.org> + + Avoid redefinition warnings for SIZE_MAX. + * size_max.m4 (gl_SIZE_MAX): Avoid redefining SIZE_MAX in config.h. + Reported by Simon Josefsson. + +2009-05-21 Bruno Haible <bruno@clisp.org> + + * size_max.m4 (gl_SIZE_MAX): Use AC_CACHE_CHECK instead of + AC_CACHE_VAL. + 2009-02-23 Bruno Haible <bruno@clisp.org> * intl.m4 (AM_INTL_SUBDIR): Also check for strnlen, wcsnlen, mbrtowc, diff --git a/gettext-runtime/m4/size_max.m4 b/gettext-runtime/m4/size_max.m4 index e0e7b3f..35bd3d6 100644 --- a/gettext-runtime/m4/size_max.m4 +++ b/gettext-runtime/m4/size_max.m4 @@ -1,5 +1,5 @@ -# size_max.m4 serial 7 -dnl Copyright (C) 2003, 2005-2006, 2008 Free Software Foundation, Inc. +# size_max.m4 serial 9 +dnl Copyright (C) 2003, 2005-2006, 2008-2009 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. @@ -10,8 +10,7 @@ AC_DEFUN([gl_SIZE_MAX], [ AC_CHECK_HEADERS([stdint.h]) dnl First test whether the system already has SIZE_MAX. - AC_MSG_CHECKING([for SIZE_MAX]) - AC_CACHE_VAL([gl_cv_size_max], [ + AC_CACHE_CHECK([for SIZE_MAX], [gl_cv_size_max], [ gl_cv_size_max= AC_EGREP_CPP([Found it], [ #include <limits.h> @@ -54,11 +53,19 @@ Found it fi fi ]) - AC_MSG_RESULT([$gl_cv_size_max]) if test "$gl_cv_size_max" != yes; then AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], [Define as the maximum value of type 'size_t', if the system doesn't define it.]) fi + dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after + dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with + dnl #define by AC_DEFINE_UNQUOTED. + AH_VERBATIM([SIZE_MAX], +[/* Define as the maximum value of type 'size_t', if the system doesn't define + it. */ +#ifndef SIZE_MAX +# undef SIZE_MAX +#endif]) ]) dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. |