From: Bruno Haible Date: Tue, 28 Nov 2006 14:17:20 +0000 (+0000) Subject: Use AC_COMPUTE_INT instead of _AC_COMPUTE_INT. X-Git-Tag: cvs-readonly~1522 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=a44e87912d4ce841b35f454d4449986f2b209a0c;p=gnulib.git Use AC_COMPUTE_INT instead of _AC_COMPUTE_INT. --- diff --git a/ChangeLog b/ChangeLog index 2a71fcec7..0b6e07dab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-11-21 Bruno Haible + + * m4/eoverflow.m4 (gl_EOVERFLOW): Use AC_COMPUTE_INT instead of + _AC_COMPUTE_INT. + (AC_COMPUTE_INT): Add fallback definition for autoconf < 2.61. + * m4/ptrdiff_max.m4 (gl_PTRDIFF_MAX): Use AC_COMPUTE_INT instead of + _AC_COMPUTE_INT. + (AC_COMPUTE_INT): Add fallback definition for autoconf < 2.61. + * m4/size_max.m4 (gl_SIZE_MAX): Use AC_COMPUTE_INT instead of + _AC_COMPUTE_INT. + (AC_COMPUTE_INT): Add fallback definition for autoconf < 2.61. + 2006-11-28 Jim Meyering * lib/regcomp.c (parse_branch): Rename local, exp->expr, to avoid diff --git a/m4/eoverflow.m4 b/m4/eoverflow.m4 index 8c28ca305..3bffd10ed 100644 --- a/m4/eoverflow.m4 +++ b/m4/eoverflow.m4 @@ -1,5 +1,5 @@ -# eoverflow.m4 serial 1 -dnl Copyright (C) 2004 Free Software Foundation, Inc. +# eoverflow.m4 serial 2 +dnl Copyright (C) 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. @@ -40,7 +40,7 @@ yes if test -n "$have_eoverflow"; then dnl EOVERFLOW exists but is hidden. dnl Define it to the same value. - _AC_COMPUTE_INT([EOVERFLOW], ac_cv_decl_EOVERFLOW, [ + AC_COMPUTE_INT([ac_cv_decl_EOVERFLOW], [EOVERFLOW], [ #define _XOPEN_SOURCE_EXTENDED 1 #include /* The following two lines are a workaround against an autoconf-2.52 bug. */ @@ -62,3 +62,9 @@ yes AC_SUBST(EOVERFLOW) fi ]) + +dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. +dnl Remove this when we can assume autoconf >= 2.61. +m4_ifdef([AC_COMPUTE_INT], [], [ + AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) +]) diff --git a/m4/ptrdiff_max.m4 b/m4/ptrdiff_max.m4 index 9eeb5d13a..79e68f2a1 100644 --- a/m4/ptrdiff_max.m4 +++ b/m4/ptrdiff_max.m4 @@ -1,5 +1,5 @@ -# ptrdiff_max.m4 serial 1 -dnl Copyright (C) 2003 Free Software Foundation, Inc. +# ptrdiff_max.m4 serial 2 +dnl Copyright (C) 2003, 2006 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 @@ -30,15 +30,15 @@ Found it if test -z "$result"; then dnl Define it ourselves. Here we assume that the type 'ptrdiff_t' is not dnl wider than the type 'long'. - dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', + dnl The AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', dnl which is guaranteed to work from LONG_MIN to LONG_MAX. - _AC_COMPUTE_INT([STYPE_MAXIMUM (ptrdiff_t)], res, [ + AC_COMPUTE_INT([res], [STYPE_MAXIMUM (ptrdiff_t)], [ #include #include #define STYPE_MINIMUM(t) (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)) #define STYPE_MAXIMUM(t) ((t) (~ (t) 0 - STYPE_MINIMUM (t))) ], result=?) - _AC_COMPUTE_INT([sizeof (ptrdiff_t) <= sizeof (int)], fits_in_int, + AC_COMPUTE_INT([fits_in_int], [sizeof (ptrdiff_t) <= sizeof (int)], [#include ], result=?) if test "$fits_in_int" = 1; then dnl Even though PTRDIFF_MAX fits in an int, it must be of type @@ -65,3 +65,9 @@ Found it [Define as the maximum value of type 'ptrdiff_t', if the system doesn't define it.]) fi ]) + +dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. +dnl Remove this when we can assume autoconf >= 2.61. +m4_ifdef([AC_COMPUTE_INT], [], [ + AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) +]) diff --git a/m4/size_max.m4 b/m4/size_max.m4 index bfba811eb..6cb486892 100644 --- a/m4/size_max.m4 +++ b/m4/size_max.m4 @@ -1,4 +1,4 @@ -# size_max.m4 serial 5 +# size_max.m4 serial 6 dnl Copyright (C) 2003, 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, @@ -26,10 +26,10 @@ Found it dnl Define it ourselves. Here we assume that the type 'size_t' is not wider dnl than the type 'unsigned long'. Try hard to find a definition that can dnl be used in a preprocessor #if, i.e. doesn't contain a cast. - _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1, + AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1], [#include #include ], size_t_bits_minus_1=) - _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, + AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)], [#include ], fits_in_uint=) if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then if test $fits_in_uint = 1; then @@ -60,3 +60,9 @@ Found it [Define as the maximum value of type 'size_t', if the system doesn't define it.]) fi ]) + +dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. +dnl Remove this when we can assume autoconf >= 2.61. +m4_ifdef([AC_COMPUTE_INT], [], [ + AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) +])