X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fargp.m4;h=6a5d6b246eb945dd6ea3ec81e6b8be09079f9e6d;hb=3a0fd281a43a8eaea2168600c1f36fbebc4dea81;hp=8ecc4ee15e1d0df89c2648fb2d199f088941251e;hpb=b567fb8da47528c280e2748cf9e2f67246ef00be;p=gnulib.git

diff --git a/m4/argp.m4 b/m4/argp.m4
index 8ecc4ee15..6a5d6b246 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -9,8 +9,40 @@ AC_DEFUN([gl_ARGP],
   AC_REQUIRE([AC_C_INLINE])
   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_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])],
+                [#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])],
+                [#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_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_CHECK_DECLS_ONCE(
      [clearerr_unlocked feof_unlocked ferror_unlocked
       fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked