mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-02-23 15:19:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

* libtool.m4 (AC_PATH_PROG_VERSION_GREP): removed in favour of the

Browse Source 
more general AC_PATH_PROG_GREP_OUTPUT.
(AC_PATH_TOOL_VERSION_GREP): removed in favour of the more general
AC_PATH_TOOL_GREP_OUTPUT.
(AC_PROG_LIBTOOL):  Search for a working find program in the
user's PATH using the new macros.
This commit is contained in:
Gary V. Vaughan 1999-10-07 15:40:07 +00:00
parent 8bddb60764
commit 692d6c3975
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
1999-10-07 Gary V. Vaughan <gary@oranda.demon.co.uk>
* libtool.m4 (AC_PATH_PROG_VERSION_GREP): removed in favour of the
more general AC_PATH_PROG_GREP_OUTPUT.
(AC_PATH_TOOL_VERSION_GREP): removed in favour of the more general
AC_PATH_TOOL_GREP_OUTPUT.
(AC_PROG_LIBTOOL): Search for a working find program in the
user's PATH using the new macros.
1999-10-06 Gary V. Vaughan <gary@oranda.demon.co.uk> 1999-10-06 Gary V. Vaughan <gary@oranda.demon.co.uk>
* NEWS: updtaed. * NEWS: updtaed.

27
libtool.m4 vendored
View File

@ -21,7 +21,7 @@
## configuration script generated by Autoconf, you may include it under ## configuration script generated by Autoconf, you may include it under
## the same distribution terms that you use for the rest of that program. ## the same distribution terms that you use for the rest of that program.
# serial 41 AC_PROG_LIBTOOL # serial 42 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL, AC_DEFUN(AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
@ -70,7 +70,10 @@ dnl
AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(STRIP, strip, :)
AC_PATH_TOOL_VERSION_GREP(FILE, file, file, :, "/usr/bin:$PATH")
echo 'This is only a test.' > conftest.txt
AC_PATH_TOOL_GREP_OUTPUT(FILE, file conftest.txt, text, :, "/usr/bin:$PATH")
rm -rf conftest*
# Check for any special flags to pass to ltconfig. # Check for any special flags to pass to ltconfig.
libtool_flags="--cache-file=$cache_file" libtool_flags="--cache-file=$cache_file"
@ -267,10 +270,10 @@ AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_FAST_INSTALL(no)]) AC_ENABLE_FAST_INSTALL(no)])
# AC_PATH_PROG_VERSION_GREP - look for a particular expression in the output # AC_PATH_PROG_GREP_OUTPUT - look for a particular expression in the output
# generated by $PROG --version # generated by $PROG
dnl AC_PATH_PROG_VERSION_GREP(VARIABLE, PROG-TO-CHECK-FOR, GREP-EXPRESSION[, VALUE-IF-NOT-FOUND[, PATH]]) dnl AC_PATH_PROG_GREP_OUTPUT(VARIABLE, PROG-TO-CHECK-FOR, GREP-EXPRESSION[, VALUE-IF-NOT-FOUND[, PATH]])
AC_DEFUN(AC_PATH_PROG_VERSION_GREP, AC_DEFUN(AC_PATH_PROG_GREP_OUTPUT,
[# Extract the first word of "$2", so it can be a program name with args. [# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2 set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word]) AC_MSG_CHECKING([for $ac_word])
@ -290,7 +293,7 @@ dnl not every word. This closes a longstanding sh security hole.
ac_dummy="ifelse([$5], , $PATH, [$5])" ac_dummy="ifelse([$5], , $PATH, [$5])"
for ac_dir in $ac_dummy; do for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if $ac_dir/$2 --version 2>/dev/null | grep $3 >/dev/null 2>&1; then if eval '$ac_dir/$2' 2>&1 | grep $3 >/dev/null 2>&1; then
ac_cv_path_$1="$ac_dir/$ac_word" ac_cv_path_$1="$ac_dir/$ac_word"
break break
fi fi
@ -311,17 +314,17 @@ AC_SUBST($1)dnl
]) ])
# AC_PATH_TOOL_VERSION_GREP - Try AC_PATH_PROG_VERSION_GREP with target # AC_PATH_TOOL_GREP_OUTPUT - Try AC_PATH_PROG_GREP_OUTPUT with target
# prefix when cross-compiling # prefix when cross-compiling
dnl AC_PATH_TOOL_VERSION_GREP(VARIABLE, PROG-TO-CHECK-FOR, GREP-EXPRESSION[, VALUE-IF-NOT-FOUND [, PATH]]) dnl AC_PATH_TOOL_GREP_OUTPUT(VARIABLE, PROG-TO-CHECK-FOR, GREP-EXPRESSION[, VALUE-IF-NOT-FOUND [, PATH]])
AC_DEFUN(AC_PATH_TOOL_VERSION_GREP, AC_DEFUN(AC_PATH_TOOL_GREP_OUTPUT,
[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
AC_PATH_PROG_VERSION_GREP($1, ${ac_tool_prefix}$2, $3, AC_PATH_PROG_GREP_OUTPUT($1, ${ac_tool_prefix}$2, $3,
ifelse([$4], , [$2], ), $5) ifelse([$4], , [$2], ), $5)
ifelse([$4], , , [ ifelse([$4], , , [
if test -z "$ac_cv_prog_$1"; then if test -z "$ac_cv_prog_$1"; then
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
AC_PATH_PROG_VERSION_GREP($1, $2, $3, $2, $5) AC_PATH_PROG_GREP_OUTPUT($1, $2, $3, $2, $5)
else else
$1="$4" $1="$4"
fi fi