(gl_ARGP): Do not check for argp.h or argp_parse; nobody

uses HAVE_ARGP_H or HAVE_ARGP_PARSE.
Require gl_FUNC_GLIBC_UNLOCKED_IO, gl_USE_SYSTEM_EXTENSIONS.
Check for program_invocation_name, program_invocation_short_name,
flockfile, funlockfile, features.h, _getopt_long_only_r.

diff --git a/m4/argp.m4 b/m4/argp.m4
index c7e485d601771d18ce9c486a0a02c614163df85b..b7f213d00eed8628b190a4e661f02790fb629668 100644 (file)
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -1,5 +1,5 @@
-# argp.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# argp.m4 serial 3
+dnl Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -8,7 +8,12 @@ dnl the same distribution terms as the rest of that program.
 
 AC_DEFUN([gl_ARGP],
 [
-  AC_CHECK_HEADERS([argp.h linewrap.h])
-  AC_CHECK_FUNCS(argp_parse)
   AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],,,
+    [#include <errno.h>])
+  AC_CHECK_FUNCS_ONCE([flockfile funlockfile])
+  AC_CHECK_HEADERS_ONCE([features.h linewrap.h])
+  AC_CHECK_FUNC(_getopt_long_only_r, :, [gl_GETOPT_SUBSTITUTE])
 ])