From: Akim Demaille <akim@epita.fr>
Date: Sun, 25 Feb 2001 10:43:34 +0000 (+0000)
Subject: * m4sh.m4 (_AS_TEST_PREPARE): Rename as...
X-Git-Tag: autoconf-2.50~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc2da2eb0dff804cd0b6a7ffe6501dcf3be9a2ce;p=thirdparty%2Fautoconf.git

* 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.
---

diff --git a/ChangeLog b/ChangeLog
index cafb7a743..752623bbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-25  Akim Demaille  <akim@epita.fr>
+
+	* 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.
+
 2001-02-25  Akim Demaille  <akim@epita.fr>
 
 	* autoupdate.in (&parse_args): Support `-'.
diff --git a/acspecific.m4 b/acspecific.m4
index 8c75c8c01..d81f0003e 100644
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -217,7 +217,7 @@ AC_CACHE_VAL(ac_cv_path_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.
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 8c75c8c01..d81f0003e 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -217,7 +217,7 @@ AC_CACHE_VAL(ac_cv_path_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.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 4b975906b..82f500f38 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -375,11 +375,13 @@ done; }
 ])# 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 @@ else
   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
+
+
+
 
 
 
diff --git a/m4sh.m4 b/m4sh.m4
index 4b975906b..82f500f38 100644
--- a/m4sh.m4
+++ b/m4sh.m4
@@ -375,11 +375,13 @@ done; }
 ])# 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 @@ else
   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
+
+
+