From 3b22f80f07a2782f90c7ea108164facefd309d2e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 23 Jan 2009 13:32:48 +0000 Subject: [PATCH] m4: update from gnulib to avoid warnings from cutting-edge autoconf * gnulib/m4/errno_h.m4 * gnulib/m4/gnulib-comp.m4 * gnulib/m4/multiarch.m4 --- ChangeLog | 7 +++++++ gnulib/m4/errno_h.m4 | 12 +++--------- gnulib/m4/gnulib-comp.m4 | 5 ++--- gnulib/m4/multiarch.m4 | 16 ++++------------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86582f3ae0..63931b3337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jan 23 14:30:59 +0100 2009 Jim Meyering + + m4: update from gnulib to avoid warnings from cutting-edge autoconf + * gnulib/m4/errno_h.m4 + * gnulib/m4/gnulib-comp.m4 + * gnulib/m4/multiarch.m4 + Fri Jan 23 14:30:59 +0100 2009 Jim Meyering correct and tighten up .*ignore files diff --git a/gnulib/m4/errno_h.m4 b/gnulib/m4/errno_h.m4 index 0682d1ab63..4d77672cb7 100644 --- a/gnulib/m4/errno_h.m4 +++ b/gnulib/m4/errno_h.m4 @@ -1,17 +1,11 @@ -# errno_h.m4 serial 3 +# errno_h.m4 serial 4 dnl Copyright (C) 2004, 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. -AC_DEFUN([gl_HEADER_ERRNO_H], -[ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_HEADER_ERRNO_H_BODY]) -]) - -AC_DEFUN([gl_HEADER_ERRNO_H_BODY], +dnl This macro must pass through AC_REQUIRE (never directly invoke it). +AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], [ AC_REQUIRE([AC_PROG_CC]) AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [ diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index e8747d85a8..3879843122 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -25,7 +25,6 @@ AC_DEFUN([gl_EARLY], m4_pattern_allow([^gl_LIBOBJS$])dnl a variable m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable AC_REQUIRE([AC_PROG_RANLIB]) - AC_REQUIRE([AC_GNU_SOURCE]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([AC_FUNC_FSEEKO]) ]) @@ -57,7 +56,7 @@ AC_SUBST([LTALLOCA]) AC_LIBOBJ([connect]) fi gl_SYS_SOCKET_MODULE_INDICATOR([connect]) - gl_HEADER_ERRNO_H + AC_REQUIRE([gl_HEADER_ERRNO_H]) gl_FUNC_FCLOSE gl_STDIO_MODULE_INDICATOR([fclose]) gl_FLOAT_H @@ -97,7 +96,7 @@ AC_SUBST([LTALLOCA]) gl_STDLIB_MODULE_INDICATOR([malloc-posix]) gl_FUNC_MKSTEMP gl_STDLIB_MODULE_INDICATOR([mkstemp]) - gl_MULTIARCH + AC_REQUIRE([gl_MULTIARCH]) gl_HEADER_NETDB gl_HEADER_NETINET_IN AC_PROG_MKDIR_P diff --git a/gnulib/m4/multiarch.m4 b/gnulib/m4/multiarch.m4 index 7b73e15ee9..3948e6e0db 100644 --- a/gnulib/m4/multiarch.m4 +++ b/gnulib/m4/multiarch.m4 @@ -1,5 +1,5 @@ -# multiarch.m4 serial 3 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# multiarch.m4 serial 4 +dnl Copyright (C) 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. @@ -19,16 +19,8 @@ dnl with or without modifications, as long as this notice is preserved. # Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the # beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. -AC_DEFUN([gl_MULTIARCH], -[ - dnl This AC_REQUIRE is not necessary in theory. It works around a bug in - dnl autoconf <= 2.63: AC_REQUIRE invocations inside AC_REQUIREd macros are - dnl being handled better than AC_REQUIRE invocations inside normally invoked - dnl macros. - AC_REQUIRE([gl_MULTIARCH_BODY]) -]) - -AC_DEFUN([gl_MULTIARCH_BODY], +dnl This macro must pass through AC_REQUIRE (never directly invoke it). +AC_DEFUN_ONCE([gl_MULTIARCH], [ dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN. gl_cv_c_multiarch=no