* 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.

diff --git a/ChangeLog b/ChangeLog
index 6e3dc1d3ec20959c6f62d7fa95d5f0c6442471a0..3e3de74951c650089bbfe9225f61b36ac37fdfb4 100644 (file)
--- 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.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 4b1b8bc47d4a25d7bc269fccf5baf2d42ca7ecf5..56ab1ccd81bc90cde5fc4585f4667c76a974b564 100644 (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

diff --git a/m4/argp.m4 b/m4/argp.m4
index 98fb40f62ff58ec9cfbff5230d1d597620f680e4..8ecc4ee15e1d0df89c2648fb2d199f088941251e 100644 (file)
--- 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 @@ dnl with or without modifications, as long as this notice is preserved.
 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])
 ])

diff --git a/modules/argp b/modules/argp
index 1807e35ea33bb5e2e58285c3d1e0cd9f844a32f0..cc9eb8160f1a13721934076b0735edb82ea0eabd 100644 (file)
--- a/modules/argp
+++ b/modules/argp
@@ -26,7 +26,6 @@ strndup
 restrict
 strcase
 extensions
-unlocked-io
 vsnprintf
 
 configure.ac:
@@ -45,4 +44,3 @@ LGPL
 
 Maintainer:
 Sergey Poznyakoff, glibc
-