Mercurial > hg > octave-nkf > gnulib-hg
changeset 7330:b537fff46f2e
Remove inttypes-h.m4 and its gl_HEADER_INTTYES_H macro.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 18 Sep 2006 19:23:59 +0000 |
parents | c11bdf6103c7 |
children | a6bfb21a7e0d |
files | ChangeLog m4/ChangeLog m4/gettext.m4 m4/inttypes-h.m4 m4/inttypes-pri.m4 m4/inttypes.m4 modules/inttypes |
diffstat | 7 files changed, 26 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-09-18 Bruno Haible <bruno@clisp.org> + + * modules/inttypes (Files): Remove m4/inttypes-h.m4. + 2006-09-18 Paul Eggert <eggert@cs.ucla.edu> * gnulib-tool (avoidlist): Fix typo that broke options like
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,14 @@ +2006-09-18 Bruno Haible <bruno@clisp.org> + + * inttypes-h.m4 (gl_HEADER_INTTYPES_H): Remove macro. + * inttypes-pri.m4: Require autoconf >= 2.52. + (gt_INTTYPES_PRI): Invoke AC_CHECK_HEADERS on inttypes.h. Test + ac_cv_header_inttypes_h instead of gl_cv_header_inttypes_h. + * gettext.m4: Require autoconf >= 2.52. + (gt_INTL_SUBDIR_CORE): Invoke AC_CHECK_HEADERS on inttypes.h. + * inttypes.m4 (gl_INTTYPES_H): Test ac_cv_header_inttypes_h instead + of gl_cv_header_inttypes_h. + 2006-09-18 Mark D. Baushke <mdb@gnu.org> * inttypes.m4 (gl_INTTYPES_H): Quote "test" args
--- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 53 (gettext-0.15) +# gettext.m4 serial 53.1 dnl Copyright (C) 1995-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, @@ -17,6 +17,8 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2005. +AC_PREREQ(2.52) + dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). @@ -497,7 +499,6 @@ AC_REQUIRE([AC_FUNC_MMAP])dnl AC_REQUIRE([gt_INTDIV0])dnl AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl AC_REQUIRE([gl_LOCK])dnl @@ -507,7 +508,7 @@ [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, [Define to 1 if the compiler understands __builtin_expect.])]) - AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h]) + AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ argz_next __fsetlocking])
--- a/m4/inttypes-h.m4 +++ b/m4/inttypes-h.m4 @@ -1,25 +1,1 @@ -# 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 -]) +/* This file will go away when gettext-0.15.1 is released. */
--- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,4 +1,4 @@ -# inttypes-pri.m4 serial 3 (gettext-0.15.1) +# inttypes-pri.m4 serial 4 (gettext-0.15.1) 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 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, [
--- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -24,7 +24,7 @@ dnl - some additional tests. gl_cv_header_working_inttypes_h=no if test "$gl_cv_header_working_stdint_h" = yes \ - && test "$gl_cv_header_inttypes_h" = yes \ + && test $ac_cv_header_inttypes_h = yes \ && test "$ac_cv_have_decl_imaxabs" = yes \ && test "$ac_cv_have_decl_imaxdiv" = yes \ && test "$ac_cv_have_decl_strtoimax" = yes \