35-neuter-as-broken-test-prepare.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * m4sh.m4 (_AS_TEST_PREPARE): Rename as...
        (_AS_BROKEN_TEST_PREPARE): this.
        (_AS_TEST_PREPARE): New dummy but working version of this macro.
        * acspecific.m4 (AC_PROG_INSTALL): Use AS_EXECUTABLE_P.

Index: acspecific.m4
--- acspecific.m4 Mon, 19 Feb 2001 23:50:41 +0100 akim (ace/25_acspecific 1.123 
644)
+++ acspecific.m4 Sat, 24 Feb 2001 20:13:16 +0100 akim (ace/25_acspecific 1.123 
644)
@@ -217,7 +217,7 @@ AC_DEFUN([AC_PROG_INSTALL],
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f "$ac_dir/$ac_prog"; then
+        if AS_EXECUTABLE_P(["$ac_dir/$ac_prog"]); then
          if test $ac_prog = install &&
             grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
            # AIX install.  It has an incompatible calling convention.
Index: m4sh.m4
--- m4sh.m4 Thu, 01 Feb 2001 20:35:31 +0100 akim (ace/b/41_m4sh.m4 1.23 644)
+++ m4sh.m4 Sat, 24 Feb 2001 20:09:45 +0100 akim (ace/b/41_m4sh.m4 1.23 644)
@@ -375,11 +375,13 @@ m4_define([AS_MKDIR_P],
 ])# AS_MKDIR_P


-# _AS_TEST_PREPARE
-# ----------------
+# _AS_BROKEN_TEST_PREPARE
+# -----------------------
+# FIXME: This does not work and breaks way too many things.
+#
 # Find out ahead of time whether we want test -x (preferred) or test -f
 # to check whether a file is executable.
-m4_defun([_AS_TEST_PREPARE],
+m4_defun([_AS_BROKEN_TEST_PREPARE],
 [# Find out how to test for executable files. Don't use a zero-byte file,
 # as systems may use methods other than mode bits to determine executability.
 cat >conftest.file <<_ASEOF
@@ -395,7 +397,17 @@ m4_define([AS_MKDIR_P],
   AS_ERROR([cannot check whether a file is executable on this system])
 fi
 rm -f conftest.file
-])# _AS_TEST_PREPARE
+])# _AS_BROKEN_TEST_PREPARE
+
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_defun([_AS_TEST_PREPARE],
+[as_executable_p="test -f"
+])# _AS_BROKEN_TEST_PREPARE
+
+
+