1 files changed, 89 insertions, 47 deletions
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index a40d4180..60b4bd79 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,5 +1,5 @@
-# stdio_h.m4 serial 9
+# stdio_h.m4 serial 14
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 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.
@@ -8,6 +8,28 @@ AC_DEFUN([gl_STDIO_H],
 [
  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
  gl_CHECK_NEXT_HEADERS([stdio.h])
+  dnl No need to create extra modules for these functions. Everyone who uses
+  dnl <stdio.h> likely needs them.
+  GNULIB_FPRINTF=1
+  GNULIB_PRINTF=1
+  GNULIB_VFPRINTF=1
+  GNULIB_VPRINTF=1
+  GNULIB_FPUTC=1
+  GNULIB_PUTC=1
+  GNULIB_PUTCHAR=1
+  GNULIB_FPUTS=1
+  GNULIB_PUTS=1
+  GNULIB_FWRITE=1
+  dnl This ifdef is just an optimization, to avoid performing a configure
+  dnl check whose result is not used. It does not make the test of
+  dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant.
+  m4_ifdef([gl_SIGNAL_SIGPIPE], [
+    gl_SIGNAL_SIGPIPE
+    if test $gl_cv_header_signal_h_SIGPIPE != yes; then
+      REPLACE_STDIO_WRITE_FUNCS=1
+      AC_LIBOBJ([stdio-write])
+    fi
+  ])
 ])
 AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
@@ -19,49 +41,69 @@ AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
 AC_DEFUN([gl_STDIO_H_DEFAULTS],
 [
-  GNULIB_FPRINTF_POSIX=0;  AC_SUBST([GNULIB_FPRINTF_POSIX])
+  GNULIB_FPRINTF=0;              AC_SUBST([GNULIB_FPRINTF])
-  GNULIB_PRINTF_POSIX=0;   AC_SUBST([GNULIB_PRINTF_POSIX])
+  GNULIB_FPRINTF_POSIX=0;        AC_SUBST([GNULIB_FPRINTF_POSIX])
-  GNULIB_SNPRINTF=0;       AC_SUBST([GNULIB_SNPRINTF])
+  GNULIB_PRINTF=0;               AC_SUBST([GNULIB_PRINTF])
-  GNULIB_SPRINTF_POSIX=0;  AC_SUBST([GNULIB_SPRINTF_POSIX])
+  GNULIB_PRINTF_POSIX=0;         AC_SUBST([GNULIB_PRINTF_POSIX])
-  GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX])
+  GNULIB_SNPRINTF=0;             AC_SUBST([GNULIB_SNPRINTF])
-  GNULIB_VPRINTF_POSIX=0;  AC_SUBST([GNULIB_VPRINTF_POSIX])
+  GNULIB_SPRINTF_POSIX=0;        AC_SUBST([GNULIB_SPRINTF_POSIX])
-  GNULIB_VSNPRINTF=0;      AC_SUBST([GNULIB_VSNPRINTF])
+  GNULIB_VFPRINTF=0;             AC_SUBST([GNULIB_VFPRINTF])
-  GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX])
+  GNULIB_VFPRINTF_POSIX=0;       AC_SUBST([GNULIB_VFPRINTF_POSIX])
-  GNULIB_VASPRINTF=0;      AC_SUBST([GNULIB_VASPRINTF])
+  GNULIB_VPRINTF=0;              AC_SUBST([GNULIB_VPRINTF])
-  GNULIB_FOPEN=0;          AC_SUBST([GNULIB_FOPEN])
+  GNULIB_VPRINTF_POSIX=0;        AC_SUBST([GNULIB_VPRINTF_POSIX])
-  GNULIB_FREOPEN=0;        AC_SUBST([GNULIB_FREOPEN])
+  GNULIB_VSNPRINTF=0;            AC_SUBST([GNULIB_VSNPRINTF])
-  GNULIB_FSEEK=0;          AC_SUBST([GNULIB_FSEEK])
+  GNULIB_VSPRINTF_POSIX=0;       AC_SUBST([GNULIB_VSPRINTF_POSIX])
-  GNULIB_FSEEKO=0;         AC_SUBST([GNULIB_FSEEKO])
+  GNULIB_VASPRINTF=0;            AC_SUBST([GNULIB_VASPRINTF])
-  GNULIB_FTELL=0;          AC_SUBST([GNULIB_FTELL])
+  GNULIB_OBSTACK_PRINTF=0;       AC_SUBST([GNULIB_OBSTACK_PRINTF])
-  GNULIB_FTELLO=0;         AC_SUBST([GNULIB_FTELLO])
+  GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
-  GNULIB_FFLUSH=0;         AC_SUBST([GNULIB_FFLUSH])
+  GNULIB_FOPEN=0;                AC_SUBST([GNULIB_FOPEN])
-  GNULIB_GETDELIM=0;       AC_SUBST([GNULIB_GETDELIM])
+  GNULIB_FREOPEN=0;              AC_SUBST([GNULIB_FREOPEN])
-  GNULIB_GETLINE=0;        AC_SUBST([GNULIB_GETLINE])
+  GNULIB_FSEEK=0;                AC_SUBST([GNULIB_FSEEK])
+  GNULIB_FSEEKO=0;               AC_SUBST([GNULIB_FSEEKO])
+  GNULIB_FTELL=0;                AC_SUBST([GNULIB_FTELL])
+  GNULIB_FTELLO=0;               AC_SUBST([GNULIB_FTELLO])
+  GNULIB_FFLUSH=0;               AC_SUBST([GNULIB_FFLUSH])
+  GNULIB_FCLOSE=0;               AC_SUBST([GNULIB_FCLOSE])
+  GNULIB_FPUTC=0;                AC_SUBST([GNULIB_FPUTC])
+  GNULIB_PUTC=0;                 AC_SUBST([GNULIB_PUTC])
+  GNULIB_PUTCHAR=0;              AC_SUBST([GNULIB_PUTCHAR])
+  GNULIB_FPUTS=0;                AC_SUBST([GNULIB_FPUTS])
+  GNULIB_PUTS=0;                 AC_SUBST([GNULIB_PUTS])
+  GNULIB_FWRITE=0;               AC_SUBST([GNULIB_FWRITE])
+  GNULIB_GETDELIM=0;             AC_SUBST([GNULIB_GETDELIM])
+  GNULIB_GETLINE=0;              AC_SUBST([GNULIB_GETLINE])
+  GNULIB_PERROR=0;               AC_SUBST([GNULIB_PERROR])
+  GNULIB_STDIO_H_SIGPIPE=0;      AC_SUBST([GNULIB_STDIO_H_SIGPIPE])
  dnl Assume proper GNU behavior unless another module says otherwise.
-  REPLACE_FPRINTF=0;       AC_SUBST([REPLACE_FPRINTF])
+  REPLACE_STDIO_WRITE_FUNCS=0;   AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
-  REPLACE_VFPRINTF=0;      AC_SUBST([REPLACE_VFPRINTF])
+  REPLACE_FPRINTF=0;             AC_SUBST([REPLACE_FPRINTF])
-  REPLACE_PRINTF=0;        AC_SUBST([REPLACE_PRINTF])
+  REPLACE_VFPRINTF=0;            AC_SUBST([REPLACE_VFPRINTF])
-  REPLACE_VPRINTF=0;       AC_SUBST([REPLACE_VPRINTF])
+  REPLACE_PRINTF=0;              AC_SUBST([REPLACE_PRINTF])
-  REPLACE_SNPRINTF=0;      AC_SUBST([REPLACE_SNPRINTF])
+  REPLACE_VPRINTF=0;             AC_SUBST([REPLACE_VPRINTF])
-  HAVE_DECL_SNPRINTF=1;    AC_SUBST([HAVE_DECL_SNPRINTF])
+  REPLACE_SNPRINTF=0;            AC_SUBST([REPLACE_SNPRINTF])
-  REPLACE_VSNPRINTF=0;     AC_SUBST([REPLACE_VSNPRINTF])
+  HAVE_DECL_SNPRINTF=1;          AC_SUBST([HAVE_DECL_SNPRINTF])
-  HAVE_DECL_VSNPRINTF=1;   AC_SUBST([HAVE_DECL_VSNPRINTF])
+  REPLACE_VSNPRINTF=0;           AC_SUBST([REPLACE_VSNPRINTF])
-  REPLACE_SPRINTF=0;       AC_SUBST([REPLACE_SPRINTF])
+  HAVE_DECL_VSNPRINTF=1;         AC_SUBST([HAVE_DECL_VSNPRINTF])
-  REPLACE_VSPRINTF=0;      AC_SUBST([REPLACE_VSPRINTF])
+  REPLACE_SPRINTF=0;             AC_SUBST([REPLACE_SPRINTF])
-  HAVE_VASPRINTF=1;        AC_SUBST([HAVE_VASPRINTF])
+  REPLACE_VSPRINTF=0;            AC_SUBST([REPLACE_VSPRINTF])
-  REPLACE_VASPRINTF=0;     AC_SUBST([REPLACE_VASPRINTF])
+  HAVE_VASPRINTF=1;              AC_SUBST([HAVE_VASPRINTF])
-  REPLACE_FOPEN=0;         AC_SUBST([REPLACE_FOPEN])
+  REPLACE_VASPRINTF=0;           AC_SUBST([REPLACE_VASPRINTF])
-  REPLACE_FREOPEN=0;       AC_SUBST([REPLACE_FREOPEN])
+  HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
-  HAVE_FSEEKO=1;           AC_SUBST([HAVE_FSEEKO])
+  REPLACE_OBSTACK_PRINTF=0;      AC_SUBST([REPLACE_OBSTACK_PRINTF])
-  REPLACE_FSEEKO=0;        AC_SUBST([REPLACE_FSEEKO])
+  REPLACE_FOPEN=0;               AC_SUBST([REPLACE_FOPEN])
-  REPLACE_FSEEK=0;         AC_SUBST([REPLACE_FSEEK])
+  REPLACE_FREOPEN=0;             AC_SUBST([REPLACE_FREOPEN])
-  HAVE_FTELLO=1;           AC_SUBST([HAVE_FTELLO])
+  HAVE_FSEEKO=1;                 AC_SUBST([HAVE_FSEEKO])
-  REPLACE_FTELLO=0;        AC_SUBST([REPLACE_FTELLO])
+  REPLACE_FSEEKO=0;              AC_SUBST([REPLACE_FSEEKO])
-  REPLACE_FTELL=0;         AC_SUBST([REPLACE_FTELL])
+  REPLACE_FSEEK=0;               AC_SUBST([REPLACE_FSEEK])
-  REPLACE_FFLUSH=0;        AC_SUBST([REPLACE_FFLUSH])
+  HAVE_FTELLO=1;                 AC_SUBST([HAVE_FTELLO])
-  HAVE_DECL_GETDELIM=1;    AC_SUBST([HAVE_DECL_GETDELIM])
+  REPLACE_FTELLO=0;              AC_SUBST([REPLACE_FTELLO])
-  HAVE_DECL_GETLINE=1;     AC_SUBST([HAVE_DECL_GETLINE])
+  REPLACE_FTELL=0;               AC_SUBST([REPLACE_FTELL])
-  REPLACE_GETLINE=0;       AC_SUBST([REPLACE_GETLINE])
+  REPLACE_FFLUSH=0;              AC_SUBST([REPLACE_FFLUSH])
+  REPLACE_FCLOSE=0;              AC_SUBST([REPLACE_FCLOSE])
+  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])
+  REPLACE_PERROR=0;              AC_SUBST([REPLACE_PERROR])
 ])
 dnl Code shared by fseeko and ftello.  Determine if large files are supported,
@@ -70,8 +112,8 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET],
  [
    AC_CACHE_CHECK([whether stdin defaults to large file offsets],
      [gl_cv_var_stdin_large_offset],
-      [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>],
+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
-[#if defined __SL64 && defined __SCLE /* cygwin */
+[[#if defined __SL64 && defined __SCLE /* cygwin */
  /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making
     fseeko/ftello needlessly fail.  This bug was fixed in 1.5.25, and
     it is easier to do a version check than building a runtime test.  */
@@ -79,7 +121,7 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET],
 # if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25)
  choke me
 # endif
-#endif])],
+#endif]])],
        [gl_cv_var_stdin_large_offset=yes],
        [gl_cv_var_stdin_large_offset=no])])
 ])

diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4 index a40d4180..60b4bd79 100644 --- a/gl/m4/stdio_h.m4 +++ b/gl/m4/stdio_h.m4
@@ -1,5 +1,5 @@
1	# stdio_h.m4 serial 9	1	# stdio_h.m4 serial 14
2	dnl Copyright (C) 2007 Free Software Foundation, Inc.	2	dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
3	dnl This file is free software; the Free Software Foundation	3	dnl This file is free software; the Free Software Foundation
4	dnl gives unlimited permission to copy and/or distribute it,	4	dnl gives unlimited permission to copy and/or distribute it,
5	dnl with or without modifications, as long as this notice is preserved.	5	dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,28 @@ AC_DEFUN([gl_STDIO_H],
8	[	8	[
9	AC_REQUIRE([gl_STDIO_H_DEFAULTS])	9	AC_REQUIRE([gl_STDIO_H_DEFAULTS])
10	gl_CHECK_NEXT_HEADERS([stdio.h])	10	gl_CHECK_NEXT_HEADERS([stdio.h])
		11	dnl No need to create extra modules for these functions. Everyone who uses
		12	dnl <stdio.h> likely needs them.
		13	GNULIB_FPRINTF=1
		14	GNULIB_PRINTF=1
		15	GNULIB_VFPRINTF=1
		16	GNULIB_VPRINTF=1
		17	GNULIB_FPUTC=1
		18	GNULIB_PUTC=1
		19	GNULIB_PUTCHAR=1
		20	GNULIB_FPUTS=1
		21	GNULIB_PUTS=1
		22	GNULIB_FWRITE=1
		23	dnl This ifdef is just an optimization, to avoid performing a configure
		24	dnl check whose result is not used. It does not make the test of
		25	dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant.
		26	m4_ifdef([gl_SIGNAL_SIGPIPE], [
		27	gl_SIGNAL_SIGPIPE
		28	if test $gl_cv_header_signal_h_SIGPIPE != yes; then
		29	REPLACE_STDIO_WRITE_FUNCS=1
		30	AC_LIBOBJ([stdio-write])
		31	fi
		32	])
11	])	33	])
12		34
13	AC_DEFUN([gl_STDIO_MODULE_INDICATOR],	35	AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
@@ -19,49 +41,69 @@ AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
19		41
20	AC_DEFUN([gl_STDIO_H_DEFAULTS],	42	AC_DEFUN([gl_STDIO_H_DEFAULTS],
21	[	43	[
22	GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX])	44	GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF])
23	GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX])	45	GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX])
24	GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF])	46	GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF])
25	GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX])	47	GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX])
26	GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX])	48	GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF])
27	GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX])	49	GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX])
28	GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF])	50	GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF])
29	GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX])	51	GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX])
30	GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF])	52	GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF])
31	GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN])	53	GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX])
32	GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN])	54	GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF])
33	GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK])	55	GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX])
34	GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO])	56	GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF])
35	GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL])	57	GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF])
36	GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO])	58	GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
37	GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH])	59	GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN])
38	GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM])	60	GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN])
39	GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE])	61	GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK])
		62	GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO])
		63	GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL])
		64	GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO])
		65	GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH])
		66	GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE])
		67	GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC])
		68	GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC])
		69	GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR])
		70	GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS])
		71	GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS])
		72	GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE])
		73	GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM])
		74	GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE])
		75	GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR])
		76	GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE])
40	dnl Assume proper GNU behavior unless another module says otherwise.	77	dnl Assume proper GNU behavior unless another module says otherwise.
41	REPLACE_FPRINTF=0; AC_SUBST([REPLACE_FPRINTF])	78	REPLACE_STDIO_WRITE_FUNCS=0; AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
42	REPLACE_VFPRINTF=0; AC_SUBST([REPLACE_VFPRINTF])	79	REPLACE_FPRINTF=0; AC_SUBST([REPLACE_FPRINTF])
43	REPLACE_PRINTF=0; AC_SUBST([REPLACE_PRINTF])	80	REPLACE_VFPRINTF=0; AC_SUBST([REPLACE_VFPRINTF])
44	REPLACE_VPRINTF=0; AC_SUBST([REPLACE_VPRINTF])	81	REPLACE_PRINTF=0; AC_SUBST([REPLACE_PRINTF])
45	REPLACE_SNPRINTF=0; AC_SUBST([REPLACE_SNPRINTF])	82	REPLACE_VPRINTF=0; AC_SUBST([REPLACE_VPRINTF])
46	HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF])	83	REPLACE_SNPRINTF=0; AC_SUBST([REPLACE_SNPRINTF])
47	REPLACE_VSNPRINTF=0; AC_SUBST([REPLACE_VSNPRINTF])	84	HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF])
48	HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF])	85	REPLACE_VSNPRINTF=0; AC_SUBST([REPLACE_VSNPRINTF])
49	REPLACE_SPRINTF=0; AC_SUBST([REPLACE_SPRINTF])	86	HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF])
50	REPLACE_VSPRINTF=0; AC_SUBST([REPLACE_VSPRINTF])	87	REPLACE_SPRINTF=0; AC_SUBST([REPLACE_SPRINTF])
51	HAVE_VASPRINTF=1; AC_SUBST([HAVE_VASPRINTF])	88	REPLACE_VSPRINTF=0; AC_SUBST([REPLACE_VSPRINTF])
52	REPLACE_VASPRINTF=0; AC_SUBST([REPLACE_VASPRINTF])	89	HAVE_VASPRINTF=1; AC_SUBST([HAVE_VASPRINTF])
53	REPLACE_FOPEN=0; AC_SUBST([REPLACE_FOPEN])	90	REPLACE_VASPRINTF=0; AC_SUBST([REPLACE_VASPRINTF])
54	REPLACE_FREOPEN=0; AC_SUBST([REPLACE_FREOPEN])	91	HAVE_DECL_OBSTACK_PRINTF=1; AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
55	HAVE_FSEEKO=1; AC_SUBST([HAVE_FSEEKO])	92	REPLACE_OBSTACK_PRINTF=0; AC_SUBST([REPLACE_OBSTACK_PRINTF])
56	REPLACE_FSEEKO=0; AC_SUBST([REPLACE_FSEEKO])	93	REPLACE_FOPEN=0; AC_SUBST([REPLACE_FOPEN])
57	REPLACE_FSEEK=0; AC_SUBST([REPLACE_FSEEK])	94	REPLACE_FREOPEN=0; AC_SUBST([REPLACE_FREOPEN])
58	HAVE_FTELLO=1; AC_SUBST([HAVE_FTELLO])	95	HAVE_FSEEKO=1; AC_SUBST([HAVE_FSEEKO])
59	REPLACE_FTELLO=0; AC_SUBST([REPLACE_FTELLO])	96	REPLACE_FSEEKO=0; AC_SUBST([REPLACE_FSEEKO])
60	REPLACE_FTELL=0; AC_SUBST([REPLACE_FTELL])	97	REPLACE_FSEEK=0; AC_SUBST([REPLACE_FSEEK])
61	REPLACE_FFLUSH=0; AC_SUBST([REPLACE_FFLUSH])	98	HAVE_FTELLO=1; AC_SUBST([HAVE_FTELLO])
62	HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM])	99	REPLACE_FTELLO=0; AC_SUBST([REPLACE_FTELLO])
63	HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE])	100	REPLACE_FTELL=0; AC_SUBST([REPLACE_FTELL])
64	REPLACE_GETLINE=0; AC_SUBST([REPLACE_GETLINE])	101	REPLACE_FFLUSH=0; AC_SUBST([REPLACE_FFLUSH])
		102	REPLACE_FCLOSE=0; AC_SUBST([REPLACE_FCLOSE])
		103	HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM])
		104	HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE])
		105	REPLACE_GETLINE=0; AC_SUBST([REPLACE_GETLINE])
		106	REPLACE_PERROR=0; AC_SUBST([REPLACE_PERROR])
65	])	107	])
66		108
67	dnl Code shared by fseeko and ftello. Determine if large files are supported,	109	dnl Code shared by fseeko and ftello. Determine if large files are supported,
@@ -70,8 +112,8 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET],
70	[	112	[
71	AC_CACHE_CHECK([whether stdin defaults to large file offsets],	113	AC_CACHE_CHECK([whether stdin defaults to large file offsets],
72	[gl_cv_var_stdin_large_offset],	114	[gl_cv_var_stdin_large_offset],
73	[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>],	115	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
74	[#if defined __SL64 && defined __SCLE /* cygwin */	116	[[#if defined __SL64 && defined __SCLE /* cygwin */
75	/* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making	117	/* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making
76	fseeko/ftello needlessly fail. This bug was fixed in 1.5.25, and	118	fseeko/ftello needlessly fail. This bug was fixed in 1.5.25, and
77	it is easier to do a version check than building a runtime test. */	119	it is easier to do a version check than building a runtime test. */
@@ -79,7 +121,7 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET],
79	# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25)	121	# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25)
80	choke me	122	choke me
81	# endif	123	# endif
82	#endif])],	124	#endif]])],
83	[gl_cv_var_stdin_large_offset=yes],	125	[gl_cv_var_stdin_large_offset=yes],
84	[gl_cv_var_stdin_large_offset=no])])	126	[gl_cv_var_stdin_large_offset=no])])
85	])	127	])