1 --- jpeg-6b/ltconfig.arm Wed Mar 25 10:25:39 1998
2 +++ jpeg-6b/ltconfig Wed Jan 13 18:08:47 1999
5 # A lot of this script is taken from autoconf-2.10.
7 +# Check that we are running under the correct shell.
8 +SHELL=${CONFIG_SHELL-/bin/sh}
10 +if test "X$1" = X--no-reexec; then
11 + # Discard the --no-reexec flag, and continue.
13 +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
14 + # Yippee, $echo works!
17 + # Restart under the correct shell.
18 + exec "$SHELL" "$0" --no-reexec ${1+"$@"}
21 # The HP-UX ksh and POSIX shell print the target directory to stdout
23 if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
26 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
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'
36 - if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
38 - # Oops. We have no working printf. Try to find a not-so-buggy 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
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
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.
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
65 + exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
69 + if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then
70 + # Oops. We lost completely, so just stick with echo.
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'
89 help="Try \`$progname --help' for more information."
92 +default_ofile=libtool
95 # All known linkers require a `.a' archive for static linking.
100 +ofile="$default_ofile"
104 @@ -121,10 +150,12 @@
106 Generate a system-specific libtool script.
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
122 + echo "$progname: enabling shell trace mode"
126 --disable-shared) enable_shared=no ;;
128 --disable-static) enable_static=no ;;
131 --no-verify) verify_host=no ;;
133 + --output | -o) prev=ofile ;;
134 + --output=*) ofile="$optarg" ;;
136 --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
138 --with-gcc) with_gcc=yes ;;
143 -if test -f "$ltmain"; then :
145 +if test ! -f "$ltmain"; then
146 echo "$progname: \`$ltmain' does not exist" 1>&2
150 ac_config_sub=$ac_aux_dir/config.sub
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 :
156 echo "$progname: cannot run $ac_config_sub" 1>&2
158 @@ -276,14 +314,14 @@
160 case "$host_alias" in
162 - if host_alias=`$ac_config_guess`; then :
163 + if host_alias=`$SHELL $ac_config_guess`; then :
165 echo "$progname: cannot guess host type; you must specify one" 1>&2
170 - host=`$ac_config_sub $host_alias`
171 + host=`$SHELL $ac_config_sub $host_alias`
172 echo "$ac_t$host" 1>&6
174 # Make sure the host verified.
176 # Now see if the compiler is really GCC.
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
183 cat > conftest.c <<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
194 link_static_flag='-bnso -bI:/lib/syscalls.exp'
198 + hpux9* | hpux10* | hpux11*)
199 # Is there a better link_static_flag that works with the bundled CC?
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
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
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
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`
236 # Accept absolute paths.
238 + /* | [A-Za-z]:[/\\]*)
239 test -z "$LD" && LD="$ac_prog"
242 @@ -639,10 +677,10 @@
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
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
254 if test -z "$LD"; then
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=
263 @@ -701,31 +740,38 @@
264 hardcode_shlibpath_var=unsupported
269 - # On these operating systems, we should treat GNU ld like the system ld.
270 - gnu_ld_acts_native=yes
273 - gnu_ld_acts_native=no
278 -if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
279 +if test "$with_gnu_ld" = yes; then
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
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
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
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'
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'
319 # PORTME fill in a description of your system's linker (not GNU ld)
321 archive_cmds='$CC -shared -o $lib$libobjs'
322 hardcode_libdir_flag_spec='-R$libdir'
324 - hardcode_minus_L=yes
325 + hardcode_minus_L=no
326 hardcode_shlibpath_var=no
330 export_dynamic_flag_spec='${wl}-E'
335 archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs'
336 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
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'
346 + archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
348 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
355 - if test "$with_gcc" = yes; then
356 - archive_cmds='$CC -shared -o $lib$libobjs'
358 - archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
361 - if test "$with_gnu_ld" = yes; then
362 - export_dynamic_flag_spec='${wl}-export-dynamic'
364 + archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
365 hardcode_libdir_flag_spec='-L$libdir'
369 if test -z "$NM"; then
370 echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
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.
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);}
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.
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
390 # Try sorting and uniquifying the output.
391 if sort "$nlist" | uniq > "$nlist"T; then
392 @@ -1030,7 +1072,7 @@
393 save_CFLAGS="$CFLAGS"
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
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
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
411 - # We can only hardcode existing directories.
412 - hardcode_action=relink
413 + # We cannot hardcode anything, or else we can only hardcode existing
415 + hardcode_action=unsupported
417 echo "$ac_t$hardcode_action" 1>&6
418 -test "$hardcode_action" = unsupported && can_build_shared=no
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.
427 -echo "$ac_t$reload_flag"
428 +echo "$ac_t$reload_flag" 1>&6
429 test -n "$reload_flag" && reload_flag=" $reload_flag"
431 # PORTME Fill in your ld.so characteristics
432 @@ -1110,11 +1147,11 @@
436 - library_names_spec='${libname}${release}.so.$versuffix $libname.a'
437 + library_names_spec='${libname}${release}.so$versuffix $libname.a'
438 shlibpath_var=LIBPATH
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'
446 @@ -1125,25 +1162,25 @@
448 freebsd2* | freebsd3*)
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
459 - library_names_spec='${libname}${release}.so.$versuffix'
461 + library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
462 shlibpath_var=LD_LIBRARY_PATH
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"
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'
479 @@ -1151,7 +1188,7 @@
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
488 @@ -1163,9 +1200,9 @@
489 # This must be Linux ELF.
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
500 if test -f /lib/ld.so.1; then
501 @@ -1181,8 +1218,8 @@
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
512 @@ -1196,42 +1233,44 @@
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
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
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'
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
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
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
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 @@
582 -trap "$rm $ofile; exit 1" 1 2 15
583 -echo creating $ofile
587 +trap "$rm \"$ofile\"; exit 1" 1 2 15
588 +echo "creating $ofile"
590 +cat <<EOF > "$ofile"
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.
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.
602 -# This program was configured as follows,
603 -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
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" \\
609 -# Compiler and other test output produced by $progname, useful for
610 -# debugging $progname, is in ./config.log if it exists.
612 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
615 @@ -1357,25 +1385,35 @@
617 if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
619 -# An echo program that does not interpret backslashes.
621 +### BEGIN LIBTOOL CONFIG
622 +# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
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" \\
628 +# Compiler and other test output produced by $progname, useful for
629 +# debugging $progname, is in ./config.log if it exists.
631 # The version of $progname that generated this script.
632 LTCONFIG_VERSION="$VERSION"
634 # Shell to use when invoking shell scripts.
635 -SHELL=${CONFIG_SHELL-/bin/sh}
638 -# Whether or not to build libtool libraries.
639 +# Whether or not to build shared libraries.
640 build_libtool_libs=$enable_shared
642 -# Whether or not to build old-style libraries.
643 +# Whether or not to build static libraries.
644 build_old_libs=$enable_static
647 host_alias="$host_alias"
650 +# An echo program that does not interpret backslashes.
656 @@ -1413,6 +1451,9 @@
657 # Compiler flag to allow reflexive dlopens.
658 export_dynamic_flag_spec="$export_dynamic_flag_spec"
660 +# Compiler flag to generate shared objects directly from archives.
661 +whole_archive_flag_spec="$whole_archive_flag_spec"
663 # Library versioning type.
664 version_type=$version_type
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
675 - cat <<\EOF >> $ofile
676 + cat <<\EOF >> "$ofile"
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 @@
690 +echo '### END LIBTOOL CONFIG' >> "$ofile"
693 # Append the ltmain.sh script.
694 -cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1)
695 +cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
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
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.
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.
718 basic_machine=$basic_machine-pc
720 # Object if more than one company name word.
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 @@
733 # I'm not sure what "Sysv32" means. Should this be sysv3.2?
736 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
741 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
746 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
751 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
754 @@ -469,25 +469,23 @@
756 basic_machine=ns32k-pc532
759 - basic_machine=i586-intel
760 + pentium | p5 | k5 | nexen)
761 + basic_machine=i586-pc
764 - basic_machine=i686-intel
765 + pentiumpro | p6 | k6 | 6x86)
766 + basic_machine=i686-pc
769 + pentiumii | pentium2)
770 + basic_machine=i786-pc
772 + pentium-* | p5-* | k5-* | nexen-*)
773 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
775 - pentiumpro-* | p6-*)
776 + pentiumpro-* | p6-* | k6-* | 6x86-*)
777 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
780 - # We don't have specific support for AMD's K5 yet, so just call it a Pentium
781 - basic_machine=i586-amd
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/^[^-]*-//'`
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
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.
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/[-_].*/\./'`
805 - echo i386-pc-cygwin32
806 + echo ${UNAME_MACHINE}-pc-cygwin32
809 - echo i386-pc-mingw32
810 + echo ${UNAME_MACHINE}-pc-mingw32
813 echo powerpcle-unknown-cygwin32
815 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
818 + # uname on the ARM produces all sorts of strangeness, and we need to
820 + case "$UNAME_MACHINE" in
821 + arm* | sa110*) UNAME_MACHINE="arm" ;;
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`
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 ;;
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
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.
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.
845 +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
846 + # Yippee, $echo works!
849 + # Restart under the correct shell, and then maybe $echo will work.
850 + exec $SHELL "$0" --no-reexec ${1+"$@"}
853 # The name of this program.
854 progname=`$echo "$0" | sed 's%^.*/%%'`
864 help="Try \`$progname --help' for more information."
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
875 +if test "${LANG+set}" = set; then
876 + save_LANG="$LANG"; LANG=C; export LANG
879 if test "$LTCONFIG_VERSION" != "$VERSION"; then
880 echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
886 + sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
891 + echo "$progname: enabling shell trace mode"
903 + *db | *dbx | *strace | *truss)
911 - build_libtool_libs=no
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 $?
922 # Allow error messages only from the first compilation.
923 suppress_output=' >/dev/null 2>&1'
924 @@ -374,10 +400,13 @@
937 link_against_libtool_libs=
939 test -n "$old_archive_from_new_cmds" && build_old_libs=yes
941 # Go through the arguments, transforming them on the way.
944 + while test $# -gt 0; do
948 # If the previous option needs an argument, assign it.
949 if test -n "$prev"; then
953 dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
956 + /* | [A-Za-z]:[/\\]*)
957 # Add the corresponding hardcode_libdir_flag, if it is not identical.
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/'`
968 libobjs="$libobjs $arg"
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 :
976 $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
982 - if test -z "$libdir"; then
983 - $echo "$modename: \`$arg' contains no -rpath information" 1>&2
987 # Get the name of the library we link against.
989 for l in $old_library $library_names; do
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"
1003 # This library was specified with -dlopen.
1004 if test "$prev" = dlfiles; then
1005 dlfiles="$dlfiles $arg"
1011 case "$hardcode_action" in
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"
1027 # We need an absolute path.
1029 - /* | [A-Za-z]:\\*) ;;
1030 + /* | [A-Za-z]:[/\\]*) ;;
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"
1044 - $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2
1052 + if test "$lib_linked" != yes; then
1053 + $echo "$modename: configuration error: unsupported hardcode properties"
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 @@
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
1075 $echo "$modename: you must specify an output file" 1>&2
1076 @@ -819,16 +856,39 @@
1079 $echo "$modename: output file \`$output' must have no directory components" 1>&2
1080 + $echo "$help" 1>&2
1085 + if test -n "$link_against_libtool_libs"; then
1086 + $echo "$modename: error: cannot link libtool libraries into archives" 1>&2
1090 + if test -n "$deplibs"; then
1091 + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
1094 + if test -n "$dlfiles$dlprefiles"; then
1095 + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
1098 + if test -n "$rpath"; then
1099 + $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
1102 + if test -n "$vinfo"; then
1103 + $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
1106 + if test -n "$release"; then
1107 + $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
1110 # Now set the variables for building old libraries.
1111 build_libtool_libs=no
1112 - build_old_libs=yes
1114 - $show "$rm $oldlib"
1124 - $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2
1125 + $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
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 @@
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
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@%%"`
1155 - if test -z "$rpath"; then
1156 - $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2
1157 - $echo "$help" 1>&2
1159 + $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
1163 @@ -883,203 +931,250 @@
1167 - # Parse the version information argument.
1168 - IFS="${IFS= }"; save_ifs="$IFS"; 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
1178 - if test -n "$5"; then
1179 - $echo "$modename: too many parameters to \`-version-info'" 1>&2
1180 - $echo "$help" 1>&2
1183 + if test -n "$vinfo"; then
1184 + $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
1187 - test -n "$2" && current="$2"
1188 - test -n "$3" && revision="$3"
1189 - test -n "$4" && age="$4"
1191 - # Check that each of the things are valid numbers.
1192 - case "$current" in
1193 - 0 | [1-9] | [1-9][0-9]*) ;;
1195 - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
1196 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1200 + if test -n "$release"; then
1201 + $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
1205 - case "$revision" in
1206 - 0 | [1-9] | [1-9][0-9]*) ;;
1208 - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
1209 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1213 + # Parse the version information argument.
1214 + IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
1215 + set dummy $vinfo 0 0 0
1218 + if test -n "$8"; then
1219 + $echo "$modename: too many parameters to \`-version-info'" 1>&2
1220 + $echo "$help" 1>&2
1225 - 0 | [1-9] | [1-9][0-9]*) ;;
1227 - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
1228 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1236 + # Check that each of the things are valid numbers.
1237 + case "$current" in
1238 + 0 | [1-9] | [1-9][0-9]*) ;;
1240 + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
1241 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2
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
1251 + case "$revision" in
1252 + 0 | [1-9] | [1-9][0-9]*) ;;
1254 + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
1255 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1260 - # Calculate the version variables.
1261 - version_vars="version_type current age revision"
1262 - case "$version_type" in
1266 - version_vars="$version_vars major versuffix"
1267 - major=`expr $current - $age`
1268 - versuffix="$major.$age.$revision"
1272 - version_vars="$version_vars versuffix verstring"
1273 - major=`expr $current - $age`
1274 - versuffix="$current.$age.$revision"
1275 - verstring="$versuffix"
1277 - # Add in all the interfaces that we are compatible with.
1279 - while test $loop != 0; do
1280 - iface=`expr $current - $loop`
1281 - loop=`expr $loop - 1`
1282 - verstring="$verstring:${iface}.0"
1285 + 0 | [1-9] | [1-9][0-9]*) ;;
1287 + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
1288 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2
1293 - # Make executables depend on our current version.
1294 - verstring="$verstring:${current}.0"
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
1303 - version_vars="$version_vars major versuffix"
1305 - versuffix="$current.$revision"
1307 + # Calculate the version variables.
1311 + case "$version_type" in
1315 + major=.`expr $current - $age`
1316 + versuffix="$major.$age.$revision"
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
1326 + major=`expr $current - $age`
1327 + versuffix=".$current.$age.$revision"
1328 + verstring="$current.$age.$revision"
1330 + # Add in all the interfaces that we are compatible with.
1332 + while test $loop != 0; do
1333 + iface=`expr $current - $loop`
1334 + loop=`expr $loop - 1`
1335 + verstring="$verstring:${iface}.0"
1338 + # Make executables depend on our current version.
1339 + verstring="$verstring:${current}.0"
1344 + versuffix=".$current.$revision"
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
1354 + # Clear the version info if we defaulted, and they specified a release.
1355 + if test -z "$vinfo" && test -n "$release"; then
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
1369 + # Don't allow undefined symbols.
1370 + allow_undefined_flag="$no_undefined_flag"
1373 + # Add libc to deplibs on all systems.
1374 + dependency_libs="$deplibs"
1375 + deplibs="$deplibs -lc"
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}.*
1385 $show "$mkdir $objdir"
1388 - if test $status -eq 0 || test -d $objdir; then :
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
1401 + if test $status -ne 0 && test ! -d $objdir; then
1405 - # Don't allow undefined symbols.
1406 - allow_undefined_flag="$no_undefined_flag"
1409 - # Add libc to deplibs on all systems.
1410 - dependency_libs="$deplibs"
1411 - deplibs="$deplibs -lc"
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
1419 + # Get the real and link names of the library.
1420 + eval library_names=\"$library_names_spec\"
1421 + set dummy $library_names
1425 - if test -n "$soname_spec"; then
1426 - eval soname=\"$soname_spec\"
1428 - soname="$realname"
1430 + if test -n "$soname_spec"; then
1431 + eval soname=\"$soname_spec\"
1433 + soname="$realname"
1436 - lib="$objdir/$realname"
1437 + lib="$objdir/$realname"
1440 linknames="$linknames $link"
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'`
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
1454 - $run eval "$cmd" || exit $?
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'`
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 $?
1465 + if test -n "$whole_archive_flag_spec"; then
1466 + if test -n "$convenience"; then
1467 + eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
1470 + for xlib in $convenience; do
1471 + # Extract the objects.
1473 + generated="$generated $xdir"
1474 + xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
1476 + $show "${rm}r $xdir"
1477 + $run ${rm}r "$xdir"
1478 + $show "mkdir $xdir"
1479 + $run mkdir "$xdir"
1481 + if test $status -ne 0 && test ! -d "$xdir"; then
1484 + $show "(cd $xdir && $AR x ../$xlib)"
1485 + $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
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.
1493 + libobjs="$libobjs `echo $xdir/*`"
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
1505 + $run eval "$cmd" || exit $?
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 $?
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.
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
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
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
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
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
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
1561 @@ -1139,7 +1234,7 @@
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 $?
1570 @@ -1147,11 +1242,11 @@
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
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
1583 if test -n "$rpath"; then
1584 @@ -1223,8 +1318,7 @@
1585 $show "$mkdir $objdir"
1588 - if test $status -eq 0 || test -d $objdir; then :
1590 + if test $status -ne 0 && test ! -d $objdir; then
1594 @@ -1355,13 +1449,11 @@
1595 finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'`
1597 # Create the binary in the object directory, then wrap it.
1598 - if test -d $objdir; then :
1600 + if test ! -d $objdir; then
1601 $show "$mkdir $objdir"
1604 - if test $status -eq 0 || test -d $objdir; then :
1606 + if test $status -ne 0 && test ! -d $objdir; then
1610 @@ -1371,7 +1463,7 @@
1612 for dir in $temp_rpath; do
1614 - /* | [A-Za-z]:\\*)
1615 + /* | [A-Za-z]:[/\\]*)
1619 @@ -1404,13 +1496,11 @@
1620 finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
1623 - case "$hardcode_action" in
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
1633 $show "$compile_command"
1634 $run eval "$compile_command" || exit $?
1635 @@ -1430,10 +1520,10 @@
1636 trap "$rm $output; exit 1" 1 2 15
1642 # $output - temporary wrapper script for $objdir/$output
1643 -# Generated by ltmain.sh - GNU $PACKAGE $VERSION
1644 +# Generated by $PROGRAM - GNU $PACKAGE $VERSION
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\"
1651 # When we are sourced in execute mode, \$file and \$echo are already set.
1652 - if test \"\$libtool_execute_magic\" = \"$magic\"; then :
1654 + if test \"\$libtool_execute_magic\" != \"$magic\"; then
1657 + # Make sure echo works.
1658 + if test \"X\$1\" = X--no-reexec; then
1659 + # Discard the --no-reexec flag, and continue.
1661 + elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
1662 + # Yippee, \$echo works!
1665 + # Restart under the correct shell, and then maybe \$echo will work.
1666 + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
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\" ;;
1680 @@ -1537,9 +1637,36 @@
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
1689 + if test "$build_libtool_libs" = convenience; then
1690 + oldobjs="$libobjs"
1691 + addlibs="$convenience"
1692 + build_libtool_libs=no
1694 + addlibs="$old_convenience"
1697 + # Add in members from convenience archives.
1698 + for xlib in $addlibs; do
1699 + # Extract the objects.
1701 + generated="$generated $xdir"
1702 + xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
1704 + $show "${rm}r $xdir"
1705 + $run ${rm}r "$xdir"
1706 + $show "mkdir $xdir"
1707 + $run mkdir "$xdir"
1709 + if test $status -ne 0 && test ! -d "$xdir"; then
1712 + $show "(cd $xdir && $AR x ../$xlib)"
1713 + $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
1715 + oldobjs="$oldobjs `echo $xdir/*`"
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 $?
1726 + if test -n "$generated"; then
1727 + $show "${rm}r$generated"
1728 + $run ${rm}r$generated
1731 # Now create the libtool archive.
1732 @@ -1561,14 +1693,13 @@
1735 test "$build_old_libs" = yes && old_library="$libname.a"
1737 $show "creating $output"
1739 # Only create the output if not a dry run.
1740 if test -z "$run"; then
1742 # $output - a libtool library file
1743 -# Generated by ltmain.sh - GNU $PACKAGE $VERSION
1744 +# Generated by $PROGRAM - GNU $PACKAGE $VERSION
1746 # The name that we can dlopen(3).
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 $?
1757 @@ -1605,7 +1736,7 @@
1759 modename="$modename: install"
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 @@
1775 @@ -1709,7 +1840,7 @@
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
1784 @@ -1726,7 +1857,7 @@
1788 - /* | [A-Za-z]:\\*) ;;
1789 + /* | [A-Za-z]:[/\\]*) ;;
1791 for file in $files; do
1793 @@ -1759,7 +1890,7 @@
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 :
1800 $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
1802 @@ -1864,7 +1995,7 @@
1803 # Deduce the name of the destination old-style object file.
1806 - staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'`
1807 + staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/.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/'`
1818 $show "$install_prog $staticobj $staticdest"
1819 $run eval "$install_prog \$staticobj \$staticdest" || exit $?
1820 @@ -1895,8 +2026,16 @@
1824 + # Figure out destination file name, if it wasn't already specified.
1825 + if test -n "$destname"; then
1826 + destfile="$destdir/$destname"
1828 + destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
1829 + destfile="$destdir/$destfile"
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=
1838 @@ -1924,10 +2063,7 @@
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 :
1846 + if test -n "$libdir" && test ! -f "$libfile"; then
1847 $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
1850 @@ -1952,8 +2088,8 @@
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 $?
1861 @@ -1996,6 +2132,7 @@
1863 modename="$modename: finish"
1867 if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
1869 @@ -2011,19 +2148,21 @@
1870 for cmd in $cmds; do
1874 + $run eval "$cmd" || admincmds="$admincmds
1879 if test -n "$finish_eval"; then
1880 # Do the single finish_eval.
1881 eval cmds=\"$finish_eval\"
1883 + $run eval "$cmds" || admincmds="$admincmds
1889 - echo "------------------------------------------------------------------------------"
1890 + echo "----------------------------------------------------------------------"
1891 echo "Libraries have been installed in:"
1892 for libdir in $libdirs; do
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."
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 @@
1905 echo " - use the \`$flag' linker flag"
1907 + if test -n "$admincmds"; then
1908 + echo " - have your system administrator run these commands:$admincmds"
1910 if test -f /etc/ld.so.conf; then
1911 echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
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 "----------------------------------------------------------------------"
1921 @@ -2071,8 +2213,7 @@
1923 # Handle -dlopen flags immediately.
1924 for file in $execute_dlfiles; do
1925 - if test -f "$file"; then :
1927 + if test ! -f "$file"; then
1928 $echo "$modename: \`$file' is not a file" 1>&2
1931 @@ -2082,7 +2223,7 @@
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 :
1938 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
1940 @@ -2153,7 +2294,7 @@
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.
1948 */* | *\\*) . $file ;;
1949 @@ -2174,6 +2315,14 @@
1950 # Export the shlibpath_var.
1951 eval "export $shlibpath_var"
1953 + # Restore saved enviroment variables
1954 + if test "${save_LC_ALL+set}" = set; then
1955 + LC_ALL="$save_LC_ALL"; export LC_ALL
1957 + if test "${save_LANG+set}" = set; then
1958 + LANG="$save_LANG"; export LANG
1961 # Now actually exec the command.
1962 eval "exec \$cmd$args"
1964 @@ -2218,7 +2367,7 @@
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
1972 # Delete the libtool libraries and symlinks.
1973 @@ -2262,7 +2411,7 @@
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"
1981 $show "$rm $rmfiles"
1982 @@ -2297,8 +2446,10 @@
1984 Provide generalized library-building support services.
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
1997 Compile a source file into a libtool library object.
1999 +This mode accepts the following additional options:
2001 + -static always build a \`.o' file suitable for static linking
2003 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
2004 from the given SOURCEFILE.