|
Lines 1-43
Link Here
|
| 1 |
--- ltmain.sh.orig Wed May 12 23:24:02 2004 |
1 |
--- ltmain.sh.orig 2008-11-09 00:28:51.000000000 +0800 |
| 2 |
+++ ltmain.sh Fri May 14 14:47:58 2004 |
2 |
+++ ltmain.sh 2008-11-09 00:32:32.000000000 +0800 |
| 3 |
@@ -1865,7 +1865,7 @@ |
3 |
@@ -3420,7 +3420,7 @@ |
| 4 |
if test $? -eq 0 ; then |
4 |
if test "$?" -eq 0 ; then |
| 5 |
ldd_output=`ldd conftest` |
5 |
ldd_output=`ldd conftest` |
| 6 |
for i in $deplibs; do |
6 |
for i in $deplibs; do |
| 7 |
- name="`expr $i : '-l\(.*\)'`" |
7 |
- name="`expr $i : '-l\(.*\)'`" |
| 8 |
+ name="`expr X$i : 'X-l\(.*\)'`" |
8 |
+ name="`expr X$i : 'X-l\(.*\)'`" |
| 9 |
# If $name is empty we are operating on a -L argument. |
9 |
# If $name is empty we are operating on a -L argument. |
| 10 |
if test "$name" != "" ; then |
10 |
if test "$name" != "" && test "$name" -ne "0"; then |
| 11 |
libname=`eval \\$echo \"$libname_spec\"` |
11 |
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 12 |
@@ -1890,7 +1890,7 @@ |
12 |
@@ -3457,7 +3457,7 @@ |
| 13 |
# Error occured in the first compile. Let's try to salvage the situation: |
13 |
# Error occurred in the first compile. Let's try to salvage |
| 14 |
# Compile a seperate program for each library. |
14 |
# the situation: Compile a separate program for each library. |
| 15 |
for i in $deplibs; do |
15 |
for i in $deplibs; do |
| 16 |
- name="`expr $i : '-l\(.*\)'`" |
16 |
- name="`expr $i : '-l\(.*\)'`" |
| 17 |
+ name="`expr X$i : 'X-l\(.*\)'`" |
17 |
+ name="`expr X$i : 'X-l\(.*\)'`" |
| 18 |
# If $name is empty we are operating on a -L argument. |
18 |
# If $name is empty we are operating on a -L argument. |
| 19 |
if test "$name" != "" ; then |
19 |
if test "$name" != "" && test "$name" != "0"; then |
| 20 |
$rm conftest |
20 |
$rm conftest |
| 21 |
@@ -1930,7 +1930,7 @@ |
21 |
@@ -3509,7 +3509,7 @@ |
|
|
22 |
set dummy $deplibs_check_method |
| 23 |
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` |
| 24 |
for a_deplib in $deplibs; do |
| 25 |
- name="`expr $a_deplib : '-l\(.*\)'`" |
| 26 |
+ name="`expr X$a_deplib : 'X-l\(.*\)'`" |
| 27 |
# If $name is empty we are operating on a -L argument. |
| 28 |
if test "$name" != "" && test "$name" != "0"; then |
| 29 |
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 30 |
@@ -3578,7 +3578,7 @@ |
| 22 |
set dummy $deplibs_check_method |
31 |
set dummy $deplibs_check_method |
| 23 |
file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`" |
32 |
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` |
| 24 |
for a_deplib in $deplibs; do |
33 |
for a_deplib in $deplibs; do |
| 25 |
- name="`expr $a_deplib : '-l\(.*\)'`" |
34 |
- name="`expr $a_deplib : '-l\(.*\)'`" |
| 26 |
+ name="`expr X$a_deplib : 'X-l\(.*\)'`" |
35 |
+ name="`expr X$a_deplib : 'X-l\(.*\)'`" |
| 27 |
# If $name is empty we are operating on a -L argument. |
36 |
# If $name is empty we are operating on a -L argument. |
| 28 |
if test "$name" != "" ; then |
37 |
if test -n "$name" && test "$name" != "0"; then |
| 29 |
libname=`eval \\$echo \"$libname_spec\"` |
38 |
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 30 |
@@ -3360,11 +3360,12 @@ |
|
|
| 31 |
fi |
| 32 |
|
| 33 |
# Install the pseudo-library for information purposes. |
| 34 |
+ if /usr/bin/false ; then |
| 35 |
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` |
| 36 |
instname="$dir/$name"i |
| 37 |
$show "$install_prog $instname $destdir/$name" |
| 38 |
$run eval "$install_prog $instname $destdir/$name" || exit $? |
| 39 |
- |
| 40 |
+ fi |
| 41 |
# Maybe install the static library, too. |
| 42 |
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |
| 43 |
;; |