X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fargp.m4;h=b7f213d00eed8628b190a4e661f02790fb629668;hb=76bd5cd5304484617bd8b15bfc8a59b0264482b8;hp=fc810041647ec936edecc8f68579e692c13ec015;hpb=bc4997d3dda225ff61dc9377b14aea626d9996b1;p=gnulib.git

diff --git a/m4/argp.m4 b/m4/argp.m4
index fc8100416..b7f213d00 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -1,5 +1,5 @@
-# argp.m4 serial 1
-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,6 +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])
 ])