changeset 5988:60262f4b3d5f

* modules/argp (Depends-on): Remove unlocked-io. * m4/argp.m4 (gl_ARGP): Remove invocation of gl_FUNC_GLIBC_UNLOCKED_IO. Instead, test for *_unlocked function declarations directly.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 14 Jul 2005 22:15:14 +0000
parents 3abf83a68fce
children c0415917431f
files ChangeLog m4/ChangeLog m4/argp.m4 modules/argp
diffstat 4 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* modules/argp (Depends-on): Remove unlocked-io.
+
 2005-07-11  Simon Josefsson  <jas@extundo.com>
 
 	* modules/size_max: New file.
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-14  Bruno Haible  <bruno@clisp.org>
+
+	* argp.m4 (gl_ARGP): Remove invocation of gl_FUNC_GLIBC_UNLOCKED_IO.
+	Instead, test for *_unlocked function declarations directly.
+
 2005-07-14  Derek Price  <derek@ximbiot.com>
 
 	* glob.m4 (gl_GLOB): Cache glob interface check result.  Add check for
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -1,5 +1,5 @@
-# argp.m4 serial 4
-dnl Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# argp.m4 serial 5
+dnl Copyright (C) 2003-2005 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.
@@ -7,11 +7,15 @@
 AC_DEFUN([gl_ARGP],
 [
   AC_REQUIRE([AC_C_INLINE])
-  AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_GETOPT_SUBSTITUTE])
   AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],,,
     [#include <errno.h>])
+  AC_CHECK_DECLS_ONCE(
+     [clearerr_unlocked feof_unlocked ferror_unlocked
+      fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked
+      fread_unlocked fwrite_unlocked getc_unlocked
+      getchar_unlocked putc_unlocked putchar_unlocked])
   AC_CHECK_FUNCS_ONCE([flockfile funlockfile])
   AC_CHECK_HEADERS_ONCE([features.h linewrap.h])
 ])
--- a/modules/argp
+++ b/modules/argp
@@ -26,7 +26,6 @@
 restrict
 strcase
 extensions
-unlocked-io
 vsnprintf
 
 configure.ac:
@@ -45,4 +44,3 @@
 
 Maintainer:
 Sergey Poznyakoff, glibc
-