1 --- libtool-1.4.3/ltmain.sh.wiget Wed Oct 23 04:26:24 2002
2 +++ libtool-1.4.3/ltmain.sh Thu Oct 24 16:55:44 2002
6 for pass in $passes; do
7 - if test $linkmode = prog; then
8 + if test "$linkmode" = prog; then
9 # Determine which files to process
12 @@ -1396,11 +1396,11 @@
16 - if test $linkmode = oldlib && test $linkmode = obj; then
17 + if test "$linkmode" = oldlib && test "$linkmode" = obj; then
18 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
21 - if test $pass = conv; then
22 + if test "$pass" = conv; then
23 deplibs="$deplib $deplibs"
27 finalize_deplibs="$deplib $finalize_deplibs"
29 deplibs="$deplib $deplibs"
30 - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
31 + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
35 @@ -1429,16 +1429,16 @@
38 deplibs="$deplib $deplibs"
39 - test $pass = conv && continue
40 + test "$pass" = conv && continue
41 newdependency_libs="$deplib $newdependency_libs"
42 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
45 - if test $pass = conv; then
46 + if test "$pass" = conv; then
47 deplibs="$deplib $deplibs"
50 - if test $pass = scan; then
51 + if test "$pass" = scan; then
52 deplibs="$deplib $deplibs"
53 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
59 - if test $pass = link; then
60 + if test "$pass" = link; then
61 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
62 # Make sure the xrpath contains only unique directories.
66 *.la) lib="$deplib" ;;
68 - if test $pass = conv; then
69 + if test "$pass" = conv; then
70 deplibs="$deplib $deplibs"
77 - if test $pass != link; then
78 + if test "$pass" != link; then
79 deplibs="$deplib $deplibs"
81 compile_deplibs="$deplib $compile_deplibs"
86 - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
87 + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
88 # If there is no dlopen support or we're linking statically,
90 newdlprefiles="$newdlprefiles $deplib"
91 @@ -1550,13 +1550,13 @@
93 if test "$linkmode,$pass" = "lib,link" ||
94 test "$linkmode,$pass" = "prog,scan" ||
95 - { test $linkmode = oldlib && test $linkmode = obj; }; then
96 + { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
97 # Add dl[pre]opened files of deplib
98 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
99 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
102 - if test $pass = conv; then
103 + if test "$pass" = conv; then
104 # Only check for convenience libraries
105 deplibs="$lib $deplibs"
106 if test -z "$libdir"; then
107 @@ -1577,7 +1577,7 @@
109 tmp_libs="$tmp_libs $deplib"
111 - elif test $linkmode != prog && test $linkmode != lib; then
112 + elif test "$linkmode" != prog && test "$linkmode" != lib; then
113 $echo "$modename: \`$lib' is not a convenience library" 1>&2
116 @@ -1595,7 +1595,7 @@
119 # This library was specified with -dlopen.
120 - if test $pass = dlopen; then
121 + if test "$pass" = dlopen; then
122 if test -z "$libdir"; then
123 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
125 @@ -1644,7 +1644,7 @@
126 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
128 # This library was specified with -dlpreopen.
129 - if test $pass = dlpreopen; then
130 + if test "$pass" = dlpreopen; then
131 if test -z "$libdir"; then
132 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
134 @@ -1663,7 +1663,7 @@
136 if test -z "$libdir"; then
137 # Link the convenience library
138 - if test $linkmode = lib; then
139 + if test "$linkmode" = lib; then
140 deplibs="$dir/$old_library $deplibs"
141 elif test "$linkmode,$pass" = "prog,link"; then
142 compile_deplibs="$dir/$old_library $compile_deplibs"
143 @@ -1674,7 +1674,7 @@
147 - if test $linkmode = prog && test $pass != link; then
148 + if test "$linkmode" = prog && test "$pass" != link; then
149 newlib_search_path="$newlib_search_path $ladir"
150 deplibs="$lib $deplibs"
152 @@ -1713,7 +1713,7 @@
153 # Link against this shared library
155 if test "$linkmode,$pass" = "prog,link" ||
156 - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
157 + { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
158 # Hardcode the library path.
159 # Skip directories that are in the system default run-time
161 @@ -1735,7 +1735,7 @@
165 - if test $linkmode = prog; then
166 + if test "$linkmode" = prog; then
167 # We need to hardcode the library path
168 if test -n "$shlibpath_var"; then
169 # Make sure the rpath contains only unique directories.
170 @@ -1819,7 +1819,7 @@
172 fi # test -n $old_archive_from_expsyms_cmds
174 - if test $linkmode = prog || test "$mode" != relink; then
175 + if test "$linkmode" = prog || test "$mode" != relink; then
179 @@ -1868,7 +1868,7 @@
180 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
183 - if test $linkmode = prog; then
184 + if test "$linkmode" = prog; then
185 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
186 test -n "$add" && compile_deplibs="$add $compile_deplibs"
188 @@ -1885,7 +1885,7 @@
192 - if test $linkmode = prog || test "$mode" = relink; then
193 + if test "$linkmode" = prog || test "$mode" = relink; then
197 @@ -1907,7 +1907,7 @@
201 - if test $linkmode = prog; then
202 + if test "$linkmode" = prog; then
203 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
204 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
206 @@ -1915,7 +1915,7 @@
207 test -n "$add" && deplibs="$add $deplibs"
210 - elif test $linkmode = prog; then
211 + elif test "$linkmode" = prog; then
212 if test "$alldeplibs" = yes &&
213 { test "$deplibs_check_method" = pass_all ||
214 { test "$build_libtool_libs" = yes &&
215 @@ -1975,9 +1975,9 @@
217 fi # link shared/static library?
219 - if test $linkmode = lib; then
220 + if test "$linkmode" = lib; then
221 if test -n "$dependency_libs" &&
222 - { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
223 + { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
224 test $link_static = yes; }; then
225 # Extract -R from dependency_libs
227 @@ -2009,7 +2009,7 @@
228 tmp_libs="$tmp_libs $deplib"
231 - if test $link_all_deplibs != no; then
232 + if test "$link_all_deplibs" != no; then
233 # Add the search paths of all dependency libraries
234 for deplib in $dependency_libs; do
236 @@ -2052,15 +2052,15 @@
237 fi # link_all_deplibs != no
239 done # for deplib in $libs
240 - if test $pass = dlpreopen; then
241 + if test "$pass" = dlpreopen; then
242 # Link the dlpreopened libraries before other libraries
243 for deplib in $save_deplibs; do
244 deplibs="$deplib $deplibs"
247 - if test $pass != dlopen; then
248 - test $pass != scan && dependency_libs="$newdependency_libs"
249 - if test $pass != conv; then
250 + if test "$pass" != dlopen; then
251 + test "$pass" != scan && dependency_libs="$newdependency_libs"
252 + if test "$pass" != conv; then
253 # Make sure lib_search_path contains only unique directories.
255 for dir in $newlib_search_path; do
256 @@ -2118,7 +2118,7 @@
260 - if test $linkmode = prog; then
261 + if test "$linkmode" = prog; then
262 dlfiles="$newdlfiles"
263 dlprefiles="$newdlprefiles"
265 @@ -2473,7 +2473,7 @@
268 # Add libc to deplibs on all other systems if necessary.
269 - if test $build_libtool_need_lc = "yes"; then
270 + if test "$build_libtool_need_lc" = "yes"; then
271 deplibs="$deplibs -lc"
274 @@ -2765,7 +2765,7 @@
276 # Test again, we may have decided not to build it any more
277 if test "$build_libtool_libs" = yes; then
278 - if test $hardcode_into_libs = yes; then
279 + if test "$hardcode_into_libs" = yes; then
280 # Hardcode the library paths