From d3f2c0f84d7372c6ff5e8de054df596fd5501c67 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 2 Jul 2005 10:18:28 +0000 Subject: [PATCH] * config/ltmain.m4sh (func_mode_compile, func_mode_link), m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH, _LT_ENABLE_LOCK): Remove some unnecessary quotes. --- ChangeLog | 4 ++++ config/ltmain.m4sh | 14 +++++++------- m4/libtool.m4 | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dc0e01a..49fa0205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-07-02 Ralf Wildenhues + * config/ltmain.m4sh (func_mode_compile, func_mode_link), + m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH, _LT_ENABLE_LOCK): + Remove some unnecessary quotes. + * tests/convenience.at : Fix java test. Reported by Eric Blake . diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh index 7954fa98..e66a0bef 100644 --- a/config/ltmain.m4sh +++ b/config/ltmain.m4sh @@ -1080,7 +1080,7 @@ func_mode_compile () for arg do - case "$arg_mode" in + case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile lastarg="$arg" @@ -3802,7 +3802,7 @@ func_mode_link () add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case "$libdir" in + case $libdir in [[\\/]]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -3874,7 +3874,7 @@ func_mode_link () add_dir="-L$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case "$libdir" in + case $libdir in [[\\/]]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -4592,7 +4592,7 @@ EOF if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -4629,7 +4629,7 @@ EOF # Error occurred in the first compile. Let's try to salvage # the situation: Compile a separate program for each library. for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $opt_dry_run || $RM conftest @@ -4681,7 +4681,7 @@ EOF set dummy $deplibs_check_method; shift file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" + name=`expr $a_deplib : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -4750,7 +4750,7 @@ EOF set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" + name=`expr $a_deplib : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then diff --git a/m4/libtool.m4 b/m4/libtool.m4 index abf26f8e..a14a7946 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -812,7 +812,7 @@ if test -z "$lt_ECHO"; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string="`eval $cmd`"; } 2>/dev/null && + if { echo_test_string=`eval $cmd`; } 2>/dev/null && { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null then break @@ -986,7 +986,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|s390*-*tpf*|sparc*-*l # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*)