Changeset 7 in downloads for libtool

Timestamp:

Oct 9, 2007, 10:26:37 PM (17 years ago)

Author:

anonymous

Message:

=

File:

• libtool (modified) (109 diffs)

libtool

@@ -5 +5 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
@@ -45 +45 @@
 # ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host tardis-d04:
+# Libtool was configured on host tardis-b15:
 
 # Shell to use when invoking shell scripts.
@@ -85 +85 @@
 LTCC="gcc"
 
+# LTCC compiler flags.
+LTCFLAGS="-g -O2"
+
 # A language-specific compiler.
 CC="gcc"
@@ -145 +148 @@
 
 # What is the maximum length of a command?
-max_cmd_len=32768
+max_cmd_len=98304
 
 # Does compiler simultaneously support -c and -o options?
@@ -198 +201 @@
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
@@ -317 +320 @@
 # Variables whose values should be saved in libtool wrapper scripts and
 # restored at relink time.
-variables_saved_for_relink="PATH  LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 
 # Whether libtool must link a program against all its dependency libraries.
@@ -323 +326 @@
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/ /usr/lib/gcc/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/ /usr/lib/i486-linux/3.3.5/ /usr/lib/"
+sys_lib_search_path_spec="/usr/lib/gcc-lib/i486-linux/3.3.5 /usr/lib /lib"
 
 # Run-time system search path for libraries
@@ -351 +354 @@
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -393 +396 @@
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.20
-TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+VERSION=1.5.24
+TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
@@ -455 +466 @@
 # 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
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+          export $lt_var
+        fi"
+done
 
 # Make sure IFS has a sensible default
@@ -482 +495 @@
 show_help=
 execute_dlfiles=
+duplicate_deps=no
+preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
 # This seems to be the best place for them
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $mkdir "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || {
+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+        exit $EXIT_FAILURE
+      }
+    fi
+
+    $echo "X$my_tmpdir" | $Xsed
+}
+
 
 # func_win32_libid arg
@@ -507 +561 @@
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-        sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
+        $SED -n -e '1,100{
+                / I /{
+                        s,.*,import,
+                        p
+                        q
+                        }
+                }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
     fi
     ;;
@@ -639 +698 @@
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+        *" $my_xlib_u "*)
+          extracted_serial=`expr $extracted_serial + 1`
+          my_xlib_u=lt$extracted_serial-$my_xlib ;;
+        *) break ;;
+        esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
@@ -645 +714 @@
       $show "$mkdir $my_xdir"
       $run $mkdir "$my_xdir"
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-        exit $status
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+        exit $exit_status
       fi
       case $host in
@@ -702 +771 @@
 eval std_shrext=\"$shrext_cmds\"
 
+disable_libs=no
+
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
@@ -764 +835 @@
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2007  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
@@ -818 +890 @@
     ;;
 
-  --tag) prevopt="--tag" prev=tag ;;
+  --tag)
+    prevopt="--tag"
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
   --tag=*)
     set tag "$optarg" ${1+"$@"}
@@ -849 +925 @@
   exit $EXIT_FAILURE
 fi
+
+case $disable_libs in
+no) 
+  ;;
+shared)
+  build_libtool_libs=no
+  build_old_libs=yes
+  ;;
+static)
+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+  ;;
+esac
 
 # If this variable is set in any of the actions, the command in it
@@ -1049 +1137 @@
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
@@ -1206 +1295 @@
         $show "$mkdir ${xdir}$objdir"
         $run $mkdir ${xdir}$objdir
-        status=$?
-        if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-          exit $status
+        exit_status=$?
+        if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+          exit $exit_status
         fi
       fi
@@ -1411 +1500 @@
     objs=
     non_pic_objects=
+    notinst_path= # paths that contain not-installed libtool libraries
     precious_files_regex=
     prefer_static_libs=no
@@ -1431 +1521 @@
     do
       case $arg in
-      -all-static | -static)
-        if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+        case $arg in
+        -all-static)
           if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
             $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
@@ -1439 +1530 @@
             dlopen_self=$dlopen_self_static
           fi
-        else
+          prefer_static_libs=yes
+          ;;
+        -static)
           if test -z "$pic_flag" && test -n "$link_static_flag"; then
             dlopen_self=$dlopen_self_static
           fi
-        fi
+          prefer_static_libs=built
+          ;;
+        -static-libtool-libs)
+          if test -z "$pic_flag" && test -n "$link_static_flag"; then
+            dlopen_self=$dlopen_self_static
+          fi
+          prefer_static_libs=yes
+          ;;
+        esac
         build_libtool_libs=no
         build_old_libs=yes
-        prefer_static_libs=yes
         break
         ;;
@@ -1621 +1721 @@
                     arg="$non_pic_object"
                   fi
+                else
+                  # If the PIC object exists, use it instead.
+                  # $xdir was prepended to $pic_object above.
+                  non_pic_object="$pic_object"
+                  non_pic_objects="$non_pic_objects $non_pic_object"
                 fi
               else
@@ -1704 +1809 @@
           continue
           ;;
-        darwin_framework)
-          compiler_flags="$compiler_flags $arg"
+        darwin_framework|darwin_framework_skip)
+          test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
           compile_command="$compile_command $arg"
           finalize_command="$finalize_command $arg"
@@ -1769 +1874 @@
         ;;
 
-      -framework|-arch)
-        prev=darwin_framework
-        compiler_flags="$compiler_flags $arg"
+      -framework|-arch|-isysroot)
+        case " $CC " in
+          *" ${arg} ${1} "* | *" ${arg} ${1} "*) 
+                prev=darwin_framework_skip ;;
+          *) compiler_flags="$compiler_flags $arg"
+             prev=darwin_framework ;;
+        esac
         compile_command="$compile_command $arg"
         finalize_command="$finalize_command $arg"
-        continue
-        ;;
+        continue
+        ;;
 
       -inst-prefix-dir)
@@ -1803 +1912 @@
           if test -z "$absdir"; then
             $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-            exit $EXIT_FAILURE
+            absdir="$dir"
+            notinst_path="$notinst_path $dir"
           fi
           dir="$absdir"
@@ -1817 +1927 @@
         case $host in
         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+          testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
           case :$dllsearchpath: in
           *":$dir:"*) ;;
           *) dllsearchpath="$dllsearchpath:$dir";;
+          esac
+          case :$dllsearchpath: in
+          *":$testbindir:"*) ;;
+          *) dllsearchpath="$dllsearchpath:$testbindir";;
           esac
           ;;
@@ -1829 +1944 @@
         if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
           case $host in
-          *-*-cygwin* | *-*-pw32* | *-*-beos*)
+          *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
             # These systems don't actually have a C or math library (as such)
             continue
             ;;
-          *-*-mingw* | *-*-os2*)
+          *-*-os2*)
             # These systems don't actually have a C library (as such)
             test "X$arg" = "X-lc" && continue
@@ -1845 +1960 @@
             deplibs="$deplibs -framework System"
             continue
+            ;;
+          *-*-sco3.2v5* | *-*-sco5v6*)
+            # Causes problems with __ctype
+            test "X$arg" = "X-lc" && continue
+            ;;
+          *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+            # Compiler inserts libc in the correct place for threads to work
+            test "X$arg" = "X-lc" && continue
+            ;;
           esac
         elif test "X$arg" = "X-lc_r"; then
@@ -1868 +1992 @@
         ;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
         compiler_flags="$compiler_flags $arg"
         compile_command="$compile_command $arg"
@@ -1886 +2010 @@
       # -q* pass through compiler args for the IBM compiler
       # -m* pass through architecture-specific compiler args for GCC
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
         # Unknown arguments in both finalize_command and compile_command need
@@ -1898 +2028 @@
         compile_command="$compile_command $arg"
         finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
+        compiler_flags="$compiler_flags $arg"
         continue
         ;;
@@ -1916 +2044 @@
       -no-install)
         case $host in
-        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
           # The PATH hackery in wrapper scripts is required on Windows
-          # in order for the loader to find any dlls it needs.
+          # and Darwin in order for the loader to find any dlls it needs.
           $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
           $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
@@ -1977 +2105 @@
         ;;
 
-      -static)
+      -static | -static-libtool-libs)
         # The effects of -static are defined in a previous loop.
         # We used to do the same as -all-static on platforms that
@@ -2138 +2266 @@
               arg="$non_pic_object"
             fi
+          else
+            # If the PIC object exists, use it instead.
+            # $xdir was prepended to $pic_object above.
+            non_pic_object="$pic_object"
+            non_pic_objects="$non_pic_objects $non_pic_object"
           fi
         else
@@ -2243 +2376 @@
       $show "$mkdir $output_objdir"
       $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-        exit $status
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+        exit $exit_status
       fi
     fi
@@ -2308 +2441 @@
     need_relink=no # whether we're linking any uninstalled libtool libraries
     notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
     case $linkmode in
     lib)
@@ -2355 +2487 @@
         found=no
         case $deplib in
-        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
           if test "$linkmode,$pass" = "prog,link"; then
             compile_deplibs="$deplib $compile_deplibs"
@@ -2544 +2676 @@
         if test "$found" = yes || test -f "$lib"; then :
         else
-          $echo "$modename: cannot find the library \`$lib'" 1>&2
+          $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
           exit $EXIT_FAILURE
         fi
@@ -2751 +2883 @@
         if test "$linkmode,$pass" = "prog,link"; then
           if test -n "$library_names" &&
-             { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+             { { test "$prefer_static_libs" = no ||
+                 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+               test -z "$old_library"; }; then
             # We need to hardcode the library path
             if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
@@ -2795 +2929 @@
 
         link_static=no # Whether the deplib will be linked statically
+        use_static_libs=$prefer_static_libs
+        if test "$use_static_libs" = built && test "$installed" = yes ; then
+          use_static_libs=no
+        fi
         if test -n "$library_names" &&
-           { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+           { test "$use_static_libs" = no || test -z "$old_library"; }; then
           if test "$installed" = no; then
             notinst_deplibs="$notinst_deplibs $lib"
@@ -2909 +3047 @@
                 add="$dir/$linklib"
                 case $host in
-                  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+                  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+                  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+                  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+                    *-*-unixware7*) add_dir="-L$dir" ;;
                   *-*-darwin* )
                     # if the lib is a module then we can not link against
                     # it, someone is ignoring the new warnings I added
-                    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+                    if /usr/bin/file -L $add 2> /dev/null |
+                      $EGREP ": [^:]* bundle" >/dev/null ; then
                       $echo "** Warning, lib $linklib is a module, not a shared library"
                       if test -z "$old_library" ; then
@@ -3439 +3581 @@
           #
           case $version_type in
-          darwin|linux|osf|windows)
+          darwin|linux|osf|windows|none)
             current=`expr $number_major + $number_minor`
             age="$number_minor"
@@ -3450 +3592 @@
             ;;
           irix|nonstopux)
-            current=`expr $number_major + $number_minor - 1`
+            current=`expr $number_major + $number_minor`
             age="$number_minor"
             revision="$number_minor"
+            lt_irix_increment=no
             ;;
           esac
@@ -3511 +3654 @@
           # Darwin ld doesn't like 0 for these options...
           minor_current=`expr $current + 1`
-          verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+          xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+          verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
           ;;
 
@@ -3525 +3669 @@
 
         irix | nonstopux)
-          major=`expr $current - $age + 1`
-
+          if test "X$lt_irix_increment" = "Xno"; then
+            major=`expr $current - $age`
+          else
+            major=`expr $current - $age + 1`
+          fi
           case $version_type in
             nonstopux) verstring_prefix=nonstopux ;;
@@ -3663 +3810 @@
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-        lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-        deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-        dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
+      #for path in $notinst_path; do
+      # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
@@ -3719 +3866 @@
           *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
             # Do not include libc due to us having libc/libc_r.
-            test "X$arg" = "X-lc" && continue
+            ;;
+          *-*-sco3.2v5* | *-*-sco5v6*)
+            # Causes problems with __ctype
+            ;;
+          *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+            # Compiler inserts libc in the correct place for threads to work
             ;;
           *)
@@ -3763 +3915 @@
 EOF
           $rm conftest
-          $LTCC -o conftest conftest.c $deplibs
-          if test "$?" -eq 0 ; then
+          if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
             ldd_output=`ldd conftest`
             for i in $deplibs; do
               name=`expr $i : '-l\(.*\)'`
               # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
                 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
                   case " $predeps $postdeps " in
@@ -3808 +3959 @@
               if test "$name" != "" && test "$name" != "0"; then
                 $rm conftest
-                $LTCC -o conftest conftest.c $i
-                # Did it work?
-                if test "$?" -eq 0 ; then
+                if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
                   ldd_output=`ldd conftest`
                   if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3842 +3991 @@
                   $echo
                   $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-                  $echo "***  make it link in!  You will probably need to install it or some"
+                  $echo "*** make it link in!  You will probably need to install it or some"
                   $echo "*** library that it depends on before this library will be fully"
                   $echo "*** functional.  Installing it before continuing would be even better."
@@ -4055 +4204 @@
       fi
 
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+        case " $new_libs " in
+        *" -L$path/$objdir "*) ;;
+        *)
+          case " $deplibs " in
+          *" -L$path/$objdir "*)
+            new_libs="$new_libs -L$path/$objdir" ;;
+          esac
+          ;;
+        esac
+      done
+      for deplib in $deplibs; do
+        case $deplib in
+        -L*)
+          case " $new_libs " in
+          *" $deplib "*) ;;
+          *) new_libs="$new_libs $deplib" ;;
+          esac
+          ;;
+        *) new_libs="$new_libs $deplib" ;;
+        esac
+      done
+      deplibs="$new_libs"
+
+
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -4099 +4277 @@
             libdir="$hardcode_libdirs"
             if test -n "$hardcode_libdir_flag_spec_ld"; then
-              eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+              case $archive_cmds in
+              *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+              *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+              esac
             else
               eval dep_rpath=\"$hardcode_libdir_flag_spec\"
@@ -4138 +4319 @@
 
         lib="$output_objdir/$realname"
+        linknames=
         for link
         do
@@ -4457 +4639 @@
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
         if test -n "$whole_archive_flag_spec"; then
-          eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+          eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+          reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
         else
           gentop="$output_objdir/${obj}x"
@@ -4568 +4752 @@
         ;;
       esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+        case " $new_libs " in
+        *" -L$path/$objdir "*) ;;
+        *)
+          case " $compile_deplibs " in
+          *" -L$path/$objdir "*)
+            new_libs="$new_libs -L$path/$objdir" ;;
+          esac
+          ;;
+        esac
+      done
+      for deplib in $compile_deplibs; do
+        case $deplib in
+        -L*)
+          case " $new_libs " in
+          *" $deplib "*) ;;
+          *) new_libs="$new_libs $deplib" ;;
+          esac
+          ;;
+        *) new_libs="$new_libs $deplib" ;;
+        esac
+      done
+      compile_deplibs="$new_libs"
+
 
       compile_command="$compile_command $compile_deplibs"
@@ -4613 +4826 @@
         case $host in
         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+          testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
           case :$dllsearchpath: in
           *":$libdir:"*) ;;
           *) dllsearchpath="$dllsearchpath:$libdir";;
+          esac
+          case :$dllsearchpath: in
+          *":$testbindir:"*) ;;
+          *) dllsearchpath="$dllsearchpath:$testbindir";;
           esac
           ;;
@@ -4733 +4951 @@
               $run $rm $export_symbols
               $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+              case $host in
+              *cygwin* | *mingw* )
+                $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
             else
-              $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+              $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
               $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
               $run eval 'mv "$nlist"T "$nlist"'
+              case $host in
+              *cygwin* | *mingw* )
+                $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
             fi
           fi
@@ -4853 +5083 @@
 
           # Now compile the dynamic symbol file.
-          $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-          $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+          $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+          $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
 
           # Clean up the generated files.
@@ -4861 +5091 @@
 
           # Transform the symbol file into the correct name.
-          compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-          finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+          case $host in
+          *cygwin* | *mingw* )
+            if test -f "$output_objdir/${outputname}.def" ; then
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            else
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             fi
+            ;;
+          * )
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            ;;
+          esac
           ;;
         *)
@@ -4875 +5118 @@
 
         # Nullify the symbol file.
-        compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+        compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+        finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
         # Replace the output file specification.
-        compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+        compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
         link_command="$compile_command$compile_rpath"
 
@@ -4887 +5130 @@
         $show "$link_command"
         $run eval "$link_command"
-        status=$?
+        exit_status=$?
 
         # Delete the generated files.
@@ -4895 +5138 @@
         fi
 
-        exit $status
+        exit $exit_status
       fi
 
@@ -4968 +5211 @@
           link_command="$finalize_var$compile_command$finalize_rpath"
           if test "$fast_install" = yes; then
-            relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+            relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
           else
             # fast_install is set to needless
@@ -5005 +5248 @@
         done
         relink_command="(cd `pwd`; $relink_command)"
-        relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+        relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
@@ -5035 +5278 @@
         case $host in
           *cygwin* | *mingw* )
-            cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
-            cwrapper=`$echo ${output}.exe`
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+            output_name=`basename $output`
+            output_path=`dirname $output`
+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
+            cwrapper="$output_path/$output_name.exe"
+            $rm $cwrappersource $cwrapper
+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
             cat > $cwrappersource <<EOF
@@ -5063 +5308 @@
 #include <stdarg.h>
 #include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
 #if defined(PATH_MAX)
@@ -5073 +5321 @@
 
 #ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
 #endif
 
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
   defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
 #endif
 
@@ -5091 +5343 @@
 #endif /* DIR_SEPARATOR_2 */
 
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
@@ -5096 +5354 @@
 } while (0)
 
+/* -DDEBUG is fairly common in CFLAGS.  */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
+
 const char *program_name = NULL;
 
 void * xmalloc (size_t num);
 char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int    check_executable(const char *path);
 char * strendzap(char *str, const char *pat);
 void lt_fatal (const char *message, ...);
@@ -5111 +5378 @@
   int i;
 
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
+  DEBUG("(main) program_name : %s\n",program_name);
   newargz = XMALLOC(char *, argc+2);
 EOF
 
-            cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
+            cat >> $cwrappersource <<EOF
+  newargz[0] = (char *) xstrdup("$SHELL");
 EOF
 
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
+            cat >> $cwrappersource <<"EOF"
+  newargz[1] = find_executable(argv[0]);
+  if (newargz[1] == NULL)
+    lt_fatal("Couldn't find %s", argv[0]);
+  DEBUG("(main) found exe at : %s\n",newargz[1]);
   /* we know the script has the same name, without the .exe */
   /* so make sure newargz[1] doesn't end in .exe */
@@ -5127 +5399 @@
     newargz[i+1] = xstrdup(argv[i]);
   newargz[argc+1] = NULL;
+
+  for (i=0; i<argc+1; i++)
+  {
+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+    ;
+  }
+
 EOF
 
-            cat >> $cwrappersource <<EOF
+            case $host_os in
+              mingw*)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",(char const **)newargz);
+EOF
+              ;;
+              *)
+                cat >> $cwrappersource <<EOF
   execv("$SHELL",newargz);
 EOF
-
-            cat >> $cwrappersource <<"EOF"
+              ;;
+            esac
+
+            cat >> $cwrappersource <<"EOF"
   return 127;
 }
@@ -5154 +5442 @@
 }
 
-char *
-basename (const char *name)
+const char *
+base_name (const char *name)
 {
   const char *base;
@@ -5161 +5449 @@
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
     name += 2;
 #endif
@@ -5168 +5456 @@
     if (IS_DIR_SEPARATOR (*name))
       base = name + 1;
-  return (char *) base;
+  return base;
 }
 
+int
+check_executable(const char * path)
+{
+  struct stat st;
+
+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0) &&
+      (
+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+       ((st.st_mode & S_IXUSR) == S_IXUSR))
+      )
+    return 1;
+  else
+    return 0;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise */
 char *
-fnqualify(const char *path)
+find_executable (const char* wrapper)
 {
-  size_t size;
-  char *p;
+  int has_slash = 0;
+  const char* p;
+  const char* p_next;
+  /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
+  int tmp_len;
+  char* concat_name;
+
+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+  {
+    concat_name = xstrdup (wrapper);
+    if (check_executable(concat_name))
+      return concat_name;
+    XFREE(concat_name);
+  }
+  else
+  {
 #endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
+    if (IS_DIR_SEPARATOR (wrapper[0]))
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable(concat_name))
+        return concat_name;
+      XFREE(concat_name);
+    }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+    {
+      has_slash = 1;
+      break;
+    }
+  if (!has_slash)
+  {
+    /* no slashes; search PATH */
+    const char* path = getenv ("PATH");
+    if (path != NULL)
+    {
+      for (p = path; *p; p = p_next)
+      {
+        const char* q;
+        size_t p_len;
+        for (q = p; *q; q++)
+          if (IS_PATH_SEPARATOR(*q))
+            break;
+        p_len = q - p;
+        p_next = (*q == '\0' ? q : q + 1);
+        if (p_len == 0)
+        {
+          /* empty path: current directory */
+          if (getcwd (tmp, LT_PATHMAX) == NULL)
+            lt_fatal ("getcwd failed");
+          tmp_len = strlen(tmp);
+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, tmp, tmp_len);
+          concat_name[tmp_len] = '/';
+          strcpy (concat_name + tmp_len + 1, wrapper);
+        }
+        else
+        {
+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, p, p_len);
+          concat_name[p_len] = '/';
+          strcpy (concat_name + p_len + 1, wrapper);
+        }
+        if (check_executable(concat_name))
+          return concat_name;
+        XFREE(concat_name);
+      }
+    }
+    /* not found in PATH; assume curdir */
+  }
+  /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
     lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
+  tmp_len = strlen(tmp);
+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable(concat_name))
+    return concat_name;
+  XFREE(concat_name);
+  return NULL;
 }
 
@@ -5239 +5627 @@
 }
 EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+          # we should really use a build-platform specific compiler
+          # here, but OTOH, the wrappers (shell script and this C one)
+          # are only useful if you want to execute the "real" binary.
+          # Since the "real" binary is built for $host, then this
+          # wrapper might as well be built for $host, too.
+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+          ;;
+        esac
+        $rm $output
+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
 
         $echo > $output "\
@@ -5266 +5654 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -5409 +5811 @@
         esac
         $echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
@@ -5478 +5880 @@
             $show "$mkdir $gentop"
             $run $mkdir "$gentop"
-            status=$?
-            if test "$status" -ne 0 && test ! -d "$gentop"; then
-              exit $status
+            exit_status=$?
+            if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+              exit $exit_status
             fi
           fi
@@ -5595 +5997 @@
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
         relink_command=
@@ -5940 +6342 @@
           if test -n "$inst_prefix_dir"; then
             # Stick the inst_prefix_dir data into the link command.
-            relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+            relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
           else
-            relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+            relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
           fi
 
@@ -6147 +6549 @@
           if test "$fast_install" = no && test -n "$relink_command"; then
             if test "$finalize" = yes && test -z "$run"; then
-              tmpdir="/tmp"
-              test -n "$TMPDIR" && tmpdir="$TMPDIR"
-              tmpdir="$tmpdir/libtool-$$"
-              save_umask=`umask`
-              umask 0077
-              if $mkdir "$tmpdir"; then
-                umask $save_umask
-              else
-                umask $save_umask
-                $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-                continue
-              fi
+              tmpdir=`func_mktempdir`
               file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
               outputname="$tmpdir/$file"
               # Replace the output file specification.
-              relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+              relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
               $show "$relink_command"
@@ -6282 +6673 @@
     test "$show" = : && exit $EXIT_SUCCESS
 
-    $echo "----------------------------------------------------------------------"
+    $echo "X----------------------------------------------------------------------" | $Xsed
     $echo "Libraries have been installed in:"
     for libdir in $libdirs; do
@@ -6315 +6706 @@
     $echo "See any operating system documentation about shared libraries for"
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
+    $echo "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
     ;;
@@ -6373 +6764 @@
           dir="$dir/$objdir"
         else
-          $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-          exit $EXIT_FAILURE
+          if test ! -f "$dir/$dlname"; then
+            $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+            exit $EXIT_FAILURE
+          fi
         fi
         ;;
@@ -6438 +6831 @@
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-        LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-        LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+        eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+              fi"
+      done
 
       # Now prepare to actually exec the command.
@@ -6532 +6925 @@
           done
           test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-          test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-          if test "$mode" = uninstall; then
+
+          case "$mode" in
+          clean)
+            case "  $library_names " in
+            # "  " in the beginning catches empty $dlname
+            *" $dlname "*) ;;
+            *) rmfiles="$rmfiles $objdir/$dlname" ;;
+            esac
+             test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+            ;;
+          uninstall)
             if test -n "$library_names"; then
               # Do each command in the postuninstall commands.
@@ -6567 +6968 @@
             fi
             # FIXME: should reinstall the best remaining shared library.
-          fi
+            ;;
+          esac
         fi
         ;;
@@ -6791 +7193 @@
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
@@ -6807 +7209 @@
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
@@ -6866 +7270 @@
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+disable_libs=static
 # ### END LIBTOOL TAG CONFIG: disable-static
 
@@ -6880 +7283 @@
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
-# Libtool was configured on host tardis-d04:
+# Libtool was configured on host tardis-b15:
 
 # Shell to use when invoking shell scripts.
@@ -6920 +7323 @@
 LTCC="gcc"
 
+# LTCC compiler flags.
+LTCFLAGS="-g -O2"
+
 # A language-specific compiler.
 CC="g++"
@@ -6980 +7386 @@
 
 # What is the maximum length of a command?
-max_cmd_len=32768
+max_cmd_len=98304
 
 # Does compiler simultaneously support -c and -o options?
@@ -7033 +7439 @@
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
@@ -7141 +7547 @@
 # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 # the resulting binary.
-hardcode_shlibpath_var=
+hardcode_shlibpath_var=unsupported
 
 # Set to yes if building a shared library automatically hardcodes DIR into the library
@@ -7155 +7561 @@
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/ /usr/lib/gcc/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/ /usr/lib/i486-linux/3.3.5/ /usr/lib/"
+sys_lib_search_path_spec="/usr/lib/gcc-lib/i486-linux/3.3.5 /usr/lib /lib"
 
 # Run-time system search path for libraries
@@ -7182 +7588 @@
 # ### BEGIN LIBTOOL TAG CONFIG: F77
 
-# Libtool was configured on host tardis-d04:
+# Libtool was configured on host tardis-b15:
 
 # Shell to use when invoking shell scripts.
@@ -7222 +7628 @@
 LTCC="gcc"
 
+# LTCC compiler flags.
+LTCFLAGS="-g -O2"
+
 # A language-specific compiler.
 CC="g77"
@@ -7282 +7691 @@
 
 # What is the maximum length of a command?
-max_cmd_len=32768
+max_cmd_len=98304
 
 # Does compiler simultaneously support -c and -o options?
@@ -7335 +7744 @@
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
@@ -7460 +7869 @@
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/pack/gcc-3.3.5-mo/i686-debian-linux3.1/lib/gcc-lib/i686-pc-linux-gnu/3.3.5/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.5/ /usr/pack/gcc-3.3.5-mo/i686-debian-linux3.1/lib/gcc-lib/i686-pc-linux-gnu/3.3.5/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.5/ /usr/pack/gcc-3.3.5-mo/i686-debian-linux3.1/lib/gcc-lib/i686-pc-linux-gnu/3.3.5/../../../../i686-pc-linux-gnu/lib/ /usr/pack/gcc-3.3.5-mo/i686-debian-linux3.1/lib/gcc-lib/i686-pc-linux-gnu/3.3.5/../../../i686-pc-linux-gnu/3.3.5/ /usr/pack/gcc-3.3.5-mo/i686-debian-linux3.1/lib/gcc-lib/i686-pc-linux-gnu/3.3.5/../../../ /lib/i686-pc-linux-gnu/3.3.5/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.5/ /usr/lib/"
+sys_lib_search_path_spec="/usr/lib/gcc-lib/i486-linux/3.3.5 /usr/lib /lib"
 
 # Run-time system search path for libraries
@@ -7487 +7896 @@
 # ### BEGIN LIBTOOL TAG CONFIG: F77
 
-# Libtool was configured on host tardis-d04:
+# Libtool was configured on host tardis-b15:
 
 # Shell to use when invoking shell scripts.
@@ -7527 +7936 @@
 LTCC="gcc"
 
+# LTCC compiler flags.
+LTCFLAGS="-g -O2"
+
 # A language-specific compiler.
 CC="g++"
@@ -7587 +7999 @@
 
 # What is the maximum length of a command?
-max_cmd_len=32768
+max_cmd_len=98304
 
 # Does compiler simultaneously support -c and -o options?
@@ -7640 +8052 @@
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
@@ -7748 +8160 @@
 # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 # the resulting binary.
-hardcode_shlibpath_var=
+hardcode_shlibpath_var=unsupported
 
 # Set to yes if building a shared library automatically hardcodes DIR into the library
@@ -7762 +8174 @@
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/ /usr/lib/gcc/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/ /usr/lib/i486-linux/3.3.5/ /usr/lib/"
+sys_lib_search_path_spec="/usr/lib/gcc-lib/i486-linux/3.3.5 /usr/lib /lib"
 
 # Run-time system search path for libraries