jpeg: Sync with poky, massively improve libtool handling and drop pointless sections of debian patch (200k of them)

5 files changed, 61 insertions, 8224 deletions

diff --git a/packages/jpeg/jpeg-6b/debian.patch b/packages/jpeg/jpeg-6b/debian.patch
index 823c8e08dc..a169ad19d6 100644
--- a/packages/jpeg/jpeg-6b/debian.patch
+++ b/packages/jpeg/jpeg-6b/debian.patch
@@ -1,8 +1,3 @@
-
-#
-# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
 --- jpeg-6b/jpegtran.1~libjpeg6bb-5
 +++ jpeg-6b/jpegtran.1
 @@ -131,6 +131,24 @@
@@ -41,16 +36,6 @@
  
  # Initialize some other variables.
  subdirs=
-@@ -1559,7 +1559,8 @@
-   if test "x$LTSTATIC" = xno; then
-     disable_static="--disable-static"
-   fi
--  $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
-+  chmod a+x $srcdir/ltconfig.new
-+  $srcdir/ltconfig.new $disable_shared $disable_static $srcdir/ltmain.new.sh $host
- fi
- 
- # Select memory manager depending on user input.
 --- jpeg-6b/makefile.cfg~libjpeg6bb-5
 +++ jpeg-6b/makefile.cfg
 @@ -17,7 +17,7 @@
@@ -1886,8129 +1871,4 @@
  #endif /* TRANSFORMS_SUPPORTED */
  
  
---- jpeg-6b/config.guess~libjpeg6bb-5
-+++ jpeg-6b/config.guess
-@@ -1,4 +1,10 @@
- #! /bin/sh
-+# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
-+if [ -x /usr/share/misc/config.guess ]; then
-+   /usr/share/misc/config.guess $*
-+   exit $?
-+fi
-+
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
- #
---- jpeg-6b/config.sub~libjpeg6bb-5
-+++ jpeg-6b/config.sub
-@@ -1,4 +1,10 @@
- #! /bin/sh
-+# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
-+if [ -x /usr/share/misc/config.sub ]; then
-+   /usr/share/misc/config.sub $*
-+   exit $?
-+fi
-+
- # Configuration validation subroutine script, version 1.1.
- #   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
- # This file is (in principle) common to ALL GNU software.
---- /dev/null
-+++ jpeg-6b/libtool.cfg
-@@ -0,0 +1,224 @@
-+# libtool.cfg - Libtool configuration file.
-+# Generated automatically by ltconfig (GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11))
-+# Libtool was configured as follows, on host yellowpig:
-+#
-+# CC="old_CC" CFLAGS="old_CFLAGS" CPPFLAGS="old_CPPFLAGS" \
-+# LD="old_LD" LDFLAGS="old_LDFLAGS" LIBS="old_LIBS" \
-+# NM="old_NM" RANLIB="old_RANLIB" LN_S="old_LN_S" \
-+# DLLTOOL="old_DLLTOOL" OBJDUMP="old_OBJDUMP" AS="old_AS" \
-+#   ./ltconfig.new ./ltmain.sh.new i386-gnu
-+#
-+# Compiler and other test output produced by ltconfig.new, useful for
-+# debugging ltconfig.new, is in ./config.log if it exists.
-+
-+# The version of ltconfig.new that generated this script.
-+LTCONFIG_VERSION=1.3.3
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=/bin/sh
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=yes
-+
-+# Whether or not to build static libraries.
-+build_old_libs=yes
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=yes
-+
-+# The host system.
-+host_alias=i386-gnu
-+host=i386-pc-gnu
-+
-+# An echo program that does not interpret backslashes.
-+echo=echo
-+
-+# The archiver.
-+AR=ar
-+
-+# The default C compiler.
-+CC=gcc
-+
-+# The linker used to build libraries.
-+LD=/usr/bin/ld
-+
-+# Whether we need hard or soft links.
-+LN_S=ln -s
-+
-+# A BSD-compatible nm program.
-+NM=/usr/bin/nm -B
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="dlltool"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="objdump"
-+
-+# Used on cygwin: assembler.
-+AS="as"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=.libs
-+
-+# How to create reloadable object files.
-+reload_flag= -r
-+reload_cmds=$LD$reload_flag -o $output$reload_objs
-+
-+# How to pass a linker flag through the compiler.
-+wl=-Wl,
-+
-+# Object file suffix (normally "o").
-+objext="o"
-+
-+# Old archive suffix (normally "a").
-+libext="a"
-+
-+# Executable file suffix (normally "").
-+exeext=""
-+
-+# Additional compiler flags for building library objects.
-+pic_flag= -fPIC
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=yes
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=yes
-+
-+# Must we lock files when doing compilation ?
-+need_locks=no
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=no
-+
-+# Do we need a version for libraries?
-+need_version=no
-+
-+# Whether dlopen is supported.
-+dlopen=unknown
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=unknown
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=unknown
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=-static
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag= -fno-builtin -fno-rtti -fno-exceptions
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=${wl}--export-dynamic
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=${wl}--whole-archive$convenience ${wl}--no-whole-archive
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=
-+
-+# Library versioning type.
-+version_type=linux
-+
-+# Format of library name prefix.
-+libname_spec=lib$name
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=${libname}${release}.so$major
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=ranlib
-+old_archive_cmds=$AR cru $oldlib$oldobjs~$RANLIB $oldlib
-+old_postinstall_cmds=$RANLIB $oldlib~chmod 644 $oldlib
-+old_postuninstall_cmds=
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib
-+archive_expsym_cmds=$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib
-+postinstall_cmds=
-+postuninstall_cmds=
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=unknown
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=sed -n -e 's/^.*[ 	]\([ABCDGISTW]\)[ 	][ 	]*\(\)\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2\3 \3/p'
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'
-+
-+# This is the shared library runtime path variable.
-+runpath_var=LD_RUN_PATH
-+
-+# This is the shared library path variable.
-+shlibpath_var=LD_LIBRARY_PATH
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=unknown
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=immediate
-+
-+# Flag to hardcode $libdir into a binary during linking.
-+# This must work even if $libdir does not exist.
-+hardcode_libdir_flag_spec=${wl}--rpath ${wl}$libdir
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=no
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=no
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=unsupported
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=/lib /usr/lib /usr/local/lib
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=/lib /usr/lib
-+
-+# Fix the shell variable $srcfile for the compiler.
-+fix_srcfile_path=""
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=no
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$NM $libobjs $convenience | $global_symbol_pipe | sed 's/.* //' | sort | uniq > $export_symbols
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=_GLOBAL_OFFSET_TABLE_
-+
-+# Symbols that must always be exported.
-+include_expsyms=
-+
---- /dev/null
-+++ jpeg-6b/ltmain.new.sh
-@@ -0,0 +1,3975 @@
-+# ltmain.sh - Provide generalized library-building support services.
-+# NOTE: Changing this file will not affect anything until you rerun ltconfig.
-+#
-+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Check that we have a working $echo.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $echo will work.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The name of this program.
-+progname=`$echo "$0" | sed 's%^.*/%%'`
-+modename="$progname"
-+
-+# Constants.
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.3.3
-+TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
-+
-+default_mode=
-+help="Try \`$progname --help' for more information."
-+magic="%%%MAGIC variable%%%"
-+mkdir="mkdir"
-+mv="mv -f"
-+rm="rm -f"
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e 1s/^X//'
-+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-+SP2NL='tr \040 \012'
-+NL2SP='tr \015\012 \040\040'
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+# We save the old values to restore during execute mode.
-+if test "${LC_ALL+set}" = set; then
-+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-+fi
-+if test "${LANG+set}" = set; then
-+  save_LANG="$LANG"; LANG=C; export LANG
-+fi
-+
-+if test "$LTCONFIG_VERSION" != "$VERSION"; then
-+  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+  exit 1
-+fi
-+
-+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+  echo "$modename: not configured to build any kind of library" 1>&2
-+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+  exit 1
-+fi
-+
-+# Global variables.
-+mode=$default_mode
-+nonopt=
-+prev=
-+prevopt=
-+run=
-+show="$echo"
-+show_help=
-+execute_dlfiles=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+
-+# Parse our command line options once, thoroughly.
-+while test $# -gt 0
-+do
-+  arg="$1"
-+  shift
-+
-+  case "$arg" in
-+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$prev"; then
-+    case "$prev" in
-+    execute_dlfiles)
-+      eval "$prev=\"\$$prev \$arg\""
-+      ;;
-+    *)
-+      eval "$prev=\$arg"
-+      ;;
-+    esac
-+
-+    prev=
-+    prevopt=
-+    continue
-+  fi
-+
-+  # Have we seen a non-optional argument yet?
-+  case "$arg" in
-+  --help)
-+    show_help=yes
-+    ;;
-+
-+  --version)
-+    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-+    exit 0
-+    ;;
-+
-+  --config)
-+    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
-+    exit 0
-+    ;;
-+
-+  --debug)
-+    echo "$progname: enabling shell trace mode"
-+    set -x
-+    ;;
-+
-+  --dry-run | -n)
-+    run=:
-+    ;;
-+
-+  --features)
-+    echo "host: $host"
-+    if test "$build_libtool_libs" = yes; then
-+      echo "enable shared libraries"
-+    else
-+      echo "disable shared libraries"
-+    fi
-+    if test "$build_old_libs" = yes; then
-+      echo "enable static libraries"
-+    else
-+      echo "disable static libraries"
-+    fi
-+    exit 0
-+    ;;
-+
-+  --finish) mode="finish" ;;
-+
-+  --mode) prevopt="--mode" prev=mode ;;
-+  --mode=*) mode="$optarg" ;;
-+
-+  --quiet | --silent)
-+    show=:
-+    ;;
-+
-+  -dlopen)
-+    prevopt="-dlopen"
-+    prev=execute_dlfiles
-+    ;;
-+
-+  -*)
-+    $echo "$modename: unrecognized option \`$arg'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+    ;;
-+
-+  *)
-+    nonopt="$arg"
-+    break
-+    ;;
-+  esac
-+done
-+
-+if test -n "$prevopt"; then
-+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-+  $echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+if test -z "$show_help"; then
-+
-+  # Infer the operation mode.
-+  if test -z "$mode"; then
-+    case "$nonopt" in
-+    *cc | *++ | gcc* | *-gcc*)
-+      mode=link
-+      for arg
-+      do
-+	case "$arg" in
-+	-c)
-+	   mode=compile
-+	   break
-+	   ;;
-+	esac
-+      done
-+      ;;
-+    *db | *dbx | *strace | *truss)
-+      mode=execute
-+      ;;
-+    *install*|cp|mv)
-+      mode=install
-+      ;;
-+    *rm)
-+      mode=uninstall
-+      ;;
-+    *)
-+      # If we have no mode, but dlfiles were specified, then do execute mode.
-+      test -n "$execute_dlfiles" && mode=execute
-+
-+      # Just use the default operation mode.
-+      if test -z "$mode"; then
-+	if test -n "$nonopt"; then
-+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-+	else
-+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-+	fi
-+      fi
-+      ;;
-+    esac
-+  fi
-+
-+  # Only execute mode is allowed to have -dlopen flags.
-+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+  fi
-+
-+  # Change the help message to a mode-specific one.
-+  generic_help="$help"
-+  help="Try \`$modename --help --mode=$mode' for more information."
-+
-+  # These modes are in order of execution frequency so that they run quickly.
-+  case "$mode" in
-+  # libtool compile mode
-+  compile)
-+    modename="$modename: compile"
-+    # Get the compilation command and the source file.
-+    base_compile=
-+    lastarg=
-+    srcfile="$nonopt"
-+    suppress_output=
-+
-+    user_target=no
-+    for arg
-+    do
-+      # Accept any command-line options.
-+      case "$arg" in
-+      -o)
-+	if test "$user_target" != "no"; then
-+	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-+	  exit 1
-+	fi
-+	user_target=next
-+	;;
-+
-+      -static)
-+	build_old_libs=yes
-+	continue
-+	;;
-+      esac
-+
-+      case "$user_target" in
-+      next)
-+	# The next one is the -o target name
-+	user_target=yes
-+	continue
-+	;;
-+      yes)
-+	# We got the output file
-+	user_target=set
-+	libobj="$arg"
-+	continue
-+	;;
-+      esac
-+
-+      # Accept the current argument as the source file.
-+      lastarg="$srcfile"
-+      srcfile="$arg"
-+
-+      # Aesthetically quote the previous argument.
-+
-+      # Backslashify any backslashes, double quotes, and dollar signs.
-+      # These are the only characters that are still specially
-+      # interpreted inside of double-quoted scrings.
-+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-+
-+      # Double-quote args containing other shell metacharacters.
-+      # Many Bourne shells cannot handle close brackets correctly in scan
-+      # sets, so we specify it separately.
-+      case "$lastarg" in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	lastarg="\"$lastarg\""
-+	;;
-+      esac
-+
-+      # Add the previous argument to base_compile.
-+      if test -z "$base_compile"; then
-+	base_compile="$lastarg"
-+      else
-+	base_compile="$base_compile $lastarg"
-+      fi
-+    done
-+
-+    case "$user_target" in
-+    set)
-+      ;;
-+    no)
-+      # Get the name of the library object.
-+      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-+      ;;
-+    *)
-+      $echo "$modename: you must specify a target with \`-o'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    # Recognize several different file suffixes.
-+    # If the user specifies -o file.o, it is replaced with file.lo
-+    xform='[cCFSfmso]'
-+    case "$libobj" in
-+    *.ada) xform=ada ;;
-+    *.adb) xform=adb ;;
-+    *.ads) xform=ads ;;
-+    *.asm) xform=asm ;;
-+    *.c++) xform=c++ ;;
-+    *.cc) xform=cc ;;
-+    *.cpp) xform=cpp ;;
-+    *.cxx) xform=cxx ;;
-+    *.f90) xform=f90 ;;
-+    *.for) xform=for ;;
-+    esac
-+
-+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-+
-+    case "$libobj" in
-+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-+    *)
-+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    if test -z "$base_compile"; then
-+      $echo "$modename: you must specify a compilation command" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    # Delete any leftover library objects.
-+    if test "$build_old_libs" = yes; then
-+      removelist="$obj $libobj"
-+    else
-+      removelist="$libobj"
-+    fi
-+
-+    $run $rm $removelist
-+    trap "$run $rm $removelist; exit 1" 1 2 15
-+
-+    # Calculate the filename of the output object if compiler does
-+    # not support -o with -c
-+    if test "$compiler_c_o" = no; then
-+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
-+      lockfile="$output_obj.lock"
-+      removelist="$removelist $output_obj $lockfile"
-+      trap "$run $rm $removelist; exit 1" 1 2 15
-+    else
-+      need_locks=no
-+      lockfile=
-+    fi
-+
-+    # Lock this critical section if it is needed
-+    # We use this script file to make the link, it avoids creating a new file
-+    if test "$need_locks" = yes; then
-+      until ln "$0" "$lockfile" 2>/dev/null; do
-+	$show "Waiting for $lockfile to be removed"
-+	sleep 2
-+      done
-+    elif test "$need_locks" = warn; then
-+      if test -f "$lockfile"; then
-+	echo "\
-+*** ERROR, $lockfile exists and contains:
-+`cat $lockfile 2>/dev/null`
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+      echo $srcfile > "$lockfile"
-+    fi
-+
-+    if test -n "$fix_srcfile_path"; then
-+      eval srcfile=\"$fix_srcfile_path\"
-+    fi
-+
-+    # Only build a PIC object if we are building libtool libraries.
-+    if test "$build_libtool_libs" = yes; then
-+      # Without this assignment, base_compile gets emptied.
-+      fbsd_hideous_sh_bug=$base_compile
-+
-+      # All platforms use -DPIC, to notify preprocessed assembler code.
-+      command="$base_compile $pic_flag -DPIC $srcfile"
-+      if test "$build_old_libs" = yes; then
-+	lo_libobj="$libobj"
-+	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$dir" = "X$libobj"; then
-+	  dir="$objdir"
-+	else
-+	  dir="$dir/$objdir"
-+	fi
-+	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-+
-+	if test -d "$dir"; then
-+	  $show "$rm $libobj"
-+	  $run $rm $libobj
-+	else
-+	  $show "$mkdir $dir"
-+	  $run $mkdir $dir
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d $dir; then
-+	    exit $status
-+	  fi
-+	fi
-+      fi
-+      if test "$compiler_o_lo" = yes; then
-+	output_obj="$libobj"
-+	command="$command -o $output_obj"
-+      elif test "$compiler_c_o" = yes; then
-+	output_obj="$obj"
-+	command="$command -o $output_obj"
-+      fi
-+
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	test -n "$output_obj" && $run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed, then go on to compile the next one
-+      if test x"$output_obj" != x"$libobj"; then
-+	$show "$mv $output_obj $libobj"
-+	if $run $mv $output_obj $libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # If we have no pic_flag, then copy the object into place and finish.
-+      if test -z "$pic_flag" && test "$build_old_libs" = yes; then
-+	# Rename the .lo from within objdir to obj
-+	if test -f $obj; then
-+	  $show $rm $obj
-+	  $run $rm $obj
-+	fi
-+
-+	$show "$mv $libobj $obj"
-+	if $run $mv $libobj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+
-+	# Now arrange that obj and lo_libobj become the same file
-+	$show "$LN_S $obj $lo_libobj"
-+	if $run $LN_S $obj $lo_libobj; then
-+	  exit 0
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Allow error messages only from the first compilation.
-+      suppress_output=' >/dev/null 2>&1'
-+    fi
-+
-+    # Only build a position-dependent object if we build old libraries.
-+    if test "$build_old_libs" = yes; then
-+      command="$base_compile $srcfile"
-+      if test "$compiler_c_o" = yes; then
-+	command="$command -o $obj"
-+	output_obj="$obj"
-+      fi
-+
-+      # Suppress compiler output if we already did a PIC compilation.
-+      command="$command$suppress_output"
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed
-+      if test x"$output_obj" != x"$obj"; then
-+	$show "$mv $output_obj $obj"
-+	if $run $mv $output_obj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Create an invalid libtool object if no PIC, so that we do not
-+      # accidentally link it into a program.
-+      if test "$build_libtool_libs" != yes; then
-+	$show "echo timestamp > $libobj"
-+	$run eval "echo timestamp > \$libobj" || exit $?
-+      else
-+	# Move the .lo from within objdir
-+	$show "$mv $libobj $lo_libobj"
-+	if $run $mv $libobj $lo_libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+    fi
-+
-+    # Unlock the critical section if it was locked
-+    if test "$need_locks" != no; then
-+      $rm "$lockfile"
-+    fi
-+
-+    exit 0
-+    ;;
-+
-+  # libtool link mode
-+  link)
-+    modename="$modename: link"
-+    C_compiler="$CC" # save it, to compile generated C sources
-+    CC="$nonopt"
-+    case "$host" in
-+    *-*-cygwin* | *-*-mingw* | *-*-os2*)
-+      # It is impossible to link a dll without this setting, and
-+      # we shouldn't force the makefile maintainer to figure out
-+      # which system we are compiling for in order to pass an extra
-+      # flag for every libtool invokation.
-+      # allow_undefined=no
-+
-+      # FIXME: Unfortunately, there are problems with the above when trying
-+      # to make a dll which has undefined symbols, in which case not
-+      # even a static library is built.  For now, we need to specify
-+      # -no-undefined on the libtool link line when we can be certain
-+      # that all symbols are satisfied, otherwise we get a static library.
-+      allow_undefined=yes
-+
-+      # This is a source program that is used to create dlls on Windows
-+      # Don't remove nor modify the starting and closing comments
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+      # This is a source program that is used to create import libraries
-+      # on Windows for dlls which lack them. Don't remove nor modify the
-+      # starting and closing comments
-+# /* impgen.c starts here */
-+# /*   Copyright (C) 1999 Free Software Foundation, Inc.
-+# 
-+#  This file is part of GNU libtool.
-+# 
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+# 
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+# 
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#  */
-+# 
-+#  #include <stdio.h>		/* for printf() */
-+#  #include <unistd.h>		/* for open(), lseek(), read() */
-+#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-+#  #include <string.h>		/* for strdup() */
-+# 
-+#  static unsigned int
-+#  pe_get16 (fd, offset)
-+#       int fd;
-+#       int offset;
-+#  {
-+#    unsigned char b[2];
-+#    lseek (fd, offset, SEEK_SET);
-+#    read (fd, b, 2);
-+#    return b[0] + (b[1]<<8);
-+#  }
-+# 
-+#  static unsigned int
-+#  pe_get32 (fd, offset)
-+#      int fd;
-+#      int offset;
-+#  {
-+#    unsigned char b[4];
-+#    lseek (fd, offset, SEEK_SET);
-+#    read (fd, b, 4);
-+#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+#  }
-+# 
-+#  static unsigned int
-+#  pe_as32 (ptr)
-+#       void *ptr;
-+#  {
-+#    unsigned char *b = ptr;
-+#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+#  }
-+# 
-+#  int
-+#  main (argc, argv)
-+#      int argc;
-+#      char *argv[];
-+#  {
-+#      int dll;
-+#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-+#      unsigned long export_rva, export_size, nsections, secptr, expptr;
-+#      unsigned long name_rvas, nexp;
-+#      unsigned char *expdata, *erva;
-+#      char *filename, *dll_name;
-+# 
-+#      filename = argv[1];
-+# 
-+#      dll = open(filename, O_RDONLY|O_BINARY);
-+#      if (!dll)
-+#  	return 1;
-+# 
-+#      dll_name = filename;
-+#    
-+#      for (i=0; filename[i]; i++)
-+#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-+#  	    dll_name = filename + i +1;
-+# 
-+#      pe_header_offset = pe_get32 (dll, 0x3c);
-+#      opthdr_ofs = pe_header_offset + 4 + 20;
-+#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
-+# 
-+#      if (num_entries < 1) /* no exports */
-+#  	return 1;
-+# 
-+#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
-+#      export_size = pe_get32 (dll, opthdr_ofs + 100);
-+#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-+#      secptr = (pe_header_offset + 4 + 20 +
-+#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
-+# 
-+#      expptr = 0;
-+#      for (i = 0; i < nsections; i++)
-+#      {
-+#  	char sname[8];
-+#  	unsigned long secptr1 = secptr + 40 * i;
-+#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-+#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-+#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-+#  	lseek(dll, secptr1, SEEK_SET);
-+#  	read(dll, sname, 8);
-+#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-+#  	{
-+#  	    expptr = fptr + (export_rva - vaddr);
-+#  	    if (export_rva + export_size > vaddr + vsize)
-+#  		export_size = vsize - (export_rva - vaddr);
-+#  	    break;
-+#  	}
-+#      }
-+# 
-+#      expdata = (unsigned char*)malloc(export_size);
-+#      lseek (dll, expptr, SEEK_SET);
-+#      read (dll, expdata, export_size);
-+#      erva = expdata - export_rva;
-+# 
-+#      nexp = pe_as32 (expdata+24);
-+#      name_rvas = pe_as32 (expdata+32);
-+# 
-+#      printf ("EXPORTS\n");
-+#      for (i = 0; i<nexp; i++)
-+#      {
-+#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-+#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-+#      }
-+# 
-+#      return 0;
-+#  }
-+# /* impgen.c ends here */
-+      ;;
-+    *)
-+      allow_undefined=yes
-+      ;;
-+    esac
-+    compile_command="$CC"
-+    finalize_command="$CC"
-+
-+    compile_rpath=
-+    finalize_rpath=
-+    compile_shlibpath=
-+    finalize_shlibpath=
-+    convenience=
-+    old_convenience=
-+    deplibs=
-+    linkopts=
-+
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      lib_search_path=
-+    fi
-+    # now prepend the system-specific ones
-+    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
-+    eval sys_lib_dlse