From b42261a8e9d8d98b9649b92ccaead47735c9fa41 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 11 Feb 2007 13:37:02 +0000 Subject: [PATCH] * libtool.m4 (_AS_TEST_PREPARE, AS_EXECUTABLE_P): m4_defun these macros, if undefined, with modified copies from Autoconf 2.59. (LT_AC_PROG_SED): Use AS_EXECUTABLE_P, not $as_executable_p, this is an internal Autoconf detail. --- ChangeLog | 6 ++++++ libtool.m4 | 26 +++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0f30a5cc1..77ed3c1fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2007-02-11 Ralf Wildenhues + * libtool.m4 (_AS_TEST_PREPARE, AS_EXECUTABLE_P): m4_defun + these macros, if undefined, with modified copies from Autoconf + 2.59. + (LT_AC_PROG_SED): Use AS_EXECUTABLE_P, not $as_executable_p, + this is an internal Autoconf detail. + * doc/libtool.texi: Update copyright years. 2007-02-06 Ralf Wildenhues diff --git a/libtool.m4 b/libtool.m4 index 84f5d61cd..5baf011db 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -6483,6 +6483,30 @@ AC_DEFUN([LT_AC_PROG_RC], [AC_CHECK_TOOL(RC, windres, no) ]) + +# Cheap backport of AS_EXECUTABLE_P and required macros +# from Autoconf 2.59; we should not use $as_executable_p directly. + +# _AS_TEST_PREPARE +# ---------------- +m4_ifndef([_AS_TEST_PREPARE], +[m4_defun([_AS_TEST_PREPARE], +[if test -x / >/dev/null 2>&1; then + as_executable_p='test -x' +else + as_executable_p='test -f' +fi +])])# _AS_TEST_PREPARE + +# AS_EXECUTABLE_P +# --------------- +# Check whether a file is executable. +m4_ifndef([AS_EXECUTABLE_P], +[m4_defun([AS_EXECUTABLE_P], +[AS_REQUIRE([_AS_TEST_PREPARE])dnl +$as_executable_p $1[]dnl +])])# AS_EXECUTABLE_P + ############################################################ # NOTE: This macro has been submitted for inclusion into # # GNU Autoconf as AC_PROG_SED. When it is available in # @@ -6505,7 +6529,7 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done -- 2.47.2