[Cvs-cvs] ccvs/m4 ChangeLog getdelim.m4 getline.m4 gnulib...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/08/27 02:12:26

Modified files:
        m4             : ChangeLog getdelim.m4 getline.m4 gnulib-comp.m4 
                         stdio_h.m4 

Log message:
        * getdelim.m4, getline.m4, stdio_h.m4: Update from GNULIB.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ChangeLog?cvsroot=cvs&r1=1.194&r2=1.195
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/getdelim.m4?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/getline.m4?cvsroot=cvs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/gnulib-comp.m4?cvsroot=cvs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/stdio_h.m4?cvsroot=cvs&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ChangeLog,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- ChangeLog   24 Aug 2007 18:08:07 -0000      1.194
+++ ChangeLog   27 Aug 2007 02:12:25 -0000      1.195
@@ -1,3 +1,7 @@
+2007-08-26  Derek Price  <address@hidden>
+
+       * getdelim.m4, getline.m4, stdio_h.m4: Update from GNULIB.
+
 2007-08-24  Derek Price  <address@hidden>
 
        * lchmod.m4, mkancesdirs.m4, mkdir-p.m4, quote.m4, savewd.m4: New

Index: getdelim.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/getdelim.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- getdelim.m4 24 Aug 2006 01:24:14 -0000      1.2
+++ getdelim.m4 27 Aug 2007 02:12:25 -0000      1.3
@@ -1,25 +1,30 @@
-# getdelim.m4 serial 2
+# getdelim.m4 serial 3
 
-dnl Copyright (C) 2005, 2006 Free Software dnl Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007 Free Software dnl Foundation, Inc.
 dnl
 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_PREREQ(2.52)
+AC_PREREQ([2.60])
 
 AC_DEFUN([gl_FUNC_GETDELIM],
 [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
 
   dnl Persuade glibc <stdio.h> to declare getdelim().
   AC_REQUIRE([AC_GNU_SOURCE])
 
-  AC_REPLACE_FUNCS(getdelim)
-  AC_CHECK_DECLS_ONCE(getdelim)
+  AC_REPLACE_FUNCS([getdelim])
+  AC_CHECK_DECLS_ONCE([getdelim])
 
   if test $ac_cv_func_getdelim = no; then
     gl_PREREQ_GETDELIM
   fi
+
+  if test $ac_cv_have_decl_getdelim = no; then
+    HAVE_DECL_GETDELIM=0
+  fi
 ])
 
 # Prerequisites of lib/getdelim.c.

Index: getline.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/getline.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- getline.m4  24 Aug 2006 01:24:14 -0000      1.13
+++ getline.m4  27 Aug 2007 02:12:25 -0000      1.14
@@ -1,13 +1,13 @@
-# getline.m4 serial 15
+# getline.m4 serial 16
 
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 Free
+dnl Software Foundation, Inc.
 dnl
 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_PREREQ(2.52)
+AC_PREREQ([2.60])
 
 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
@@ -15,10 +15,12 @@
 dnl to do with the function we need.
 AC_DEFUN([gl_FUNC_GETLINE],
 [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+
   dnl Persuade glibc <stdio.h> to declare getline().
   AC_REQUIRE([AC_GNU_SOURCE])
 
-  AC_CHECK_DECLS([getline])
+  AC_CHECK_DECLS_ONCE([getline])
 
   gl_getline_needs_run_time_check=no
   AC_CHECK_FUNC(getline,
@@ -60,13 +62,13 @@
     )])
   fi
 
+  if test $ac_cv_have_decl_getline = no; then
+    HAVE_DECL_GETLINE=0
+  fi
+
   if test $am_cv_func_working_getline = no; then
-    dnl We must choose a different name for our function, since on ELF systems
-    dnl a broken getline() in libc.so would override our getline() in
-    dnl libgettextlib.so.
-    AC_DEFINE([getline], [gnu_getline],
-      [Define to a replacement function name for getline().])
-    AC_LIBOBJ(getline)
+    REPLACE_GETLINE=1
+    AC_LIBOBJ([getline])
 
     gl_PREREQ_GETLINE
   fi

Index: gnulib-comp.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/gnulib-comp.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gnulib-comp.m4      24 Aug 2007 18:08:07 -0000      1.29
+++ gnulib-comp.m4      27 Aug 2007 02:12:25 -0000      1.30
@@ -92,8 +92,10 @@
   gl_UNISTD_MODULE_INDICATOR([getcwd])
   gl_GETDATE
   gl_FUNC_GETDELIM
+  gl_STDIO_MODULE_INDICATOR([getdelim])
   gl_FUNC_GETHOSTNAME
   gl_FUNC_GETLINE
+  gl_STDIO_MODULE_INDICATOR([getline])
   gl_GETLOGIN_R
   gl_UNISTD_MODULE_INDICATOR([getlogin_r])
   gl_GETNDELIM2
@@ -321,10 +323,8 @@
   lib/getdate.h
   lib/getdate.y
   lib/getdelim.c
-  lib/getdelim.h
   lib/gethostname.c
   lib/getline.c
-  lib/getline.h
   lib/getlogin_r.c
   lib/getndelim2.c
   lib/getndelim2.h

Index: stdio_h.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/stdio_h.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- stdio_h.m4  22 Aug 2007 13:44:02 -0000      1.1
+++ stdio_h.m4  27 Aug 2007 02:12:26 -0000      1.2
@@ -33,6 +33,8 @@
   GNULIB_FTELL=0;          AC_SUBST([GNULIB_FTELL])
   GNULIB_FTELLO=0;         AC_SUBST([GNULIB_FTELLO])
   GNULIB_FFLUSH=0;         AC_SUBST([GNULIB_FFLUSH])
+  GNULIB_GETDELIM=0;       AC_SUBST([GNULIB_GETDELIM])
+  GNULIB_GETLINE=0;        AC_SUBST([GNULIB_GETLINE])
   dnl Assume proper GNU behavior unless another module says otherwise.
   REPLACE_FPRINTF=0;       AC_SUBST([REPLACE_FPRINTF])
   REPLACE_VFPRINTF=0;      AC_SUBST([REPLACE_VFPRINTF])
@@ -53,6 +55,9 @@
   REPLACE_FTELLO=0;        AC_SUBST([REPLACE_FTELLO])
   REPLACE_FTELL=0;         AC_SUBST([REPLACE_FTELL])
   REPLACE_FFLUSH=0;        AC_SUBST([REPLACE_FFLUSH])
+  HAVE_DECL_GETDELIM=1;    AC_SUBST([HAVE_DECL_GETDELIM])
+  HAVE_DECL_GETLINE=1;     AC_SUBST([HAVE_DECL_GETLINE])
+  REPLACE_GETLINE=0;       AC_SUBST([REPLACE_GETLINE])
 ])
 
 dnl Code shared by fseeko and ftello.  Determine if large files are supported,