[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Lay groundwork for exec. ext. support
From: |
Tim Van Holder |
Subject: |
Lay groundwork for exec. ext. support |
Date: |
Mon, 18 Jun 2001 18:34:05 +0200 |
I'd like to see this included in 2.51 as groundwork for
a working solution in 2.52. It should not affect any
existing scripts (I think).
2001-06-18 Tim Van Holder <address@hidden>
* acgeneral.m4 (AC_CHECK_PROG, AC_PATH_PROG): Add basic
support for executable extensions.
acspecific.m4 (AC_PROG_INSTALL): Ditto.
Index: acgeneral.m4
===================================================================
RCS file: /cvs/autoconf/acgeneral.m4,v
retrieving revision 1.734
diff -u -u -r1.734 acgeneral.m4
--- acgeneral.m4 2001/06/15 17:40:57 1.734
+++ acgeneral.m4 2001/06/18 16:29:57
@@ -2279,15 +2282,18 @@
m4_ifvaln([$6],
[ ac_prog_rejected=no])dnl
AC_SHELL_PATH_WALK([$5],
-[AS_EXECUTABLE_P("$ac_dir/$ac_word") || continue
+[for ac_exec_ext in '' $ac_executable_extensions; do
+ if AS_EXECUTABLE_P("$ac_dir/$ac_word$ac_exec_ext"); then
m4_ifvaln([$6],
-[if test "$ac_dir/$ac_word" = "$6"; then
- ac_prog_rejected=yes
- continue
-fi])dnl
-ac_cv_prog_$1="$3"
-echo "$as_me:__oline__: found $ac_dir/$ac_word" >&AS_MESSAGE_LOG_FD
-break])
+[ if test "$ac_dir/$ac_word$ac_exec_ext" = "$6"; then
+ ac_prog_rejected=yes
+ continue
+ fi])dnl
+ ac_cv_prog_$1="$3"
+ echo "$as_me:__oline__: found $ac_dir/$ac_word$ac_exec_ext"
>&AS_MESSAGE_LOG_FD
+ break 2
+ fi
+done])
m4_ifvaln([$6],
[if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -2349,11 +2355,13 @@
;;
*)
AC_SHELL_PATH_WALK([$4],
-[if AS_EXECUTABLE_P("$ac_dir/$ac_word"); then
- ac_cv_path_$1="$ac_dir/$ac_word"
- echo "$as_me:__oline__: found $ac_dir/$ac_word" >&AS_MESSAGE_LOG_FD
- break
-fi])
+[for ac_exec_ext in '' $ac_executable_extensions; do
+ if AS_EXECUTABLE_P("$ac_dir/$ac_word$ac_exec_ext"); then
+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:__oline__: found $ac_dir/$ac_word$ac_exec_ext"
>&AS_MESSAGE_LOG_FD
+ break 2
+ fi
+done])
dnl If no 3rd arg is given, leave the cache variable unset,
dnl so AC_PATH_PROGS will keep looking.
m4_ifvaln([$3],
Index: acspecific.m4
===================================================================
RCS file: /cvs/autoconf/acspecific.m4,v
retrieving revision 1.342
diff -u -u -r1.342 acspecific.m4
--- acspecific.m4 2001/06/15 17:44:17 1.342
+++ acspecific.m4 2001/06/18 16:26:32
@@ -218,20 +218,22 @@
# Don't use installbsd from OSF since it installs stuff as root
# by default.
for ac_prog in ginstall scoinst install; do
- 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.
- :
- elif test $ac_prog = install &&
- grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if AS_EXECUTABLE_P("$ac_dir/$ac_prog$ac_exec_ext"); then
+ if test $ac_prog = install &&
+ grep dspmsg "$ac_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1;
then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$ac_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$ac_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
- fi
+ done
done
;;
esac
- Lay groundwork for exec. ext. support,
Tim Van Holder <=