# HG changeset patch # User Karl Berry # Date 1197050007 28800 # Node ID f6e2c698e47006dda8199f9e0719df685f4e728d # Parent 3542c129d35e30986b22f6e6ea1b63c0902024b8# Parent 740cd2f7aaa1057919b7d3f93a5ccea5c9d0ec21 Merge branch 'master' of ssh://karl@git.sv.gnu.org/srv/git/gnulib diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-12-07 Jim Meyering + + Let these macros work also with autoconf-2.59. + * m4/getline.m4 (gl_FUNC_GETLINE): Require only autoconf-2.59. 2.60 + is not needed, since gnulib now permits use of AC_CHECK_DECLS_ONCE. + * m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise. + 2007-12-06 Jim Meyering Avoid a configure-time syntax error in gl_FUNC_ACL. diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -1,4 +1,4 @@ -# getdelim.m4 serial 4 +# getdelim.m4 serial 5 dnl Copyright (C) 2005, 2006, 2007 Free Software dnl Foundation, Inc. dnl @@ -6,7 +6,7 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -AC_PREREQ([2.60]) +AC_PREREQ([2.59]) AC_DEFUN([gl_FUNC_GETDELIM], [ diff --git a/m4/getline.m4 b/m4/getline.m4 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,4 +1,4 @@ -# getline.m4 serial 17 +# getline.m4 serial 18 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 Free dnl Software Foundation, Inc. @@ -7,7 +7,7 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -AC_PREREQ([2.60]) +AC_PREREQ([2.59]) dnl See if there's a working, system-supplied version of the getline function. dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems