From 1e22851b28319cebdfd9cf3e6975d170210b5d65 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 31 Dec 2009 22:41:49 +0100 Subject: [PATCH] Further updates, following today's commits. --- ChangeLog | 10 ++++++++++ m4/arpa_inet_h.m4 | 5 ++--- m4/dirent_h.m4 | 5 ++--- m4/locale_h.m4 | 5 ++--- m4/spawn_h.m4 | 5 ++--- m4/sys_ioctl_h.m4 | 5 ++--- m4/wchar.m4 | 8 ++------ 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10e9366574..a318caec77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-12-31 Bruno Haible + + * m4/wchar.m4 (gl_WCHAR_H): Remove gl_STDDEF_H invocation. + (gl_REPLACE_WCHAR_H): Turn into a no-op. + * m4/arpa_inet_h.m4 (gl_REPLACE_ARPA_INET_H): Likewise. + * m4/dirent_h.m4 (gl_REPLACE_DIRENT_H): Likewise. + * m4/locale_h.m4 (gl_REPLACE_LOCALE_H): Likewise. + * m4/spawn_h.m4 (gl_REPLACE_SPAWN_H): Likewise. + * m4/sys_ioctl_h.m4 (gl_REPLACE_SYS_IOCTL_H): Likewise. + 2009-12-31 Bruno Haible * m4/sys_select_h.m4 (gl_HEADER_SYS_SELECT): Invoke diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index 84f3e571d9..cf63b30da3 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -19,15 +19,14 @@ AC_DEFUN([gl_HEADER_ARPA_INET], HAVE_ARPA_INET_H=0 fi AC_SUBST([HAVE_ARPA_INET_H]) - dnl Execute this unconditionally, because ARPA_INET_H may be set by other - dnl modules, after this code is executed. + dnl is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([arpa/inet.h]) ]) dnl Unconditionally enables the replacement of . AC_DEFUN([gl_REPLACE_ARPA_INET_H], [ - AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) + dnl This is a no-op, because is always overridden. : ]) diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 index 54dea8e47f..467e5cdbbe 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -12,15 +12,14 @@ AC_DEFUN([gl_DIRENT_H], dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) - dnl Execute this unconditionally, because DIRENT_H may be set by other - dnl modules, after this code is executed. + dnl is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([dirent.h]) ]) dnl Unconditionally enables the replacement of . AC_DEFUN([gl_REPLACE_DIRENT_H], [ - AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + dnl This is a no-op, because is always overridden. : ]) diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index 9228118b52..32ceeafdb3 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -48,8 +48,7 @@ locale_t x;], [], fi AC_SUBST([HAVE_XLOCALE_H]) - dnl Execute this unconditionally, because LOCALE_H may be set by other - dnl modules, after this code is executed. + dnl is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([locale.h]) if test -n "$STDDEF_H" \ @@ -62,7 +61,7 @@ locale_t x;], [], dnl Unconditionally enables the replacement of . AC_DEFUN([gl_REPLACE_LOCALE_H], [ - AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) + dnl This is a no-op, because is always overridden. : ]) diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4 index 5b4b214d29..91ae99d88c 100644 --- a/m4/spawn_h.m4 +++ b/m4/spawn_h.m4 @@ -12,8 +12,7 @@ AC_DEFUN([gl_SPAWN_H], dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) - dnl Execute this unconditionally, because SPAWN_H may be set by other - dnl modules, after this code is executed. + dnl is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([spawn.h]) AC_CHECK_HEADERS_ONCE([spawn.h]) @@ -40,7 +39,7 @@ AC_DEFUN([gl_SPAWN_H], dnl Unconditionally enables the replacement of . AC_DEFUN([gl_REPLACE_SPAWN_H], [ - AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) + dnl This is a no-op, because is always overridden. : ]) diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index 1de3b44290..abb984f095 100644 --- a/m4/sys_ioctl_h.m4 +++ b/m4/sys_ioctl_h.m4 @@ -31,15 +31,14 @@ AC_DEFUN([gl_SYS_IOCTL_H], HAVE_SYS_IOCTL_H=0 fi AC_SUBST([HAVE_SYS_IOCTL_H]) - dnl Execute this unconditionally, because SYS_IOCTL_H may be set by other - dnl modules, after this code is executed. + dnl is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([sys/ioctl.h]) ]) dnl Unconditionally enables the replacement of . AC_DEFUN([gl_REPLACE_SYS_IOCTL_H], [ - AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS]) + dnl This is a no-op, because is always overridden. : ]) diff --git a/m4/wchar.m4 b/m4/wchar.m4 index daf532ae7a..ad3bebd769 100644 --- a/m4/wchar.m4 +++ b/m4/wchar.m4 @@ -28,9 +28,6 @@ wchar_t w;]], fi AC_SUBST([HAVE_WINT_T]) - dnl If is replaced, then must also be replaced. - AC_REQUIRE([gl_STDDEF_H]) - dnl Prepare for creating substitute . dnl Do it always: WCHAR_H may be empty here but can be set later. dnl Check for (missing in Linux uClibc when built without wide @@ -42,8 +39,7 @@ wchar_t w;]], HAVE_WCHAR_H=0 fi AC_SUBST([HAVE_WCHAR_H]) - dnl Execute this unconditionally, because WCHAR_H may be set by other - dnl modules, after this code is executed. + dnl is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([wchar.h]) ]) @@ -98,7 +94,7 @@ Configuration aborted.]) dnl Unconditionally enables the replacement of . AC_DEFUN([gl_REPLACE_WCHAR_H], [ - AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + dnl This is a no-op, because is always overridden. : ]) -- 2.30.2