From 54b258e089547fb76e1a788c2e3c37df0a560b01 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 19 Aug 2018 20:57:24 +0200 Subject: [PATCH] limits-h: Formalize side effects from other modules. * m4/limits-h.m4 (gl_REPLACE_LIMITS_H): New macro. * m4/stdint.m4 (gl_STDINT_H): Invoke it. --- ChangeLog | 6 ++++++ m4/limits-h.m4 | 8 ++++++++ m4/stdint.m4 | 5 ++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d20b21ce9..b38be6b5ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-08-19 Bruno Haible + + limits-h: Formalize side effects from other modules. + * m4/limits-h.m4 (gl_REPLACE_LIMITS_H): New macro. + * m4/stdint.m4 (gl_STDINT_H): Invoke it. + 2018-08-19 Bruno Haible getpass: Move declaration to . diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index 511dcef5e0..8388663439 100644 --- a/m4/limits-h.m4 +++ b/m4/limits-h.m4 @@ -29,3 +29,11 @@ AC_DEFUN_ONCE([gl_LIMITS_H], AC_SUBST([LIMITS_H]) AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) ]) + +dnl Unconditionally enables the replacement of . +AC_DEFUN([gl_REPLACE_LIMITS_H], +[ + AC_REQUIRE([gl_LIMITS_H]) + LIMITS_H='limits.h' + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) +]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index b86184c2ea..38dbbedffe 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 51 +# stdint.m4 serial 52 dnl Copyright (C) 2001-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -364,8 +364,7 @@ int32_t i32 = INT32_C (0x7fffffff); esac dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. - LIMITS_H=limits.h - AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) + gl_REPLACE_LIMITS_H AC_SUBST([HAVE_C99_STDINT_H]) AC_SUBST([HAVE_SYS_BITYPES_H]) -- 2.39.5