/[pcre]/code/trunk/ltmain.sh

Diff of /code/trunk/ltmain.sh

Parent Directory | Revision Log | View Patch Patch

-revision 74 by nigel,
Sat Feb 24 21:40:03 2007 UTC
+revision 75 by nigel,
Sat Feb 24 21:40:37 2007 UTC
 Line 1
  # 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
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
  # Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
  #
 Line 24
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
+ basename="s,^.*/,,g"
+ # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+ # is ksh but when the shell is invoked as "sh" and the current value of
+ # the _XPG environment variable is not equal to 1 (one), the special
+ # positional parameter $0, within a function call, is the name of the
+ # function.
+ progpath="$0"
+ # Modification by PH (26-Aug-2004, originally 18-Feb-2003) to ensure that
+ # ${SED} is always set (it is not set on my system).
+ case "X${SED}" in
+   X) SED=sed ;;
+ esac
+ # The name of this program:
+ progname=`echo "$progpath" | $SED $basename`
+ modename="$progname"
+ # Global variables:
+ EXIT_SUCCESS=0
+ EXIT_FAILURE=1
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+ VERSION=1.5.8
+ TIMESTAMP=" (1.1220.2.117 2004/08/04 14:12:05)"
+ # 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
+ fi
  # Check that we have a working $echo.
  if test "X$1" = X--no-reexec; then
    # Discard the --no-reexec flag, and continue.
-Line 36 
 elif test "X`($echo '\t') 2>/dev/null`"
+Line 71 
 elif test "X`($echo '\t') 2>/dev/null`"
    :
  else
    # Restart under the correct shell, and then maybe $echo will work.
-   exec $SHELL "$0" --no-reexec ${1+"$@"}
+   exec $SHELL "$progpath" --no-reexec ${1+"$@"}
  fi
  if test "X$1" = X--fallback-echo; then
-Line 45 
 if test "X$1" = X--fallback-echo; then
+Line 80 
 if test "X$1" = X--fallback-echo; then
    cat <<EOF
  $*
  EOF
-   exit 0
+   exit $EXIT_SUCCESS
  fi
- # Modification by PH (18-Feb-2003) to ensure that ${SED} is always set
- # (it is not set on my system).
- case "X${SED}" in
-   X) SED=sed ;;
- esac
- # The name of this program.
- progname=`$echo "$0" | ${SED} 's%^.*/%%'`
- modename="$progname"
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
- VERSION=1.4.3
- TIMESTAMP=" (1.922.2.110 2002/10/23 01:39:54)"
  default_mode=
  help="Try \`$progname --help' for more information."
  magic="%%%MAGIC variable%%%"
-Line 76 
 rm="rm -f"
+Line 94 
 rm="rm -f"
  # metacharacters that are still active within double-quoted strings.
  Xsed="${SED}"' -e 1s/^X//'
  sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
  # test EBCDIC or ASCII
- case `echo A|od -x` in
+ case `echo A|tr A '\301'` in
-  *[Cc]1*) # EBCDIC based system
+  A) # EBCDIC based system
    SP2NL="tr '\100' '\n'"
    NL2SP="tr '\r\n' '\100\100'"
    ;;
   *) # Assume ASCII based system
    SP2NL="tr '\040' '\012'"
    NL2SP="tr '\015\012' '\040\040'"
    ;;
  esac
  # NLS nuisances.
  # Only set LANG and LC_ALL to C if already set.
-Line 101 
 if test "${LANG+set}" = set; then
+Line 119 
 if test "${LANG+set}" = set; then
  fi
  # Make sure IFS has a sensible default
- : ${IFS="       "}
+ : ${IFS="
+ "}
  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-   echo "$modename: not configured to build any kind of library" 1>&2
+   $echo "$modename: not configured to build any kind of library" 1>&2
-   echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-   exit 1
+   exit $EXIT_FAILURE
  fi
  # Global variables.
-Line 121 
 execute_dlfiles=
+Line 140 
 execute_dlfiles=
  lo2o="s/\\.lo\$/.${objext}/"
  o2lo="s/\\.${objext}\$/.lo/"
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+ # func_win32_libid arg
+ # return the library type of file 'arg'
+ #
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+ func_win32_libid () {
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+   *ar\ archive\ import\ library*) # definitely import
+     win32_libid_type="x86 archive import"
+     ;;
+   *ar\ archive*) # could be an import, or static
+     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 /{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
+     fi
+     ;;
+   *DLL*)
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+     case $win32_fileres in
+     *MS\ Windows\ PE\ Intel*)
+       win32_libid_type="x86 DLL"
+       ;;
+     esac
+     ;;
+   esac
+   $echo $win32_libid_type
+ }
+ # func_infer_tag arg
+ # Infer tagged configuration to use if any are available and
+ # if one wasn't chosen via the "--tag" command line option.
+ # Only attempt this if the compiler in the base compile
+ # command doesn't match the default compiler.
+ # arg is usually of the form 'gcc ...'
+ func_infer_tag () {
+     if test -n "$available_tags" && test -z "$tagname"; then
+       CC_quoted=
+       for arg in $CC; do
+         case $arg in
+           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+           arg="\"$arg\""
+           ;;
+         esac
+         CC_quoted="$CC_quoted $arg"
+       done
+       case $@ in
+       # Blanks in the command may have been stripped by the calling shell,
+       # but not from the CC environment variable when configure was run.
+       " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+       # Blanks at the start of $base_compile will cause this to fail
+       # if we don't check for them as well.
+       *)
+         for z in $available_tags; do
+           if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+             # Evaluate the configuration.
+             eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+             CC_quoted=
+             for arg in $CC; do
+             # Double-quote args containing other shell metacharacters.
+             case $arg in
+               *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
+               arg="\"$arg\""
+               ;;
+             esac
+             CC_quoted="$CC_quoted $arg"
+           done
+             case "$@ " in
+               " $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.
+               # Assume this is the tagged configuration we want.
+               tagname=$z
+               break
+               ;;
+             esac
+           fi
+         done
+         # If $tagname still isn't set, then no tagged configuration
+         # was found and let the user know that the "--tag" command
+         # line option must be used.
+         if test -z "$tagname"; then
+           $echo "$modename: unable to infer tagged configuration"
+           $echo "$modename: specify a tag with \`--tag'" 1>&2
+           exit $EXIT_FAILURE
+ #        else
+ #          $echo "$modename: using $tagname tagged configuration"
+         fi
+         ;;
+       esac
+     fi
+ }
+ # func_extract_archives gentop oldlib ...
+ func_extract_archives () {
+     my_gentop="$1"; shift
+     my_oldlibs=${1+"$@"}
+     my_oldobjs=""
+     my_xlib=""
+     my_xabs=""
+     my_xdir=""
+     my_status=""
+     $show "${rm}r $my_gentop"
+     $run ${rm}r "$my_gentop"
+     $show "$mkdir $my_gentop"
+     $run $mkdir "$my_gentop"
+     my_status=$?
+     if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+       exit $my_status
+     fi
+     for my_xlib in $my_oldlibs; do
+       # Extract the objects.
+       case $my_xlib in
+         [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+         *) my_xabs=`pwd`"/$my_xlib" ;;
+       esac
+       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+       my_xdir="$my_gentop/$my_xlib"
+       $show "${rm}r $my_xdir"
+       $run ${rm}r "$my_xdir"
+       $show "$mkdir $my_xdir"
+       $run $mkdir "$my_xdir"
+       status=$?
+       if test "$status" -ne 0 && test ! -d "$my_xdir"; then
+         exit $status
+       fi
+       case $host in
+       *-darwin*)
+         $show "Extracting $my_xabs"
+         # Do not bother doing anything if just a dry run
+         if test -z "$run"; then
+           darwin_orig_dir=`pwd`
+           cd $my_xdir || exit $?
+           darwin_archive=$my_xabs
+           darwin_curdir=`pwd`
+           darwin_base_archive=`basename $darwin_archive`
+           darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+           if test -n "$darwin_arches"; then
+             darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+             darwin_arch=
+             $show "$darwin_base_archive has multiple architectures $darwin_arches"
+             for darwin_arch in  $darwin_arches ; do
+               mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+               lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+               # Remove the table of contents from the thin files.
+               $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true
+               $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true
+               cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+               $AR -xo "${darwin_base_archive}"
+               rm "${darwin_base_archive}"
+               cd "$darwin_curdir"
+             done # $darwin_arches
+       ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+             darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP`
+             darwin_file=
+             darwin_files=
+             for darwin_file in $darwin_filelist; do
+               darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+               lipo -create -output "$darwin_file" $darwin_files
+             done # $darwin_filelist
+             rm -rf unfat-$$
+             cd "$darwin_orig_dir"
+           else
+             cd $darwin_orig_dir
+             (cd $my_xdir && $AR x $my_xabs) || exit $?
+           fi # $darwin_arches
+         fi # $run
+       ;;
+       *)
+         # We will extract separately just the conflicting names and we will
+         # no longer touch any unique names. It is faster to leave these
+         # extract automatically by $AR in one run.
+         $show "(cd $my_xdir && $AR x $my_xabs)"
+         $run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $?
+         if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then
+           :
+         else
+           $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+           $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+           $AR t "$my_xabs" | sort | uniq -cd | while read -r count name
+           do
+             i=1
+             while test "$i" -le "$count"
+             do
+               # Put our $i before any first dot (extension)
+               # Never overwrite any file
+               name_to="$name"
+               while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to"
+               do
+                 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+               done
+               $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')"
+               $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $?
+               i=`expr $i + 1`
+             done
+           done
+         fi
+         ;;
+       esac
+       my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+     done
+     func_extract_archives_result="$my_oldobjs"
+ }
+ # End of Shell function definitions
+ #####################################
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
  # Parse our command line options once, thoroughly.
- while test $# -gt 0
+ while test "$#" -gt 0
  do
    arg="$1"
    shift
-Line 138 
 do
+Line 386 
 do
      execute_dlfiles)
        execute_dlfiles="$execute_dlfiles $arg"
        ;;
+     tag)
+       tagname="$arg"
+       preserve_args="${preserve_args}=$arg"
+       # Check whether tagname contains only valid characters
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+         $echo "$progname: invalid tag name: $tagname" 1>&2
+         exit $EXIT_FAILURE
+         ;;
+       esac
+       case $tagname in
+       CC)
+         # Don't test for the "default" C tag, as we know, it's there, but
+         # not specially marked.
+         ;;
+       *)
+         if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+           taglist="$taglist $tagname"
+           # Evaluate the configuration.
+           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+         else
+           $echo "$progname: ignoring unknown tag $tagname" 1>&2
+         fi
+         ;;
+       esac
+       ;;
      *)
        eval "$prev=\$arg"
        ;;
-Line 155 
 do
+Line 431 
 do
      ;;
    --version)
-     echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-     exit 0
+     $echo
+     $echo "Copyright (C) 2003  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_SUCCESS
      ;;
    --config)
-     ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+     ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-     exit 0
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+     done
+     exit $EXIT_SUCCESS
      ;;
    --debug)
-     echo "$progname: enabling shell trace mode"
+     $echo "$progname: enabling shell trace mode"
      set -x
+     preserve_args="$preserve_args $arg"
      ;;
    --dry-run | -n)
-Line 174 
 do
+Line 459 
 do
      ;;
    --features)
-     echo "host: $host"
+     $echo "host: $host"
      if test "$build_libtool_libs" = yes; then
-       echo "enable shared libraries"
+       $echo "enable shared libraries"
      else
-       echo "disable shared libraries"
+       $echo "disable shared libraries"
      fi
      if test "$build_old_libs" = yes; then
-       echo "enable static libraries"
+       $echo "enable static libraries"
      else
-       echo "disable static libraries"
+       $echo "disable static libraries"
      fi
-     exit 0
+     exit $EXIT_SUCCESS
      ;;
    --finish) mode="finish" ;;
-Line 197 
 do
+Line 482 
 do
    --quiet | --silent)
      show=:
+     preserve_args="$preserve_args $arg"
+     ;;
+   --tag) prevopt="--tag" prev=tag ;;
+   --tag=*)
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
+     preserve_args="$preserve_args --tag"
      ;;
    -dlopen)
-Line 207 
 do
+Line 501 
 do
    -*)
      $echo "$modename: unrecognized option \`$arg'" 1>&2
      $echo "$help" 1>&2
-     exit 1
+     exit $EXIT_FAILURE
      ;;
    *)
-Line 220 
 done
+Line 514 
 done
  if test -n "$prevopt"; then
    $echo "$modename: option \`$prevopt' requires an argument" 1>&2
    $echo "$help" 1>&2
-   exit 1
+   exit $EXIT_FAILURE
  fi
  # If this variable is set in any of the actions, the command in it
-Line 232 
 if test -z "$show_help"; then
+Line 526 
 if test -z "$show_help"; then
    # Infer the operation mode.
    if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+     $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
      case $nonopt in
-     *cc | *++ | gcc* | *-gcc* | xlc*)
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
        mode=link
        for arg
        do
-Line 274 
 if test -z "$show_help"; then
+Line 570 
 if test -z "$show_help"; then
    if test -n "$execute_dlfiles" && test "$mode" != execute; then
      $echo "$modename: unrecognized option \`-dlopen'" 1>&2
      $echo "$help" 1>&2
-     exit 1
+     exit $EXIT_FAILURE
    fi
    # Change the help message to a mode-specific one.
-Line 288 
 if test -z "$show_help"; then
+Line 584 
 if test -z "$show_help"; then
      modename="$modename: compile"
      # Get the compilation command and the source file.
      base_compile=
-     prev=
+     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-     lastarg=
+     suppress_opt=yes
-     srcfile="$nonopt"
      suppress_output=
+     arg_mode=normal
+     libobj=
+     later=
-     user_target=no
      for arg
      do
-       case $prev in
+       case "$arg_mode" in
-       "") ;;
+       arg  )
-       xcompiler)
+         # do not "continue".  Instead, add this to base_compile
-         # Aesthetically quote the previous argument.
+         lastarg="$arg"
-         prev=
+         arg_mode=normal
-         lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-         case $arg in
-         # Double-quote args containing other shell metacharacters.
-         # Many Bourne shells cannot handle close brackets correctly
-         # in scan sets, so we specify it separately.
-         *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
-           arg="\"$arg\""
-           ;;
-         esac
-         # Add the previous argument to base_compile.
-         if test -z "$base_compile"; then
-           base_compile="$lastarg"
-         else
-           base_compile="$base_compile $lastarg"
-         fi
-         continue
          ;;
-       esac
-       # Accept any command-line options.
+       target )
-       case $arg in
+         libobj="$arg"
-       -o)
+         arg_mode=normal
-         if test "$user_target" != "no"; then
-           $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-           exit 1
-         fi
-         user_target=next
-         ;;
-       -static)
-         build_old_libs=yes
          continue
          ;;
-       -prefer-pic)
+       normal )
-         pic_mode=yes
+         # Accept any command-line options.
-         continue
+         case $arg in
-         ;;
+         -o)
+           if test -n "$libobj" ; then
+             $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+             exit $EXIT_FAILURE
+           fi
+           arg_mode=target
+           continue
+           ;;
-       -prefer-non-pic)
+         -static | -prefer-pic | -prefer-non-pic)
-         pic_mode=no
+           later="$later $arg"
-         continue
+           continue
-         ;;
+           ;;
-       -Xcompiler)
+         -no-suppress)
-         prev=xcompiler
+           suppress_opt=no
-         continue
+           continue
-         ;;
+           ;;
-       -Wc,*)
+         -Xcompiler)
-         args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+           arg_mode=arg  #  the next one goes into the "base_compile" arg list
-         lastarg=
+           continue      #  The current "srcfile" will either be retained or
-         save_ifs="$IFS"; IFS=','
+           ;;            #  replaced later.  I would guess that would be a bug.
-         for arg in $args; do
-           IFS="$save_ifs"
+         -Wc,*)
+           args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+           lastarg=
+           save_ifs="$IFS"; IFS=','
+           for arg in $args; do
+             IFS="$save_ifs"
-           # Double-quote args containing other shell metacharacters.
+             # Double-quote args containing other shell metacharacters.
-           # Many Bourne shells cannot handle close brackets correctly
+             # Many Bourne shells cannot handle close brackets correctly
-           # in scan sets, so we specify it separately.
+             # in scan sets, so we specify it separately.
-           case $arg in
+             case $arg in
-             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
+               *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
-             arg="\"$arg\""
+               arg="\"$arg\""
-             ;;
+               ;;
-           esac
+             esac
-           lastarg="$lastarg $arg"
+             lastarg="$lastarg $arg"
-         done
+           done
-         IFS="$save_ifs"
+           IFS="$save_ifs"
-         lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+           lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-         # Add the arguments to base_compile.
+           # Add the arguments to base_compile.
-         if test -z "$base_compile"; then
-           base_compile="$lastarg"
-         else
            base_compile="$base_compile $lastarg"
-         fi
+           continue
-         continue
+           ;;
-         ;;
-       esac
-       case $user_target in
+         * )
-       next)
+           # Accept the current argument as the source file.
-         # The next one is the -o target name
+           # The previous "srcfile" becomes the current argument.
-         user_target=yes
+           #
-         continue
+           lastarg="$srcfile"
-         ;;
+           srcfile="$arg"
-       yes)
+           ;;
-         # We got the output file
+         esac  #  case $arg
-         user_target=set
-         libobj="$arg"
-         continue
          ;;
-       esac
+       esac    #  case $arg_mode
-       # Accept the current argument as the source file.
-       lastarg="$srcfile"
-       srcfile="$arg"
        # Aesthetically quote the previous argument.
-       # Backslashify any backslashes, double quotes, and dollar signs.
-       # These are the only characters that are still specially
-       # interpreted inside of double-quoted scrings.
        lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+       case $lastarg in
        # Double-quote args containing other shell metacharacters.
        # Many Bourne shells cannot handle close brackets correctly
        # in scan sets, so we specify it separately.
-       case $lastarg in
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
          lastarg="\"$lastarg\""
          ;;
        esac
-       # Add the previous argument to base_compile.
+       base_compile="$base_compile $lastarg"
-       if test -z "$base_compile"; then
+     done # for arg
-         base_compile="$lastarg"
-       else
-         base_compile="$base_compile $lastarg"
-       fi
-     done
-     case $user_target in
+     case $arg_mode in
-     set)
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+       exit $EXIT_FAILURE
        ;;
-     no)
+     target)
-       # Get the name of the library object.
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
-       libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+       exit $EXIT_FAILURE
        ;;
      *)
-       $echo "$modename: you must specify a target with \`-o'" 1>&2
+       # Get the name of the library object.
-       exit 1
+       [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
        ;;
      esac
      # Recognize several different file suffixes.
      # If the user specifies -o file.o, it is replaced with file.lo
-     xform='[cCFSfmso]'
+     xform='[cCFSifmso]'
      case $libobj in
      *.ada) xform=ada ;;
      *.adb) xform=adb ;;
-Line 447 
 if test -z "$show_help"; then
+Line 709 
 if test -z "$show_help"; then
      *.asm) xform=asm ;;
      *.c++) xform=c++ ;;
      *.cc) xform=cc ;;
+     *.ii) xform=ii ;;
+     *.class) xform=class ;;
      *.cpp) xform=cpp ;;
      *.cxx) xform=cxx ;;
      *.f90) xform=f90 ;;
      *.for) xform=for ;;
+     *.java) xform=java ;;
      esac
      libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-Line 459 
 if test -z "$show_help"; then
+Line 724 
 if test -z "$show_help"; then
      *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
      *)
        $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-       exit 1
+       exit $EXIT_FAILURE
        ;;
      esac
+     func_infer_tag $base_compile
+     for arg in $later; do
+       case $arg in
+       -static)
+         build_old_libs=yes
+         continue
+         ;;
+       -prefer-pic)
+         pic_mode=yes
+         continue
+         ;;
+       -prefer-non-pic)
+         pic_mode=no
+         continue
+         ;;
+       esac
+     done
+     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$xdir" = "X$obj"; then
+       xdir=
+     else
+       xdir=$xdir/
+     fi
+     lobj=${xdir}$objdir/$objname
      if test -z "$base_compile"; then
        $echo "$modename: you must specify a compilation command" 1>&2
        $echo "$help" 1>&2
-       exit 1
+       exit $EXIT_FAILURE
      fi
      # Delete any leftover library objects.
      if test "$build_old_libs" = yes; then
-       removelist="$obj $libobj"
+       removelist="$obj $lobj $libobj ${libobj}T"
      else
-       removelist="$libobj"
+       removelist="$lobj $libobj ${libobj}T"
      fi
      $run $rm $removelist
-     trap "$run $rm $removelist; exit 1" 1 2 15
+     trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
      # On Cygwin there's no "real" PIC flag so we must build both object types
      case $host_os in
-Line 496 
 if test -z "$show_help"; then
+Line 791 
 if test -z "$show_help"; then
        output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
        lockfile="$output_obj.lock"
        removelist="$removelist $output_obj $lockfile"
-       trap "$run $rm $removelist; exit 1" 1 2 15
+       trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
      else
+       output_obj=
        need_locks=no
        lockfile=
      fi
-Line 505 
 if test -z "$show_help"; then
+Line 801 
 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
-       until $run ln "$0" "$lockfile" 2>/dev/null; do
+       until $run ln "$progpath" "$lockfile" 2>/dev/null; do
          $show "Waiting for $lockfile to be removed"
          sleep 2
        done
      elif test "$need_locks" = warn; then
        if test -f "$lockfile"; then
-         echo "\
+         $echo "\
  *** ERROR, $lockfile exists and contains:
  `cat $lockfile 2>/dev/null`
-Line 523 
 avoid parallel builds (make -j) in this
+Line 819 
 avoid parallel builds (make -j) in this
  compiler."
          $run $rm $removelist
-         exit 1
+         exit $EXIT_FAILURE
        fi
-       echo $srcfile > "$lockfile"
+       $echo $srcfile > "$lockfile"
      fi
      if test -n "$fix_srcfile_path"; then
        eval srcfile=\"$fix_srcfile_path\"
      fi
+     $run $rm "$libobj" "${libobj}T"
+     # Create a libtool object file (analogous to a ".la" file),
+     # but don't create it if we're doing a dry run.
+     test -z "$run" && cat > ${libobj}T <<EOF
+ # $libobj - a libtool object file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+ # Name of the PIC object.
+ EOF
      # Only build a PIC object if we are building libtool libraries.
      if test "$build_libtool_libs" = yes; then
        # Without this assignment, base_compile gets emptied.
        fbsd_hideous_sh_bug=$base_compile
        if test "$pic_mode" != no; then
-         # All platforms use -DPIC, to notify preprocessed assembler code.
+         command="$base_compile $srcfile $pic_flag"
-         command="$base_compile $srcfile $pic_flag -DPIC"
        else
          # Don't build PIC code
          command="$base_compile $srcfile"
        fi
-       if test "$build_old_libs" = yes; then
-         lo_libobj="$libobj"
-         dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-         if test "X$dir" = "X$libobj"; then
-           dir="$objdir"
-         else
-           dir="$dir/$objdir"
-         fi
-         libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-         if test -d "$dir"; then
+       if test ! -d "${xdir}$objdir"; then
-           $show "$rm $libobj"
+         $show "$mkdir ${xdir}$objdir"
-           $run $rm $libobj
+         $run $mkdir ${xdir}$objdir
-         else
+         status=$?
-           $show "$mkdir $dir"
+         if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-           $run $mkdir $dir
+           exit $status
-           status=$?
-           if test $status -ne 0 && test ! -d $dir; then
-             exit $status
-           fi
          fi
        fi
-       if test "$compiler_o_lo" = yes; then
-         output_obj="$libobj"
+       if test -z "$output_obj"; then
-         command="$command -o $output_obj"
+         # Place PIC objects in $objdir
-       elif test "$compiler_c_o" = yes; then
+         command="$command -o $lobj"
-         output_obj="$obj"
-         command="$command -o $output_obj"
        fi
-       $run $rm "$output_obj"
+       $run $rm "$lobj" "$output_obj"
        $show "$command"
        if $run eval "$command"; then :
        else
          test -n "$output_obj" && $run $rm $removelist
-         exit 1
+         exit $EXIT_FAILURE
        fi
        if test "$need_locks" = warn &&
-          test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+          test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-         echo "\
+         $echo "\
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
-Line 599 
 avoid parallel builds (make -j) in this
+Line 894 
 avoid parallel builds (make -j) in this
  compiler."
          $run $rm $removelist
-         exit 1
+         exit $EXIT_FAILURE
        fi
        # Just move the object if needed, then go on to compile the next one
-       if test x"$output_obj" != x"$libobj"; then
+       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-         $show "$mv $output_obj $libobj"
+         $show "$mv $output_obj $lobj"
-         if $run $mv $output_obj $libobj; then :
+         if $run $mv $output_obj $lobj; then :
          else
            error=$?
            $run $rm $removelist
-Line 613 
 compiler."
+Line 908 
 compiler."
          fi
        fi
-       # If we have no pic_flag, then copy the object into place and finish.
+       # Append the name of the PIC object to the libtool object file.
-       if (test -z "$pic_flag" || test "$pic_mode" != default) &&
+       test -z "$run" && cat >> ${libobj}T <<EOF
-          test "$build_old_libs" = yes; then
+ pic_object='$objdir/$objname'
-         # Rename the .lo from within objdir to obj
-         if test -f $obj; then
-           $show $rm $obj
-           $run $rm $obj
-         fi
-         $show "$mv $libobj $obj"
+ EOF
-         if $run $mv $libobj $obj; then :
-         else
-           error=$?
-           $run $rm $removelist
-           exit $error
-         fi
-         xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+       # Allow error messages only from the first compilation.
-         if test "X$xdir" = "X$obj"; then
+       if test "$suppress_opt" = yes; then
-           xdir="."
+         suppress_output=' >/dev/null 2>&1'
-         else
-           xdir="$xdir"
-         fi
-         baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
-         libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-         # Now arrange that obj and lo_libobj become the same file
-         $show "(cd $xdir && $LN_S $baseobj $libobj)"
-         if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
-           # Unlock the critical section if it was locked
-           if test "$need_locks" != no; then
-             $run $rm "$lockfile"
-           fi
-           exit 0
-         else
-           error=$?
-           $run $rm $removelist
-           exit $error
-         fi
        fi
+     else
+       # No PIC object so indicate it doesn't exist in the libtool
+       # object file.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ pic_object=none
-       # Allow error messages only from the first compilation.
+ EOF
-       suppress_output=' >/dev/null 2>&1'
      fi
      # Only build a position-dependent object if we build old libraries.
-Line 663 
 compiler."
+Line 933 
 compiler."
          # Don't build PIC code
          command="$base_compile $srcfile"
        else
-         # All platforms use -DPIC, to notify preprocessed assembler code.
+         command="$base_compile $srcfile $pic_flag"
-         command="$base_compile $srcfile $pic_flag -DPIC"
        fi
        if test "$compiler_c_o" = yes; then
          command="$command -o $obj"
-         output_obj="$obj"
        fi
        # Suppress compiler output if we already did a PIC compilation.
        command="$command$suppress_output"
-       $run $rm "$output_obj"
+       $run $rm "$obj" "$output_obj"
        $show "$command"
        if $run eval "$command"; then :
        else
          $run $rm $removelist
-         exit 1
+         exit $EXIT_FAILURE
        fi
        if test "$need_locks" = warn &&
-          test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+          test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-         echo "\
+         $echo "\
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
-Line 698 
 avoid parallel builds (make -j) in this
+Line 966 
 avoid parallel builds (make -j) in this
  compiler."
          $run $rm $removelist
-         exit 1
+         exit $EXIT_FAILURE
        fi
        # Just move the object if needed
-       if test x"$output_obj" != x"$obj"; then
+       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
          $show "$mv $output_obj $obj"
          if $run $mv $output_obj $obj; then :
          else
-Line 712 
 compiler."
+Line 980 
 compiler."
          fi
        fi
-       # Create an invalid libtool object if no PIC, so that we do not
+       # Append the name of the non-PIC object the libtool object file.
-       # accidentally link it into a program.
+       # Only append if the libtool object file exists.
-       if test "$build_libtool_libs" != yes; then
+       test -z "$run" && cat >> ${libobj}T <<EOF
-         $show "echo timestamp > $libobj"
+ # Name of the non-PIC object.
-         $run eval "echo timestamp > \$libobj" || exit $?
+ non_pic_object='$objname'
-       else
-         # Move the .lo from within objdir
+ EOF
-         $show "$mv $libobj $lo_libobj"
+     else
-         if $run $mv $libobj $lo_libobj; then :
+       # Append the name of the non-PIC object the libtool object file.
-         else
+       # Only append if the libtool object file exists.
-           error=$?
+       test -z "$run" && cat >> ${libobj}T <<EOF
-           $run $rm $removelist
+ # Name of the non-PIC object.
-           exit $error
+ non_pic_object=none
-         fi
-       fi
+ EOF
      fi
+     $run $mv "${libobj}T" "${libobj}"
      # Unlock the critical section if it was locked
      if test "$need_locks" != no; then
        $run $rm "$lockfile"
      fi
-     exit 0
+     exit $EXIT_SUCCESS
      ;;
    # libtool link mode
-Line 745 
 compiler."
+Line 1015 
 compiler."
        # It is impossible to link a dll without this setting, and
        # we shouldn't force the makefile maintainer to figure out
        # which system we are compiling for in order to pass an extra
-       # flag for every libtool invokation.
+       # flag for every libtool invocation.
        # allow_undefined=no
        # FIXME: Unfortunately, there are problems with the above when trying
-Line 760 
 compiler."
+Line 1030 
 compiler."
        ;;
      esac
      libtool_args="$nonopt"
+     base_compile="$nonopt $@"
      compile_command="$nonopt"
      finalize_command="$nonopt"
-Line 775 
 compiler."
+Line 1046 
 compiler."
      linker_flags=
      dllsearchpath=
      lib_search_path=`pwd`
+     inst_prefix_dir=
      avoid_version=no
      dlfiles=
-Line 789 
 compiler."
+Line 1061 
 compiler."
      module=no
      no_install=no
      objs=
+     non_pic_objects=
+     precious_files_regex=
      prefer_static_libs=no
      preload=no
      prev=
-Line 800 
 compiler."
+Line 1074 
 compiler."
      temp_rpath=
      thread_safe=no
      vinfo=
+     vinfo_number=no
+     func_infer_tag $base_compile
      # We need to know -static, to get the right output filenames.
      for arg
-Line 830 
 compiler."
+Line 1107 
 compiler."
      test -n "$old_archive_from_new_cmds" && build_old_libs=yes
      # Go through the arguments, transforming them on the way.
-     while test $# -gt 0; do
+     while test "$#" -gt 0; do
        arg="$1"
        shift
        case $arg in
-Line 895 
 compiler."
+Line 1172 
 compiler."
            export_symbols="$arg"
            if test ! -f "$arg"; then
              $echo "$modename: symbol file \`$arg' does not exist"
-             exit 1
+             exit $EXIT_FAILURE
            fi
            prev=
            continue
-Line 905 
 compiler."
+Line 1182 
 compiler."
            prev=
            continue
            ;;
-         release)
+         inst_prefix)
-           release="-$arg"
+           inst_prefix_dir="$arg"
+           prev=
+           continue
+           ;;
+         precious_regex)
+           precious_files_regex="$arg"
+           prev=
+           continue
+           ;;
+         release)
+           release="-$arg"
+           prev=
+           continue
+           ;;
+         objectlist)
+           if test -f "$arg"; then
+             save_arg=$arg
+             moreargs=
+             for fil in `cat $save_arg`
+             do
+ #             moreargs="$moreargs $fil"
+               arg=$fil
+               # A libtool-controlled object.
+               # Check to see that this really is a libtool object.
+               if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+                 pic_object=
+                 non_pic_object=
+                 # Read the .lo file
+                 # If there is no directory component, then add one.
+                 case $arg in
+                 */* | *\\*) . $arg ;;
+                 *) . ./$arg ;;
+                 esac
+                 if test -z "$pic_object" || \
+                    test -z "$non_pic_object" ||
+                    test "$pic_object" = none && \
+                    test "$non_pic_object" = none; then
+                   $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+                   exit $EXIT_FAILURE
+                 fi
+                 # Extract subdirectory from the argument.
+                 xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+                 if test "X$xdir" = "X$arg"; then
+                   xdir=
+                 else
+                   xdir="$xdir/"
+                 fi
+                 if test "$pic_object" != none; then
+                   # Prepend the subdirectory the object is found in.
+                   pic_object="$xdir$pic_object"
+                   if test "$prev" = dlfiles; then
+                     if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+                       dlfiles="$dlfiles $pic_object"
+                       prev=
+                       continue
+                     else
+                       # If libtool objects are unsupported, then we need to preload.
+                       prev=dlprefiles
+                     fi
+                   fi
+                   # CHECK ME:  I think I busted this.  -Ossama
+                   if test "$prev" = dlprefiles; then
+                     # Preload the old-style object.
+                     dlprefiles="$dlprefiles $pic_object"
+                     prev=
+                   fi
+                   # A PIC object.
+                   libobjs="$libobjs $pic_object"
+                   arg="$pic_object"
+                 fi
+                 # Non-PIC object.
+                 if test "$non_pic_object" != none; then
+                   # Prepend the subdirectory the object is found in.
+                   non_pic_object="$xdir$non_pic_object"
+                   # A standard non-PIC object
+                   non_pic_objects="$non_pic_objects $non_pic_object"
+                   if test -z "$pic_object" || test "$pic_object" = none ; then
+                     arg="$non_pic_object"
+                   fi
+                 fi
+               else
+                 # Only an error if not doing a dry-run.
+                 if test -z "$run"; then
+                   $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+                   exit $EXIT_FAILURE
+                 else
+                   # Dry-run case.
+                   # Extract subdirectory from the argument.
+                   xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+                   if test "X$xdir" = "X$arg"; then
+                     xdir=
+                   else
+                     xdir="$xdir/"
+                   fi
+                   pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+                   non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+                   libobjs="$libobjs $pic_object"
+                   non_pic_objects="$non_pic_objects $non_pic_object"
+                 fi
+               fi
+             done
+           else
+             $echo "$modename: link input file \`$save_arg' does not exist"
+             exit $EXIT_FAILURE
+           fi
+           arg=$save_arg
            prev=
            continue
            ;;
-Line 916 
 compiler."
+Line 1310 
 compiler."
            [\\/]* | [A-Za-z]:[\\/]*) ;;
            *)
              $echo "$modename: only absolute run-paths are allowed" 1>&2
-             exit 1
+             exit $EXIT_FAILURE
              ;;
            esac
            if test "$prev" = rpath; then
-Line 948 
 compiler."
+Line 1342 
 compiler."
            finalize_command="$finalize_command $wl$qarg"
            continue
            ;;
+         xcclinker)
+           linker_flags="$linker_flags $qarg"
+           compiler_flags="$compiler_flags $qarg"
+           prev=
+           compile_command="$compile_command $qarg"
+           finalize_command="$finalize_command $qarg"
+           continue
+           ;;
+         shrext)
+           shrext_cmds="$arg"
+           prev=
+           continue
+           ;;
          *)
            eval "$prev=\"\$arg\""
            prev=
            continue
            ;;
          esac
-       fi # test -n $prev
+       fi # test -n "$prev"
        prevarg="$arg"
-Line 996 
 compiler."
+Line 1403 
 compiler."
        -export-symbols | -export-symbols-regex)
          if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
            $echo "$modename: more than one -exported-symbols argument is not allowed"
-           exit 1
+           exit $EXIT_FAILURE
          fi
          if test "X$arg" = "X-export-symbols"; then
            prev=expsyms
-Line 1006 
 compiler."
+Line 1413 
 compiler."
          continue
          ;;
+       -inst-prefix-dir)
+         prev=inst_prefix
+         continue
+         ;;
        # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
        # so, if we see these flags be careful not to treat them like -L
        -L[A-Z][A-Z]*:*)
          case $with_gcc/$host in
-         no/*-*-irix* | no/*-*-nonstopux*)
+         no/*-*-irix* | /*-*-irix*)
            compile_command="$compile_command $arg"
            finalize_command="$finalize_command $arg"
            ;;
-Line 1027 
 compiler."
+Line 1439 
 compiler."
            absdir=`cd "$dir" && pwd`
            if test -z "$absdir"; then
              $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-             exit 1
+             exit $EXIT_FAILURE
            fi
            dir="$absdir"
            ;;
-Line 1065 
 compiler."
+Line 1477 
 compiler."
              # Do not include libc due to us having libc/libc_r.
              test "X$arg" = "X-lc" && continue
              ;;
-           esac
+           *-*-rhapsody* | *-*-darwin1.[012])
-          elif test "X$arg" = "X-lc_r"; then
+             # Rhapsody C and math libraries are in the System framework
-           case $host in
+             deplibs="$deplibs -framework System"
-          *-*-openbsd* | *-*-freebsd*)
-             # Do not include libc_r directly, use -pthread flag.
              continue
-             ;;
            esac
+         elif test "X$arg" = "X-lc_r"; then
+          case $host in
+          *-*-openbsd* | *-*-freebsd*)
+            # Do not include libc_r directly, use -pthread flag.
+            continue
+            ;;
+          esac
          fi
          deplibs="$deplibs $arg"
          continue
          ;;
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+         deplibs="$deplibs $arg"
+         continue
+         ;;
        -module)
          module=yes
          continue
          ;;
+       # gcc -m* arguments should be passed to the linker via $compiler_flags
+       # in order to pass architecture information to the linker
+       # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+       # but this is not reliable with gcc because gcc may use -mfoo to
+       # select a different linker, different libraries, etc, while
+       # -Wl,-mfoo simply passes -mfoo to the linker.
+       -m*)
+         # Unknown arguments in both finalize_command and compile_command need
+         # to be aesthetically quoted because they are evaled later.
+         arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+         case $arg in
+         *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
+           arg="\"$arg\""
+           ;;
+         esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+         if test "$with_gcc" = "yes" ; then
+           compiler_flags="$compiler_flags $arg"
+         fi
+         continue
+         ;;
+       -shrext)
+         prev=shrext
+         continue
+         ;;
        -no-fast-install)
          fast_install=no
          continue
-Line 1107 
 compiler."
+Line 1556 
 compiler."
          continue
          ;;
+       -objectlist)
+         prev=objectlist
+         continue
+         ;;
        -o) prev=output ;;
+       -precious-files-regex)
+         prev=precious_regex
+         continue
+         ;;
        -release)
          prev=release
          continue
-Line 1131 
 compiler."
+Line 1590 
 compiler."
          [\\/]* | [A-Za-z]:[\\/]*) ;;
          *)
            $echo "$modename: only absolute run-paths are allowed" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
            ;;
          esac
          case "$xrpath " in
-Line 1159 
 compiler."
+Line 1618 
 compiler."
          prev=vinfo
          continue
          ;;
+       -version-number)
+         prev=vinfo
+         vinfo_number=yes
+         continue
+         ;;
        -Wc,*)
          args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-Line 1207 
 compiler."
+Line 1671 
 compiler."
          continue
          ;;
+       -XCClinker)
+         prev=xcclinker
+         continue
+         ;;
        # Some other compiler flag.
        -* | +*)
          # Unknown arguments in both finalize_command and compile_command need
-Line 1219 
 compiler."
+Line 1688 
 compiler."
          esac
          ;;
-       *.lo | *.$objext)
+       *.$objext)
-         # A library or standard object.
+         # A standard object.
-         if test "$prev" = dlfiles; then
+         objs="$objs $arg"
-           # This file was specified with -dlopen.
+         ;;
-           if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-             dlfiles="$dlfiles $arg"
+       *.lo)
-             prev=
+         # A libtool-controlled object.
-             continue
+         # Check to see that this really is a libtool object.
+         if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+           pic_object=
+           non_pic_object=
+           # Read the .lo file
+           # If there is no directory component, then add one.
+           case $arg in
+           */* | *\\*) . $arg ;;
+           *) . ./$arg ;;
+           esac
+           if test -z "$pic_object" || \
+              test -z "$non_pic_object" ||
+              test "$pic_object" = none && \
+              test "$non_pic_object" = none; then
+             $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+             exit $EXIT_FAILURE
+           fi
+           # Extract subdirectory from the argument.
+           xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+           if test "X$xdir" = "X$arg"; then
+             xdir=
            else
-             # If libtool objects are unsupported, then we need to preload.
+             xdir="$xdir/"
-             prev=dlprefiles
            fi
-         fi
-         if test "$prev" = dlprefiles; then
+           if test "$pic_object" != none; then
-           # Preload the old-style object.
+             # Prepend the subdirectory the object is found in.
-           dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+             pic_object="$xdir$pic_object"
-           prev=
+             if test "$prev" = dlfiles; then
+               if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+                 dlfiles="$dlfiles $pic_object"
+                 prev=
+                 continue
+               else
+                 # If libtool objects are unsupported, then we need to preload.
+                 prev=dlprefiles
+               fi
+             fi
+             # CHECK ME:  I think I busted this.  -Ossama
+             if test "$prev" = dlprefiles; then
+               # Preload the old-style object.
+               dlprefiles="$dlprefiles $pic_object"
+               prev=
+             fi
+             # A PIC object.
+             libobjs="$libobjs $pic_object"
+             arg="$pic_object"
+           fi
+           # Non-PIC object.
+           if test "$non_pic_object" != none; then
+             # Prepend the subdirectory the object is found in.
+             non_pic_object="$xdir$non_pic_object"
+             # A standard non-PIC object
+             non_pic_objects="$non_pic_objects $non_pic_object"
+             if test -z "$pic_object" || test "$pic_object" = none ; then
+               arg="$non_pic_object"
+             fi
+           fi
          else
-           case $arg in
+           # Only an error if not doing a dry-run.
-           *.lo) libobjs="$libobjs $arg" ;;
+           if test -z "$run"; then
-           *) objs="$objs $arg" ;;
+             $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-           esac
+             exit $EXIT_FAILURE
+           else
+             # Dry-run case.
+             # Extract subdirectory from the argument.
+             xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+             if test "X$xdir" = "X$arg"; then
+               xdir=
+             else
+               xdir="$xdir/"
+             fi
+             pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+             non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+             libobjs="$libobjs $pic_object"
+             non_pic_objects="$non_pic_objects $non_pic_object"
+           fi
          fi
          ;;
-Line 1292 
 compiler."
+Line 1833 
 compiler."
      if test -n "$prev"; then
        $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
        $echo "$help" 1>&2
-       exit 1
+       exit $EXIT_FAILURE
      fi
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-Line 1301 
 compiler."
+Line 1842 
 compiler."
        finalize_command="$finalize_command $arg"
      fi
+     oldlibs=
      # calculate the name of the file, without its directory
      outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
      libobjs_save="$libobjs"
-Line 1321 
 compiler."
+Line 1863 
 compiler."
        output_objdir="$output_objdir/$objdir"
      fi
      # Create the object directory.
-     if test ! -d $output_objdir; then
+     if test ! -d "$output_objdir"; then
        $show "$mkdir $output_objdir"
        $run $mkdir $output_objdir
        status=$?
-       if test $status -ne 0 && test ! -d $output_objdir; then
+       if test "$status" -ne 0 && test ! -d "$output_objdir"; then
          exit $status
        fi
      fi
-Line 1335 
 compiler."
+Line 1877 
 compiler."
      "")
        $echo "$modename: you must specify an output file" 1>&2
        $echo "$help" 1>&2
-       exit 1
+       exit $EXIT_FAILURE
        ;;
      *.$libext) linkmode=oldlib ;;
      *.lo | *.$objext) linkmode=obj ;;
-Line 1343 
 compiler."
+Line 1885 
 compiler."
      *) linkmode=prog ;; # Anything else should be a program.
      esac
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+       # don't eliminate duplications in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+       duplicate_compiler_generated_deps=$duplicate_deps
+       ;;
+     esac
      specialdeplibs=
      libs=
      # Find all interdependent deplibs by searching for libraries
      # that are linked more than once (e.g. -la -lb -la)
-Line 1355 
 compiler."
+Line 1907 
 compiler."
        fi
        libs="$libs $deplib"
      done
+     if test "$linkmode" = lib; then
+       libs="$predeps $libs $compiler_lib_search_path $postdeps"
+       # Compute libraries that are listed more than once in $predeps
+       # $postdeps and mark them as special (i.e., whose duplicates are
+       # not to be eliminated).
+       pre_post_deps=
+       if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+         for pre_post_dep in $predeps $postdeps; do
+           case "$pre_post_deps " in
+           *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+           esac
+           pre_post_deps="$pre_post_deps $pre_post_dep"
+         done
+       fi
+       pre_post_deps=
+     fi
      deplibs=
      newdependency_libs=
      newlib_search_path=
-Line 1369 
 compiler."
+Line 1940 
 compiler."
            *.la) ;;
            *)
              $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-             exit 1
+             exit $EXIT_FAILURE
              ;;
            esac
          done
-Line 1386 
 compiler."
+Line 1957 
 compiler."
          ;;
      esac
      for pass in $passes; do
-       if test $linkmode = prog; then
+       if test "$linkmode,$pass" = "lib,link" ||
-         # Determine which files to process
+          test "$linkmode,$pass" = "prog,scan"; then
+         libs="$deplibs"
+         deplibs=
+       fi
+       if test "$linkmode" = prog; then
          case $pass in
-         dlopen)
+         dlopen) libs="$dlfiles" ;;
-           libs="$dlfiles"
-           save_deplibs="$deplibs" # Collect dlpreopened libraries
-           deplibs=
-           ;;
          dlpreopen) libs="$dlprefiles" ;;
          link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
          esac
        fi
+       if test "$pass" = dlopen; then
+         # Collect dlpreopened libraries
+         save_deplibs="$deplibs"
+         deplibs=
+       fi
        for deplib in $libs; do
          lib=
          found=no
          case $deplib in
+         -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"
+           else
+             deplibs="$deplib $deplibs"
+           fi
+           continue
+           ;;
          -l*)
-           if test $linkmode = oldlib && test $linkmode = obj; then
+           if test "$linkmode" != lib && test "$linkmode" != prog; then
-             $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+             $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
              continue
            fi
-           if test $pass = conv; then
+           if test "$pass" = conv; then
              deplibs="$deplib $deplibs"
              continue
            fi
            name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
            for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-             # Search the libtool library
+             for search_ext in .la $std_shrext .so .a; do
-             lib="$searchdir/lib${name}.la"
+               # Search the libtool library
-             if test -f "$lib"; then
+               lib="$searchdir/lib${name}${search_ext}"
-               found=yes
+               if test -f "$lib"; then
-               break
+                 if test "$search_ext" = ".la"; then
-             fi
+                   found=yes
+                 else
+                   found=no
+                 fi
+                 break 2
+               fi
+             done
            done
            if test "$found" != yes; then
              # deplib doesn't seem to be a libtool library
-Line 1427 
 compiler."
+Line 2018 
 compiler."
                finalize_deplibs="$deplib $finalize_deplibs"
              else
                deplibs="$deplib $deplibs"
-               test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
+               test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
              fi
              continue
+           else # deplib is a libtool library
+             # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+             # We need to do some special things here, and not later.
+             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+               case " $predeps $postdeps " in
+               *" $deplib "*)
+                 if (${SED} -e '2q' $lib |
+                     grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+                   library_names=
+                   old_library=
+                   case $lib in
+                   */* | *\\*) . $lib ;;
+                   *) . ./$lib ;;
+                   esac
+                   for l in $old_library $library_names; do
+                     ll="$l"
+                   done
+                   if test "X$ll" = "X$old_library" ; then # only static version available
+                     found=no
+                     ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+                     test "X$ladir" = "X$lib" && ladir="."
+                     lib=$ladir/$old_library
+                     if test "$linkmode,$pass" = "prog,link"; then
+                       compile_deplibs="$deplib $compile_deplibs"
+                       finalize_deplibs="$deplib $finalize_deplibs"
+                     else
+                       deplibs="$deplib $deplibs"
+                       test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+                     fi
+                     continue
+                   fi
+                 fi
+                 ;;
+               *) ;;
+               esac
+             fi
            fi
            ;; # -l
          -L*)
            case $linkmode in
            lib)
              deplibs="$deplib $deplibs"
-             test $pass = conv && continue
+             test "$pass" = conv && continue
              newdependency_libs="$deplib $newdependency_libs"
              newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
              ;;
            prog)
-             if test $pass = conv; then
+             if test "$pass" = conv; then
                deplibs="$deplib $deplibs"
                continue
              fi
-             if test $pass = scan; then
+             if test "$pass" = scan; then
                deplibs="$deplib $deplibs"
-               newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
              else
                compile_deplibs="$deplib $compile_deplibs"
                finalize_deplibs="$deplib $finalize_deplibs"
              fi
+             newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
              ;;
            *)
-             $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
+             $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
              ;;
            esac # linkmode
            continue
            ;; # -L
          -R*)
-           if test $pass = link; then
+           if test "$pass" = link; then
              dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
              # Make sure the xrpath contains only unique directories.
              case "$xrpath " in
-Line 1473 
 compiler."
+Line 2100 
 compiler."
            ;;
          *.la) lib="$deplib" ;;
          *.$libext)
-           if test $pass = conv; then
+           if test "$pass" = conv; then
              deplibs="$deplib $deplibs"
              continue
            fi
            case $linkmode in
            lib)
-             if test "$deplibs_check_method" != pass_all; then
+             valid_a_lib=no
-               echo
+             case $deplibs_check_method in
-               echo "*** Warning: Trying to link with static lib archive $deplib."
+               match_pattern*)
-               echo "*** I have the capability to make that library automatically link in when"
+                 set dummy $deplibs_check_method
-               echo "*** you link to this library.  But I can only do this if you have a"
+                 match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-               echo "*** shared version of the library, which you do not appear to have"
+                 if eval $echo \"$deplib\" 2>/dev/null \
-               echo "*** because the file extensions .$libext of this argument makes me believe"
+                     | $SED 10q \
-               echo "*** that it is just a static archive that I should not used here."
+                     | $EGREP "$match_pattern_regex" > /dev/null; then
+                   valid_a_lib=yes
+                 fi
+                 ;;
+               pass_all)
+                 valid_a_lib=yes
+                 ;;
+             esac
+             if test "$valid_a_lib" != yes; then
+               $echo
+               $echo "*** Warning: Trying to link with static lib archive $deplib."
+               $echo "*** I have the capability to make that library automatically link in when"
+               $echo "*** you link to this library.  But I can only do this if you have a"
+               $echo "*** shared version of the library, which you do not appear to have"
+               $echo "*** because the file extensions .$libext of this argument makes me believe"
+               $echo "*** that it is just a static archive that I should not used here."
              else
-               echo
+               $echo
-               echo "*** Warning: Linking the shared library $output against the"
+               $echo "*** Warning: Linking the shared library $output against the"
-               echo "*** static library $deplib is not portable!"
+               $echo "*** static library $deplib is not portable!"
                deplibs="$deplib $deplibs"
              fi
              continue
              ;;
            prog)
-             if test $pass != link; then
+             if test "$pass" != link; then
                deplibs="$deplib $deplibs"
              else
                compile_deplibs="$deplib $compile_deplibs"
-Line 1507 
 compiler."
+Line 2149 
 compiler."
            esac # linkmode
            ;; # *.$libext
          *.lo | *.$objext)
-           if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+           if test "$pass" = conv; then
-             # If there is no dlopen support or we're linking statically,
+             deplibs="$deplib $deplibs"
-             # we need to preload.
+           elif test "$linkmode" = prog; then
-             newdlprefiles="$newdlprefiles $deplib"
+             if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-             compile_deplibs="$deplib $compile_deplibs"
+               # If there is no dlopen support or we're linking statically,
-             finalize_deplibs="$deplib $finalize_deplibs"
+               # we need to preload.
-           else
+               newdlprefiles="$newdlprefiles $deplib"
-             newdlfiles="$newdlfiles $deplib"
+               compile_deplibs="$deplib $compile_deplibs"
+               finalize_deplibs="$deplib $finalize_deplibs"
+             else
+               newdlfiles="$newdlfiles $deplib"
+             fi
            fi
            continue
            ;;
-Line 1523 
 compiler."
+Line 2169 
 compiler."
            continue
            ;;
          esac # case $deplib
-         if test $found = yes || test -f "$lib"; then :
+         if test "$found" = yes || test -f "$lib"; then :
          else
            $echo "$modename: cannot find the library \`$lib'" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
          fi
          # Check to see that this really is a libtool archive.
-         if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+         if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
          else
            $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
          fi
          ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-Line 1546 
 compiler."
+Line 2192 
 compiler."
          library_names=
          old_library=
          # If the library was installed with an old release of libtool,
-         # it will not redefine variable installed.
+         # it will not redefine variables installed, or shouldnotlink
          installed=yes
+         shouldnotlink=no
          # Read the .la file
          case $lib in
-Line 1557 
 compiler."
+Line 2204 
 compiler."
          if test "$linkmode,$pass" = "lib,link" ||
             test "$linkmode,$pass" = "prog,scan" ||
-            { test $linkmode = oldlib && test $linkmode = obj; }; then
+            { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-            # Add dl[pre]opened files of deplib
            test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
            test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
          fi
-         if test $pass = conv; then
+         if test "$pass" = conv; then
            # Only check for convenience libraries
            deplibs="$lib $deplibs"
            if test -z "$libdir"; then
              if test -z "$old_library"; then
                $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-               exit 1
+               exit $EXIT_FAILURE
              fi
              # It is a libtool convenience library, so add in its objects.
              convenience="$convenience $ladir/$objdir/$old_library"
-Line 1584 
 compiler."
+Line 2230 
 compiler."
                fi
                tmp_libs="$tmp_libs $deplib"
              done
-           elif test $linkmode != prog && test $linkmode != lib; then
+           elif test "$linkmode" != prog && test "$linkmode" != lib; then
              $echo "$modename: \`$lib' is not a convenience library" 1>&2
-             exit 1
+             exit $EXIT_FAILURE
            fi
            continue
          fi # $pass = conv
          # Get the name of the library we link against.
          linklib=
          for l in $old_library $library_names; do
-Line 1598 
 compiler."
+Line 2245 
 compiler."
          done
          if test -z "$linklib"; then
            $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
          fi
          # This library was specified with -dlopen.
-         if test $pass = dlopen; then
+         if test "$pass" = dlopen; then
            if test -z "$libdir"; then
              $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-             exit 1
+             exit $EXIT_FAILURE
            fi
-           if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+           if test -z "$dlname" ||
+              test "$dlopen_support" != yes ||
+              test "$build_libtool_libs" = no; then
              # If there is no dlname, no dlopen support or we're linking
-             # statically, we need to preload.
+             # statically, we need to preload.  We also need to preload any
-             dlprefiles="$dlprefiles $lib"
+             # dependent libraries so libltdl's deplib preloader doesn't
+             # bomb out in the load deplibs phase.
+             dlprefiles="$dlprefiles $lib $dependency_libs"
            else
              newdlfiles="$newdlfiles $lib"
            fi
-Line 1643 
 compiler."
+Line 2294 
 compiler."
              absdir="$libdir"
            fi
          else
-           dir="$ladir/$objdir"
+           if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-           absdir="$abs_ladir/$objdir"
+             dir="$ladir"
-           # Remove this search path later
+             absdir="$abs_ladir"
-           notinst_path="$notinst_path $abs_ladir"
+             # Remove this search path later
+             notinst_path="$notinst_path $abs_ladir"
+           else
+             dir="$ladir/$objdir"
+             absdir="$abs_ladir/$objdir"
+             # Remove this search path later
+             notinst_path="$notinst_path $abs_ladir"
+           fi
          fi # $installed = yes
          name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
          # This library was specified with -dlpreopen.
-         if test $pass = dlpreopen; then
+         if test "$pass" = dlpreopen; then
            if test -z "$libdir"; then
              $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-             exit 1
+             exit $EXIT_FAILURE
            fi
            # Prefer using a static library (so that no silly _DYNAMIC symbols
            # are required to link).
-Line 1670 
 compiler."
+Line 2328 
 compiler."
          if test -z "$libdir"; then
            # Link the convenience library
-           if test $linkmode = lib; then
+           if test "$linkmode" = lib; then
              deplibs="$dir/$old_library $deplibs"
            elif test "$linkmode,$pass" = "prog,link"; then
              compile_deplibs="$dir/$old_library $compile_deplibs"
              finalize_deplibs="$dir/$old_library $finalize_deplibs"
            else
-             deplibs="$lib $deplibs"
+             deplibs="$lib $deplibs" # used for prog,scan pass
            fi
            continue
          fi
-         if test $linkmode = prog && test $pass != link; then
+         if test "$linkmode" = prog && test "$pass" != link; then
            newlib_search_path="$newlib_search_path $ladir"
            deplibs="$lib $deplibs"
-Line 1697 
 compiler."
+Line 2356 
 compiler."
              -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
              esac
              # Need to link against all dependency_libs?
-             if test $linkalldeplibs = yes; then
+             if test "$linkalldeplibs" = yes; then
                deplibs="$deplib $deplibs"
              else
                # Need to hardcode shared library paths
-Line 1714 
 compiler."
+Line 2373 
 compiler."
            continue
          fi # $linkmode = prog...
-         link_static=no # Whether the deplib will be linked statically
+         if test "$linkmode,$pass" = "prog,link"; then
-         if test -n "$library_names" &&
+           if test -n "$library_names" &&
-            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+              { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-           # Link against this shared library
+             # We need to hardcode the library path
+             if test -n "$shlibpath_var"; then
+               # Make sure the rpath contains only unique directories.
+               case "$temp_rpath " in
+               *" $dir "*) ;;
+               *" $absdir "*) ;;
+               *) temp_rpath="$temp_rpath $dir" ;;
+               esac
+             fi
-           if test "$linkmode,$pass" = "prog,link" ||
-            { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
              # Hardcode the library path.
              # Skip directories that are in the system default run-time
              # search path.
-Line 1742 
 compiler."
+Line 2407 
 compiler."
                esac
                ;;
              esac
-             if test $linkmode = prog; then
-               # We need to hardcode the library path
-               if test -n "$shlibpath_var"; then
-                 # Make sure the rpath contains only unique directories.
-                 case "$temp_rpath " in
-                 *" $dir "*) ;;
-                 *" $absdir "*) ;;
-                 *) temp_rpath="$temp_rpath $dir" ;;
-                 esac
-               fi
-             fi
            fi # $linkmode,$pass = prog,link...
            if test "$alldeplibs" = yes &&
-Line 1762 
 compiler."
+Line 2416 
 compiler."
              # We only need to search for static libraries
              continue
            fi
+         fi
+         link_static=no # Whether the deplib will be linked statically
+         if test -n "$library_names" &&
+            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
            if test "$installed" = no; then
              notinst_deplibs="$notinst_deplibs $lib"
              need_relink=yes
            fi
+           # This is a shared library
+           # Warn about portability, can't link against -module's on
+           # some systems (darwin)
+           if test "$shouldnotlink" = yes && test "$pass" = link ; then
+             $echo
+             if test "$linkmode" = prog; then
+               $echo "*** Warning: Linking the executable $output against the loadable module"
+             else
+               $echo "*** Warning: Linking the shared library $output against the loadable module"
+             fi
+             $echo "*** $linklib is not portable!"
+           fi
+           if test "$linkmode" = lib &&
+              test "$hardcode_into_libs" = yes; then
+             # Hardcode the library path.
+             # Skip directories that are in the system default run-time
+             # search path.
+             case " $sys_lib_dlsearch_path " in
+             *" $absdir "*) ;;
+             *)
+               case "$compile_rpath " in
+               *" $absdir "*) ;;
+               *) compile_rpath="$compile_rpath $absdir"
+               esac
+               ;;
+             esac
+             case " $sys_lib_dlsearch_path " in
+             *" $libdir "*) ;;
+             *)
+               case "$finalize_rpath " in
+               *" $libdir "*) ;;
+               *) finalize_rpath="$finalize_rpath $libdir"
+               esac
+               ;;
+             esac
+           fi
            if test -n "$old_archive_from_expsyms_cmds"; then
              # figure out the soname
-Line 1780 
 compiler."
+Line 2475 
 compiler."
              elif test -n "$soname_spec"; then
                # bleh windows
                case $host in
-               *cygwin*)
+               *cygwin* | mingw*)
                  major=`expr $current - $age`
                  versuffix="-$major"
                  ;;
-Line 1792 
 compiler."
+Line 2487 
 compiler."
              # Make a new name for the extract_expsyms_cmds to use
              soroot="$soname"
-             soname=`echo $soroot | ${SED} -e 's/^.*\///'`
+             soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-             newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+             newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
              # If the library has no export list, then create one now
              if test -f "$output_objdir/$soname-def"; then :
              else
                $show "extracting exported symbol list from \`$soname'"
                save_ifs="$IFS"; IFS='~'
-               eval cmds=\"$extract_expsyms_cmds\"
+               cmds=$extract_expsyms_cmds
                for cmd in $cmds; do
                  IFS="$save_ifs"
+                 eval cmd=\"$cmd\"
                  $show "$cmd"
                  $run eval "$cmd" || exit $?
                done
-Line 1813 
 compiler."
+Line 2509 
 compiler."
              if test -f "$output_objdir/$newlib"; then :; else
                $show "generating import library for \`$soname'"
                save_ifs="$IFS"; IFS='~'
-               eval cmds=\"$old_archive_from_expsyms_cmds\"
+               cmds=$old_archive_from_expsyms_cmds
                for cmd in $cmds; do
                  IFS="$save_ifs"
+                 eval cmd=\"$cmd\"
                  $show "$cmd"
                  $run eval "$cmd" || exit $?
                done
-Line 1824 
 compiler."
+Line 2521 
 compiler."
              # make sure the library variables are pointing to the new library
              dir=$output_objdir
              linklib=$newlib
-           fi # test -n $old_archive_from_expsyms_cmds
+           fi # test -n "$old_archive_from_expsyms_cmds"
-           if test $linkmode = prog || test "$mode" != relink; then
+           if test "$linkmode" = prog || test "$mode" != relink; then
              add_shlibpath=
              add_dir=
              add=
-Line 1835 
 compiler."
+Line 2532 
 compiler."
              immediate | unsupported)
                if test "$hardcode_direct" = no; then
                  add="$dir/$linklib"
+                 case $host in
+                   *-*-sco3.2v5* ) 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
+                       $echo "** Warning, lib $linklib is a module, not a shared library"
+                       if test -z "$old_library" ; then
+                         $echo
+                         $echo "** And there doesn't seem to be a static archive available"
+                         $echo "** The link will probably fail, sorry"
+                       else
+                         add="$dir/$old_library"
+                       fi
+                     fi
+                 esac
                elif test "$hardcode_minus_L" = no; then
                  case $host in
                  *-*-sunos*) add_shlibpath="$dir" ;;
-Line 1853 
 compiler."
+Line 2566 
 compiler."
                  add="$dir/$linklib"
                elif test "$hardcode_minus_L" = yes; then
                  add_dir="-L$dir"
+                 # Try looking first in the location we're being installed to.
+                 if test -n "$inst_prefix_dir"; then
+                   case "$libdir" in
+                     [\\/]*)
+                       add_dir="$add_dir -L$inst_prefix_dir$libdir"
+                       ;;
+                   esac
+                 fi
                  add="-l$name"
                elif test "$hardcode_shlibpath_var" = yes; then
                  add_shlibpath="$dir"
-Line 1866 
 compiler."
+Line 2587 
 compiler."
              if test "$lib_linked" != yes; then
                $echo "$modename: configuration error: unsupported hardcode properties"
-               exit 1
+               exit $EXIT_FAILURE
              fi
              if test -n "$add_shlibpath"; then
-Line 1875 
 compiler."
+Line 2596 
 compiler."
                *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
                esac
              fi
-             if test $linkmode = prog; then
+             if test "$linkmode" = prog; then
                test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
                test -n "$add" && compile_deplibs="$add $compile_deplibs"
              else
-Line 1892 
 compiler."
+Line 2613 
 compiler."
              fi
            fi
-           if test $linkmode = prog || test "$mode" = relink; then
+           if test "$linkmode" = prog || test "$mode" = relink; then
              add_shlibpath=
              add_dir=
              add=
-Line 1908 
 compiler."
+Line 2629 
 compiler."
                *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
                esac
                add="-l$name"
+             elif test "$hardcode_automatic" = yes; then
+               if test -n "$inst_prefix_dir" &&
+                  test -f "$inst_prefix_dir$libdir/$linklib" ; then
+                 add="$inst_prefix_dir$libdir/$linklib"
+               else
+                 add="$libdir/$linklib"
+               fi
              else
                # We cannot seem to hardcode it, guess we'll fake it.
                add_dir="-L$libdir"
+               # Try looking first in the location we're being installed to.
+               if test -n "$inst_prefix_dir"; then
+                 case "$libdir" in
+                   [\\/]*)
+                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
+                     ;;
+                 esac
+               fi
                add="-l$name"
              fi
-             if test $linkmode = prog; then
+             if test "$linkmode" = prog; then
                test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
                test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
              else
-Line 1922 
 compiler."
+Line 2658 
 compiler."
                test -n "$add" && deplibs="$add $deplibs"
              fi
            fi
-         elif test $linkmode = prog; then
+         elif test "$linkmode" = prog; then
-           if test "$alldeplibs" = yes &&
-              { test "$deplibs_check_method" = pass_all ||
-                { test "$build_libtool_libs" = yes &&
-                  test -n "$library_names"; }; }; then
-             # We only need to search for static libraries
-             continue
-           fi
-           # Try to link the static library
            # Here we assume that one of hardcode_direct or hardcode_minus_L
            # is not unsupported.  This is valid on all known static and
            # shared platforms.
-Line 1951 
 compiler."
+Line 2678 
 compiler."
              # Just print a warning and add the library to dependency_libs so
              # that the program can be linked against the static library.
-             echo
+             $echo
-             echo "*** Warning: This system can not link to static lib archive $lib."
+             $echo "*** Warning: This system can not link to static lib archive $lib."
-             echo "*** I have the capability to make that library automatically link in when"
+             $echo "*** I have the capability to make that library automatically link in when"
-             echo "*** you link to this library.  But I can only do this if you have a"
+             $echo "*** you link to this library.  But I can only do this if you have a"
-             echo "*** shared version of the library, which you do not appear to have."
+             $echo "*** shared version of the library, which you do not appear to have."
              if test "$module" = yes; then
-               echo "*** But as you try to build a module library, libtool will still create "
+               $echo "*** But as you try to build a module library, libtool will still create "
-               echo "*** a static module, that should work as long as the dlopening application"
+               $echo "*** a static module, that should work as long as the dlopening application"
-               echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+               $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
                if test -z "$global_symbol_pipe"; then
-                 echo
+                 $echo
-                 echo "*** However, this would only work if libtool was able to extract symbol"
+                 $echo "*** However, this would only work if libtool was able to extract symbol"
-                 echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+                 $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-                 echo "*** not find such a program.  So, this module is probably useless."
+                 $echo "*** not find such a program.  So, this module is probably useless."
-                 echo "*** \`nm' from GNU binutils and a full rebuild may help."
+                 $echo "*** \`nm' from GNU binutils and a full rebuild may help."
                fi
                if test "$build_old_libs" = no; then
                  build_libtool_libs=module
-Line 1982 
 compiler."
+Line 2709 
 compiler."
            fi
          fi # link shared/static library?
-         if test $linkmode = lib; then
+         if test "$linkmode" = lib; then
            if test -n "$dependency_libs" &&
-              { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+              { test "$hardcode_into_libs" != yes ||
-                test $link_static = yes; }; then
+                test "$build_old_libs" = yes ||
+                test "$link_static" = yes; }; then
              # Extract -R from dependency_libs
              temp_deplibs=
              for libdir in $dependency_libs; do
-Line 2016 
 compiler."
+Line 2744 
 compiler."
              tmp_libs="$tmp_libs $deplib"
            done
-           if test $link_all_deplibs != no; then
+           if test "$link_all_deplibs" != no; then
              # Add the search paths of all dependency libraries
              for deplib in $dependency_libs; do
                case $deplib in
-Line 2036 
 compiler."
+Line 2764 
 compiler."
                    ;;
                  esac
                  if grep "^installed=no" $deplib > /dev/null; then
-                   path="-L$absdir/$objdir"
+                   path="$absdir/$objdir"
                  else
                    eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                    if test -z "$libdir"; then
                      $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-                     exit 1
+                     exit $EXIT_FAILURE
                    fi
                    if test "$absdir" != "$libdir"; then
                      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
                    fi
-                   path="-L$absdir"
+                   path="$absdir"
                  fi
+                 depdepl=
+                 case $host in
+                 *-*-darwin*)
+                   # we do not want to link against static libs,
+                   # but need to link against shared
+                   eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+                   if test -n "$deplibrary_names" ; then
+                     for tmp in $deplibrary_names ; do
+                       depdepl=$tmp
+                     done
+                     if test -f "$path/$depdepl" ; then
+                       depdepl="$path/$depdepl"
+                     fi
+                     # do not add paths which are already there
+                     case " $newlib_search_path " in
+                     *" $path "*) ;;
+                     *) newlib_search_path="$newlib_search_path $path";;
+                     esac
+                   fi
+                   path=""
+                   ;;
+                 *)
+                   path="-L$path"
+                   ;;
+                 esac
+                 ;;
+               -l*)
+                 case $host in
+                 *-*-darwin*)
+                   # Again, we only want to link against shared libraries
+                   eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+                   for tmp in $newlib_search_path ; do
+                     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+                       eval depdepl="$tmp/lib$tmp_libs.dylib"
+                       break
+                     fi
+                   done
+                   path=""
+                   ;;
+                 *) continue ;;
+                 esac
                  ;;
                *) continue ;;
                esac
                case " $deplibs " in
+               *" $depdepl "*) ;;
+               *) deplibs="$depdepl $deplibs" ;;
+               esac
+               case " $deplibs " in
                *" $path "*) ;;
                *) deplibs="$deplibs $path" ;;
                esac
-Line 2059 
 compiler."
+Line 2832 
 compiler."
            fi # link_all_deplibs != no
          fi # linkmode = lib
        done # for deplib in $libs
-       if test $pass = dlpreopen; then
+       dependency_libs="$newdependency_libs"
+       if test "$pass" = dlpreopen; then
          # Link the dlpreopened libraries before other libraries
          for deplib in $save_deplibs; do
            deplibs="$deplib $deplibs"
          done
        fi
-       if test $pass != dlopen; then
+       if test "$pass" != dlopen; then
-         test $pass != scan && dependency_libs="$newdependency_libs"
+         if test "$pass" != conv; then
-         if test $pass != conv; then
            # Make sure lib_search_path contains only unique directories.
            lib_search_path=
            for dir in $newlib_search_path; do
-Line 2089 
 compiler."
+Line 2862 
 compiler."
            eval tmp_libs=\"\$$var\"
            new_libs=
            for deplib in $tmp_libs; do
+             # FIXME: Pedantically, this is the right thing to do, so
+             #        that some nasty dependency loop isn't accidentally
+             #        broken:
+             #new_libs="$deplib $new_libs"
+             # Pragmatically, this seems to cause very few problems in
+             # practice:
              case $deplib in
              -L*) new_libs="$deplib $new_libs" ;;
+             -R*) ;;
              *)
+               # And here is the reason: when a library appears more
+               # than once as an explicit dependence of a library, or
+               # is implicitly linked in more than once by the
+               # compiler, it is considered special, and multiple
+               # occurrences thereof are not removed.  Compare this
+               # with having the same library being listed as a
+               # dependency of multiple other libraries: in this case,
+               # we know (pedantically, we assume) the library does not
+               # need to be listed more than once, so we keep only the
+               # last copy.  This is not always right, but it is rare
+               # enough that we require users that really mean to play
+               # such unportable linking tricks to link the library
+               # using -Wl,-lname, so that libtool does not consider it
+               # for duplicate removal.
                case " $specialdeplibs " in
                *" $deplib "*) new_libs="$deplib $new_libs" ;;
                *)
-Line 2119 
 compiler."
+Line 2913 
 compiler."
            eval $var=\"$tmp_libs\"
          done # for var
        fi
-       if test "$pass" = "conv" &&
+       # Last step: remove runtime libs from dependency_libs
-        { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
+       # (they stay in deplibs)
-         libs="$deplibs" # reset libs
+       tmp_libs=
-         deplibs=
+       for i in $dependency_libs ; do
-       fi
+         case " $predeps $postdeps $compiler_lib_search_path " in
+         *" $i "*)
+           i=""
+           ;;
+         esac
+         if test -n "$i" ; then
+           tmp_libs="$tmp_libs $i"
+         fi
+       done
+       dependency_libs=$tmp_libs
      done # for pass
-     if test $linkmode = prog; then
+     if test "$linkmode" = prog; then
        dlfiles="$newdlfiles"
        dlprefiles="$newdlprefiles"
      fi
      case $linkmode in
      oldlib)
+       if test -n "$deplibs"; then
+         $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+       fi
        if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
          $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
        fi
-Line 2145 
 compiler."
+Line 2952 
 compiler."
        fi
        if test -n "$vinfo"; then
-         $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+         $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
        fi
        if test -n "$release"; then
-Line 2167 
 compiler."
+Line 2974 
 compiler."
        case $outputname in
        lib*)
          name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+         eval shared_ext=\"$shrext_cmds\"
          eval libname=\"$libname_spec\"
          ;;
        *)
          if test "$module" = no; then
            $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
            $echo "$help" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
          fi
          if test "$need_lib_prefix" != no; then
            # Add the "lib" prefix for modules if required
            name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+           eval shared_ext=\"$shrext_cmds\"
            eval libname=\"$libname_spec\"
          else
            libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-Line 2188 
 compiler."
+Line 2997 
 compiler."
        if test -n "$objs"; then
          if test "$deplibs_check_method" != pass_all; then
            $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-           exit 1
+           exit $EXIT_FAILURE
          else
-           echo
+           $echo
-           echo "*** Warning: Linking the shared library $output against the non-libtool"
+           $echo "*** Warning: Linking the shared library $output against the non-libtool"
-           echo "*** objects $objs is not portable!"
+           $echo "*** objects $objs is not portable!"
            libobjs="$libobjs $objs"
          fi
        fi
-Line 2202 
 compiler."
+Line 3011 
 compiler."
        fi
        set dummy $rpath
-       if test $# -gt 2; then
+       if test "$#" -gt 2; then
          $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
        fi
        install_libdir="$2"
-Line 2211 
 compiler."
+Line 3020 
 compiler."
        if test -z "$rpath"; then
          if test "$build_libtool_libs" = yes; then
            # Building a libtool convenience library.
-           libext=al
+           # Some compilers have problems with a `.al' extension so
+           # convenience libraries should have the same extension an
+           # archive normally would.
            oldlibs="$output_objdir/$libname.$libext $oldlibs"
            build_libtool_libs=convenience
            build_old_libs=yes
          fi
          if test -n "$vinfo"; then
-           $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+           $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
          fi
          if test -n "$release"; then
-Line 2234 
 compiler."
+Line 3045 
 compiler."
          if test -n "$8"; then
            $echo "$modename: too many parameters to \`-version-info'" 1>&2
            $echo "$help" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
          fi
-         current="$2"
+         # convert absolute version numbers to libtool ages
-         revision="$3"
+         # this retains compatibility with .la files and attempts
-         age="$4"
+         # to make the code below a bit more comprehensible
+         case $vinfo_number in
+         yes)
+           number_major="$2"
+           number_minor="$3"
+           number_revision="$4"
+           #
+           # There are really only two kinds -- those that
+           # use the current revision as the major version
+           # and those that subtract age and use age as
+           # a minor version.  But, then there is irix
+           # which has an extra 1 added just for fun
+           #
+           case $version_type in
+           darwin|linux|osf|windows)
+             current=`expr $number_major + $number_minor`
+             age="$number_minor"
+             revision="$number_revision"
+             ;;
+           freebsd-aout|freebsd-elf|sunos)
+             current="$number_major"
+             revision="$number_minor"
+             age="0"
+             ;;
+           irix|nonstopux)
+             current=`expr $number_major + $number_minor - 1`
+             age="$number_minor"
+             revision="$number_minor"
+             ;;
+           esac
+           ;;
+         no)
+           current="$2"
+           revision="$3"
+           age="$4"
+           ;;
+         esac
          # Check that each of the things are valid numbers.
          case $current in
-Line 2247 
 compiler."
+Line 3095 
 compiler."
          *)
            $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
            $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
            ;;
          esac
-Line 2256 
 compiler."
+Line 3104 
 compiler."
          *)
            $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
            $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
            ;;
          esac
-Line 2265 
 compiler."
+Line 3113 
 compiler."
          *)
            $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
            $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
            ;;
          esac
-         if test $age -gt $current; then
+         if test "$age" -gt "$current"; then
            $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
            $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
          fi
          # Calculate the version variables.
-Line 2289 
 compiler."
+Line 3137 
 compiler."
            versuffix="$major.$age.$revision"
            # Darwin ld doesn't like 0 for these options...
            minor_current=`expr $current + 1`
-           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)
-Line 2313 
 compiler."
+Line 3161 
 compiler."
            # Add in all the interfaces that we are compatible with.
            loop=$revision
-           while test $loop != 0; do
+           while test "$loop" -ne 0; do
              iface=`expr $revision - $loop`
              loop=`expr $loop - 1`
              verstring="$verstring_prefix$major.$iface:$verstring"
-Line 2336 
 compiler."
+Line 3184 
 compiler."
            # Add in all the interfaces that we are compatible with.
            loop=$age
-           while test $loop != 0; do
+           while test "$loop" -ne 0; do
              iface=`expr $current - $loop`
              loop=`expr $loop - 1`
              verstring="$verstring:${iface}.0"
-Line 2360 
 compiler."
+Line 3208 
 compiler."
          *)
            $echo "$modename: unknown library version type \`$version_type'" 1>&2
-           echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+           $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-           exit 1
+           exit $EXIT_FAILURE
            ;;
          esac
          # Clear the version info if we defaulted, and they specified a release.
          if test -z "$vinfo" && test -n "$release"; then
            major=
-           verstring="0.0"
            case $version_type in
            darwin)
              # we can't check for "0.0" in archive_cmds due to quoting
              # problems, so we reset it completely
-             verstring=""
+             verstring=
              ;;
            *)
              verstring="0.0"
-Line 2407 
 compiler."
+Line 3254 
 compiler."
        fi
        if test "$mode" != relink; then
-         # Remove our outputs.
+         # Remove our outputs, but don't remove object files since they
-         $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+         # may have been created when compiling PIC objects.
-         $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+         removelist=
+         tempremovelist=`$echo "$output_objdir/*"`
+         for p in $tempremovelist; do
+           case $p in
+             *.$objext)
+                ;;
+             $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+                if test "X$precious_files_regex" != "X"; then
+                  if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+                  then
+                    continue
+                  fi
+                fi
+                removelist="$removelist $p"
+                ;;
+             *) ;;
+           esac
+         done
+         if test -n "$removelist"; then
+           $show "${rm}r $removelist"
+           $run ${rm}r $removelist
+         fi
        fi
        # Now set the variables for building old libraries.
-Line 2422 
 compiler."
+Line 3290 
 compiler."
        # Eliminate all temporary directories.
        for path in $notinst_path; do
-         lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+         lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-         deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+         deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-         dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+         dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
        done
        if test -n "$xrpath"; then
-Line 2437 
 compiler."
+Line 3305 
 compiler."
            *) finalize_rpath="$finalize_rpath $libdir" ;;
            esac
          done
-         if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
+         if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
            dependency_libs="$temp_xrpath $dependency_libs"
          fi
        fi
-Line 2477 
 compiler."
+Line 3345 
 compiler."
              ;;
            *-*-openbsd* | *-*-freebsd*)
              # Do not include libc due to us having libc/libc_r.
+             test "X$arg" = "X-lc" && continue
              ;;
            *)
              # Add libc to deplibs on all other systems if necessary.
-             if test $build_libtool_need_lc = "yes"; then
+             if test "$build_libtool_need_lc" = "yes"; then
                deplibs="$deplibs -lc"
              fi
              ;;
-Line 2507 
 compiler."
+Line 3376 
 compiler."
            # This might be a little naive.  We might want to check
            # whether the library exists or not.  But this is on
            # osf3 & osf4 and I'm not really sure... Just
-           # implementing what was already the behaviour.
+           # implementing what was already the behavior.
            newdeplibs=$deplibs
            ;;
          test_compile)
-Line 2520 
 compiler."
+Line 3389 
 compiler."
            int main() { return 0; }
  EOF
            $rm conftest
-           $CC -o conftest conftest.c $deplibs
+           $LTCC -o conftest conftest.c $deplibs
-           if test $? -eq 0 ; then
+           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.
-               if test -n "$name" && test "$name" != "0"; then
+               if test "$name" != "" && test "$name" -ne "0"; then
-                 libname=`eval \\$echo \"$libname_spec\"`
+                 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                 deplib_matches=`eval \\$echo \"$library_names_spec\"`
+                   case " $predeps $postdeps " in
-                 set dummy $deplib_matches
+                   *" $i "*)
-                 deplib_match=$2
+                     newdeplibs="$newdeplibs $i"
-                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                     i=""
-                   newdeplibs="$newdeplibs $i"
+                     ;;
-                 else
+                   esac
-                   droppeddeps=yes
+                 fi
-                   echo
+                 if test -n "$i" ; then
-                   echo "*** Warning: dynamic linker does not accept needed library $i."
+                   libname=`eval \\$echo \"$libname_spec\"`
-                   echo "*** I have the capability to make that library automatically link in when"
+                   deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                   echo "*** you link to this library.  But I can only do this if you have a"
+                   set dummy $deplib_matches
-                   echo "*** shared version of the library, which I believe you do not have"
+                   deplib_match=$2
-                   echo "*** because a test_compile did reveal that the linker did not use it for"
+                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                   echo "*** its dynamic dependency list that programs get resolved with at runtime."
+                     newdeplibs="$newdeplibs $i"
+                   else
+                     droppeddeps=yes
+                     $echo
+                     $echo "*** Warning: dynamic linker does not accept needed library $i."
+                     $echo "*** I have the capability to make that library automatically link in when"
+                     $echo "*** you link to this library.  But I can only do this if you have a"
+                     $echo "*** shared version of the library, which I believe you do not have"
+                     $echo "*** because a test_compile did reveal that the linker did not use it for"
+                     $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+                   fi
                  fi
                else
                  newdeplibs="$newdeplibs $i"
                fi
              done
            else
-             # Error occured in the first compile.  Let's try to salvage
+             # Error occurred in the first compile.  Let's try to salvage
              # the situation: Compile a separate program for each library.
              for i in $deplibs; do
                name="`expr $i : '-l\(.*\)'`"
-              # If $name is empty we are operating on a -L argument.
+               # If $name is empty we are operating on a -L argument.
-               if test -n "$name" && test "$name" != "0"; then
+               if test "$name" != "" && test "$name" != "0"; then
                  $rm conftest
-                 $CC -o conftest conftest.c $i
+                 $LTCC -o conftest conftest.c $i
                  # Did it work?
-                 if test $? -eq 0 ; then
+                 if test "$?" -eq 0 ; then
                    ldd_output=`ldd conftest`
-                   libname=`eval \\$echo \"$libname_spec\"`
+                   if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                   deplib_matches=`eval \\$echo \"$library_names_spec\"`
+                     case " $predeps $postdeps " in
-                   set dummy $deplib_matches
+                     *" $i "*)
-                   deplib_match=$2
+                       newdeplibs="$newdeplibs $i"
-                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                       i=""
-                     newdeplibs="$newdeplibs $i"
+                       ;;
-                   else
+                     esac
-                     droppeddeps=yes
+                   fi
-                     echo
+                   if test -n "$i" ; then
-                     echo "*** Warning: dynamic linker does not accept needed library $i."
+                     libname=`eval \\$echo \"$libname_spec\"`
-                     echo "*** I have the capability to make that library automatically link in when"
+                     deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                     echo "*** you link to this library.  But I can only do this if you have a"
+                     set dummy $deplib_matches
-                     echo "*** shared version of the library, which you do not appear to have"
+                     deplib_match=$2
-                     echo "*** because a test_compile did reveal that the linker did not use this one"
+                     if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                     echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+                       newdeplibs="$newdeplibs $i"
+                     else
+                       droppeddeps=yes
+                       $echo
+                       $echo "*** Warning: dynamic linker does not accept needed library $i."
+                       $echo "*** I have the capability to make that library automatically link in when"
+                       $echo "*** you link to this library.  But I can only do this if you have a"
+                       $echo "*** shared version of the library, which you do not appear to have"
+                       $echo "*** because a test_compile did reveal that the linker did not use this one"
+                       $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+                     fi
                    fi
                  else
                    droppeddeps=yes
-                   echo
+                   $echo
-                   echo "*** Warning!  Library $i is needed by this library but I was not able to"
+                   $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 "*** library that it depends on before this library will be fully"
-                   echo "*** functional.  Installing it before continuing would be even better."
+                   $echo "*** functional.  Installing it before continuing would be even better."
                  fi
                else
                  newdeplibs="$newdeplibs $i"
-Line 2595 
 EOF
+Line 3484 
 EOF
            for a_deplib in $deplibs; do
              name="`expr $a_deplib : '-l\(.*\)'`"
              # If $name is empty we are operating on a -L argument.
-             if test -n "$name" && test "$name" != "0"; then
+             if test "$name" != "" && test  "$name" != "0"; then
-               libname=`eval \\$echo \"$libname_spec\"`
+               if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 case " $predeps $postdeps " in
-                     potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                 *" $a_deplib "*)
-                     for potent_lib in $potential_libs; do
+                   newdeplibs="$newdeplibs $a_deplib"
+                   a_deplib=""
+                   ;;
+                 esac
+               fi
+               if test -n "$a_deplib" ; then
+                 libname=`eval \\$echo \"$libname_spec\"`
+                 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                   potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                   for potent_lib in $potential_libs; do
                        # Follow soft links.
                        if ls -lLd "$potent_lib" 2>/dev/null \
                           | grep " -> " >/dev/null; then
-Line 2620 
 EOF
+Line 3518 
 EOF
                        done
                        if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
                           | ${SED} 10q \
-                          | egrep "$file_magic_regex" > /dev/null; then
+                          | $EGREP "$file_magic_regex" > /dev/null; then
                          newdeplibs="$newdeplibs $a_deplib"
                          a_deplib=""
                          break 2
                        fi
-                     done
+                   done
-               done
+                 done
+               fi
                if test -n "$a_deplib" ; then
                  droppeddeps=yes
-                 echo
+                 $echo
-                 echo "*** Warning: linker path does not have real file for library $a_deplib."
+                 $echo "*** Warning: linker path does not have real file for library $a_deplib."
-                 echo "*** I have the capability to make that library automatically link in when"
+                 $echo "*** I have the capability to make that library automatically link in when"
-                 echo "*** you link to this library.  But I can only do this if you have a"
+                 $echo "*** you link to this library.  But I can only do this if you have a"
-                 echo "*** shared version of the library, which you do not appear to have"
+                 $echo "*** shared version of the library, which you do not appear to have"
-                 echo "*** because I did check the linker path looking for a file starting"
+                 $echo "*** because I did check the linker path looking for a file starting"
                  if test -z "$potlib" ; then
-                   echo "*** with $libname but no candidates were found. (...for file magic test)"
+                   $echo "*** with $libname but no candidates were found. (...for file magic test)"
                  else
-                   echo "*** with $libname and none of the candidates passed a file format test"
+                   $echo "*** with $libname and none of the candidates passed a file format test"
-                   echo "*** using a file magic. Last file checked: $potlib"
+                   $echo "*** using a file magic. Last file checked: $potlib"
                  fi
                fi
              else
-Line 2655 
 EOF
+Line 3554 
 EOF
              name="`expr $a_deplib : '-l\(.*\)'`"
              # If $name is empty we are operating on a -L argument.
              if test -n "$name" && test "$name" != "0"; then
-               libname=`eval \\$echo \"$libname_spec\"`
+               if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 case " $predeps $postdeps " in
-                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                 *" $a_deplib "*)
-                 for potent_lib in $potential_libs; do
+                   newdeplibs="$newdeplibs $a_deplib"
-                   potlib="$potent_lib" # see symlink-check below in file_magic test
+                   a_deplib=""
-                   if eval echo \"$potent_lib\" 2>/dev/null \
+                   ;;
-                       | ${SED} 10q \
+                 esac
-                       | egrep "$match_pattern_regex" > /dev/null; then
+               fi
-                     newdeplibs="$newdeplibs $a_deplib"
+               if test -n "$a_deplib" ; then
-                     a_deplib=""
+                 libname=`eval \\$echo \"$libname_spec\"`
-                     break 2
+                 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                   fi
+                   potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                   for potent_lib in $potential_libs; do
+                     potlib="$potent_lib" # see symlink-check above in file_magic test
+                     if eval $echo \"$potent_lib\" 2>/dev/null \
+                         | ${SED} 10q \
+                         | $EGREP "$match_pattern_regex" > /dev/null; then
+                       newdeplibs="$newdeplibs $a_deplib"
+                       a_deplib=""
+                       break 2
+                     fi
+                   done
                  done
-               done
+               fi
                if test -n "$a_deplib" ; then
                  droppeddeps=yes
-                 echo
+                 $echo
-                 echo "*** Warning: linker path does not have real file for library $a_deplib."
+                 $echo "*** Warning: linker path does not have real file for library $a_deplib."
-                 echo "*** I have the capability to make that library automatically link in when"
+                 $echo "*** I have the capability to make that library automatically link in when"
-                 echo "*** you link to this library.  But I can only do this if you have a"
+                 $echo "*** you link to this library.  But I can only do this if you have a"
-                 echo "*** shared version of the library, which you do not appear to have"
+                 $echo "*** shared version of the library, which you do not appear to have"
-                 echo "*** because I did check the linker path looking for a file starting"
+                 $echo "*** because I did check the linker path looking for a file starting"
                  if test -z "$potlib" ; then
-                   echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+                   $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
                  else
-                   echo "*** with $libname and none of the candidates passed a file format test"
+                   $echo "*** with $libname and none of the candidates passed a file format test"
-                   echo "*** using a regex pattern. Last file checked: $potlib"
+                   $echo "*** using a regex pattern. Last file checked: $potlib"
                  fi
                fi
              else
-Line 2692 
 EOF
+Line 3601 
 EOF
            ;;
          none | unknown | *)
            newdeplibs=""
-           if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+           tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-                -e 's/ -[LR][^ ]*//g' -e 's/[    ]//g' |
+             -e 's/ -[LR][^ ]*//g'`
-              grep . >/dev/null; then
+           if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-             echo
+             for i in $predeps $postdeps ; do
+               # can't use Xsed below, because $i might contain '/'
+               tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+             done
+           fi
+           if $echo "X $tmp_deplibs" | $Xsed -e 's/[     ]//g' \
+             | grep . >/dev/null; then
+             $echo
              if test "X$deplibs_check_method" = "Xnone"; then
-               echo "*** Warning: inter-library dependencies are not supported in this platform."
+               $echo "*** Warning: inter-library dependencies are not supported in this platform."
              else
-               echo "*** Warning: inter-library dependencies are not known to be supported."
+               $echo "*** Warning: inter-library dependencies are not known to be supported."
              fi
-             echo "*** All declared inter-library dependencies are being dropped."
+             $echo "*** All declared inter-library dependencies are being dropped."
              droppeddeps=yes
            fi
            ;;
-Line 2721 
 EOF
+Line 3637 
 EOF
          if test "$droppeddeps" = yes; then
            if test "$module" = yes; then
-             echo
+             $echo
-             echo "*** Warning: libtool could not satisfy all declared inter-library"
+             $echo "*** Warning: libtool could not satisfy all declared inter-library"
-             echo "*** dependencies of module $libname.  Therefore, libtool will create"
+             $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-             echo "*** a static module, that should work as long as the dlopening"
+             $echo "*** a static module, that should work as long as the dlopening"
-             echo "*** application is linked with the -dlopen flag."
+             $echo "*** application is linked with the -dlopen flag."
              if test -z "$global_symbol_pipe"; then
-               echo
+               $echo
-               echo "*** However, this would only work if libtool was able to extract symbol"
+               $echo "*** However, this would only work if libtool was able to extract symbol"
-               echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+               $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-               echo "*** not find such a program.  So, this module is probably useless."
+               $echo "*** not find such a program.  So, this module is probably useless."
-               echo "*** \`nm' from GNU binutils and a full rebuild may help."
+               $echo "*** \`nm' from GNU binutils and a full rebuild may help."
              fi
              if test "$build_old_libs" = no; then
                oldlibs="$output_objdir/$libname.$libext"
-Line 2741 
 EOF
+Line 3657 
 EOF
                build_libtool_libs=no
              fi
            else
-             echo "*** The inter-library dependencies that have been dropped here will be"
+             $echo "*** The inter-library dependencies that have been dropped here will be"
-             echo "*** automatically added whenever a program is linked with this library"
+             $echo "*** automatically added whenever a program is linked with this library"
-             echo "*** or is declared to -dlopen it."
+             $echo "*** or is declared to -dlopen it."
-             if test $allow_undefined = no; then
+             if test "$allow_undefined" = no; then
-               echo
+               $echo
-               echo "*** Since this library must not contain undefined symbols,"
+               $echo "*** Since this library must not contain undefined symbols,"
-               echo "*** because either the platform does not support them or"
+               $echo "*** because either the platform does not support them or"
-               echo "*** it was explicitly requested with -no-undefined,"
+               $echo "*** it was explicitly requested with -no-undefined,"
-               echo "*** libtool will only create a static version of it."
+               $echo "*** libtool will only create a static version of it."
                if test "$build_old_libs" = no; then
                  oldlibs="$output_objdir/$libname.$libext"
                  build_libtool_libs=module
-Line 2772 
 EOF
+Line 3688 
 EOF
        # Test again, we may have decided not to build it any more
        if test "$build_libtool_libs" = yes; then
-         if test $hardcode_into_libs = yes; then
+         if test "$hardcode_into_libs" = yes; then
            # Hardcode the library paths
            hardcode_libdirs=
            dep_rpath=
-Line 2808 
 EOF
+Line 3724 
 EOF
            if test -n "$hardcode_libdir_separator" &&
               test -n "$hardcode_libdirs"; then
              libdir="$hardcode_libdirs"
-             eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+             if test -n "$hardcode_libdir_flag_spec_ld"; then
+               eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+             else
+               eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+             fi
            fi
            if test -n "$runpath_var" && test -n "$perm_rpath"; then
              # We should set the runpath_var.
-Line 2828 
 EOF
+Line 3748 
 EOF
          fi
          # Get the real and link names of the library.
+         eval shared_ext=\"$shrext_cmds\"
          eval library_names=\"$library_names_spec\"
          set dummy $library_names
          realname="$2"
-Line 2838 
 EOF
+Line 3759 
 EOF
          else
            soname="$realname"
          fi
-         test -z "$dlname" && dlname=$soname
+         if test -z "$dlname"; then
+           dlname=$soname
+         fi
          lib="$output_objdir/$realname"
          for link
-Line 2846 
 EOF
+Line 3769 
 EOF
            linknames="$linknames $link"
          done
-         # Ensure that we have .o objects for linkers which dislike .lo
-         # (e.g. aix) in case we are running --disable-static
-         for obj in $libobjs; do
-           xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-           if test "X$xdir" = "X$obj"; then
-             xdir="."
-           else
-             xdir="$xdir"
-           fi
-           baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-           oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-           if test ! -f $xdir/$oldobj; then
-             $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-             $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-           fi
-         done
          # Use standard objects if they are pic
          test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-Line 2872 
 EOF
+Line 3778 
 EOF
              $show "generating symbol list for \`$libname.la'"
              export_symbols="$output_objdir/$libname.exp"
              $run $rm $export_symbols
-             eval cmds=\"$export_symbols_cmds\"
+             cmds=$export_symbols_cmds
              save_ifs="$IFS"; IFS='~'
              for cmd in $cmds; do
                IFS="$save_ifs"
-               $show "$cmd"
+               eval cmd=\"$cmd\"
-               $run eval "$cmd" || exit $?
+               if len=`expr "X$cmd" : ".*"` &&
+                test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+                 $show "$cmd"
+                 $run eval "$cmd" || exit $?
+                 skipped_export=false
+               else
+                 # The command line is too long to execute in one step.
+                 $show "using reloadable object file for export list..."
+                 skipped_export=:
+               fi
              done
              IFS="$save_ifs"
              if test -n "$export_symbols_regex"; then
-               $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+               $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-               $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+               $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
                $show "$mv \"${export_symbols}T\" \"$export_symbols\""
                $run eval '$mv "${export_symbols}T" "$export_symbols"'
              fi
-Line 2893 
 EOF
+Line 3808 
 EOF
            $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
          fi
+         tmp_deplibs=
+         for test_deplib in $deplibs; do
+                 case " $convenience " in
+                 *" $test_deplib "*) ;;
+                 *)
+                         tmp_deplibs="$tmp_deplibs $test_deplib"
+                         ;;
+                 esac
+         done
+         deplibs="$tmp_deplibs"
          if test -n "$convenience"; then
            if test -n "$whole_archive_flag_spec"; then
+             save_libobjs=$libobjs
              eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
            else
              gentop="$output_objdir/${outputname}x"
-             $show "${rm}r $gentop"
-             $run ${rm}r "$gentop"
-             $show "mkdir $gentop"
-             $run mkdir "$gentop"
-             status=$?
-             if test $status -ne 0 && test ! -d "$gentop"; then
-               exit $status
-             fi
              generated="$generated $gentop"
-             for xlib in $convenience; do
+             func_extract_archives $gentop $convenience
-               # Extract the objects.
+             libobjs="$libobjs $func_extract_archives_result"
-               case $xlib in
-               [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-               *) xabs=`pwd`"/$xlib" ;;
-               esac
-               xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-               xdir="$gentop/$xlib"
-               $show "${rm}r $xdir"
-               $run ${rm}r "$xdir"
-               $show "mkdir $xdir"
-               $run mkdir "$xdir"
-               status=$?
-               if test $status -ne 0 && test ! -d "$xdir"; then
-                 exit $status
-               fi
-               $show "(cd $xdir && $AR x $xabs)"
-               $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-               libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-             done
            fi
          fi
          if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
            eval flag=\"$thread_safe_flag_spec\"
            linker_flags="$linker_flags $flag"
-Line 2944 
 EOF
+Line 3843 
 EOF
          fi
          # Do each of the archive commands.
+         if test "$module" = yes && test -n "$module_cmds" ; then
+           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+             eval test_cmds=\"$module_expsym_cmds\"
+             cmds=$module_expsym_cmds
+           else
+             eval test_cmds=\"$module_cmds\"
+             cmds=$module_cmds
+           fi
+         else
          if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-           eval cmds=\"$archive_expsym_cmds\"
+           eval test_cmds=\"$archive_expsym_cmds\"
+           cmds=$archive_expsym_cmds
+         else
+           eval test_cmds=\"$archive_cmds\"
+           cmds=$archive_cmds
+           fi
+         fi
+         if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+            test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+           :
          else
-           save_deplibs="$deplibs"
+           # The command line is too long to link in one step, link piecewise.
-           for conv in $convenience; do
+           $echo "creating reloadable object files..."
-             tmp_deplibs=
-             for test_deplib in $deplibs; do
+           # Save the value of $output and $libobjs because we want to
-               if test "$test_deplib" != "$conv"; then
+           # use them later.  If we have whole_archive_flag_spec, we
-                 tmp_deplibs="$tmp_deplibs $test_deplib"
+           # want to use save_libobjs as it was before
+           # whole_archive_flag_spec was expanded, because we can't
+           # assume the linker understands whole_archive_flag_spec.
+           # This may have to be revisited, in case too many
+           # convenience libraries get linked in and end up exceeding
+           # the spec.
+           if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+             save_libobjs=$libobjs
+           fi
+           save_output=$output
+           # Clear the reloadable object creation command queue and
+           # initialize k to one.
+           test_cmds=
+           concat_cmds=
+           objlist=
+           delfiles=
+           last_robj=
+           k=1
+           output=$output_objdir/$save_output-${k}.$objext
+           # Loop over the list of objects to be linked.
+           for obj in $save_libobjs
+           do
+             eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+             if test "X$objlist" = X ||
+                { len=`expr "X$test_cmds" : ".*"` &&
+                  test "$len" -le "$max_cmd_len"; }; then
+               objlist="$objlist $obj"
+             else
+               # The command $test_cmds is almost too long, add a
+               # command to the queue.
+               if test "$k" -eq 1 ; then
+                 # The first file doesn't have a previous command to add.
+                 eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+               else
+                 # All subsequent reloadable object files will link in
+                 # the last one created.
+                 eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
                fi
-             done
+               last_robj=$output_objdir/$save_output-${k}.$objext
-             deplibs="$tmp_deplibs"
+               k=`expr $k + 1`
+               output=$output_objdir/$save_output-${k}.$objext
+               objlist=$obj
+               len=1
+             fi
+           done
+           # Handle the remaining objects by creating one last
+           # reloadable object file.  All subsequent reloadable object
+           # files will link in the last one created.
+           test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+           eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+           if ${skipped_export-false}; then
+             $show "generating symbol list for \`$libname.la'"
+             export_symbols="$output_objdir/$libname.exp"
+             $run $rm $export_symbols
+             libobjs=$output
+             # Append the command to create the export file.
+             eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+           # Set up a command to remove the reloadale object files
+           # after they are used.
+           i=0
+           while test "$i" -lt "$k"
+           do
+             i=`expr $i + 1`
+             delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+           done
+           $echo "creating a temporary reloadable object file: $output"
+           # Loop through the commands generated above and execute them.
+           save_ifs="$IFS"; IFS='~'
+           for cmd in $concat_cmds; do
+             IFS="$save_ifs"
+             $show "$cmd"
+             $run eval "$cmd" || exit $?
            done
-           eval cmds=\"$archive_cmds\"
+           IFS="$save_ifs"
-           deplibs="$save_deplibs"
+           libobjs=$output
+           # Restore the value of output.
+           output=$save_output
+           if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+             eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+           fi
+           # Expand the library linking commands again to reset the
+           # value of $libobjs for piecewise linking.
+           # Do each of the archive commands.
+           if test "$module" = yes && test -n "$module_cmds" ; then
+             if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+               cmds=$module_expsym_cmds
+             else
+               cmds=$module_cmds
+             fi
+           else
+           if test -n "$ex