2004-11-10  Stepan Kasal  <address@hidden>

	* lib/autoconf/programs.m4 (_AC_FEATURE_CHECK_LENGTH): Don't check
	  the $1_found variable, don't test whether the file is executable;
	  Both things are checked ...
	(_AC_PATH_PROG_FEATURE_CHECK): ... here; AS_EXECUTABLE_P replaces
	  the former ``test -f''.
	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Fix a typo.

Index: lib/autoconf/programs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/programs.m4,v
retrieving revision 1.33
diff -u -r1.33 programs.m4
--- lib/autoconf/programs.m4	5 Sep 2004 22:26:22 -0000	1.33
+++ lib/autoconf/programs.m4	10 Nov 2004 07:02:01 -0000
@@ -435,7 +435,7 @@
 [for ac_prog in $2; do
   for ac_exec_ext in '' $ac_executable_extensions; do
     ac_path_$1="$as_dir/$ac_prog$ac_exec_ext"
-    test -f "$ac_path_$1" || continue
+    AS_EXECUTABLE_P(["$ac_path_$1"]) || continue
     $3
     $ac_path_$1_found && break 3
   done
@@ -464,8 +464,7 @@
 # iteration by appending (optionally, MATCH-STRING and) a newline
 # to the file, and using the result as input to CHECK-CMD.
 m4_define([_AC_FEATURE_CHECK_LENGTH],
-[$$1_found || if AS_EXECUTABLE_P(["$$1"]); then
-  # Check for GNU $1 and select it if it is found.
+[# Check for GNU $1 and select it if it is found.
   _AC_PATH_PROG_FLAVOR_GNU([$$1],
     [$2="$$1" $1_found=:],
   [ac_count=0
@@ -490,7 +489,6 @@
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
   done])
-fi
 ])
 
 
Index: lib/m4sugar/m4sh.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sh.m4,v
retrieving revision 1.120
diff -u -r1.120 m4sh.m4
--- lib/m4sugar/m4sh.m4	20 Aug 2004 19:58:07 -0000	1.120
+++ lib/m4sugar/m4sh.m4	10 Nov 2004 07:02:01 -0000
@@ -884,7 +884,7 @@
 # ----------------
 m4_defun([_AS_TEST_PREPARE],
 [as_executable_p="test -f"
-])# _AS_BROKEN_TEST_PREPARE
+])# _AS_TEST_PREPARE
 
 
 # AS_SET_CATFILE(VAR, DIR-NAME, FILE-NAME)