X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fargp.m4;h=819425bbb73bac8bd659edfb272be20ab1ab865f;hb=5510d3df6c49b73ed41fd3243c276f96a3c3f9d4;hp=7d761ae979b1f688d6b0f72c1743525c87973887;hpb=997f5bfa12cec90a7dab44a46eb5278a2ef519ed;p=gnulib.git

diff --git a/m4/argp.m4 b/m4/argp.m4
index 7d761ae97..819425bbb 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -1,5 +1,5 @@
-# argp.m4 serial 6
-dnl Copyright (C) 2003-2006 Free Software Foundation, Inc.
+# argp.m4 serial 10
+dnl Copyright (C) 2003-2007, 2009-2010 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,41 +7,45 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_ARGP],
 [
   AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_REQUIRE([gl_GETOPT_SUBSTITUTE])
+  dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt
+  dnl always.
+  gl_REPLACE_GETOPT
+  dnl Note: gl_REPLACE_GETOPT does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]).
 
   AC_CHECK_DECL([program_invocation_name],
-                [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_NAME, 1,
+                [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1],
                            [Define if program_invocation_name is declared])],
-	        [AC_DEFINE(GNULIB_PROGRAM_INVOCATION_NAME, 1,
-                           [Define to 1 to add extern declaration of program_invocation_name to argp-namefrob.h])],
+                [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1],
+                           [Define to 1 to add extern declaration of program_invocation_name to argp.h])],
                 [#include <errno.h>])
   AC_CHECK_DECL([program_invocation_short_name],
-                [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME, 1,
+                [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME], [1],
                            [Define if program_invocation_short_name is declared])],
-	        [AC_DEFINE(GNULIB_PROGRAM_INVOCATION_SHORT_NAME, 1,
-                           [Define to 1 to add extern declaration of program_invocation_short_name to argp-namefrob.h])],
+                [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1],
+                           [Define to 1 to add extern declaration of program_invocation_short_name to argp.h])],
                 [#include <errno.h>])
 
   # Check if program_invocation_name and program_invocation_short_name
   # are defined elsewhere. It is improbable that only one of them will
   # be defined and other not, I prefer to stay on the safe side and to
   # test each one separately.
-  AC_MSG_CHECKING(whether program_invocation_name is defined)
-  AC_TRY_COMPILE([#include <argp.h>],
-                 [ program_invocation_name = "test"; ],
-                 [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME,1,
-                   [Define if program_invocation_name is defined])
-                   AC_MSG_RESULT(yes)],
-                 [ AC_MSG_RESULT(no)] )
+  AC_MSG_CHECKING([whether program_invocation_name is defined])
+  AC_TRY_LINK([#include <argp.h>],
+              [ program_invocation_name = "test"; ],
+              [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], [1],
+                 [Define if program_invocation_name is defined])
+                 AC_MSG_RESULT([yes])],
+              [ AC_MSG_RESULT([no])] )
 
-  AC_MSG_CHECKING(whether program_invocation_short_name is defined)
-  AC_TRY_COMPILE([#include <argp.h>],
-                 [ program_invocation_short_name = "test"; ],
-                 [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME,1,
-                   [Define if program_invocation_short_name is defined])
-                   AC_MSG_RESULT(yes)],
-                 [ AC_MSG_RESULT(no)] )
+  AC_MSG_CHECKING([whether program_invocation_short_name is defined])
+  AC_TRY_LINK([#include <argp.h>],
+              [ program_invocation_short_name = "test"; ],
+              [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1],
+                 [Define if program_invocation_short_name is defined])
+                 AC_MSG_RESULT([yes])],
+              [ AC_MSG_RESULT([no])] )
 
   AC_CHECK_DECLS_ONCE([clearerr_unlocked])
   AC_CHECK_DECLS_ONCE([feof_unlocked])