]> git.pld-linux.org Git - packages/libjpeg.git/blame - libjpeg-arm.patch
projects / packages / libjpeg.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- massive attack: no need for 755 for *.la
[packages/libjpeg.git] / libjpeg-arm.patch
CommitLineData
c2f14c5c 1--- jpeg-6b/ltconfig.arm Wed Mar 25 10:25:39 1998
2+++ jpeg-6b/ltconfig Wed Jan 13 18:08:47 1999
3@@ -25,30 +25,57 @@
4
5 # A lot of this script is taken from autoconf-2.10.
6
7+# Check that we are running under the correct shell.
8+SHELL=${CONFIG_SHELL-/bin/sh}
9+echo=echo
10+if test "X$1" = X--no-reexec; then
11+ # Discard the --no-reexec flag, and continue.
12+ shift
13+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
14+ # Yippee, $echo works!
15+ :
16+else
17+ # Restart under the correct shell.
18+ exec "$SHELL" "$0" --no-reexec ${1+"$@"}
19+fi
20+
21 # The HP-UX ksh and POSIX shell print the target directory to stdout
22 # if CDPATH is set.
23 if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
24
25-echo=echo
26-if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
27-else
28- # The Solaris and AIX default echo program unquotes backslashes.
29- # This makes it impossible to quote backslashes using
30+if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then
31+ # The Solaris, AIX, and Digital Unix default echo programs unquote
32+ # backslashes. This makes it impossible to quote backslashes using
33 # echo "$something" | sed 's/\\/\\\\/g'
34- # So, we emulate echo with printf '%s\n'
35- echo="printf %s\\n"
36- if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
37- else
38- # Oops. We have no working printf. Try to find a not-so-buggy echo.
39- echo=echo
40- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
41- for dir in $PATH /usr/ucb; do
42- if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then
43- echo="$dir/echo"
44- break
45+ #
46+ # So, first we look for a working echo in the user's PATH.
47+ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
48+ for dir in $PATH /usr/ucb; do
49+ if test -f $dir/echo && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t'; then
50+ echo="$dir/echo"
51+ break
52+ fi
53+ done
54+ IFS="$save_ifs"
55+
56+ if test "X$echo" = Xecho; then
57+ # We didn't find a better echo, so look for alternatives.
58+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t'; then
59+ # This shell has a builtin print -r that does the trick.
60+ echo='print -r'
61+ elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
62+ # If we have ksh, try running ltconfig again with it.
63+ CONFIG_SHELL=/bin/ksh
64+ export CONFIG_SHELL
65+ exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
66+ else
67+ # Try using printf.
68+ echo='printf %s\n'
69+ if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then
70+ # Oops. We lost completely, so just stick with echo.
71+ echo=echo
72 fi
73- done
74- IFS="$save_ifs"
75+ fi
76 fi
77 fi
78
79@@ -66,7 +93,7 @@
80 # Constants:
81 PROGRAM=ltconfig
82 PACKAGE=libtool
83-VERSION=1.2
84+VERSION=1.2b
85 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
86 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
87 rm="rm -f"
88@@ -74,6 +101,7 @@
89 help="Try \`$progname --help' for more information."
90
91 # Global variables:
92+default_ofile=libtool
93 can_build_shared=yes
94 enable_shared=yes
95 # All known linkers require a `.a' archive for static linking.
96@@ -85,6 +113,7 @@
97 ac_config_sub=
98 host=
99 nonopt=
100+ofile="$default_ofile"
101 verify_host=yes
102 with_gcc=no
103 with_gnu_ld=no
104@@ -121,10 +150,12 @@
105
106 Generate a system-specific libtool script.
107
108+ --debug enable verbose shell tracing
109 --disable-shared do not build shared libraries
110 --disable-static do not build static libraries
111 --help display this help and exit
112 --no-verify do not verify that HOST is a valid host type
113+-o, --output=FILE specify the output file [default=$default_ofile]
114 --quiet same as \`--silent'
115 --silent do not print informational messages
116 --srcdir=DIR find \`config.guess' in DIR
117@@ -140,6 +171,11 @@
118 exit 0
119 ;;
120
121+ --debug)
122+ echo "$progname: enabling shell trace mode"
123+ set -x
124+ ;;
125+
126 --disable-shared) enable_shared=no ;;
127
128 --disable-static) enable_static=no ;;
129@@ -151,6 +187,9 @@
130
131 --no-verify) verify_host=no ;;
132
133+ --output | -o) prev=ofile ;;
134+ --output=*) ofile="$optarg" ;;
135+
136 --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
137
138 --with-gcc) with_gcc=yes ;;
139@@ -185,8 +224,7 @@
140 exit 1
141 fi
142
143-if test -f "$ltmain"; then :
144-else
145+if test ! -f "$ltmain"; then
146 echo "$progname: \`$ltmain' does not exist" 1>&2
147 echo "$help" 1>&2
148 exit 1
149@@ -264,7 +302,7 @@
150 ac_config_sub=$ac_aux_dir/config.sub
151
152 # Make sure we can run config.sub.
153- if $ac_config_sub sun4 >/dev/null 2>&1; then :
154+ if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
155 else
156 echo "$progname: cannot run $ac_config_sub" 1>&2
157 echo "$help" 1>&2
158@@ -276,14 +314,14 @@
159 host_alias=$host
160 case "$host_alias" in
161 "")
162- if host_alias=`$ac_config_guess`; then :
163+ if host_alias=`$SHELL $ac_config_guess`; then :
164 else
165 echo "$progname: cannot guess host type; you must specify one" 1>&2
166 echo "$help" 1>&2
167 exit 1
168 fi ;;
169 esac
170- host=`$ac_config_sub $host_alias`
171+ host=`$SHELL $ac_config_sub $host_alias`
172 echo "$ac_t$host" 1>&6
173
174 # Make sure the host verified.
175@@ -421,7 +459,7 @@
176 # Now see if the compiler is really GCC.
177 with_gcc=no
178 echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
179- echo "$progname:424: checking whether we are using GNU C" >&5
180+ echo "$progname:462: checking whether we are using GNU C" >&5
181
182 $rm conftest.c
183 cat > conftest.c <<EOF
184@@ -429,7 +467,7 @@
185 yes;
186 #endif
187 EOF
188- if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
189+ if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
190 with_gcc=yes
191 fi
192 $rm conftest.c
193@@ -477,7 +515,7 @@
194 link_static_flag='-bnso -bI:/lib/syscalls.exp'
195 ;;
196
197- hpux9* | hpux10*)
198+ hpux9* | hpux10* | hpux11*)
199 # Is there a better link_static_flag that works with the bundled CC?
200 wl='-Wl,'
201 link_static_flag="${wl}-a ${wl}archive"
202@@ -541,11 +579,11 @@
203 # Check to make sure the pic_flag actually works.
204 echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
205 $rm conftest*
206- echo > conftest.c
207+ echo "int some_variable = 0;" > conftest.c
208 save_CFLAGS="$CFLAGS"
209 CFLAGS="$CFLAGS $pic_flag -DPIC"
210- echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5
211- if { (eval echo $progname:548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
212+ echo "$progname:585: checking if $compiler PIC flag $pic_flag works" >&5
213+ if { (eval echo $progname:586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
214 # Append any warnings to the config.log.
215 cat conftest.err 1>&5
216
217@@ -588,8 +626,8 @@
218 echo 'main(){return(0);}' > conftest.c
219 save_LDFLAGS="$LDFLAGS"
220 LDFLAGS="$LDFLAGS $link_static_flag"
221-echo "$progname:591: checking if $compiler static flag $link_static_flag works" >&5
222-if { (eval echo $progname:592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
223+echo "$progname:629: checking if $compiler static flag $link_static_flag works" >&5
224+if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
225 echo "$ac_t$link_static_flag" 1>&6
226 else
227 echo "$ac_t"none 1>&6
228@@ -621,11 +659,11 @@
229 if test "$with_gcc" = yes; then
230 # Check if gcc -print-prog-name=ld gives a path.
231 echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
232- echo "$progname:624: checking for ld used by GCC" >&5
233+ echo "$progname:662: checking for ld used by GCC" >&5
234 ac_prog=`($CC -print-prog-name=ld) 2>&5`
235 case "$ac_prog" in
236 # Accept absolute paths.
237- /* | [A-Za-z]:\\*)
238+ /* | [A-Za-z]:[/\\]*)
239 test -z "$LD" && LD="$ac_prog"
240 ;;
241 "")
242@@ -639,10 +677,10 @@
243 esac
244 elif test "$with_gnu_ld" = yes; then
245 echo $ac_n "checking for GNU ld... $ac_c" 1>&6
246- echo "$progname:642: checking for GNU ld" >&5
247+ echo "$progname:680: checking for GNU ld" >&5
248 else
249 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
250- echo "$progname:645: checking for non-GNU ld" >&5
251+ echo "$progname:683: checking for non-GNU ld" >&5
252 fi
253
254 if test -z "$LD"; then
255@@ -694,6 +732,7 @@
256 archive_cmds=
257 old_archive_from_new_cmds=
258 export_dynamic_flag_spec=
259+whole_archive_flag_spec=
260 hardcode_libdir_flag_spec=
261 hardcode_libdir_separator=
262 hardcode_direct=no
263@@ -701,31 +740,38 @@
264 hardcode_shlibpath_var=unsupported
265 runpath_var=
266
267-case "$host_os" in
268-amigaos* | sunos4*)
269- # On these operating systems, we should treat GNU ld like the system ld.
270- gnu_ld_acts_native=yes
271- ;;
272-*)
273- gnu_ld_acts_native=no
274- ;;
275-esac
276-
277 ld_shlibs=yes
278-if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
279+if test "$with_gnu_ld" = yes; then
280
281 # See if GNU ld supports shared libraries.
282- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
283- archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
284- runpath_var=LD_RUN_PATH
285- ld_shlibs=yes
286- else
287- ld_shlibs=no
288- fi
289+ case "$host_os" in
290+ amigaos*)
291+ archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)'
292+ hardcode_libdir_flag_spec='-L$libdir'
293+ hardcode_minus_L=yes
294+ ;;
295+
296+ sunos4*)
297+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
298+ hardcode_direct=yes
299+ hardcode_minus_L=yes
300+ hardcode_shlibpath_var=no
301+ ;;
302+
303+ *)
304+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
305+ archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
306+ else
307+ ld_shlibs=no
308+ fi
309+ ;;
310+ esac
311
312 if test "$ld_shlibs" = yes; then
313+ runpath_var=LD_RUN_PATH
314 hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
315 export_dynamic_flag_spec='${wl}--export-dynamic'
316+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
317 fi
318 else
319 # PORTME fill in a description of your system's linker (not GNU ld)
320@@ -781,7 +827,7 @@
321 archive_cmds='$CC -shared -o $lib$libobjs'
322 hardcode_libdir_flag_spec='-R$libdir'
323 hardcode_direct=yes
324- hardcode_minus_L=yes
325+ hardcode_minus_L=no
326 hardcode_shlibpath_var=no
327 ;;
328
329@@ -793,7 +839,7 @@
330 export_dynamic_flag_spec='${wl}-E'
331 ;;
332
333- hpux10*)
334+ hpux10* | hpux11*)
335 archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs'
336 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
337 hardcode_direct=yes
338@@ -802,7 +848,11 @@
339 ;;
340
341 irix5* | irix6*)
342- archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
343+ if test "$with_gcc" = yes; then
344+ archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs'
345+ else
346+ archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
347+ fi
348 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
349 ;;
350
351@@ -856,15 +906,7 @@
352 ;;
353
354 sunos4*)
355- if test "$with_gcc" = yes; then
356- archive_cmds='$CC -shared -o $lib$libobjs'
357- else
358- archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
359- fi
360-
361- if test "$with_gnu_ld" = yes; then
362- export_dynamic_flag_spec='${wl}-export-dynamic'
363- fi
364+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
365 hardcode_libdir_flag_spec='-L$libdir'
366 hardcode_direct=yes
367 hardcode_minus_L=yes
368@@ -890,7 +932,7 @@
369 if test -z "$NM"; then
370 echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
371 case "$NM" in
372- /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path.
373+ /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path.
374 *)
375 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
376 for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
377@@ -968,11 +1010,11 @@
378 main(){nm_test_var='a';nm_test_func();return(0);}
379 EOF
380
381-echo "$progname:971: checking if global_symbol_pipe works" >&5
382-if { (eval echo $progname:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
383+echo "$progname:1013: checking if global_symbol_pipe works" >&5
384+if { (eval echo $progname:1014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
385 # Now try to grab the symbols.
386 nlist=conftest.nm
387- if { echo "$progname:975: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
388+ if { echo "$progname:1017: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
389
390 # Try sorting and uniquifying the output.
391 if sort "$nlist" | uniq > "$nlist"T; then
392@@ -1030,7 +1072,7 @@
393 save_CFLAGS="$CFLAGS"
394 LIBS='conftestm.o'
395 CFLAGS="$CFLAGS$no_builtin_flag"
396- if { (eval echo $progname:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
397+ if { (eval echo $progname:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
398 pipe_works=yes
399 else
400 echo "$progname: failed program was:" >&5
401@@ -1073,25 +1115,20 @@
402 # We can link without hardcoding, and we can hardcode nonexisting dirs.
403 hardcode_action=immediate
404 fi
405-elif test "$hardcode_direct" != yes && \
406- test "$hardcode_minus_L" != yes && \
407- test "$hardcode_shlibpath_var" != yes; then
408- # We cannot hardcode anything.
409- hardcode_action=unsupported
410 else
411- # We can only hardcode existing directories.
412- hardcode_action=relink
413+ # We cannot hardcode anything, or else we can only hardcode existing
414+ # directories.
415+ hardcode_action=unsupported
416 fi
417 echo "$ac_t$hardcode_action" 1>&6
418-test "$hardcode_action" = unsupported && can_build_shared=no
419
420
421 reload_flag=
422 reload_cmds='$LD$reload_flag -o $output$reload_objs'
423 echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
424-# PORTME Some linker may need a different reload flag.
425+# PORTME Some linkers may need a different reload flag.
426 reload_flag='-r'
427-echo "$ac_t$reload_flag"
428+echo "$ac_t$reload_flag" 1>&6
429 test -n "$reload_flag" && reload_flag=" $reload_flag"
430
431 # PORTME Fill in your ld.so characteristics
432@@ -1110,11 +1147,11 @@
433 case "$host_os" in
434 aix3* | aix4*)
435 version_type=linux
436- library_names_spec='${libname}${release}.so.$versuffix $libname.a'
437+ library_names_spec='${libname}${release}.so$versuffix $libname.a'
438 shlibpath_var=LIBPATH
439
440 # AIX has no versioning support, so we append a major version to the name.
441- soname_spec='${libname}${release}.so.$major'
442+ soname_spec='${libname}${release}.so$major'
443 ;;
444
445 amigaos*)
446@@ -1125,25 +1162,25 @@
447
448 freebsd2* | freebsd3*)
449 version_type=sunos
450- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
451- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
452+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
453+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
454 shlibpath_var=LD_LIBRARY_PATH
455 ;;
456
457 gnu*)
458- version_type=sunos
459- library_names_spec='${libname}${release}.so.$versuffix'
460+ version_type=linux
461+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
462 shlibpath_var=LD_LIBRARY_PATH
463 ;;
464
465-hpux9* | hpux10*)
466+hpux9* | hpux10* | hpux11*)
467 # Give a soname corresponding to the major version so that dld.sl refuses to
468 # link against other versions.
469 dynamic_linker="$host_os dld.sl"
470 version_type=sunos
471 shlibpath_var=SHLIB_PATH
472- library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl'
473- soname_spec='${libname}${release}.sl.$major'
474+ library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
475+ soname_spec='${libname}${release}.sl$major'
476 # HP-UX runs *really* slowly unless shared libraries are mode 555.
477 postinstall_cmds='chmod 555 $lib'
478 ;;
479@@ -1151,7 +1188,7 @@
480 irix5* | irix6*)
481 version_type=osf
482 soname_spec='${libname}${release}.so'
483- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
484+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
485 shlibpath_var=LD_LIBRARY_PATH
486 ;;
487
488@@ -1163,9 +1200,9 @@
489 # This must be Linux ELF.
490 linux-gnu*)
491 version_type=linux
492- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
493- soname_spec='${libname}${release}.so.$major'
494- finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
495+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
496+ soname_spec='${libname}${release}.so$major'
497+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
498 shlibpath_var=LD_LIBRARY_PATH
499
500 if test -f /lib/ld.so.1; then
501@@ -1181,8 +1218,8 @@
502
503 netbsd* | openbsd*)
504 version_type=sunos
505- library_names_spec='${libname}${release}.so.$versuffix'
506- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
507+ library_names_spec='${libname}${release}.so$versuffix'
508+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
509 shlibpath_var=LD_LIBRARY_PATH
510 ;;
511
512@@ -1196,42 +1233,44 @@
513 osf3* | osf4*)
514 version_type=osf
515 soname_spec='${libname}${release}.so'
516- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
517+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
518 shlibpath_var=LD_LIBRARY_PATH
519 ;;
520
521 sco3.2v5*)
522 version_type=osf
523- soname_spec='${libname}${release}.so.$major'
524- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
525+ soname_spec='${libname}${release}.so$major'
526+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
527 shlibpath_var=LD_LIBRARY_PATH
528 ;;
529
530 solaris2*)
531 version_type=linux
532- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
533- soname_spec='${libname}${release}.so.$major'
534+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
535+ soname_spec='${libname}${release}.so$major'
536 shlibpath_var=LD_LIBRARY_PATH
537+ # ldd complains unless libraries are executable
538+ postinstall_cmds='chmod +x $lib'
539 ;;
540
541 sunos4*)
542 version_type=sunos
543- library_names_spec='${libname}${release}.so.$versuffix'
544- finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir'
545+ library_names_spec='${libname}${release}.so$versuffix'
546+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
547 shlibpath_var=LD_LIBRARY_PATH
548 ;;
549
550 sysv4.2uw2*)
551 version_type=linux
552- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
553- soname_spec='${libname}${release}.so.$major'
554+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
555+ soname_spec='${libname}${release}.so$major'
556 shlibpath_var=LD_LIBRARY_PATH
557 ;;
558
559 uts4*)
560 version_type=linux
561- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
562- soname_spec='${libname}${release}.so.$major'
563+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
564+ soname_spec='${libname}${release}.so$major'
565 shlibpath_var=LD_LIBRARY_PATH
566 ;;
567
568@@ -1287,7 +1326,7 @@
569 for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
570 old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \
571 link_static_flag no_builtin_flag export_dynamic_flag_spec \
572- libname_spec library_names_spec soname_spec RANLIB \
573+ whole_archive_flag_spec libname_spec library_names_spec soname_spec RANLIB \
574 old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
575 old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \
576 allow_undefined_flag no_undefined_flag \
577@@ -1307,14 +1346,13 @@
578 esac
579 done
580
581-ofile=libtool
582-trap "$rm $ofile; exit 1" 1 2 15
583-echo creating $ofile
584-$rm $ofile
585-cat <<EOF > $ofile
586-#! /bin/sh
587+trap "$rm \"$ofile\"; exit 1" 1 2 15
588+echo "creating $ofile"
589+$rm "$ofile"
590+cat <<EOF > "$ofile"
591+#! $SHELL
592
593-# libtool - Provide generalized library-building support services.
594+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
595 # Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION
596 # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
597 #
598@@ -1340,16 +1378,6 @@
599 # configuration script generated by Autoconf, you may include it under
600 # the same distribution terms that you use for the rest of that program.
601
602-# This program was configured as follows,
603-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
604-#
605-# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
606-# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
607-# $0$ltconfig_args
608-#
609-# Compiler and other test output produced by $progname, useful for
610-# debugging $progname, is in ./config.log if it exists.
611-
612 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
613 Xsed="sed -e s/^X//"
614
615@@ -1357,25 +1385,35 @@
616 # if CDPATH is set.
617 if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
618
619-# An echo program that does not interpret backslashes.
620-echo="$ltecho"
621+### BEGIN LIBTOOL CONFIG
622+# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
623+#
624+# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
625+# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
626+# $0$ltconfig_args
627+#
628+# Compiler and other test output produced by $progname, useful for
629+# debugging $progname, is in ./config.log if it exists.
630
631 # The version of $progname that generated this script.
632 LTCONFIG_VERSION="$VERSION"
633
634 # Shell to use when invoking shell scripts.
635-SHELL=${CONFIG_SHELL-/bin/sh}
636+SHELL="$SHELL"
637
638-# Whether or not to build libtool libraries.
639+# Whether or not to build shared libraries.
640 build_libtool_libs=$enable_shared
641
642-# Whether or not to build old-style libraries.
643+# Whether or not to build static libraries.
644 build_old_libs=$enable_static
645
646 # The host system.
647 host_alias="$host_alias"
648 host="$host"
649
650+# An echo program that does not interpret backslashes.
651+echo="$ltecho"
652+
653 # The archiver.
654 AR="$AR"
655
656@@ -1413,6 +1451,9 @@
657 # Compiler flag to allow reflexive dlopens.
658 export_dynamic_flag_spec="$export_dynamic_flag_spec"
659
660+# Compiler flag to generate shared objects directly from archives.
661+whole_archive_flag_spec="$whole_archive_flag_spec"
662+
663 # Library versioning type.
664 version_type=$version_type
665
666@@ -1482,12 +1523,12 @@
667 # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
668 # the resulting binary.
669 hardcode_shlibpath_var=$hardcode_shlibpath_var
670-
671 EOF
672
673 case "$host_os" in
674 aix3*)
675- cat <<\EOF >> $ofile
676+ cat <<\EOF >> "$ofile"
677+
678 # AIX sometimes has problems with the GCC collect2 program. For some
679 # reason, if we set the COLLECT_NAMES environment variable, the problems
680 # vanish in a puff of smoke.
681@@ -1495,15 +1536,17 @@
682 COLLECT_NAMES=
683 export COLLECT_NAMES
684 fi
685-
686 EOF
687 ;;
688 esac
689
690+echo '### END LIBTOOL CONFIG' >> "$ofile"
691+echo >> "$ofile"
692+
693 # Append the ltmain.sh script.
694-cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1)
695+cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
696
697-chmod +x $ofile
698+chmod +x "$ofile"
699 exit 0
700
701 # Local Variables:
702--- jpeg-6b/config.sub.arm Wed Mar 25 10:25:39 1998
703+++ jpeg-6b/config.sub Wed Jan 13 18:08:47 1999
704@@ -1,6 +1,6 @@
705 #! /bin/sh
706 # Configuration validation subroutine script, version 1.1.
707-# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
708+# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
709 # This file is (in principle) common to ALL GNU software.
710 # The presence of a machine in this file suggests that SOME GNU software
711 # can handle that machine. It does not imply ALL GNU software can.
712@@ -162,7 +162,7 @@
713 # We use `pc' rather than `unknown'
714 # because (1) that's what they normally are, and
715 # (2) the word "unknown" tends to confuse beginning users.
716- i[3456]86)
717+ i[34567]86)
718 basic_machine=$basic_machine-pc
719 ;;
720 # Object if more than one company name word.
721@@ -171,7 +171,7 @@
722 exit 1
723 ;;
724 # Recognize the basic CPU types with company name.
725- vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
726+ vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
727 | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
728 | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
729 | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
730@@ -350,19 +350,19 @@
731 os=-mvs
732 ;;
733 # I'm not sure what "Sysv32" means. Should this be sysv3.2?
734- i[3456]86v32)
735+ i[34567]86v32)
736 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
737 os=-sysv32
738 ;;
739- i[3456]86v4*)
740+ i[34567]86v4*)
741 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
742 os=-sysv4
743 ;;
744- i[3456]86v)
745+ i[34567]86v)
746 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
747 os=-sysv
748 ;;
749- i[3456]86sol2)
750+ i[34567]86sol2)
751 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
752 os=-solaris2
753 ;;
754@@ -469,25 +469,23 @@
755 pc532 | pc532-*)
756 basic_machine=ns32k-pc532
757 ;;
758- pentium | p5)
759- basic_machine=i586-intel
760+ pentium | p5 | k5 | nexen)
761+ basic_machine=i586-pc
762 ;;
763- pentiumpro | p6)
764- basic_machine=i686-intel
765+ pentiumpro | p6 | k6 | 6x86)
766+ basic_machine=i686-pc
767 ;;
768- pentium-* | p5-*)
769+ pentiumii | pentium2)
770+ basic_machine=i786-pc
771+ ;;
772+ pentium-* | p5-* | k5-* | nexen-*)
773 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
774 ;;
775- pentiumpro-* | p6-*)
776+ pentiumpro-* | p6-* | k6-* | 6x86-*)
777 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
778 ;;
779- k5)
780- # We don't have specific support for AMD's K5 yet, so just call it a Pentium
781- basic_machine=i586-amd
782- ;;
783- nexen)
784- # We don't have specific support for Nexgen yet, so just call it a Pentium
785- basic_machine=i586-nexgen
786+ pentiumii-* | pentium2-*)
787+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
788 ;;
789 pn)
790 basic_machine=pn-gould
791--- jpeg-6b/config.guess.arm Wed Mar 25 10:25:38 1998
792+++ jpeg-6b/config.guess Wed Jan 13 18:08:44 1999
793@@ -1,6 +1,6 @@
794 #! /bin/sh
795 # Attempt to guess a canonical system name.
796-# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
797+# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
798 #
799 # This file is free software; you can redistribute it and/or modify it
800 # under the terms of the GNU General Public License as published by
801@@ -478,10 +478,10 @@
802 echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
803 exit 0 ;;
804 i*:CYGWIN*:*)
805- echo i386-pc-cygwin32
806+ echo ${UNAME_MACHINE}-pc-cygwin32
807 exit 0 ;;
808 i*:MINGW*:*)
809- echo i386-pc-mingw32
810+ echo ${UNAME_MACHINE}-pc-mingw32
811 exit 0 ;;
812 p*:CYGWIN*:*)
813 echo powerpcle-unknown-cygwin32
814@@ -493,6 +493,12 @@
815 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
816 exit 0 ;;
817 *:Linux:*:*)
818+ # uname on the ARM produces all sorts of strangeness, and we need to
819+ # filter it out.
820+ case "$UNAME_MACHINE" in
821+ arm* | sa110*) UNAME_MACHINE="arm" ;;
822+ esac
823+
824 # The BFD linker knows what the default object file format is, so
825 # first see if it will tell us.
826 ld_help_string=`ld --help 2>&1`
827@@ -506,6 +512,7 @@
828 i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
829 i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
830 sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
831+ armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
832 m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
833 elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
834 esac
835--- jpeg-6b/ltmain.sh.arm Wed Mar 25 10:25:39 1998
836+++ jpeg-6b/ltmain.sh Wed Jan 13 18:08:47 1999
837@@ -23,6 +23,18 @@
838 # configuration script generated by Autoconf, you may include it under
839 # the same distribution terms that you use for the rest of that program.
840
841+# Check that we have a working $echo.
842+if test "X$1" = X--no-reexec; then
843+ # Discard the --no-reexec flag, and continue.
844+ shift
845+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
846+ # Yippee, $echo works!
847+ :
848+else
849+ # Restart under the correct shell, and then maybe $echo will work.
850+ exec $SHELL "$0" --no-reexec ${1+"$@"}
851+fi
852+
853 # The name of this program.
854 progname=`$echo "$0" | sed 's%^.*/%%'`
855 modename="$progname"
856@@ -30,7 +42,7 @@
857 # Constants.
858 PROGRAM=ltmain.sh
859 PACKAGE=libtool
860-VERSION=1.2
861+VERSION=1.2b
862
863 default_mode=
864 help="Try \`$progname --help' for more information."
865@@ -48,8 +60,13 @@
866 # Only set LANG and LC_ALL to C if already set.
867 # These must not be set unconditionally because not all systems understand
868 # e.g. LANG=C (notably SCO).
869-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
870-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
871+# We save the old values to restore during execute mode.
872+if test "${LC_ALL+set}" = set; then
873+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
874+fi
875+if test "${LANG+set}" = set; then
876+ save_LANG="$LANG"; LANG=C; export LANG
877+fi
878
879 if test "$LTCONFIG_VERSION" != "$VERSION"; then
880 echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
881@@ -111,6 +128,16 @@
882 exit 0
883 ;;
884
885+ --config)
886+ sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
887+ exit 0
888+ ;;
889+
890+ --debug)
891+ echo "$progname: enabling shell trace mode"
892+ set -x
893+ ;;
894+
895 --dry-run | -n)
896 run=:
897 ;;
898@@ -180,7 +207,7 @@
899 esac
900 done
901 ;;
902- *db | *dbx)
903+ *db | *dbx | *strace | *truss)
904 mode=execute
905 ;;
906 *install*|cp|mv)
907@@ -238,7 +265,6 @@
908 ;;
909
910 -static)
911- build_libtool_libs=no
912 build_old_libs=yes
913 continue
914 ;;
915@@ -337,7 +363,7 @@
916
917 # Just move the object, then go on to compile the next one
918 $show "$mv $obj $libobj"
919- $run $mv $obj $libobj || exit 1
920+ $run $mv $obj $libobj || exit $?
921
922 # Allow error messages only from the first compilation.
923 suppress_output=' >/dev/null 2>&1'
924@@ -374,10 +400,13 @@
925
926 compile_shlibpath=
927 finalize_shlibpath=
928+ convenience=
929+ old_convenience=
930 deplibs=
931 dlfiles=
932 dlprefiles=
933 export_dynamic=no
934+ generated=
935 hardcode_libdirs=
936 libobjs=
937 link_against_libtool_libs=
938@@ -410,8 +439,10 @@
939 test -n "$old_archive_from_new_cmds" && build_old_libs=yes
940
941 # Go through the arguments, transforming them on the way.
942- for arg
943- do
944+ while test $# -gt 0; do
945+ arg="$1"
946+ shift
947+
948 # If the previous option needs an argument, assign it.
949 if test -n "$prev"; then
950 case "$prev" in
951@@ -495,7 +526,7 @@
952 -L*)
953 dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
954 case "$dir" in
955- /* | [A-Za-z]:\\*)
956+ /* | [A-Za-z]:[/\\]*)
957 # Add the corresponding hardcode_libdir_flag, if it is not identical.
958 ;;
959 *)
960@@ -571,7 +602,7 @@
961
962 if test "$prev" = dlprefiles; then
963 # Preload the old-style object.
964- dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'`
965+ dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/.o/'`
966 prev=
967 fi
968 libobjs="$libobjs $arg"
969@@ -586,7 +617,7 @@
970 old_library=
971
972 # Check to see that this really is a libtool archive.
973- if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
974+ if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
975 else
976 $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
977 exit 1
978@@ -598,11 +629,6 @@
979 *) . ./$arg ;;
980 esac
981
982- if test -z "$libdir"; then
983- $echo "$modename: \`$arg' contains no -rpath information" 1>&2
984- exit 1
985- fi
986-
987 # Get the name of the library we link against.
988 linklib=
989 for l in $old_library $library_names; do
990@@ -623,6 +649,15 @@
991 dir="$dir/$objdir"
992 fi
993
994+ if test -z "$libdir"; then
995+ # It is a libtool convenience library, so add in its objects.
996+ convenience="$convenience $dir/$old_library"l
997+ old_convenience="$old_convenience $dir/$old_library"
998+ compile_command="$compile_command $dir/$old_library"
999+ finalize_command="$finalize_command $dir/$old_library"
1000+ continue
1001+ fi
1002+
1003 # This library was specified with -dlopen.
1004 if test "$prev" = dlfiles; then
1005 dlfiles="$dlfiles $arg"
1006@@ -696,8 +731,9 @@
1007 fi
1008
1009
1010+ lib_linked=yes
1011 case "$hardcode_action" in
1012- immediate)
1013+ immediate | unsupported)
1014 if test "$hardcode_direct" = no; then
1015 compile_command="$compile_command $dir/$linklib"
1016 elif test "$hardcode_minus_L" = no; then
1017@@ -705,13 +741,15 @@
1018 elif test "$hardcode_shlibpath_var" = no; then
1019 compile_shlibpath="$compile_shlibpath$dir:"
1020 compile_command="$compile_command -l$name"
1021+ else
1022+ lib_linked=no
1023 fi
1024 ;;
1025
1026 relink)
1027 # We need an absolute path.
1028 case "$dir" in
1029- /* | [A-Za-z]:\\*) ;;
1030+ /* | [A-Za-z]:[/\\]*) ;;
1031 *)
1032 absdir=`cd "$dir" && pwd`
1033 if test -z "$absdir"; then
1034@@ -729,15 +767,21 @@
1035 elif test "$hardcode_shlibpath_var" = yes; then
1036 compile_shlibpath="$compile_shlibpath$dir:"
1037 compile_command="$compile_command -l$name"
1038+ else
1039+ lib_linked=no
1040 fi
1041 ;;
1042
1043- *)
1044- $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2
1045- exit 1
1046- ;;
1047+ *)
1048+ lib_linked=no
1049+ ;;
1050 esac
1051
1052+ if test "$lib_linked" != yes; then
1053+ $echo "$modename: configuration error: unsupported hardcode properties"
1054+ exit 1
1055+ fi
1056+
1057 # Finalize command for both is simple: just hardcode it.
1058 if test "$hardcode_direct" = yes; then
1059 finalize_command="$finalize_command $libdir/$linklib"
1060@@ -802,14 +846,7 @@
1061 exit 1
1062 fi
1063
1064- if test -n "$vinfo" && test -n "$release"; then
1065- $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2
1066- $echo "$help" 1>&2
1067- exit 1
1068- fi
1069-
1070- oldlib=
1071- oldobjs=
1072+ oldlibs=
1073 case "$output" in
1074 "")
1075 $echo "$modename: you must specify an output file" 1>&2
1076@@ -819,16 +856,39 @@
1077
1078 */* | *\\*)
1079 $echo "$modename: output file \`$output' must have no directory components" 1>&2
1080+ $echo "$help" 1>&2
1081 exit 1
1082 ;;
1083
1084 *.a)
1085+ if test -n "$link_against_libtool_libs"; then
1086+ $echo "$modename: error: cannot link libtool libraries into archives" 1>&2
1087+ exit 1
1088+ fi
1089+
1090+ if test -n "$deplibs"; then
1091+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
1092+ fi
1093+
1094+ if test -n "$dlfiles$dlprefiles"; then
1095+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
1096+ fi
1097+
1098+ if test -n "$rpath"; then
1099+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
1100+ fi
1101+
1102+ if test -n "$vinfo"; then
1103+ $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
1104+ fi
1105+
1106+ if test -n "$release"; then
1107+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
1108+ fi
1109+
1110 # Now set the variables for building old libraries.
1111 build_libtool_libs=no
1112- build_old_libs=yes
1113- oldlib="$output"
1114- $show "$rm $oldlib"
1115- $run $rm $oldlib
1116+ oldlibs="$output"
1117 ;;
1118
1119 *.la)
1120@@ -836,7 +896,7 @@
1121 case "$output" in
1122 lib*) ;;
1123 *)
1124- $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2
1125+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
1126 $echo "$help" 1>&2
1127 exit 1
1128 ;;
1129@@ -849,9 +909,6 @@
1130 library_names=
1131 old_library=
1132 dlname=
1133- current=0
1134- revision=0
1135- age=0
1136
1137 if test -n "$objs"; then
1138 $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
1139@@ -860,21 +917,12 @@
1140
1141 # How the heck are we supposed to write a wrapper for a shared library?
1142 if test -n "$link_against_libtool_libs"; then
1143- $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
1144+ $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
1145 exit 1
1146 fi
1147
1148 if test -n "$dlfiles$dlprefiles"; then
1149- $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
1150- # Nullify the symbol file.
1151- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
1152- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
1153- fi
1154-
1155- if test -z "$rpath"; then
1156- $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2
1157- $echo "$help" 1>&2
1158- exit 1
1159+ $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
1160 fi
1161
1162 set dummy $rpath
1163@@ -883,203 +931,250 @@
1164 fi
1165 install_libdir="$2"
1166
1167- # Parse the version information argument.
1168- IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
1169- set dummy $vinfo
1170- IFS="$save_ifs"
1171+ # Now set the variables for building old libraries.
1172+ oldlibs="$objdir/$libname.a"
1173+ if test -z "$rpath"; then
1174+ # Building a libtool convenience library.
1175+ oldlibs="$objdir/$libname.al $oldlibs"
1176+ build_libtool_libs=convenience
1177
1178- if test -n "$5"; then
1179- $echo "$modename: too many parameters to \`-version-info'" 1>&2
1180- $echo "$help" 1>&2
1181- exit 1
1182- fi
1183+ if test -n "$vinfo"; then
1184+ $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
1185+ fi
1186
1187- test -n "$2" && current="$2"
1188- test -n "$3" && revision="$3"
1189- test -n "$4" && age="$4"
1190-
1191- # Check that each of the things are valid numbers.
1192- case "$current" in
1193- 0 | [1-9] | [1-9][0-9]*) ;;
1194- *)
1195- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
1196- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1197- exit 1
1198- ;;
1199- esac
1200+ if test -n "$release"; then
1201+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
1202+ fi
1203+ else
1204
1205- case "$revision" in
1206- 0 | [1-9] | [1-9][0-9]*) ;;
1207- *)
1208- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
1209- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1210- exit 1
1211- ;;
1212- esac
1213+ # Parse the version information argument.
1214+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
1215+ set dummy $vinfo 0 0 0
1216+ IFS="$save_ifs"
1217+
1218+ if test -n "$8"; then
1219+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
1220+ $echo "$help" 1>&2
1221+ exit 1
1222+ fi
1223
1224- case "$age" in
1225- 0 | [1-9] | [1-9][0-9]*) ;;
1226- *)
1227- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
1228- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1229- exit 1
1230- ;;
1231- esac
1232+ current="$2"
1233+ revision="$3"
1234+ age="$4"
1235+
1236+ # Check that each of the things are valid numbers.
1237+ case "$current" in
1238+ 0 | [1-9] | [1-9][0-9]*) ;;
1239+ *)
1240+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
1241+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1242+ exit 1
1243+ ;;
1244+ esac
1245
1246- if test $age -gt $current; then
1247- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
1248- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1249- exit 1
1250- fi
1251+ case "$revision" in
1252+ 0 | [1-9] | [1-9][0-9]*) ;;
1253+ *)
1254+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
1255+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1256+ exit 1
1257+ ;;
1258+ esac
1259
1260- # Calculate the version variables.
1261- version_vars="version_type current age revision"
1262- case "$version_type" in
1263- none) ;;
1264-
1265- linux)
1266- version_vars="$version_vars major versuffix"
1267- major=`expr $current - $age`
1268- versuffix="$major.$age.$revision"
1269- ;;
1270-
1271- osf)
1272- version_vars="$version_vars versuffix verstring"
1273- major=`expr $current - $age`
1274- versuffix="$current.$age.$revision"
1275- verstring="$versuffix"
1276-
1277- # Add in all the interfaces that we are compatible with.
1278- loop=$age
1279- while test $loop != 0; do
1280- iface=`expr $current - $loop`
1281- loop=`expr $loop - 1`
1282- verstring="$verstring:${iface}.0"
1283- done
1284+ case "$age" in
1285+ 0 | [1-9] | [1-9][0-9]*) ;;
1286+ *)
1287+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
1288+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1289+ exit 1
1290+ ;;
1291+ esac
1292
1293- # Make executables depend on our current version.
1294- verstring="$verstring:${current}.0"
1295- ;;
1296+ if test $age -gt $current; then
1297+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
1298+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1299+ exit 1
1300+ fi
1301
1302- sunos)
1303- version_vars="$version_vars major versuffix"
1304- major="$current"
1305- versuffix="$current.$revision"
1306- ;;
1307+ # Calculate the version variables.
1308+ major=
1309+ versuffix=
1310+ verstring=
1311+ case "$version_type" in
1312+ none) ;;
1313+
1314+ linux)
1315+ major=.`expr $current - $age`
1316+ versuffix="$major.$age.$revision"
1317+ ;;
1318
1319- *)
1320- $echo "$modename: unknown library version type \`$version_type'" 1>&2
1321- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
1322- exit 1
1323- ;;
1324- esac
1325+ osf)
1326+ major=`expr $current - $age`
1327+ versuffix=".$current.$age.$revision"
1328+ verstring="$current.$age.$revision"
1329+
1330+ # Add in all the interfaces that we are compatible with.
1331+ loop=$age
1332+ while test $loop != 0; do
1333+ iface=`expr $current - $loop`
1334+ loop=`expr $loop - 1`
1335+ verstring="$verstring:${iface}.0"
1336+ done
1337+
1338+ # Make executables depend on our current version.
1339+ verstring="$verstring:${current}.0"
1340+ ;;
1341+
1342+ sunos)
1343+ major=".$current"
1344+ versuffix=".$current.$revision"
1345+ ;;
1346+
1347+ *)
1348+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
1349+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
1350+ exit 1
1351+ ;;
1352+ esac
1353+
1354+ # Clear the version info if we defaulted, and they specified a release.
1355+ if test -z "$vinfo" && test -n "$release"; then
1356+ major=
1357+ versuffix=
1358+ verstring="0.0"
1359+ fi
1360+
1361+ # Check to see if the archive will have undefined symbols.
1362+ if test "$allow_undefined" = yes; then
1363+ if test "$allow_undefined_flag" = unsupported; then
1364+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
1365+ build_libtool_libs=no
1366+ build_old_libs=yes
1367+ fi
1368+ else
1369+ # Don't allow undefined symbols.
1370+ allow_undefined_flag="$no_undefined_flag"
1371+ fi
1372+
1373+ # Add libc to deplibs on all systems.
1374+ dependency_libs="$deplibs"
1375+ deplibs="$deplibs -lc"
1376+ fi
1377
1378 # Create the output directory, or remove our outputs if we need to.
1379 if test -d $objdir; then
1380- $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*"
1381- $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*
1382+ $show "${rm}r $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*"
1383+ $run ${rm}r $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*
1384 else
1385 $show "$mkdir $objdir"
1386 $run $mkdir $objdir
1387- status=$?
1388- if test $status -eq 0 || test -d $objdir; then :
1389- else
1390- exit $status
1391- fi
1392- fi
1393-
1394- # Check to see if the archive will have undefined symbols.
1395- if test "$allow_undefined" = yes; then
1396- if test "$allow_undefined_flag" = unsupported; then
1397- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
1398- build_libtool_libs=no
1399- build_old_libs=yes
1400+ status=$?
1401+ if test $status -ne 0 && test ! -d $objdir; then
1402+ exit $status
1403 fi
1404- else
1405- # Don't allow undefined symbols.
1406- allow_undefined_flag="$no_undefined_flag"
1407 fi
1408
1409- # Add libc to deplibs on all systems.
1410- dependency_libs="$deplibs"
1411- deplibs="$deplibs -lc"
1412-
1413 if test "$build_libtool_libs" = yes; then
1414- # Get the real and link names of the library.
1415- eval library_names=\"$library_names_spec\"
1416- set dummy $library_names
1417- realname="$2"
1418- shift; shift
1419+ # Get the real and link names of the library.
1420+ eval library_names=\"$library_names_spec\"
1421+ set dummy $library_names
1422+ realname="$2"
1423+ shift; shift
1424
1425- if test -n "$soname_spec"; then
1426- eval soname=\"$soname_spec\"
1427- else
1428- soname="$realname"
1429- fi
1430+ if test -n "$soname_spec"; then
1431+ eval soname=\"$soname_spec\"
1432+ else
1433+ soname="$realname"
1434+ fi
1435
1436- lib="$objdir/$realname"
1437+ lib="$objdir/$realname"
1438 for link
1439 do
1440 linknames="$linknames $link"
1441 done
1442
1443- # Use standard objects if they are PIC.
1444- test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'`
1445+ # Use standard objects if they are PIC.
1446+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'`
1447
1448- # Do each of the archive commands.
1449- eval cmds=\"$archive_cmds\"
1450- IFS="${IFS= }"; save_ifs="$IFS"; IFS=';'
1451- for cmd in $cmds; do
1452- IFS="$save_ifs"
1453- $show "$cmd"
1454- $run eval "$cmd" || exit $?
1455- done
1456- IFS="$save_ifs"
1457+ # Transform .lo files to .o files.
1458+ test "$build_old_libs" = yes && oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
1459
1460- # Create links to the real library.
1461- for linkname in $linknames; do
1462- $show "(cd $objdir && $LN_S $realname $linkname)"
1463- $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $?
1464- done
1465+ if test -n "$whole_archive_flag_spec"; then
1466+ if test -n "$convenience"; then
1467+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
1468+ fi
1469+ else
1470+ for xlib in $convenience; do
1471+ # Extract the objects.
1472+ xdir="$xlib"x
1473+ generated="$generated $xdir"
1474+ xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
1475+
1476+ $show "${rm}r $xdir"
1477+ $run ${rm}r "$xdir"
1478+ $show "mkdir $xdir"
1479+ $run mkdir "$xdir"
1480+ status=$?
1481+ if test $status -ne 0 && test ! -d "$xdir"; then
1482+ exit $status
1483+ fi
1484+ $show "(cd $xdir && $AR x ../$xlib)"
1485+ $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
1486
1487- # If -export-dynamic was specified, set the dlname.
1488- if test "$export_dynamic" = yes; then
1489- # On all known operating systems, these are identical.
1490- dlname="$soname"
1491- fi
1492- fi
1493+ libobjs="$libobjs `echo $xdir/*`"
1494+ done
1495+ fi
1496
1497- # Now set the variables for building old libraries.
1498- oldlib="$objdir/$libname.a"
1499+ # Do each of the archive commands.
1500+ eval cmds=\"$archive_cmds\"
1501+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=';'
1502+ for cmd in $cmds; do
1503+ IFS="$save_ifs"
1504+ $show "$cmd"
1505+ $run eval "$cmd" || exit $?
1506+ done
1507+ IFS="$save_ifs"
1508+
1509+ # Create links to the real library.
1510+ for linkname in $linknames; do
1511+ if test "$realname" != "$linkname"; then
1512+ $show "(cd $objdir && $LN_S $realname $linkname)"
1513+ $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $?
1514+ fi
1515+ done
1516+
1517+ # If -export-dynamic was specified, set the dlname.
1518+ if test "$export_dynamic" = yes; then
1519+ # On all known operating systems, these are identical.
1520+ dlname="$soname"
1521+ fi
1522+ fi
1523 ;;
1524
1525 *.lo | *.o)
1526 if test -n "$link_against_libtool_libs"; then
1527- $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2
1528+ $echo "$modename: error: cannot link libtool libraries into objects" 1>&2
1529 exit 1
1530 fi
1531
1532 if test -n "$deplibs"; then
1533- $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
1534+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
1535 fi
1536
1537 if test -n "$dlfiles$dlprefiles"; then
1538- $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2
1539- # Nullify the symbol file.
1540- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
1541- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
1542+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
1543 fi
1544
1545 if test -n "$rpath"; then
1546- $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2
1547+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
1548 fi
1549
1550 if test -n "$vinfo"; then
1551- $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2
1552+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
1553 fi
1554
1555 if test -n "$release"; then
1556- $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
1557+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
1558 fi
1559
1560 case "$output" in
1561@@ -1139,7 +1234,7 @@
1562 else
1563 # Just create a symlink.
1564 $show "$LN_S $obj $libobj"
1565- $run $LN_S $obj $libobj || exit 1
1566+ $run $LN_S $obj $libobj || exit $?
1567 fi
1568
1569 exit 0
1570@@ -1147,11 +1242,11 @@
1571
1572 *)
1573 if test -n "$vinfo"; then
1574- $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2
1575+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
1576 fi
1577
1578 if test -n "$release"; then
1579- $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
1580+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
1581 fi
1582
1583 if test -n "$rpath"; then
1584@@ -1223,8 +1318,7 @@
1585 $show "$mkdir $objdir"
1586 $run $mkdir $objdir
1587 status=$?
1588- if test $status -eq 0 || test -d $objdir; then :
1589- else
1590+ if test $status -ne 0 && test ! -d $objdir; then
1591 exit $status
1592 fi
1593 fi
1594@@ -1355,13 +1449,11 @@
1595 finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'`
1596
1597 # Create the binary in the object directory, then wrap it.
1598- if test -d $objdir; then :
1599- else
1600+ if test ! -d $objdir; then
1601 $show "$mkdir $objdir"
1602 $run $mkdir $objdir
1603 status=$?
1604- if test $status -eq 0 || test -d $objdir; then :
1605- else
1606+ if test $status -ne 0 && test ! -d $objdir; then
1607 exit $status
1608 fi
1609 fi
1610@@ -1371,7 +1463,7 @@
1611 rpath=
1612 for dir in $temp_rpath; do
1613 case "$dir" in
1614- /* | [A-Za-z]:\\*)
1615+ /* | [A-Za-z]:[/\\]*)
1616 # Absolute path.
1617 rpath="$rpath$dir:"
1618 ;;
1619@@ -1404,13 +1496,11 @@
1620 finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
1621 fi
1622
1623- case "$hardcode_action" in
1624- relink)
1625+ if test "$hardcode_action" = relink; then
1626 # AGH! Flame the AIX and HP-UX people for me, will ya?
1627 $echo "$modename: warning: using a buggy system linker" 1>&2
1628 $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2
1629- ;;
1630- esac
1631+ fi
1632
1633 $show "$compile_command"
1634 $run eval "$compile_command" || exit $?
1635@@ -1430,10 +1520,10 @@
1636 trap "$rm $output; exit 1" 1 2 15
1637
1638 $echo > $output "\
1639-#! /bin/sh
1640+#! $SHELL
1641
1642 # $output - temporary wrapper script for $objdir/$output
1643-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
1644+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
1645 #
1646 # The $output program cannot be directly executed until all the libtool
1647 # libraries that it depends on are installed.
1648@@ -1457,10 +1547,20 @@
1649 finalize_command=\"$finalize_command\"
1650 else
1651 # When we are sourced in execute mode, \$file and \$echo are already set.
1652- if test \"\$libtool_execute_magic\" = \"$magic\"; then :
1653- else
1654+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
1655 echo=\"$qecho\"
1656 file=\"\$0\"
1657+ # Make sure echo works.
1658+ if test \"X\$1\" = X--no-reexec; then
1659+ # Discard the --no-reexec flag, and continue.
1660+ shift
1661+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
1662+ # Yippee, \$echo works!
1663+ :
1664+ else
1665+ # Restart under the correct shell, and then maybe \$echo will work.
1666+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
1667+ fi
1668 fi\
1669 "
1670 $echo >> $output "\
1671@@ -1477,7 +1577,7 @@
1672 # If there was a directory component, then change thisdir.
1673 if test \"x\$destdir\" != \"x\$file\"; then
1674 case \"\$destdir\" in
1675- /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;;
1676+ /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;;
1677 *) thisdir=\"\$thisdir/\$destdir\" ;;
1678 esac
1679 fi
1680@@ -1537,9 +1637,36 @@
1681 esac
1682
1683 # See if we need to build an old-fashioned archive.
1684- if test "$build_old_libs" = "yes"; then
1685- # Transform .lo files to .o files.
1686- oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
1687+ for oldlib in $oldlibs; do
1688+
1689+ if test "$build_libtool_libs" = convenience; then
1690+ oldobjs="$libobjs"
1691+ addlibs="$convenience"
1692+ build_libtool_libs=no
1693+ else
1694+ addlibs="$old_convenience"
1695+ fi
1696+
1697+ # Add in members from convenience archives.
1698+ for xlib in $addlibs; do
1699+ # Extract the objects.
1700+ xdir="$xlib"x
1701+ generated="$generated $xdir"
1702+ xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
1703+
1704+ $show "${rm}r $xdir"
1705+ $run ${rm}r "$xdir"
1706+ $show "mkdir $xdir"
1707+ $run mkdir "$xdir"
1708+ status=$?
1709+ if test $status -ne 0 && test ! -d "$xdir"; then
1710+ exit $status
1711+ fi
1712+ $show "(cd $xdir && $AR x ../$xlib)"
1713+ $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
1714+
1715+ oldobjs="$oldobjs `echo $xdir/*`"
1716+ done
1717
1718 # Do each command in the archive commands.
1719 if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
1720@@ -1554,6 +1681,11 @@
1721 $run eval "$cmd" || exit $?
1722 done
1723 IFS="$save_ifs"
1724+ done
1725+
1726+ if test -n "$generated"; then
1727+ $show "${rm}r$generated"
1728+ $run ${rm}r$generated
1729 fi
1730
1731 # Now create the libtool archive.
1732@@ -1561,14 +1693,13 @@
1733 *.la)
1734 old_library=
1735 test "$build_old_libs" = yes && old_library="$libname.a"
1736-
1737 $show "creating $output"
1738
1739 # Only create the output if not a dry run.
1740 if test -z "$run"; then
1741 $echo > $output "\
1742 # $output - a libtool library file
1743-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
1744+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
1745
1746 # The name that we can dlopen(3).
1747 dlname='$dlname'
1748@@ -1595,7 +1726,7 @@
1749 # Do a symbolic link so that the libtool archive can be found in
1750 # LD_LIBRARY_PATH before the program is installed.
1751 $show "(cd $objdir && $LN_S ../$output $output)"
1752- $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1
1753+ $run eval "(cd $objdir && $LN_S ../$output $output)" || exit $?
1754 ;;
1755 esac
1756 exit 0
1757@@ -1605,7 +1736,7 @@
1758 install)
1759 modename="$modename: install"
1760
1761- # There may be an optional /bin/sh argument at the beginning of
1762+ # There may be an optional sh(1) argument at the beginning of
1763 # install_prog (especially on Windows NT).
1764 if test "$nonopt" = "$SHELL"; then
1765 # Aesthetically quote it.
1766@@ -1639,7 +1770,7 @@
1767 opts=
1768 prev=
1769 install_type=
1770- isdir=
1771+ isdir=no
1772 stripme=
1773 for arg
1774 do
1775@@ -1709,7 +1840,7 @@
1776
1777 # Check to see that the destination is a directory.
1778 test -d "$dest" && isdir=yes
1779- if test -n "$isdir"; then
1780+ if test "$isdir" = yes; then
1781 destdir="$dest"
1782 destname=
1783 else
1784@@ -1726,7 +1857,7 @@
1785 fi
1786 fi
1787 case "$destdir" in
1788- /* | [A-Za-z]:\\*) ;;
1789+ /* | [A-Za-z]:[/\\]*) ;;
1790 *)
1791 for file in $files; do
1792 case "$file" in
1793@@ -1759,7 +1890,7 @@
1794
1795 *.la)
1796 # Check to see that this really is a libtool archive.
1797- if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
1798+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
1799 else
1800 $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
1801 $echo "$help" 1>&2
1802@@ -1864,7 +1995,7 @@
1803 # Deduce the name of the destination old-style object file.
1804 case "$destfile" in
1805 *.lo)
1806- staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'`
1807+ staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/.o/'`
1808 ;;
1809 *.o)
1810 staticdest="$destfile"
1811@@ -1886,7 +2017,7 @@
1812 # Install the old object if enabled.
1813 if test "$build_old_libs" = yes; then
1814 # Deduce the name of the old-style object file.
1815- staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'`
1816+ staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/.o/'`
1817
1818 $show "$install_prog $staticobj $staticdest"
1819 $run eval "$install_prog \$staticobj \$staticdest" || exit $?
1820@@ -1895,8 +2026,16 @@
1821 ;;
1822
1823 *)
1824+ # Figure out destination file name, if it wasn't already specified.
1825+ if test -n "$destname"; then
1826+ destfile="$destdir/$destname"
1827+ else
1828+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
1829+ destfile="$destdir/$destfile"
1830+ fi
1831+
1832 # Do a test to see if this is really a libtool program.
1833- if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
1834+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
1835 link_against_libtool_libs=
1836 finalize_command=
1837
1838@@ -1924,10 +2063,7 @@
1839 esac
1840 fi
1841 libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
1842- if test -z "$libdir"; then
1843- $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2
1844- elif test -f "$libfile"; then :
1845- else
1846+ if test -n "$libdir" && test ! -f "$libfile"; then
1847 $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
1848 finalize=no
1849 fi
1850@@ -1952,8 +2088,8 @@
1851 fi
1852 fi
1853
1854- $show "$install_prog$stripme $file $dest"
1855- $run eval "$install_prog\$stripme \$file \$dest" || exit $?
1856+ $show "$install_prog$stripme $file $destfile"
1857+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
1858 ;;
1859 esac
1860 done
1861@@ -1996,6 +2132,7 @@
1862 finish)
1863 modename="$modename: finish"
1864 libdirs="$nonopt"
1865+ admincmds=
1866
1867 if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
1868 for dir
1869@@ -2011,19 +2148,21 @@
1870 for cmd in $cmds; do
1871 IFS="$save_ifs"
1872 $show "$cmd"
1873- $run eval "$cmd"
1874+ $run eval "$cmd" || admincmds="$admincmds
1875+ $cmd"
1876 done
1877 IFS="$save_ifs"
1878 fi
1879 if test -n "$finish_eval"; then
1880 # Do the single finish_eval.
1881 eval cmds=\"$finish_eval\"
1882- $run eval "$cmds"
1883+ $run eval "$cmds" || admincmds="$admincmds
1884+ $cmds"
1885 fi
1886 done
1887 fi
1888
1889- echo "------------------------------------------------------------------------------"
1890+ echo "----------------------------------------------------------------------"
1891 echo "Libraries have been installed in:"
1892 for libdir in $libdirs; do
1893 echo " $libdir"
1894@@ -2032,7 +2171,7 @@
1895 echo "To link against installed libraries in a given directory, LIBDIR,"
1896 echo "you must use the \`-LLIBDIR' flag during linking."
1897 echo
1898- echo " You will also need to do one of the following:"
1899+ echo " You will also need to do at least one of the following:"
1900 if test -n "$shlibpath_var"; then
1901 echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
1902 echo " during execution"
1903@@ -2047,13 +2186,16 @@
1904
1905 echo " - use the \`$flag' linker flag"
1906 fi
1907+ if test -n "$admincmds"; then
1908+ echo " - have your system administrator run these commands:$admincmds"
1909+ fi
1910 if test -f /etc/ld.so.conf; then
1911 echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
1912 fi
1913 echo
1914 echo "See any operating system documentation about shared libraries for"
1915 echo "more information, such as the ld(1) and ld.so(8) manual pages."
1916- echo "------------------------------------------------------------------------------"
1917+ echo "----------------------------------------------------------------------"
1918 exit 0
1919 ;;
1920
1921@@ -2071,8 +2213,7 @@
1922
1923 # Handle -dlopen flags immediately.
1924 for file in $execute_dlfiles; do
1925- if test -f "$file"; then :
1926- else
1927+ if test ! -f "$file"; then
1928 $echo "$modename: \`$file' is not a file" 1>&2
1929 $echo "$help" 1>&2
1930 exit 1
1931@@ -2082,7 +2223,7 @@
1932 case "$file" in
1933 *.la)
1934 # Check to see that this really is a libtool archive.
1935- if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
1936+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
1937 else
1938 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
1939 $echo "$help" 1>&2
1940@@ -2153,7 +2294,7 @@
1941 -*) ;;
1942 *)
1943 # Do a test to see if this is really a libtool program.
1944- if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
1945+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
1946 # If there is no directory component, then add one.
1947 case "$file" in
1948 */* | *\\*) . $file ;;
1949@@ -2174,6 +2315,14 @@
1950 # Export the shlibpath_var.
1951 eval "export $shlibpath_var"
1952
1953+ # Restore saved enviroment variables
1954+ if test "${save_LC_ALL+set}" = set; then
1955+ LC_ALL="$save_LC_ALL"; export LC_ALL
1956+ fi
1957+ if test "${save_LANG+set}" = set; then
1958+ LANG="$save_LANG"; export LANG
1959+ fi
1960+
1961 # Now actually exec the command.
1962 eval "exec \$cmd$args"
1963
1964@@ -2218,7 +2367,7 @@
1965 case "$name" in
1966 *.la)
1967 # Possibly a libtool archive, so verify it.
1968- if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
1969+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
1970 . $dir/$name
1971
1972 # Delete the libtool libraries and symlinks.
1973@@ -2262,7 +2411,7 @@
1974
1975 *.lo)
1976 if test "$build_old_libs" = yes; then
1977- oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'`
1978+ oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/.o/'`
1979 rmfiles="$rmfiles $dir/$oldobj"
1980 fi
1981 $show "$rm $rmfiles"
1982@@ -2297,8 +2446,10 @@
1983
1984 Provide generalized library-building support services.
1985
1986+ --config show all configuration variables
1987+ --debug enable verbose shell tracing
1988 -n, --dry-run display commands without modifying any files
1989- --features display configuration information and exit
1990+ --features display basic configuration information and exit
1991 --finish same as \`--mode=finish'
1992 --help display this help message and exit
1993 --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
1994@@ -2325,6 +2476,10 @@
1995 "Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
1996
1997 Compile a source file into a libtool library object.
1998+
1999+This mode accepts the following additional options:
2000+
2001+ -static always build a \`.o' file suitable for static linking
2002
2003 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
2004 from the given SOURCEFILE.
Library for handling different JPEG files
This page took 0.402533 seconds and 4 git commands to generate.