X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fargp.m4;h=80cb72f53ed7e672de4329eb439e5f82a04436e9;hb=01dfd1752e938c6fca54e791eb2adc1de29189f5;hp=3cd609b4197184a22c2cfa1b40625f04f6ebd09e;hpb=3e1218682966f9d8f92240d4185cc2218d7bf29f;p=gnulib.git

diff --git a/m4/argp.m4 b/m4/argp.m4
index 3cd609b41..80cb72f53 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -1,5 +1,5 @@
-# argp.m4 serial 7
-dnl Copyright (C) 2003-2006 Free Software Foundation, Inc.
+# argp.m4 serial 8
+dnl Copyright (C) 2003-2007 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.
@@ -9,19 +9,22 @@ 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_GETOPT_SUBSTITUTE
+  dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ(getopt), AC_LIBOBJ(getopt1).
 
   AC_CHECK_DECL([program_invocation_name],
                 [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])],
+                           [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,
                            [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])],
+                           [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
@@ -29,20 +32,20 @@ AC_DEFUN([gl_ARGP],
   # 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_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_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])