From 1e6979e8bb29cbb42d09f09c79fbcaa9f57a44a3 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 13 Nov 2010 22:25:32 +0100 Subject: [PATCH] remove autoconf-2.57 work-around requiring AC_PROG_EGREP and AC_PROG_CPP Now we require at least autoconf-2.59, which means that the work-around is no longer needed. * m4/alloca.m4 (gl_FUNC_ALLOCA): Remove work-around. * m4/dirfd.m4 (gl_FUNC_DIRFD): Likewise. * m4/mmap-anon.m4 (gl_FUNC_MMAP_ANON): Likewise. * m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Likewise. * m4/strtoumax.m4 (gl_FUNC_STRTOUMAX): Likewise. --- ChangeLog | 11 +++++++++++ m4/alloca.m4 | 6 +----- m4/dirfd.m4 | 6 +----- m4/mmap-anon.m4 | 6 +----- m4/strtoimax.m4 | 6 +----- m4/strtoumax.m4 | 6 +----- 6 files changed, 16 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3bc707409..5548bef1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-11-13 Jim Meyering + + remove autoconf-2.57 work-around requiring AC_PROG_EGREP and AC_PROG_CPP + Now we require at least autoconf-2.59, which means the work-around + is no longer needed. + * m4/alloca.m4 (gl_FUNC_ALLOCA): Remove work-around. + * m4/dirfd.m4 (gl_FUNC_DIRFD): Likewise. + * m4/mmap-anon.m4 (gl_FUNC_MMAP_ANON): Likewise. + * m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Likewise. + * m4/strtoumax.m4 (gl_FUNC_STRTOUMAX): Likewise. + 2010-11-13 Bruno Haible rename, renameat: Avoid test failures at NFS mounted locations. diff --git a/m4/alloca.m4 b/m4/alloca.m4 index f3ee34380..80d67aad7 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,4 +1,4 @@ -# alloca.m4 serial 9 +# alloca.m4 serial 10 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2010 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -7,10 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_ALLOCA], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_REQUIRE([AC_FUNC_ALLOCA]) if test $ac_cv_func_alloca_works = no; then gl_PREREQ_ALLOCA diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index 48b7bae1a..bfddeb940 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,4 +1,4 @@ -# serial 18 -*- Autoconf -*- +# serial 19 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. @@ -17,10 +17,6 @@ AC_DEFUN([gl_FUNC_DIRFD], dnl Persuade glibc to declare dirfd(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_CHECK_FUNCS([dirfd]) AC_CHECK_DECLS([dirfd], , , [#include diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index a6b7b9ac3..e20fc3c67 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,4 +1,4 @@ -# mmap-anon.m4 serial 8 +# mmap-anon.m4 serial 9 dnl Copyright (C) 2005, 2007, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,10 +15,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_MMAP_ANON], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - dnl Persuade glibc to define MAP_ANONYMOUS. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 index 8d8298b99..5027e2681 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -1,4 +1,4 @@ -# strtoimax.m4 serial 7 +# strtoimax.m4 serial 8 dnl Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -7,10 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRTOIMAX], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_CACHE_CHECK([whether defines strtoimax as a macro], gl_cv_func_strtoimax_macro, [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 684634f5d..5450037c1 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,4 +1,4 @@ -# strtoumax.m4 serial 7 +# strtoumax.m4 serial 8 dnl Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -7,10 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRTOUMAX], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_CACHE_CHECK([whether defines strtoumax as a macro], gl_cv_func_strtoumax_macro, [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include -- 2.11.0