*** empty log message ***

Rev: src/argp/acinclude.m4:1.2
Rev: src/argp/configure.in:1.5

src/argp/acinclude.m4

-dnl AC_CHECK_VAR(VAR, TYPE)
-AC_DEFUN(AC_CHECK_VAR,
+dnl ARGP_CHECK_VAR(VAR, INCLUDES)
+AC_DEFUN(ARGP_CHECK_VAR,
 [ AC_CACHE_CHECK(
     [for $1],
-    argp_cv_var_$1,
-    AC_TRY_LINK(, [extern $2 $1; void *p = (void *) &$1;],
-		[argp_cv_var_$1=yes],
-		[argp_cv_var_$1=no]))
-  if eval "test \"`echo '$argp_cv_var_'$1`\" = yes"; then
+    lsh_cv_var_$1,
+    AC_TRY_LINK([$2], [void *p = (void *) &$1;],
+		[lsh_cv_var_$1=yes],
+		[lsh_cv_var_$1=no]))
+  if eval "test \"`echo '$lsh_cv_var_'$1`\" = yes"; then
     AC_DEFINE_UNQUOTED(HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`)
   fi
 ])

src/argp/configure.in

@@ -41,20 +41,8 @@ AC_CHECK_FUNCS(fputs_unlocked fwrite_unlocked)
 dnl Used only by argp-test.c, so don't use AC_REPLACE_FUNCS.
 AC_CHECK_FUNCS(strdup asprintf)
 
-dnl AC_CHECK_VAR(VAR, TYPE)
-AC_DEFUN(AC_CHECK_VAR,
-[ AC_CACHE_CHECK(
-    [for $1],
-    lsh_cv_var_$1,
-    AC_TRY_LINK(, [extern $2 $1; void *p = (void *) &$1;],
-		[lsh_cv_var_$1=yes],
-		[lsh_cv_var_$1=no]))
-  if eval "test \"`echo '$lsh_cv_var_'$1`\" = yes"; then
-    AC_DEFINE_UNQUOTED(HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`)
-  fi
-])
-AC_CHECK_VAR(program_invocation_name, [char *])
-AC_CHECK_VAR(program_invocation_short_name, [char *])
+ARGP_CHECK_VAR(program_invocation_name, [#include <errno.h>])
+ARGP_CHECK_VAR(program_invocation_short_name, [#include <errno.h>])
 
 # Set these flags *last*, or else the test programs won't compile
 if test x$GCC = xyes ; then