/[gentoo-x86]/eclass/libtool.eclass
Gentoo

Contents of /eclass/libtool.eclass

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.8 - (hide annotations) (download)
Wed Jun 26 20:17:53 2002 UTC (12 years, 1 month ago) by azarah
Branch: MAIN
Changes since 1.7: +19 -18 lines
portage patch updates

1 azarah 1.1 #!/bin/bash
2     # Copyright 1999-2002 Gentoo Technologies, Inc.
3     # Distributed under the terms of the GNU General Public License, v2 or later
4     # Author: Martin Schlemmer <azarah@gentoo.org>
5 azarah 1.8 # $Header: /home/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.7 2002/06/24 02:06:01 azarah Exp $
6 azarah 1.1 # This eclass patches ltmain.sh distributed with libtoolized packages with the
7     # relink and portage patch
8     ECLASS=libtool
9     newdepend sys-devel/libtool
10    
11     DESCRIPTION="Based on the ${ECLASS} eclass"
12    
13    
14     elibtoolize() {
15    
16     local x=""
17     local y=""
18     local dopatch="no"
19 azarah 1.3 local dotest="yes"
20     local dorelink="yes"
21 azarah 1.7 local dotmp="yes"
22 azarah 1.3 local doportage="yes"
23 azarah 1.2 local portage="no"
24 azarah 1.4 local mylist=""
25 azarah 1.2
26 azarah 1.4 mylist="$(find_ltmain)"
27 azarah 1.3 # Only apply portage patch, and dont "libtoolize --copy --force"
28     # if all patches fail.
29 azarah 1.4 for x in ${*}
30     do
31 azarah 1.5 if [ "${x}" = "--portage" ]
32 azarah 1.4 then
33     portage="yes"
34     fi
35     # Only patch the ltmain.sh in ${S}
36 azarah 1.5 if [ "${x}" = "--shallow" ]
37 azarah 1.4 then
38     if [ -f ${S}/ltmain.sh ]
39     then
40     mylist="${S}"
41     else
42     mylist=""
43     fi
44     else
45     mylist="$(find_ltmain)"
46     fi
47     done
48 azarah 1.1
49 azarah 1.4 for x in ${mylist}
50 azarah 1.1 do
51     cd ${x}
52     einfo "Working directory: ${x}..."
53     dopatch="yes"
54 azarah 1.4 dotest="yes"
55     dorelink="yes"
56 azarah 1.7 dotmp="yes"
57 azarah 1.4 doportage="yes"
58 azarah 1.2
59 azarah 1.7 for y in test_patch relink_patch tmp_patch portage_patch
60 azarah 1.1 do
61     if ! eval ${y} --test $>${T}/libtool.foo
62     then
63 azarah 1.3 case ${y} in
64     test_patch)
65     # non critical patch
66     dotest="no"
67     ;;
68     relink_patch)
69     # critical patch, but could be applied
70     if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \
71     [ "${portage}" = "no" ]
72     then
73     dopatch="no"
74     fi
75     dorelink="no"
76     ;;
77 azarah 1.7 tmp_patch)
78     # non critical patch
79     dotmp="no"
80     ;;
81 azarah 1.3 portage_patch)
82     # critical patch
83     if [ "${portage}" = "yes" ]
84     then
85     echo
86     eerror "Portage patch requested, but failed to apply!"
87     die
88     fi
89     dopatch="no"
90     doportage="no"
91     ;;
92     esac
93 azarah 1.1 fi
94     done
95    
96 azarah 1.7 for y in test_patch relink_patch tmp_patch portage_patch
97 azarah 1.1 do
98     if [ "${dopatch}" = "yes" ]
99     then
100 azarah 1.3 case ${y} in
101     test_patch)
102     if [ "${dotest}" = "no" ]
103     then
104     continue
105     fi
106     ;;
107     relink_patch)
108     if [ "${dorelink}" = "no" ]
109     then
110     continue
111     fi
112     ;;
113 azarah 1.7 tmp_patch)
114     if [ "${dotmp}" = "no" ]
115     then
116     continue
117     fi
118     ;;
119 azarah 1.3 portage_patch)
120     if [ "${doportage}" = "no" ]
121     then
122     continue
123     fi
124     ;;
125     esac
126    
127 azarah 1.1 einfo "Applying libtool-${y/_patch/}.patch..."
128     eval ${y} $>${T}/libtool.foo
129 azarah 1.3 elif [ "${portage}" = "no" ]
130     then
131 azarah 1.1 libtoolize --copy --force
132     break
133     fi
134     done
135     done
136 azarah 1.6
137 azarah 1.7 if [ -f libtool ]
138     then
139     rm -f libtool
140     fi
141    
142 azarah 1.6 # We need to change the pwd back to $S, as we may be called in
143     # src_compile()
144     cd ${S}
145 azarah 1.1 }
146    
147     #
148     # Returns all the directories containing ltmain.sh
149     #
150     find_ltmain() {
151    
152     local x=""
153     local dirlist=""
154    
155     for x in $(find ${S} -name 'ltmain.sh')
156     do
157     dirlist="${dirlist} ${x%/*}"
158     done
159    
160     echo "${dirlist}"
161     }
162    
163     #
164     # Various patches we want to apply.
165     #
166     # Contains: portage_patch
167     # relink_patch
168     # test_patch
169     #
170     portage_patch() {
171    
172     local opts=""
173    
174     if [ "${1}" = "--test" ]
175     then
176     opts="--force --dry-run"
177     fi
178    
179     patch ${opts} -p0 <<-"ENDPATCH"
180     --- ltmain.sh.orig Wed Apr 3 01:19:37 2002
181     +++ ltmain.sh Sun May 26 19:50:52 2002
182 azarah 1.8 @@ -3940,9 +3940,40 @@
183 azarah 1.1 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
184     exit 1
185     fi
186     - newdependency_libs="$newdependency_libs $libdir/$name"
187     + # We do not want portage's install root ($D) present. Check only for
188     + # this if the .la is being installed.
189 azarah 1.8 + if test "$installed" = yes && test "$D"; then
190     + mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
191 azarah 1.1 + else
192     + mynewdependency_lib="$libdir/$name"
193     + fi
194     + # Do not add duplicates
195 azarah 1.8 + if test "$mynewdependency_lib"; then
196     + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
197     + newdependency_libs="$newdependency_libs $mynewdependency_lib"
198     + fi
199 azarah 1.1 + fi
200     + ;;
201     + *)
202 azarah 1.8 + if test "$installed" = yes && test "$S"; then
203     + # We do not want portage's build root ($S) present.
204     + if test -n "`echo $deplib |grep -e "$S"`"
205 azarah 1.1 + then
206 azarah 1.8 + newdependency_libs=""
207 azarah 1.1 + # We do not want portage's install root ($D) present.
208 azarah 1.8 + elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
209     + mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
210 azarah 1.1 + fi
211     + else
212     + mynewdependency_lib="$deplib"
213     + fi
214     + # Do not add duplicates
215 azarah 1.8 + if test "$mynewdependency_lib"; then
216     + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
217 azarah 1.1 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
218 azarah 1.8 + fi
219 azarah 1.1 + fi
220     ;;
221     - *) newdependency_libs="$newdependency_libs $deplib" ;;
222     esac
223     done
224     dependency_libs="$newdependency_libs"
225     @@ -3975,6 +4005,10 @@
226     case $host,$output,$installed,$module,$dlname in
227     *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
228     esac
229     + # Do not add duplicates
230 azarah 1.8 + if test "$installed" = yes && test "$D"; then
231     + install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
232 azarah 1.1 + fi
233     $echo > $output "\
234     # $outputname - a libtool library file
235     # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
236     ENDPATCH
237     }
238    
239     relink_patch() {
240    
241     local opts=""
242     local retval=0
243    
244     if [ "${1}" = "--test" ]
245     then
246     opts="--force --dry-run"
247     fi
248    
249     patch ${opts} -p0 <<-"ENDPATCH"
250     --- ltmain.sh Sun Aug 12 18:08:05 2001
251     +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
252     @@ -827,6 +827,7 @@
253     linker_flags=
254     dllsearchpath=
255     lib_search_path=`pwd`
256     + inst_prefix_dir=
257    
258     avoid_version=no
259     dlfiles=
260     @@ -959,6 +960,11 @@
261     prev=
262     continue
263     ;;
264     + inst_prefix)
265     + inst_prefix_dir="$arg"
266     + prev=
267     + continue
268     + ;;
269     release)
270     release="-$arg"
271     prev=
272     @@ -1167,6 +1173,11 @@
273     continue
274     ;;
275    
276     + -inst-prefix-dir)
277     + prev=inst_prefix
278     + continue
279     + ;;
280     +
281     # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
282     # so, if we see these flags be careful not to treat them like -L
283     -L[A-Z][A-Z]*:*)
284     @@ -2231,7 +2242,16 @@
285     if test "$hardcode_direct" = yes; then
286     add="$libdir/$linklib"
287     elif test "$hardcode_minus_L" = yes; then
288     - add_dir="-L$libdir"
289     + # Try looking first in the location we're being installed to.
290     + add_dir=
291     + if test -n "$inst_prefix_dir"; then
292     + case "$libdir" in
293     + [\\/]*)
294     + add_dir="-L$inst_prefix_dir$libdir"
295     + ;;
296     + esac
297     + fi
298     + add_dir="$add_dir -L$libdir"
299     add="-l$name"
300     elif test "$hardcode_shlibpath_var" = yes; then
301     case :$finalize_shlibpath: in
302     @@ -2241,7 +2261,16 @@
303     add="-l$name"
304     else
305     # We cannot seem to hardcode it, guess we'll fake it.
306     - add_dir="-L$libdir"
307     + # Try looking first in the location we're being installed to.
308     + add_dir=
309     + if test -n "$inst_prefix_dir"; then
310     + case "$libdir" in
311     + [\\/]*)
312     + add_dir="-L$inst_prefix_dir$libdir"
313     + ;;
314     + esac
315     + fi
316     + add_dir="$add_dir -L$libdir"
317     add="-l$name"
318     fi
319    
320     @@ -4622,12 +4651,30 @@
321     dir="$dir$objdir"
322    
323     if test -n "$relink_command"; then
324     + # Determine the prefix the user has applied to our future dir.
325     + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
326     +
327     + # Don't allow the user to place us outside of our expected
328     + # location b/c this prevents finding dependent libraries that
329     + # are installed to the same prefix.
330     + if test "$inst_prefix_dir" = "$destdir"; then
331     + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
332     + exit 1
333     + fi
334     +
335     + if test -n "$inst_prefix_dir"; then
336     + # Stick the inst_prefix_dir data into the link command.
337     + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
338     + else
339     + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
340     + fi
341     +
342     $echo "$modename: warning: relinking \`$file'" 1>&2
343     $show "$relink_command"
344     if $run eval "$relink_command"; then :
345     else
346     $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
347     - continue
348     + exit 1
349     fi
350     fi
351    
352 azarah 1.7 ENDPATCH
353    
354     retval=$?
355    
356     # This one dont apply clean to libtool-1.4.2a, so do it manually.
357     if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ]
358     then
359     cp ltmain.sh ltmain.sh.orig
360     sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \
361     ltmain.sh.orig > ltmain.sh
362     rm -f ltmain.sh.orig
363     fi
364    
365     return ${retval}
366     }
367    
368     tmp_patch() {
369    
370     local opts=""
371    
372     if [ "${1}" = "--test" ]
373     then
374     opts="--force --dry-run"
375     fi
376    
377     patch ${opts} -p0 <<-"ENDPATCH"
378     --- ltmain.sh Sun Aug 12 18:08:05 2001
379     +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
380 azarah 1.1 @@ -4782,7 +4829,11 @@
381     if test "$finalize" = yes && test -z "$run"; then
382     tmpdir="/tmp"
383     test -n "$TMPDIR" && tmpdir="$TMPDIR"
384     - tmpdir="$tmpdir/libtool-$$"
385     + tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
386     + if test $? = 0 ; then :
387     + else
388     + tmpdir="$tmpdir/libtool-$$"
389     + fi
390     if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
391     else
392     $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
393     ENDPATCH
394     }
395    
396     test_patch() {
397    
398     local opts=""
399    
400     if [ "${1}" = "--test" ]
401     then
402     opts="--force --dry-run"
403     fi
404    
405     patch ${opts} -p0 <<-"ENDPATCH"
406     --- ./ltmain.sh Tue May 29 19:16:03 2001
407     +++ ./ltmain.sh Tue May 29 21:26:50 2001
408     @@ -459,7 +459,7 @@
409     pic_mode=default
410     ;;
411     esac
412     - if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
413     + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
414     # non-PIC code in shared libraries is not supported
415     pic_mode=default
416     fi
417     @@ -1343,7 +1343,7 @@
418     ;;
419     esac
420     for pass in $passes; do
421     - if test $linkmode = prog; then
422     + if test "$linkmode" = prog; then
423     # Determine which files to process
424     case $pass in
425     dlopen)
426     @@ -1360,11 +1360,11 @@
427     found=no
428     case $deplib in
429     -l*)
430     - if test $linkmode = oldlib && test $linkmode = obj; then
431     + if test "$linkmode" = oldlib && test "$linkmode" = obj; then
432     $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
433     continue
434     fi
435     - if test $pass = conv; then
436     + if test "$pass" = conv; then
437     deplibs="$deplib $deplibs"
438     continue
439     fi
440     @@ -1384,7 +1384,7 @@
441     finalize_deplibs="$deplib $finalize_deplibs"
442     else
443     deplibs="$deplib $deplibs"
444     - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
445     + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
446     fi
447     continue
448     fi
449     @@ -1393,16 +1393,16 @@
450     case $linkmode in
451     lib)
452     deplibs="$deplib $deplibs"
453     - test $pass = conv && continue
454     + test "$pass" = conv && continue
455     newdependency_libs="$deplib $newdependency_libs"
456     newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
457     ;;
458     prog)
459     - if test $pass = conv; then
460     + if test "$pass" = conv; then
461     deplibs="$deplib $deplibs"
462     continue
463     fi
464     - if test $pass = scan; then
465     + if test "$pass" = scan; then
466     deplibs="$deplib $deplibs"
467     newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
468     else
469     @@ -1417,7 +1417,7 @@
470     continue
471     ;; # -L
472     -R*)
473     - if test $pass = link; then
474     + if test "$pass" = link; then
475     dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
476     # Make sure the xrpath contains only unique directories.
477     case "$xrpath " in
478     @@ -1430,7 +1430,7 @@
479     ;;
480     *.la) lib="$deplib" ;;
481     *.$libext)
482     - if test $pass = conv; then
483     + if test "$pass" = conv; then
484     deplibs="$deplib $deplibs"
485     continue
486     fi
487     @@ -1451,7 +1451,7 @@
488     continue
489     ;;
490     prog)
491     - if test $pass != link; then
492     + if test "$pass" != link; then
493     deplibs="$deplib $deplibs"
494     else
495     compile_deplibs="$deplib $compile_deplibs"
496     @@ -1462,7 +1462,7 @@
497     esac # linkmode
498     ;; # *.$libext
499     *.lo | *.$objext)
500     - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
501     + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
502     # If there is no dlopen support or we're linking statically,
503     # we need to preload.
504     newdlprefiles="$newdlprefiles $deplib"
505     @@ -1512,13 +1512,13 @@
506    
507     if test "$linkmode,$pass" = "lib,link" ||
508     test "$linkmode,$pass" = "prog,scan" ||
509     - { test $linkmode = oldlib && test $linkmode = obj; }; then
510     + { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
511     # Add dl[pre]opened files of deplib
512     test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
513     test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
514     fi
515    
516     - if test $pass = conv; then
517     + if test "$pass" = conv; then
518     # Only check for convenience libraries
519     deplibs="$lib $deplibs"
520     if test -z "$libdir"; then
521     @@ -1537,7 +1537,7 @@
522     esac
523     tmp_libs="$tmp_libs $deplib"
524     done
525     - elif test $linkmode != prog && test $linkmode != lib; then
526     + elif test "$linkmode" != prog && test "$linkmode" != lib; then
527     $echo "$modename: \`$lib' is not a convenience library" 1>&2
528     exit 1
529     fi
530     @@ -1555,7 +1555,7 @@
531     fi
532    
533     # This library was specified with -dlopen.
534     - if test $pass = dlopen; then
535     + if test "$pass" = dlopen; then
536     if test -z "$libdir"; then
537     $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
538     exit 1
539     @@ -1604,7 +1604,7 @@
540     name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
541    
542     # This library was specified with -dlpreopen.
543     - if test $pass = dlpreopen; then
544     + if test "$pass" = dlpreopen; then
545     if test -z "$libdir"; then
546     $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
547     exit 1
548     @@ -1623,7 +1623,7 @@
549    
550     if test -z "$libdir"; then
551     # Link the convenience library
552     - if test $linkmode = lib; then
553     + if test "$linkmode" = lib; then
554     deplibs="$dir/$old_library $deplibs"
555     elif test "$linkmode,$pass" = "prog,link"; then
556     compile_deplibs="$dir/$old_library $compile_deplibs"
557     @@ -1634,7 +1634,7 @@
558     continue
559     fi
560    
561     - if test $linkmode = prog && test $pass != link; then
562     + if test "$linkmode" = prog && test "$pass" != link; then
563     newlib_search_path="$newlib_search_path $ladir"
564     deplibs="$lib $deplibs"
565    
566     @@ -1671,7 +1671,7 @@
567     # Link against this shared library
568    
569     if test "$linkmode,$pass" = "prog,link" ||
570     - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
571     + { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
572     # Hardcode the library path.
573     # Skip directories that are in the system default run-time
574     # search path.
575     @@ -1693,7 +1693,7 @@
576     esac
577     ;;
578     esac
579     - if test $linkmode = prog; then
580     + if test "$linkmode" = prog; then
581     # We need to hardcode the library path
582     if test -n "$shlibpath_var"; then
583     # Make sure the rpath contains only unique directories.
584     @@ -1777,7 +1777,7 @@
585     linklib=$newlib
586     fi # test -n $old_archive_from_expsyms_cmds
587    
588     - if test $linkmode = prog || test "$mode" != relink; then
589     + if test "$linkmode" = prog || test "$mode" != relink; then
590     add_shlibpath=
591     add_dir=
592     add=
593     @@ -1826,7 +1826,7 @@
594     *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
595     esac
596     fi
597     - if test $linkmode = prog; then
598     + if test "$linkmode" = prog; then
599     test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
600     test -n "$add" && compile_deplibs="$add $compile_deplibs"
601     else
602     @@ -1843,7 +1843,7 @@
603     fi
604     fi
605    
606     - if test $linkmode = prog || test "$mode" = relink; then
607     + if test "$linkmode" = prog || test "$mode" = relink; then
608     add_shlibpath=
609     add_dir=
610     add=
611     @@ -1865,7 +1865,7 @@
612     add="-l$name"
613     fi
614    
615     - if test $linkmode = prog; then
616     + if test "$linkmode" = prog; then
617     test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
618     test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
619     else
620     @@ -1873,7 +1873,7 @@
621     test -n "$add" && deplibs="$add $deplibs"
622     fi
623     fi
624     - elif test $linkmode = prog; then
625     + elif test "$linkmode" = prog; then
626     if test "$alldeplibs" = yes &&
627     { test "$deplibs_check_method" = pass_all ||
628     { test "$build_libtool_libs" = yes &&
629     @@ -1932,9 +1932,9 @@
630     fi
631     fi # link shared/static library?
632    
633     - if test $linkmode = lib; then
634     + if test "$linkmode" = lib; then
635     if test -n "$dependency_libs" &&
636     - { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
637     + { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
638     test $link_static = yes; }; then
639     # Extract -R from dependency_libs
640     temp_deplibs=
641     @@ -1964,7 +1964,7 @@
642     tmp_libs="$tmp_libs $deplib"
643     done
644    
645     - if test $link_all_deplibs != no; then
646     + if test "$link_all_deplibs" != no; then
647     # Add the search paths of all dependency libraries
648     for deplib in $dependency_libs; do
649     case $deplib in
650     @@ -2007,15 +2007,15 @@
651     fi # link_all_deplibs != no
652     fi # linkmode = lib
653     done # for deplib in $libs
654     - if test $pass = dlpreopen; then
655     + if test "$pass" = dlpreopen; then
656     # Link the dlpreopened libraries before other libraries
657     for deplib in $save_deplibs; do
658     deplibs="$deplib $deplibs"
659     done
660     fi
661     - if test $pass != dlopen; then
662     - test $pass != scan && dependency_libs="$newdependency_libs"
663     - if test $pass != conv; then
664     + if test "$pass" != dlopen; then
665     + test "$pass" != scan && dependency_libs="$newdependency_libs"
666     + if test "$pass" != conv; then
667     # Make sure lib_search_path contains only unique directories.
668     lib_search_path=
669     for dir in $newlib_search_path; do
670     @@ -2073,7 +2073,7 @@
671     deplibs=
672     fi
673     done # for pass
674     - if test $linkmode = prog; then
675     + if test "$linkmode" = prog; then
676     dlfiles="$newdlfiles"
677     dlprefiles="$newdlprefiles"
678     fi
679     @@ -2410,7 +2410,7 @@
680     ;;
681     *)
682     # Add libc to deplibs on all other systems if necessary.
683     - if test $build_libtool_need_lc = "yes"; then
684     + if test "$build_libtool_need_lc" = "yes"; then
685     deplibs="$deplibs -lc"
686     fi
687     ;;
688     @@ -2683,7 +2683,7 @@
689    
690     # Test again, we may have decided not to build it any more
691     if test "$build_libtool_libs" = yes; then
692     - if test $hardcode_into_libs = yes; then
693     + if test "$hardcode_into_libs" = yes; then
694     # Hardcode the library paths
695     hardcode_libdirs=
696     dep_rpath=
697     ENDPATCH
698     }

  ViewVC Help
Powered by ViewVC 1.1.20