Update autogenerated

[simgrid.git] / libtool

diff --git a/libtool b/libtool
index 3df5148..e231334 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -4,7 +4,7 @@
 # Generated automatically by  (GNU simgrid 3.3-cvs)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 # Generated automatically by  (GNU simgrid 3.3-cvs)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001

 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:


@@ -30,10 +30,10 @@
 # the same distribution terms that you use for the rest of that program.
 
 # A sed program that does not truncate output.
 # the same distribution terms that you use for the rest of that program.
 
 # A sed program that does not truncate output.

-SED="/usr/bin/sed"
+SED="/bin/sed"

 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.

-Xsed="/usr/bin/sed -e 1s/^X//"
+Xsed="/bin/sed -e 1s/^X//"

 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.


@@ -44,7 +44,7 @@ available_tags=" CXX GCJ"
 
 # ### BEGIN LIBTOOL CONFIG
 
 
 # ### BEGIN LIBTOOL CONFIG
 

-# Libtool was configured on host laserbeak:
+# Libtool was configured on host blaise:

 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"


@@ -97,7 +97,7 @@ with_gcc=yes
 EGREP="/bin/grep -E"
 
 # The linker used to build libraries.
 EGREP="/bin/grep -E"
 
 # The linker used to build libraries.

-LD="/usr/i686-pc-linux-gnu/bin/ld"
+LD="/usr/bin/ld"

 
 # Whether we need hard or soft links.
 LN_S="ln -s"
 
 # Whether we need hard or soft links.
 LN_S="ln -s"


@@ -147,7 +147,7 @@ pic_flag=" -fPIC -DPIC"
 pic_mode=default
 
 # What is the maximum length of a command?
 pic_mode=default
 
 # What is the maximum length of a command?

-max_cmd_len=98304
+max_cmd_len=32768

 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"


@@ -200,7 +200,7 @@ soname_spec="\${libname}\${release}\${shared_ext}\$major"
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"

-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"

 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 


@@ -322,13 +322,13 @@ hardcode_automatic=no
 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.
 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.

-link_all_deplibs=unknown
+link_all_deplibs=no

 
 # Compile-time system search path for libraries
 
 # Compile-time system search path for libraries

-sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/i686-pc-linux-gnu/lib /usr/lib /lib"
+sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../ /lib/i486-linux-gnu/4.1.3/ /lib/ /usr/lib/i486-linux-gnu/4.1.3/ /usr/lib/"

 
 # Run-time system search path for libraries
 
 # Run-time system search path for libraries

-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.1 /usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/lib/gcc/i686-pc-linux-gnu/4.2.0 /usr/lib/nspr /usr/lib/nss /usr/lib/lesstif-2.1 /usr/lib/openmotif-2.2 /usr/lib/qt4 /usr/kde/3.5/lib /usr/qt/3/lib /usr/games/lib /usr/lib/fltk-1.1 /usr/lib/libstdc++-v3/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib "

 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""


@@ -353,8 +353,8 @@ include_expsyms=""
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+# 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
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify


@@ -395,22 +395,14 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool

-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-
-# 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+"$@"}'='"$@"'
+VERSION="1.5.22 Debian 1.5.22-4"
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+
+# 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

   setopt NO_GLOB_SUBST
   setopt NO_GLOB_SUBST

-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

 fi
 fi

-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh

 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then


@@ -465,14 +457,12 @@ esac
 # 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.
 # 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.

-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
+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

 
 # Make sure IFS has a sensible default
 lt_nl='
 
 # Make sure IFS has a sensible default
 lt_nl='


@@ -498,8 +488,6 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"

-extracted_archives=
-extracted_serial=0

 
 #####################################
 # Shell function definitions:
 
 #####################################
 # Shell function definitions:


@@ -560,13 +548,7 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $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 /{
-                       s,.*,import,
-                       p
-                       q
-                       }
-               }'`
+       $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";;
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;


@@ -627,21 +609,7 @@ func_infer_tag ()
            esac
            CC_quoted="$CC_quoted $arg"
          done
            esac
            CC_quoted="$CC_quoted $arg"
          done

-           # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-           trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
-           # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
-           extendcc=${host}-${CC}
-           # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc  
-           # (Gentoo-specific hack because we always export $CHOST)
-           mungedcc=${CHOST-${host}}-${trimedcc}

            case "$@ " in
            case "$@ " in

-             "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
-             "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
-             tagname=CC
-             break ;;
-             "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
-             "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
-             "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\

              " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
              # The compiler in the base compile command matches
              # the one in the tagged configuration.
              " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
              # The compiler in the base compile command matches
              # the one in the tagged configuration.


@@ -711,17 +679,7 @@ func_extract_archives ()
        *) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
        *) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`

-      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"
+      my_xdir="$my_gentop/$my_xlib"

 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"


@@ -848,12 +806,11 @@ do
     ;;
 
   --version)
     ;;
 
   --version)

-    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."
+    $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."

     exit $?
     ;;
 
     exit $?
     ;;
 


@@ -1150,10 +1107,9 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;

-    *.[fF][09]?) xform=[fF][09]. ;;
+    *.f90) xform=f90 ;;

     *.for) xform=for ;;
     *.java) xform=java ;;
     *.for) xform=for ;;
     *.java) xform=java ;;

-    *.obj) xform=obj ;;

     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`


@@ -1247,7 +1203,7 @@ if test -z "$show_help"; then
     # 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
     # 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 $run ln "$srcfile" "$lockfile" 2>/dev/null; do
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do

        $show "Waiting for $lockfile to be removed"
        sleep 2
       done
        $show "Waiting for $lockfile to be removed"
        sleep 2
       done


@@ -1534,9 +1490,8 @@ EOF
     for arg
     do
       case $arg in
     for arg
     do
       case $arg in

-      -all-static | -static | -static-libtool-libs)
-       case $arg in
-       -all-static)
+      -all-static | -static)
+       if test "X$arg" = "X-all-static"; then

          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
          fi
          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
          fi


@@ -1544,20 +1499,12 @@ EOF
            dlopen_self=$dlopen_self_static
          fi
          prefer_static_libs=yes
            dlopen_self=$dlopen_self_static
          fi
          prefer_static_libs=yes

-         ;;
-       -static)
+       else

          if test -z "$pic_flag" && test -n "$link_static_flag"; then
            dlopen_self=$dlopen_self_static
          fi
          prefer_static_libs=built
          if test -z "$pic_flag" && test -n "$link_static_flag"; then
            dlopen_self=$dlopen_self_static
          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
+       fi

        build_libtool_libs=no
        build_old_libs=yes
        break
        build_libtool_libs=no
        build_old_libs=yes
        break


@@ -2005,7 +1952,7 @@ EOF
        continue
        ;;
 
        continue
        ;;
 

-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)

        compiler_flags="$compiler_flags $arg"
        compile_command="$compile_command $arg"
        finalize_command="$finalize_command $arg"
        compiler_flags="$compiler_flags $arg"
        compile_command="$compile_command $arg"
        finalize_command="$finalize_command $arg"


@@ -2025,11 +1972,10 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
       # -m* pass through architecture-specific compiler args for GCC
       # -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
+      # -pg pass through profiling flag for GCC

       # @file GCC response files
       # @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*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+      -t[45]*|-txscale*|@*)

 
        # Unknown arguments in both finalize_command and compile_command need
        # to be aesthetically quoted because they are evaled later.
 
        # Unknown arguments in both finalize_command and compile_command need
        # to be aesthetically quoted because they are evaled later.


@@ -2057,9 +2003,9 @@ EOF
 
       -no-install)
        case $host in
 
       -no-install)
        case $host in

-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)

          # The PATH hackery in wrapper scripts is required on Windows
          # The PATH hackery in wrapper scripts is required on Windows

-         # and Darwin in order for the loader to find any dlls it needs.
+         # 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
          fast_install=no
          $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
          $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
          fast_install=no


@@ -2118,7 +2064,7 @@ EOF
        continue
        ;;
 
        continue
        ;;
 

-      -static | -static-libtool-libs)
+      -static)

        # The effects of -static are defined in a previous loop.
        # We used to do the same as -all-static on platforms that
        # didn't have a PIC flag, but the assumption that the effects
        # The effects of -static are defined in a previous loop.
        # We used to do the same as -all-static on platforms that
        # didn't have a PIC flag, but the assumption that the effects


@@ -2488,7 +2434,10 @@ EOF
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;

-       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+       link)
+         libs="$deplibs %DEPLIBS%"
+         test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+         ;;

        esac
       fi
       if test "$pass" = dlopen; then
        esac
       fi
       if test "$pass" = dlopen; then


@@ -2500,7 +2449,7 @@ EOF
        lib=
        found=no
        case $deplib in
        lib=
        found=no
        case $deplib in

-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)

          if test "$linkmode,$pass" = "prog,link"; then
            compile_deplibs="$deplib $compile_deplibs"
            finalize_deplibs="$deplib $finalize_deplibs"
          if test "$linkmode,$pass" = "prog,link"; then
            compile_deplibs="$deplib $compile_deplibs"
            finalize_deplibs="$deplib $finalize_deplibs"


@@ -2896,9 +2845,7 @@ EOF
 
        if test "$linkmode,$pass" = "prog,link"; then
          if test -n "$library_names" &&
 
        if test "$linkmode,$pass" = "prog,link"; then
          if test -n "$library_names" &&

-            { { test "$prefer_static_libs" = no ||
-                test "$prefer_static_libs,$installed" = "built,yes"; } ||
-              test -z "$old_library"; }; then
+            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then

            # We need to hardcode the library path
            if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
              # Make sure the rpath contains only unique directories.
            # We need to hardcode the library path
            if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
              # Make sure the rpath contains only unique directories.


@@ -3594,7 +3541,7 @@ EOF
          # which has an extra 1 added just for fun
          #
          case $version_type in
          # which has an extra 1 added just for fun
          #
          case $version_type in

-         darwin|linux|osf|windows|none)
+         darwin|linux|osf|windows)

            current=`expr $number_major + $number_minor`
            age="$number_minor"
            revision="$number_revision"
            current=`expr $number_major + $number_minor`
            age="$number_minor"
            revision="$number_revision"


@@ -3605,10 +3552,14 @@ EOF
            age="0"
            ;;
          irix|nonstopux)
            age="0"
            ;;
          irix|nonstopux)

-           current=`expr $number_major + $number_minor`
+           current=`expr $number_major + $number_minor - 1`

            age="$number_minor"
            revision="$number_minor"
            age="$number_minor"
            revision="$number_minor"

-           lt_irix_increment=no
+           ;;
+         *)
+           $echo "$modename: unknown library version type \`$version_type'" 1>&2
+           $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+           exit $EXIT_FAILURE

            ;;
          esac
          ;;
            ;;
          esac
          ;;


@@ -3667,8 +3618,7 @@ EOF
          versuffix="$major.$age.$revision"
          # Darwin ld doesn't like 0 for these options...
          minor_current=`expr $current + 1`
          versuffix="$major.$age.$revision"
          # Darwin ld doesn't like 0 for these options...
          minor_current=`expr $current + 1`

-         xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-         verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+         verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"

          ;;
 
        freebsd-aout)
          ;;
 
        freebsd-aout)


@@ -3682,11 +3632,8 @@ EOF
          ;;
 
        irix | nonstopux)
          ;;
 
        irix | nonstopux)

-         if test "X$lt_irix_increment" = "Xno"; then
-           major=`expr $current - $age`
-         else
-           major=`expr $current - $age + 1`
-         fi
+         major=`expr $current - $age + 1`
+

          case $version_type in
            nonstopux) verstring_prefix=nonstopux ;;
            *)         verstring_prefix=sgi ;;
          case $version_type in
            nonstopux) verstring_prefix=nonstopux ;;
            *)         verstring_prefix=sgi ;;


@@ -3823,11 +3770,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
       fi
 
       # 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
        # If the user specified any rpath flags, then add them.
 
       if test -n "$xrpath"; then
        # If the user specified any rpath flags, then add them.


@@ -3928,12 +3875,13 @@ EOF
          int main() { return 0; }
 EOF
          $rm conftest
          int main() { return 0; }
 EOF
          $rm conftest

-         if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+         $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+         if test "$?" -eq 0 ; 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.
            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" != "0"; then
+              if test "$name" != "" && test "$name" -ne "0"; then

                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
                  case " $predeps $postdeps " in
                  *" $i "*)
                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
                  case " $predeps $postdeps " in
                  *" $i "*)


@@ -3972,7 +3920,9 @@ EOF
              # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
                $rm conftest
              # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
                $rm conftest

-               if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+               $LTCC $LTCFLAGS -o conftest conftest.c $i
+               # Did it work?
+               if test "$?" -eq 0 ; then

                  ldd_output=`ldd conftest`
                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
                    case " $predeps $postdeps " in
                  ldd_output=`ldd conftest`
                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
                    case " $predeps $postdeps " in


@@ -4004,7 +3954,7 @@ EOF
                  droppeddeps=yes
                  $echo
                  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
                  droppeddeps=yes
                  $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."
                fi
                  $echo "*** library that it depends on before this library will be fully"
                  $echo "*** functional.  Installing it before continuing would be even better."
                fi


@@ -4290,10 +4240,7 @@ EOF
             test -n "$hardcode_libdirs"; then
            libdir="$hardcode_libdirs"
            if test -n "$hardcode_libdir_flag_spec_ld"; then
             test -n "$hardcode_libdirs"; then
            libdir="$hardcode_libdirs"
            if test -n "$hardcode_libdir_flag_spec_ld"; then

-             case $archive_cmds in
-             *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-             *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-             esac
+             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"

            else
              eval dep_rpath=\"$hardcode_libdir_flag_spec\"
            fi
            else
              eval dep_rpath=\"$hardcode_libdir_flag_spec\"
            fi


@@ -4652,14 +4599,12 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of

-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
+      # -Wl from whole_archive_flag_spec

       wl=
 
       if test -n "$convenience"; then
        if test -n "$whole_archive_flag_spec"; then
       wl=
 
       if test -n "$convenience"; then
        if test -n "$whole_archive_flag_spec"; then

-         eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-         reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+         eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"

        else
          gentop="$output_objdir/${obj}x"
          generated="$generated $gentop"
        else
          gentop="$output_objdir/${obj}x"
          generated="$generated $gentop"


@@ -5107,16 +5052,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
           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`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`

             else
             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`
+              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}%"`

              fi
             ;;
           * )
              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`
+            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}%"`

             ;;
           esac
          ;;
             ;;
           esac
          ;;


@@ -5131,13 +5076,13 @@ static const void *lt_preloaded_setup() {
        # really was required.
 
        # Nullify the symbol file.
        # really was required.
 
        # Nullify the symbol file.

-       compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-       finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+       compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+       finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`

       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
        # Replace the output file specification.
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
        # Replace the output file specification.

-       compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+       compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`

        link_command="$compile_command$compile_rpath"
 
        # We have no uninstalled library dependencies, so finalize right now.
        link_command="$compile_command$compile_rpath"
 
        # We have no uninstalled library dependencies, so finalize right now.


@@ -5224,7 +5169,7 @@ static const void *lt_preloaded_setup() {
        if test "$fast_install" != no; then
          link_command="$finalize_var$compile_command$finalize_rpath"
          if test "$fast_install" = yes; then
        if test "$fast_install" != no; then
          link_command="$finalize_var$compile_command$finalize_rpath"
          if test "$fast_install" = yes; then

-           relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+           relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`

          else
            # fast_install is set to needless
            relink_command=
          else
            # fast_install is set to needless
            relink_command=


@@ -5261,7 +5206,7 @@ static const void *lt_preloaded_setup() {
          fi
        done
        relink_command="(cd `pwd`; $relink_command)"
          fi
        done
        relink_command="(cd `pwd`; $relink_command)"

-       relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`

       fi
 
       # Quote $echo for shipping.
       fi
 
       # Quote $echo for shipping.


@@ -5668,20 +5613,6 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 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
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH


@@ -5808,11 +5739,6 @@ else
        $echo >> $output "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
        $echo >> $output "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.

-
-      # Make sure env LD_LIBRARY_PATH does not mess us up
-      if test -n \"\${LD_LIBRARY_PATH+set}\"; then
-        export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
-      fi

 "
        case $host in
        # Backslashes separate directories on plain windows
 "
        case $host in
        # Backslashes separate directories on plain windows


@@ -5829,7 +5755,7 @@ else
          ;;
        esac
        $echo >> $output "\
          ;;
        esac
        $echo >> $output "\

-      \$echo \"\$0: cannot exec \$program \$*\"
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"

       exit $EXIT_FAILURE
     fi
   else
       exit $EXIT_FAILURE
     fi
   else


@@ -6015,7 +5941,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       done
       # 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" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`

       if test "$hardcode_automatic" = yes ; then
        relink_command=
       fi
       if test "$hardcode_automatic" = yes ; then
        relink_command=
       fi


@@ -6040,53 +5966,9 @@ fi\
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  exit $EXIT_FAILURE
                fi
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  exit $EXIT_FAILURE
                fi

-               if test "X$EGREP" = X ; then
-                       EGREP=egrep
-               fi
-               # We do not want portage's install root ($D) present.  Check only for
-               # this if the .la is being installed.
-               if test "$installed" = yes && test "$D"; then
-                 eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
-               else
-                 mynewdependency_lib="$libdir/$name"
-               fi
-               # Do not add duplicates
-               if test "$mynewdependency_lib"; then
-                 my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-                 if test -z "$my_little_ninja_foo_1"; then
-                   newdependency_libs="$newdependency_libs $mynewdependency_lib"
-                 fi
-               fi
-               ;;
-                 *)
-               if test "$installed" = yes; then
-                 # Rather use S=WORKDIR if our version of portage supports it.
-                 # This is because some ebuild (gcc) do not use $S as buildroot.
-                 if test "$PWORKDIR"; then
-                   S="$PWORKDIR"
-                 fi
-                 # We do not want portage's build root ($S) present.
-                 my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-                 # We do not want portage's install root ($D) present.
-                 my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
-                 if test -n "$my_little_ninja_foo_2" && test "$S"; then
-                   mynewdependency_lib=""
-                 elif test -n "$my_little_ninja_foo_3" && test "$D"; then
-                   eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
-                 else
-                   mynewdependency_lib="$deplib"
-                 fi
-               else
-                 mynewdependency_lib="$deplib"
-               fi
-               # Do not add duplicates
-               if test "$mynewdependency_lib"; then
-                 my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-                 if test -z "$my_little_ninja_foo_4"; then
-                       newdependency_libs="$newdependency_libs $mynewdependency_lib"
-                 fi
-               fi
+               newdependency_libs="$newdependency_libs $libdir/$name"

                ;;
                ;;

+             *) newdependency_libs="$newdependency_libs $deplib" ;;

              esac
            done
            dependency_libs="$newdependency_libs"
              esac
            done
            dependency_libs="$newdependency_libs"


@@ -6138,10 +6020,6 @@ fi\
          case $host,$output,$installed,$module,$dlname in
            *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
          esac
          case $host,$output,$installed,$module,$dlname in
            *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
          esac

-         # Do not add duplicates
-         if test "$installed" = yes && test "$D"; then
-           install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
-         fi

          $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
          $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP


@@ -6408,9 +6286,9 @@ relink_command=\"$relink_command\""
 
          if test -n "$inst_prefix_dir"; then
            # Stick the inst_prefix_dir data into the link command.
 
          if test -n "$inst_prefix_dir"; then
            # Stick the inst_prefix_dir data into the link command.

-           relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

          else
          else

-           relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`

          fi
 
          $echo "$modename: warning: relinking \`$file'" 1>&2
          fi
 
          $echo "$modename: warning: relinking \`$file'" 1>&2


@@ -6619,7 +6497,7 @@ relink_command=\"$relink_command\""
              file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
              outputname="$tmpdir/$file"
              # Replace the output file specification.
              file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
              outputname="$tmpdir/$file"
              # Replace the output file specification.

-             relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+             relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`

 
              $show "$relink_command"
              if $run eval "$relink_command"; then :
 
              $show "$relink_command"
              if $run eval "$relink_command"; then :


@@ -6830,10 +6708,8 @@ relink_command=\"$relink_command\""
        if test -f "$dir/$objdir/$dlname"; then
          dir="$dir/$objdir"
        else
        if test -f "$dir/$objdir/$dlname"; then
          dir="$dir/$objdir"
        else

-         if test ! -f "$dir/$dlname"; then
-           $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-           exit $EXIT_FAILURE
-         fi
+         $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+         exit $EXIT_FAILURE

        fi
        ;;
 
        fi
        ;;
 


@@ -6897,12 +6773,12 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
       fi
 
       # Restore saved environment variables

-      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
+      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

 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"


@@ -7259,9 +7135,9 @@ The following components of LINK-COMMAND are treated specially:
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -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
   -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
   -module           build a library that can dlopened
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened


@@ -7275,11 +7151,9 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
   -release RELEASE  specify package release information
   -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 uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of libtool libraries

   -version-info CURRENT[:REVISION[:AGE]]
   -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.
 
 
 All other options (arguments beginning with \`-') are ignored.
 


@@ -7349,7 +7223,7 @@ disable_libs=static
 # End:
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
 # End:
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 

-# Libtool was configured on host laserbeak:
+# Libtool was configured on host blaise:

 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"


@@ -7402,7 +7276,7 @@ with_gcc=yes
 EGREP="/bin/grep -E"
 
 # The linker used to build libraries.
 EGREP="/bin/grep -E"
 
 # The linker used to build libraries.

-LD="/usr/i686-pc-linux-gnu/bin/ld"
+LD="/usr/bin/ld"

 
 # Whether we need hard or soft links.
 LN_S="ln -s"
 
 # Whether we need hard or soft links.
 LN_S="ln -s"


@@ -7452,7 +7326,7 @@ pic_flag=" -fPIC -DPIC"
 pic_mode=default
 
 # What is the maximum length of a command?
 pic_mode=default
 
 # What is the maximum length of a command?

-max_cmd_len=98304
+max_cmd_len=32768

 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"


@@ -7505,7 +7379,7 @@ soname_spec="\${libname}\${release}\${shared_ext}\$major"
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"

-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"

 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 


@@ -7531,11 +7405,11 @@ striplib="strip --strip-unneeded"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
 
 # Dependencies to place before the objects being linked to create a
 # shared library.

-predep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../crti.o /usr/lib/gcc/i686-pc-linux-gnu/4.1.2/crtbeginS.o"
+predep_objects="/usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../lib/crti.o /usr/lib/gcc/i486-linux-gnu/4.1.3/crtbeginS.o"

 
 # Dependencies to place after the objects being linked to create a
 # shared library.
 
 # Dependencies to place after the objects being linked to create a
 # shared library.

-postdep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/crtendS.o /usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../crtn.o"
+postdep_objects="/usr/lib/gcc/i486-linux-gnu/4.1.3/crtendS.o /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../lib/crtn.o"

 
 # Dependencies to place before the objects being linked to create a
 # shared library.
 
 # Dependencies to place before the objects being linked to create a
 # shared library.


@@ -7547,7 +7421,7 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.
 
 # The library search path used internally by the compiler when linking
 # a shared library.

-compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../../i686-pc-linux-gnu/lib -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/i486-linux-gnu/4.1.3 -L/usr/lib/gcc/i486-linux-gnu/4.1.3 -L/usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../lib -L/lib/../lib -L/usr/lib/../lib"

 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"


@@ -7624,13 +7498,13 @@ hardcode_automatic=no
 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.
 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.

-link_all_deplibs=unknown
+link_all_deplibs=no

 
 # Compile-time system search path for libraries
 
 # Compile-time system search path for libraries

-sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/i686-pc-linux-gnu/lib /usr/lib /lib"
+sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../ /lib/i486-linux-gnu/4.1.3/ /lib/ /usr/lib/i486-linux-gnu/4.1.3/ /usr/lib/"

 
 # Run-time system search path for libraries
 
 # Run-time system search path for libraries

-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.1 /usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/lib/gcc/i686-pc-linux-gnu/4.2.0 /usr/lib/nspr /usr/lib/nss /usr/lib/lesstif-2.1 /usr/lib/openmotif-2.2 /usr/lib/qt4 /usr/kde/3.5/lib /usr/qt/3/lib /usr/games/lib /usr/lib/fltk-1.1 /usr/lib/libstdc++-v3/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib "

 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""


@@ -7654,7 +7528,7 @@ include_expsyms=""
 
 # ### BEGIN LIBTOOL TAG CONFIG: GCJ
 
 
 # ### BEGIN LIBTOOL TAG CONFIG: GCJ
 

-# Libtool was configured on host laserbeak:
+# Libtool was configured on host blaise:

 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"


@@ -7757,7 +7631,7 @@ pic_flag=" -fPIC"
 pic_mode=default
 
 # What is the maximum length of a command?
 pic_mode=default
 
 # What is the maximum length of a command?

-max_cmd_len=98304
+max_cmd_len=32768

 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"


@@ -7810,7 +7684,7 @@ soname_spec="\${libname}\${release}\${shared_ext}\$major"
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"

-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"

 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 


@@ -7932,13 +7806,13 @@ hardcode_automatic=no
 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.
 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.

-link_all_deplibs=unknown
+link_all_deplibs=no

 
 # Compile-time system search path for libraries
 
 # Compile-time system search path for libraries

-sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/i686-pc-linux-gnu/lib /usr/lib /lib"
+sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.2.1/ /usr/lib/gcc/i486-linux-gnu/4.2.1/ /usr/lib/gcc/i486-linux-gnu/4.2.1/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.2.1/ /usr/lib/gcc/i486-linux-gnu/4.2.1/../../../../i486-linux-gnu/lib/../lib/ /usr/lib/gcc/i486-linux-gnu/4.2.1/../../../i486-linux-gnu/4.2.1/ /usr/lib/gcc/i486-linux-gnu/4.2.1/../../../../lib/ /lib/i486-linux-gnu/4.2.1/ /lib/../lib/ /usr/lib/i486-linux-gnu/4.2.1/ /usr/lib/../lib/ /usr/lib/gcc/i486-linux-gnu/4.2.1/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.2.1/../../../ /lib/ /usr/lib/"

 
 # Run-time system search path for libraries
 
 # Run-time system search path for libraries

-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.1 /usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/lib/gcc/i686-pc-linux-gnu/4.2.0 /usr/lib/nspr /usr/lib/nss /usr/lib/lesstif-2.1 /usr/lib/openmotif-2.2 /usr/lib/qt4 /usr/kde/3.5/lib /usr/qt/3/lib /usr/games/lib /usr/lib/fltk-1.1 /usr/lib/libstdc++-v3/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib "

 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""