Mercurial > hg > octave-nkf > gnulib-hg
changeset 9512:f6e2c698e470
Merge branch 'master' of ssh://karl@git.sv.gnu.org/srv/git/gnulib
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Fri, 07 Dec 2007 09:53:27 -0800 |
parents | 3542c129d35e (current diff) 740cd2f7aaa1 (diff) |
children | 61a2180a8648 |
files | |
diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-12-07 Jim Meyering <meyering@redhat.com> + + 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 <meyering@redhat.com> Avoid a configure-time syntax error in gl_FUNC_ACL.
--- 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], [
--- 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