* 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.
This commit is contained in:
Akim Demaille 2001-02-25 10:43:34 +00:00
parent 8fa22f9fb7
commit bc2da2eb0d
5 changed files with 41 additions and 10 deletions

View File

@ -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 `-'.

View File

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

View File

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

View File

@ -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

20
m4sh.m4
View File

@ -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