1 --- ./ltmain.sh Tue May 29 19:16:03 2001
2 +++ ./ltmain.sh Tue May 29 21:26:50 2001
7 - if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
8 + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
9 # non-PIC code in shared libraries is not supported
15 for pass in $passes; do
16 - if test $linkmode = prog; then
17 + if test "$linkmode" = prog; then
18 # Determine which files to process
21 @@ -1360,11 +1360,11 @@
25 - if test $linkmode = oldlib && test $linkmode = obj; then
26 + if test "$linkmode" = oldlib && test "$linkmode" = obj; then
27 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
30 - if test $pass = conv; then
31 + if test "$pass" = conv; then
32 deplibs="$deplib $deplibs"
36 finalize_deplibs="$deplib $finalize_deplibs"
38 deplibs="$deplib $deplibs"
39 - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
40 + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
44 @@ -1393,16 +1393,16 @@
47 deplibs="$deplib $deplibs"
48 - test $pass = conv && continue
49 + test "$pass" = conv && continue
50 newdependency_libs="$deplib $newdependency_libs"
51 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
54 - if test $pass = conv; then
55 + if test "$pass" = conv; then
56 deplibs="$deplib $deplibs"
59 - if test $pass = scan; then
60 + if test "$pass" = scan; then
61 deplibs="$deplib $deplibs"
62 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
68 - if test $pass = link; then
69 + if test "$pass" = link; then
70 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
71 # Make sure the xrpath contains only unique directories.
75 *.la) lib="$deplib" ;;
77 - if test $pass = conv; then
78 + if test "$pass" = conv; then
79 deplibs="$deplib $deplibs"
86 - if test $pass != link; then
87 + if test "$pass" != link; then
88 deplibs="$deplib $deplibs"
90 compile_deplibs="$deplib $compile_deplibs"
95 - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
96 + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
97 # If there is no dlopen support or we're linking statically,
99 newdlprefiles="$newdlprefiles $deplib"
100 @@ -1512,13 +1512,13 @@
102 if test "$linkmode,$pass" = "lib,link" ||
103 test "$linkmode,$pass" = "prog,scan" ||
104 - { test $linkmode = oldlib && test $linkmode = obj; }; then
105 + { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
106 # Add dl[pre]opened files of deplib
107 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
108 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
111 - if test $pass = conv; then
112 + if test "$pass" = conv; then
113 # Only check for convenience libraries
114 deplibs="$lib $deplibs"
115 if test -z "$libdir"; then
116 @@ -1537,7 +1537,7 @@
118 tmp_libs="$tmp_libs $deplib"
120 - elif test $linkmode != prog && test $linkmode != lib; then
121 + elif test "$linkmode" != prog && test "$linkmode" != lib; then
122 $echo "$modename: \`$lib' is not a convenience library" 1>&2
125 @@ -1555,7 +1555,7 @@
128 # This library was specified with -dlopen.
129 - if test $pass = dlopen; then
130 + if test "$pass" = dlopen; then
131 if test -z "$libdir"; then
132 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
134 @@ -1604,7 +1604,7 @@
135 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
137 # This library was specified with -dlpreopen.
138 - if test $pass = dlpreopen; then
139 + if test "$pass" = dlpreopen; then
140 if test -z "$libdir"; then
141 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
143 @@ -1623,7 +1623,7 @@
145 if test -z "$libdir"; then
146 # Link the convenience library
147 - if test $linkmode = lib; then
148 + if test "$linkmode" = lib; then
149 deplibs="$dir/$old_library $deplibs"
150 elif test "$linkmode,$pass" = "prog,link"; then
151 compile_deplibs="$dir/$old_library $compile_deplibs"
152 @@ -1634,7 +1634,7 @@
156 - if test $linkmode = prog && test $pass != link; then
157 + if test "$linkmode" = prog && test "$pass" != link; then
158 newlib_search_path="$newlib_search_path $ladir"
159 deplibs="$lib $deplibs"
161 @@ -1671,7 +1671,7 @@
162 # Link against this shared library
164 if test "$linkmode,$pass" = "prog,link" ||
165 - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
166 + { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
167 # Hardcode the library path.
168 # Skip directories that are in the system default run-time
170 @@ -1693,7 +1693,7 @@
174 - if test $linkmode = prog; then
175 + if test "$linkmode" = prog; then
176 # We need to hardcode the library path
177 if test -n "$shlibpath_var"; then
178 # Make sure the rpath contains only unique directories.
179 @@ -1777,7 +1777,7 @@
181 fi # test -n $old_archive_from_expsyms_cmds
183 - if test $linkmode = prog || test "$mode" != relink; then
184 + if test "$linkmode" = prog || test "$mode" != relink; then
188 @@ -1826,7 +1826,7 @@
189 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
192 - if test $linkmode = prog; then
193 + if test "$linkmode" = prog; then
194 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
195 test -n "$add" && compile_deplibs="$add $compile_deplibs"
197 @@ -1843,7 +1843,7 @@
201 - if test $linkmode = prog || test "$mode" = relink; then
202 + if test "$linkmode" = prog || test "$mode" = relink; then
206 @@ -1865,7 +1865,7 @@
210 - if test $linkmode = prog; then
211 + if test "$linkmode" = prog; then
212 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
213 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
215 @@ -1873,7 +1873,7 @@
216 test -n "$add" && deplibs="$add $deplibs"
219 - elif test $linkmode = prog; then
220 + elif test "$linkmode" = prog; then
221 if test "$alldeplibs" = yes &&
222 { test "$deplibs_check_method" = pass_all ||
223 { test "$build_libtool_libs" = yes &&
224 @@ -1932,9 +1932,9 @@
226 fi # link shared/static library?
228 - if test $linkmode = lib; then
229 + if test "$linkmode" = lib; then
230 if test -n "$dependency_libs" &&
231 - { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
232 + { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
233 test $link_static = yes; }; then
234 # Extract -R from dependency_libs
236 @@ -1964,7 +1964,7 @@
237 tmp_libs="$tmp_libs $deplib"
240 - if test $link_all_deplibs != no; then
241 + if test "$link_all_deplibs" != no; then
242 # Add the search paths of all dependency libraries
243 for deplib in $dependency_libs; do
245 @@ -2007,15 +2007,15 @@
246 fi # link_all_deplibs != no
248 done # for deplib in $libs
249 - if test $pass = dlpreopen; then
250 + if test "$pass" = dlpreopen; then
251 # Link the dlpreopened libraries before other libraries
252 for deplib in $save_deplibs; do
253 deplibs="$deplib $deplibs"
256 - if test $pass != dlopen; then
257 - test $pass != scan && dependency_libs="$newdependency_libs"
258 - if test $pass != conv; then
259 + if test "$pass" != dlopen; then
260 + test "$pass" != scan && dependency_libs="$newdependency_libs"
261 + if test "$pass" != conv; then
262 # Make sure lib_search_path contains only unique directories.
264 for dir in $newlib_search_path; do
265 @@ -2073,7 +2073,7 @@
269 - if test $linkmode = prog; then
270 + if test "$linkmode" = prog; then
271 dlfiles="$newdlfiles"
272 dlprefiles="$newdlprefiles"
274 @@ -2410,7 +2410,7 @@
277 # Add libc to deplibs on all other systems if necessary.
278 - if test $build_libtool_need_lc = "yes"; then
279 + if test "$build_libtool_need_lc" = "yes"; then
280 deplibs="$deplibs -lc"
283 @@ -2683,7 +2683,7 @@
285 # Test again, we may have decided not to build it any more
286 if test "$build_libtool_libs" = yes; then
287 - if test $hardcode_into_libs = yes; then
288 + if test "$hardcode_into_libs" = yes; then
289 # Hardcode the library paths