mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-12-21 06:59:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

* config/ltmain.m4sh (func_mode_compile, func_mode_link),

Browse Source 
m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH, _LT_ENABLE_LOCK):
Remove some unnecessary quotes.
This commit is contained in:
Ralf Wildenhues 2005-07-02 10:18:28 +00:00
parent 5801b0f4df
commit d3f2c0f84d
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-07-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2005-07-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* 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 <GCJ>: Fix java test. * tests/convenience.at <GCJ>: Fix java test.
Reported by Eric Blake <ericblake@comcast.net>. Reported by Eric Blake <ericblake@comcast.net>.

14
config/ltmain.m4sh
View File

@ -1080,7 +1080,7 @@ func_mode_compile ()
for arg for arg
do do
case "$arg_mode" in case $arg_mode in
arg ) arg )
# do not "continue". Instead, add this to base_compile # do not "continue". Instead, add this to base_compile
lastarg="$arg" lastarg="$arg"
@ -3802,7 +3802,7 @@ func_mode_link ()
add_dir="-L$dir" add_dir="-L$dir"
# Try looking first in the location we're being installed to. # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then if test -n "$inst_prefix_dir"; then
case "$libdir" in case $libdir in
[[\\/]]*) [[\\/]]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir" add_dir="$add_dir -L$inst_prefix_dir$libdir"
;; ;;
@ -3874,7 +3874,7 @@ func_mode_link ()
add_dir="-L$libdir" add_dir="-L$libdir"
# Try looking first in the location we're being installed to. # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then if test -n "$inst_prefix_dir"; then
case "$libdir" in case $libdir in
[[\\/]]*) [[\\/]]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir" add_dir="$add_dir -L$inst_prefix_dir$libdir"
;; ;;
@ -4592,7 +4592,7 @@ EOF
if test "$?" -eq 0 ; then if test "$?" -eq 0 ; then
ldd_output=`ldd conftest` ldd_output=`ldd conftest`
for i in $deplibs; do 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 $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then if test "$name" != "" && test "$name" -ne "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; 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 # Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library. # the situation: Compile a separate program for each library.
for i in $deplibs; do 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 $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then if test "$name" != "" && test "$name" != "0"; then
$opt_dry_run || $RM conftest $opt_dry_run || $RM conftest
@ -4681,7 +4681,7 @@ EOF
set dummy $deplibs_check_method; shift set dummy $deplibs_check_method; shift
file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
for a_deplib in $deplibs; do 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 $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@ -4750,7 +4750,7 @@ EOF
set dummy $deplibs_check_method; shift set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
for a_deplib in $deplibs; do 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 $name is empty we are operating on a -L argument.
if test -n "$name" && test "$name" != "0"; then if test -n "$name" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

4
m4/libtool.m4 vendored
View File

@ -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 # 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 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, ... # 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 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
then then
break 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. # Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in case `/usr/bin/file conftest.o` in
*32-bit*) *32-bit*)
case $host in case $host in
x86_64-*linux*) x86_64-*linux*)