CVS shishi/gl/m4

[shishi-commit]

Update of /home/cvs/shishi/gl/m4
In directory dopio:/tmp/cvs-serv26897/gl/m4

Modified Files:
        getline.m4 gnulib.m4 strdup.m4 
Log Message:
Update.

--- /home/cvs/shishi/gl/m4/getline.m4   2003/11/22 07:10:04     1.2
+++ /home/cvs/shishi/gl/m4/getline.m4   2004/12/18 16:21:15     1.3
@@ -1,6 +1,6 @@
 # getline.m4 serial 10
 
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
 dnl Foundation, Inc.
 
 dnl This file is free software, distributed under the terms of the GNU
@@ -67,6 +67,19 @@
     gl_PREREQ_GETLINE
     gl_PREREQ_GETNDELIM2
   fi
+
+  AC_CHECK_DECLS_ONCE(getline getdelim)
+  AH_BOTTOM([/* Prototype for getline and getdelim. */
+#include <stddef.h>
+#include <stdio.h>
+#include <sys/types.h>
+#if !HAVE_DECL_GETLINE
+extern ssize_t getline (char **_lineptr, size_t *_linesize, FILE *_stream);
+#endif
+#if !HAVE_DECL_GETDELIM
+extern ssize_t getdelim (char **_lineptr, size_t *_linesize, int _delimiter,
+                         FILE *_stream);
+#endif])
 ])
 
 # Prerequisites of lib/getline.c.
--- /home/cvs/shishi/gl/m4/gnulib.m4    2004/12/02 03:09:47     1.17
+++ /home/cvs/shishi/gl/m4/gnulib.m4    2004/12/18 16:21:15     1.18
@@ -8,7 +8,7 @@
 # Generated by gnulib-tool.
 #
 # Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool  alloca alloca-opt allocsa base64 error extensions 
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt 
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv 
stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm time_r 
timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname xreadlink 
xsize xstrndup xvasprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool  alloca-opt allocsa base64 error extensions 
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt 
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv 
stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm time_r 
timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname xreadlink 
xsize xstrndup xvasprintf
 
 AC_DEFUN([gl_EARLY],
 [
@@ -19,11 +19,6 @@
 AC_DEFUN([gl_INIT],
 [
   gl_FUNC_ALLOCA
-changequote(,)dnl
-LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
-changequote([, ])dnl
-AC_SUBST(LTALLOCA)
-  gl_FUNC_ALLOCA
   gl_ALLOCSA
   gl_FUNC_BASE64
   gl_ERROR
--- /home/cvs/shishi/gl/m4/strdup.m4    2004/12/17 13:44:06     1.5
+++ /home/cvs/shishi/gl/m4/strdup.m4    2004/12/18 16:21:15     1.6
@@ -10,12 +10,10 @@
 [
   AC_REPLACE_FUNCS(strdup)
   AC_CHECK_DECLS_ONCE(strdup)
-  AH_BOTTOM([
-#if defined HAVE_DECL_STRDUP && !HAVE_DECL_STRDUP
-/* Duplicate S, returning an identical malloc'd string.  */
+  AH_BOTTOM([/* Prototype for strdup. */
+#if !HAVE_DECL_STRDUP
 extern char *strdup (const char *s);
-#endif
-])
+#endif])
   gl_PREREQ_STRDUP
 ])