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

Diff of /code/trunk/ltmain.sh

Parent Directory | Revision Log | View Patch Patch

-revision 75 by nigel,
Sat Feb 24 21:40:37 2007 UTC
+revision 87 by nigel,
Sat Feb 24 21:41:21 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, 2003, 2004
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
  # Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
  #
 Line 17
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
 Line 33 
 basename="s,^.*/,,g"
  # function.
  progpath="$0"
- # Modification by PH (26-Aug-2004, originally 18-Feb-2003) to ensure that
+ # define SED for historic ltconfig's generated by Libtool 1.3
- # ${SED} is always set (it is not set on my system).
+ test -z "$SED" && SED=sed
- case "X${SED}" in
-   X) SED=sed ;;
- esac
  # The name of this program:
  progname=`echo "$progpath" | $SED $basename`
-Line 50 
 EXIT_FAILURE=1
+Line 46 
 EXIT_FAILURE=1
  PROGRAM=ltmain.sh
  PACKAGE=libtool
- VERSION=1.5.8
+ VERSION=1.5.22
- TIMESTAMP=" (1.1220.2.117 2004/08/04 14:12:05)"
+ TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
  # See if we are running on zsh, and set the options which allow our
  # commands through without removal of \ escapes.
  if test -n "${ZSH_VERSION+set}" ; then
    setopt NO_GLOB_SUBST
  fi
+ # Same for EGREP, and just to be sure, do LTCC as well
+ if test "X$EGREP" = X ; then
+     EGREP=egrep
+ fi
+ if test "X$LTCC" = X ; then
+     LTCC=${CC-gcc}
+ fi
  # Check that we have a working $echo.
  if test "X$1" = X--no-reexec; then
-Line 95 
 rm="rm -f"
+Line 98 
 rm="rm -f"
  Xsed="${SED}"' -e 1s/^X//'
  sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
  # test EBCDIC or ASCII
- case `echo A|tr A '\301'` in
+ case `echo X|tr X '\101'` in
-  A) # EBCDIC based system
+  A) # ASCII based system
-   SP2NL="tr '\100' '\n'"
+     # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-   NL2SP="tr '\r\n' '\100\100'"
+   SP2NL='tr \040 \012'
+   NL2SP='tr \015\012 \040\040'
    ;;
-  *) # Assume ASCII based system
+  *) # EBCDIC based system
-   SP2NL="tr '\040' '\012'"
+   SP2NL='tr \100 \n'
-   NL2SP="tr '\015\012' '\040\040'"
+   NL2SP='tr \r\n \100\100'
    ;;
  esac
-Line 119 
 if test "${LANG+set}" = set; then
+Line 123 
 if test "${LANG+set}" = set; then
  fi
  # Make sure IFS has a sensible default
- : ${IFS="
+ lt_nl='
- "}
+ '
+ IFS="   $lt_nl"
  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
    $echo "$modename: not configured to build any kind of library" 1>&2
-Line 137 
 run=
+Line 142 
 run=
  show="$echo"
  show_help=
  execute_dlfiles=
+ duplicate_deps=no
+ preserve_args=
  lo2o="s/\\.lo\$/.${objext}/"
  o2lo="s/\\.${objext}\$/.lo/"
+ if test -z "$max_cmd_len"; then
+   i=0
+   testring="ABCD"
+   new_result=
+   # If test is not a shell built-in, we'll probably end up computing a
+   # maximum length that is only half of the actual maximum length, but
+   # we can't tell.
+   while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+              = "XX$testring") >/dev/null 2>&1 &&
+           new_result=`expr "X$testring" : ".*" 2>&1` &&
+           max_cmd_len="$new_result" &&
+           test "$i" != 17 # 1/2 MB should be enough
+   do
+     i=`expr $i + 1`
+     testring="$testring$testring"
+   done
+   testring=
+   # Add a significant safety factor because C++ compilers can tack on massive
+   # amounts of additional arguments before passing them to the linker.
+   # It appears as though 1/2 is a usable value.
+   max_cmd_len=`expr $max_cmd_len \/ 2`
+ fi
  #####################################
  # Shell function definitions:
  # This seems to be the best place for them
+ # func_mktempdir [string]
+ # Make a temporary directory that won't clash with other running
+ # libtool processes, and avoids race conditions if possible.  If
+ # given, STRING is the basename for that directory.
+ func_mktempdir ()
+ {
+     my_template="${TMPDIR-/tmp}/${1-$progname}"
+     if test "$run" = ":"; then
+       # Return a directory name, but don't create it in dry-run mode
+       my_tmpdir="${my_template}-$$"
+     else
+       # If mktemp works, use that first and foremost
+       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+       if test ! -d "$my_tmpdir"; then
+         # Failing that, at least try and use $RANDOM to avoid a race
+         my_tmpdir="${my_template}-${RANDOM-0}$$"
+         save_mktempdir_umask=`umask`
+         umask 0077
+         $mkdir "$my_tmpdir"
+         umask $save_mktempdir_umask
+       fi
+       # If we're not in dry-run mode, bomb out on failure
+       test -d "$my_tmpdir" || {
+         $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+         exit $EXIT_FAILURE
+       }
+     fi
+     $echo "X$my_tmpdir" | $Xsed
+ }
  # func_win32_libid arg
  # 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 () {
+ func_win32_libid ()
+ {
    win32_libid_type="unknown"
    win32_fileres=`file -L $1 2>/dev/null`
    case $win32_fileres in
-Line 161 
 func_win32_libid () {
+Line 230 
 func_win32_libid () {
      if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
        $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
        win32_nmres=`eval $NM -f posix -A $1 | \
-         sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+         $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-       if test "X$win32_nmres" = "Ximport" ; then
+       case $win32_nmres in
-         win32_libid_type="x86 archive import"
+       import*)  win32_libid_type="x86 archive import";;
-       else
+       *)        win32_libid_type="x86 archive static";;
-         win32_libid_type="x86 archive static"
+       esac
-       fi
      fi
      ;;
    *DLL*)
-Line 190 
 func_win32_libid () {
+Line 258 
 func_win32_libid () {
  # 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 () {
+ 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
-Line 222 
 func_infer_tag () {
+Line 291 
 func_infer_tag () {
              esac
              CC_quoted="$CC_quoted $arg"
            done
+             # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+             trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
+             # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
+             extendcc=${host}-${CC}
+             # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
+             # (Gentoo-specific hack because we always export $CHOST)
+             mungedcc=${CHOST-${host}}-${trimedcc}
              case "$@ " in
+               "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
+               "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+               tagname=CC
+               break ;;
+               "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
+               "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
+               "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
                " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
                # The compiler in the base compile command matches
                # the one in the tagged configuration.
-Line 249 
 func_infer_tag () {
+Line 332 
 func_infer_tag () {
  }
+ # func_extract_an_archive dir oldlib
+ func_extract_an_archive ()
+ {
+     f_ex_an_ar_dir="$1"; shift
+     f_ex_an_ar_oldlib="$1"
+     $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+     $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+      :
+     else
+       $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+       exit $EXIT_FAILURE
+     fi
+ }
  # func_extract_archives gentop oldlib ...
- func_extract_archives () {
+ func_extract_archives ()
+ {
      my_gentop="$1"; shift
      my_oldlibs=${1+"$@"}
      my_oldobjs=""
-Line 281 
 func_extract_archives () {
+Line 381 
 func_extract_archives () {
        $run ${rm}r "$my_xdir"
        $show "$mkdir $my_xdir"
        $run $mkdir "$my_xdir"
-       status=$?
+       exit_status=$?
-       if test "$status" -ne 0 && test ! -d "$my_xdir"; then
+       if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-         exit $status
+         exit $exit_status
        fi
        case $host in
        *-darwin*)
-Line 294 
 func_extract_archives () {
+Line 394 
 func_extract_archives () {
            cd $my_xdir || exit $?
            darwin_archive=$my_xabs
            darwin_curdir=`pwd`
-           darwin_base_archive=`basename $darwin_archive`
+           darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
            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}"
+               func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-               rm "${darwin_base_archive}"
                cd "$darwin_curdir"
+               $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
              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_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| 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-$$
+             ${rm}r unfat-$$
              cd "$darwin_orig_dir"
            else
-             cd $darwin_orig_dir
+             cd "$darwin_orig_dir"
-             (cd $my_xdir && $AR x $my_xabs) || exit $?
+             func_extract_an_archive "$my_xdir" "$my_xabs"
            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
          ;;
+       *)
+         func_extract_an_archive "$my_xdir" "$my_xabs"
+         ;;
        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
-Line 369 
 func_extract_archives () {
+Line 438 
 func_extract_archives () {
  # Darwin sucks
  eval std_shrext=\"$shrext_cmds\"
+ disable_libs=no
  # Parse our command line options once, thoroughly.
  while test "$#" -gt 0
  do
-Line 433 
 do
+Line 504 
 do
    --version)
      $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
      $echo
-     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+     $echo "Copyright (C) 2005  Free Software Foundation, Inc."
      $echo "This is free software; see the source for copying conditions.  There is NO"
      $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-     exit $EXIT_SUCCESS
+     exit $?
      ;;
    --config)
-Line 445 
 do
+Line 516 
 do
      for tagname in $taglist; do
        ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
      done
-     exit $EXIT_SUCCESS
+     exit $?
      ;;
    --debug)
-Line 470 
 do
+Line 541 
 do
      else
        $echo "disable static libraries"
      fi
-     exit $EXIT_SUCCESS
+     exit $?
      ;;
    --finish) mode="finish" ;;
-Line 485 
 do
+Line 556 
 do
      preserve_args="$preserve_args $arg"
      ;;
-   --tag) prevopt="--tag" prev=tag ;;
+   --tag)
+     prevopt="--tag"
+     prev=tag
+     preserve_args="$preserve_args --tag"
+     ;;
    --tag=*)
      set tag "$optarg" ${1+"$@"}
      shift
-Line 517 
 if test -n "$prevopt"; then
+Line 592 
 if test -n "$prevopt"; then
    exit $EXIT_FAILURE
  fi
+ case $disable_libs in
+ no)
+   ;;
+ shared)
+   build_libtool_libs=no
+   build_old_libs=yes
+   ;;
+ static)
+   build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+   ;;
+ esac
  # If this variable is set in any of the actions, the command in it
  # will be execed at the end.  This prevents here-documents from being
  # left over by shells.
-Line 527 
 if test -z "$show_help"; then
+Line 614 
 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
+     $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
      case $nonopt in
      *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
        mode=link
-Line 593 
 if test -z "$show_help"; then
+Line 680 
 if test -z "$show_help"; then
      for arg
      do
-       case "$arg_mode" in
+       case $arg_mode in
        arg  )
          # do not "continue".  Instead, add this to base_compile
          lastarg="$arg"
-Line 629 
 if test -z "$show_help"; then
+Line 716 
 if test -z "$show_help"; then
            ;;
          -Xcompiler)
            arg_mode=arg  #  the next one goes into the "base_compile" arg list
            continue      #  The current "srcfile" will either be retained or
            ;;            #  replaced later.  I would guess that would be a bug.
          -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.
-Line 675 
 if test -z "$show_help"; then
+Line 762 
 if test -z "$show_help"; then
        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.
+       # in scan sets, and some SunOS ksh mistreat backslash-escaping
+       # in scan sets (worked around with variable expansion),
+       # and furthermore cannot handle '|' '&' '(' ')' in scan sets
+       # at all, so we specify them separately.
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
          lastarg="\"$lastarg\""
          ;;
-Line 749 
 if test -z "$show_help"; then
+Line 839 
 if test -z "$show_help"; then
        esac
      done
+     qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+     case $qlibobj in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
+         qlibobj="\"$qlibobj\"" ;;
+     esac
+     test "X$libobj" != "X$qlibobj" \
+         && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"'  &()|`$[]' \
+         && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
      objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
      xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
      if test "X$xdir" = "X$obj"; then
-Line 801 
 if test -z "$show_help"; then
+Line 899 
 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 "$progpath" "$lockfile" 2>/dev/null; do
+       until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
          $show "Waiting for $lockfile to be removed"
          sleep 2
        done
-Line 821 
 compiler."
+Line 919 
 compiler."
          $run $rm $removelist
          exit $EXIT_FAILURE
        fi
-       $echo $srcfile > "$lockfile"
+       $echo "$srcfile" > "$lockfile"
      fi
      if test -n "$fix_srcfile_path"; then
        eval srcfile=\"$fix_srcfile_path\"
      fi
+     qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+     case $qsrcfile in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
+       qsrcfile="\"$qsrcfile\"" ;;
+     esac
      $run $rm "$libobj" "${libobj}T"
-Line 848 
 EOF
+Line 951 
 EOF
        fbsd_hideous_sh_bug=$base_compile
        if test "$pic_mode" != no; then
-         command="$base_compile $srcfile $pic_flag"
+         command="$base_compile $qsrcfile $pic_flag"
        else
          # Don't build PIC code
-         command="$base_compile $srcfile"
+         command="$base_compile $qsrcfile"
        fi
        if test ! -d "${xdir}$objdir"; then
          $show "$mkdir ${xdir}$objdir"
          $run $mkdir ${xdir}$objdir
-         status=$?
+         exit_status=$?
-         if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+         if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-           exit $status
+           exit $exit_status
          fi
        fi
-Line 931 
 EOF
+Line 1034 
 EOF
      if test "$build_old_libs" = yes; then
        if test "$pic_mode" != yes; then
          # Don't build PIC code
-         command="$base_compile $srcfile"
+         command="$base_compile $qsrcfile"
        else
-         command="$base_compile $srcfile $pic_flag"
+         command="$base_compile $qsrcfile $pic_flag"
        fi
        if test "$compiler_c_o" = yes; then
          command="$command -o $obj"
-Line 1062 
 EOF
+Line 1165 
 EOF
      no_install=no
      objs=
      non_pic_objects=
+     notinst_path= # paths that contain not-installed libtool libraries
      precious_files_regex=
      prefer_static_libs=no
      preload=no
-Line 1090 
 EOF
+Line 1194 
 EOF
            if test -n "$link_static_flag"; then
              dlopen_self=$dlopen_self_static
            fi
+           prefer_static_libs=yes
          else
            if test -z "$pic_flag" && test -n "$link_static_flag"; then
              dlopen_self=$dlopen_self_static
            fi
+           prefer_static_libs=built
          fi
          build_libtool_libs=no
          build_old_libs=yes
-         prefer_static_libs=yes
          break
          ;;
        esac
-Line 1272 
 EOF
+Line 1377 
 EOF
                    if test -z "$pic_object" || test "$pic_object" = none ; then
                      arg="$non_pic_object"
                    fi
+                 else
+                   # If the PIC object exists, use it instead.
+                   # $xdir was prepended to $pic_object above.
+                   non_pic_object="$pic_object"
+                   non_pic_objects="$non_pic_objects $non_pic_object"
                  fi
                else
                  # Only an error if not doing a dry-run.
-Line 1351 
 EOF
+Line 1461 
 EOF
            continue
            ;;
          shrext)
            shrext_cmds="$arg"
+           prev=
+           continue
+           ;;
+         darwin_framework|darwin_framework_skip)
+           test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+           compile_command="$compile_command $arg"
+           finalize_command="$finalize_command $arg"
            prev=
            continue
            ;;
-Line 1413 
 EOF
+Line 1530 
 EOF
          continue
          ;;
+       -framework|-arch|-isysroot)
+         case " $CC " in
+           *" ${arg} ${1} "* | *" ${arg} ${1} "*)
+                 prev=darwin_framework_skip ;;
+           *) compiler_flags="$compiler_flags $arg"
+              prev=darwin_framework ;;
+         esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+         continue
+         ;;
        -inst-prefix-dir)
          prev=inst_prefix
          continue
-Line 1439 
 EOF
+Line 1568 
 EOF
            absdir=`cd "$dir" && pwd`
            if test -z "$absdir"; then
              $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-             exit $EXIT_FAILURE
+             absdir="$dir"
+             notinst_path="$notinst_path $dir"
            fi
            dir="$absdir"
            ;;
-Line 1453 
 EOF
+Line 1583 
 EOF
          esac
          case $host in
          *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+           testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
            case :$dllsearchpath: in
            *":$dir:"*) ;;
            *) dllsearchpath="$dllsearchpath:$dir";;
            esac
+           case :$dllsearchpath: in
+           *":$testbindir:"*) ;;
+           *) dllsearchpath="$dllsearchpath:$testbindir";;
+           esac
            ;;
          esac
          continue
-Line 1465 
 EOF
+Line 1600 
 EOF
        -l*)
          if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
            case $host in
-           *-*-cygwin* | *-*-pw32* | *-*-beos*)
+           *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
              # These systems don't actually have a C or math library (as such)
              continue
              ;;
-           *-*-mingw* | *-*-os2*)
+           *-*-os2*)
              # These systems don't actually have a C library (as such)
              test "X$arg" = "X-lc" && continue
              ;;
-           *-*-openbsd* | *-*-freebsd*)
+           *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
              # Do not include libc due to us having libc/libc_r.
              test "X$arg" = "X-lc" && continue
              ;;
-Line 1481 
 EOF
+Line 1616 
 EOF
              # Rhapsody C and math libraries are in the System framework
              deplibs="$deplibs -framework System"
              continue
+             ;;
+           *-*-sco3.2v5* | *-*-sco5v6*)
+             # Causes problems with __ctype
+             test "X$arg" = "X-lc" && continue
+             ;;
+           *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+             # Compiler inserts libc in the correct place for threads to work
+             test "X$arg" = "X-lc" && continue
+             ;;
            esac
          elif test "X$arg" = "X-lc_r"; then
           case $host in
-          *-*-openbsd* | *-*-freebsd*)
+          *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
             # Do not include libc_r directly, use -pthread flag.
             continue
             ;;
-Line 1494 
 EOF
+Line 1638 
 EOF
          continue
          ;;
+       # Tru64 UNIX uses -model [arg] to determine the layout of C++
+       # classes, name mangling, and exception handling.
+       -model)
+         compile_command="$compile_command $arg"
+         compiler_flags="$compiler_flags $arg"
+         finalize_command="$finalize_command $arg"
+         prev=xcompiler
+         continue
+         ;;
       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-         deplibs="$deplibs $arg"
+         compiler_flags="$compiler_flags $arg"
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
          continue
          ;;
-Line 1504 
 EOF
+Line 1660 
 EOF
          continue
          ;;
-       # gcc -m* arguments should be passed to the linker via $compiler_flags
+       # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-       # in order to pass architecture information to the linker
+       # -r[0-9][0-9]* specifies the processor on the SGI compiler
-       # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+       # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-       # but this is not reliable with gcc because gcc may use -mfoo to
+       # +DA*, +DD* enable 64-bit mode on the HP compiler
-       # select a different linker, different libraries, etc, while
+       # -q* pass through compiler args for the IBM compiler
-       # -Wl,-mfoo simply passes -mfoo to the linker.
+       # -m* pass through architecture-specific compiler args for GCC
-       -m*)
+       # -m*, -t[45]*, -txscale* pass through architecture-specific
+       # compiler args for GCC
+       # -pg pass through profiling flag for GCC
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+       -t[45]*|-txscale*|@*)
          # Unknown arguments in both finalize_command and compile_command need
          # to be aesthetically quoted because they are evaled later.
          arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-Line 1521 
 EOF
+Line 1683 
 EOF
          esac
          compile_command="$compile_command $arg"
          finalize_command="$finalize_command $arg"
-         if test "$with_gcc" = "yes" ; then
+         compiler_flags="$compiler_flags $arg"
-           compiler_flags="$compiler_flags $arg"
-         fi
          continue
          ;;
-Line 1720 
 EOF
+Line 1880 
 EOF
            xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
            if test "X$xdir" = "X$arg"; then
              xdir=
            else
              xdir="$xdir/"
            fi
-Line 1761 
 EOF
+Line 1921 
 EOF
              if test -z "$pic_object" || test "$pic_object" = none ; then
                arg="$non_pic_object"
              fi
+           else
+             # If the PIC object exists, use it instead.
+             # $xdir was prepended to $pic_object above.
+             non_pic_object="$pic_object"
+             non_pic_objects="$non_pic_objects $non_pic_object"
            fi
          else
            # Only an error if not doing a dry-run.
-Line 1866 
 EOF
+Line 2031 
 EOF
      if test ! -d "$output_objdir"; then
        $show "$mkdir $output_objdir"
        $run $mkdir $output_objdir
-       status=$?
+       exit_status=$?
-       if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+       if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-         exit $status
+         exit $exit_status
        fi
      fi
-Line 1931 
 EOF
+Line 2096 
 EOF
      newlib_search_path=
      need_relink=no # whether we're linking any uninstalled libtool libraries
      notinst_deplibs= # not-installed libtool libraries
-     notinst_path= # paths that contain not-installed libtool libraries
      case $linkmode in
      lib)
          passes="conv link"
-Line 1983 
 EOF
+Line 2147 
 EOF
              compile_deplibs="$deplib $compile_deplibs"
              finalize_deplibs="$deplib $finalize_deplibs"
            else
-             deplibs="$deplib $deplibs"
+             compiler_flags="$compiler_flags $deplib"
            fi
            continue
            ;;
-Line 1992 
 EOF
+Line 2156 
 EOF
              $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
              continue
            fi
-           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
              for search_ext in .la $std_shrext .so .a; do
-Line 2053 
 EOF
+Line 2213 
 EOF
                      continue
                    fi
                  fi
                  ;;
                *) ;;
                esac
              fi
-Line 2110 
 EOF
+Line 2270 
 EOF
              case $deplibs_check_method in
                match_pattern*)
                  set dummy $deplibs_check_method
                  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
                  if eval $echo \"$deplib\" 2>/dev/null \
                      | $SED 10q \
                      | $EGREP "$match_pattern_regex" > /dev/null; then
-Line 2171 
 EOF
+Line 2331 
 EOF
          esac # case $deplib
          if test "$found" = yes || test -f "$lib"; then :
          else
-           $echo "$modename: cannot find the library \`$lib'" 1>&2
+           $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
            exit $EXIT_FAILURE
          fi
-Line 2195 
 EOF
+Line 2355 
 EOF
          # it will not redefine variables installed, or shouldnotlink
          installed=yes
          shouldnotlink=no
+         avoidtemprpath=
          # Read the .la file
          case $lib in
-Line 2224 
 EOF
+Line 2386 
 EOF
              for deplib in $dependency_libs; do
                deplibs="$deplib $deplibs"
                if test "X$duplicate_deps" = "Xyes" ; then
                  case "$tmp_libs " in
                  *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
                  esac
                fi
                tmp_libs="$tmp_libs $deplib"
              done
-Line 2293 
 EOF
+Line 2455 
 EOF
              dir="$libdir"
              absdir="$libdir"
            fi
+           test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
          else
            if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
              dir="$ladir"
-Line 2377 
 EOF
+Line 2540 
 EOF
            if test -n "$library_names" &&
               { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
              # We need to hardcode the library path
-             if test -n "$shlibpath_var"; then
+             if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
                # Make sure the rpath contains only unique directories.
                case "$temp_rpath " in
                *" $dir "*) ;;
                *" $absdir "*) ;;
-               *) temp_rpath="$temp_rpath $dir" ;;
+               *) temp_rpath="$temp_rpath $absdir" ;;
                esac
              fi
-Line 2419 
 EOF
+Line 2582 
 EOF
          fi
          link_static=no # Whether the deplib will be linked statically
+         use_static_libs=$prefer_static_libs
+         if test "$use_static_libs" = built && test "$installed" = yes ; then
+           use_static_libs=no
+         fi
          if test -n "$library_names" &&
-            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+            { test "$use_static_libs" = no || test -z "$old_library"; }; then
            if test "$installed" = no; then
              notinst_deplibs="$notinst_deplibs $lib"
              need_relink=yes
-Line 2533 
 EOF
+Line 2700 
 EOF
                if test "$hardcode_direct" = no; then
                  add="$dir/$linklib"
                  case $host in
-                   *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+                   *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+                   *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+                   *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+                     *-*-unixware7*) add_dir="-L$dir" ;;
                    *-*-darwin* )
                      # if the lib is a module then we can not link against
                      # it, someone is ignoring the new warnings I added
-                     if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+                     if /usr/bin/file -L $add 2> /dev/null |
+                       $EGREP ": [^:]* bundle" >/dev/null ; then
                        $echo "** Warning, lib $linklib is a module, not a shared library"
                        if test -z "$old_library" ; then
                          $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
-Line 2568 
 EOF
+Line 2739 
 EOF
                  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
+                   case $libdir in
                      [\\/]*)
                        add_dir="$add_dir -L$inst_prefix_dir$libdir"
                        ;;
-Line 2632 
 EOF
+Line 2803 
 EOF
              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
+                 case $libdir in
                    [\\/]*)
                      add_dir="$add_dir -L$inst_prefix_dir$libdir"
                      ;;
-Line 2702 
 EOF
+Line 2873 
 EOF
                fi
              fi
            else
-             convenience="$convenience $dir/$old_library"
-             old_convenience="$old_convenience $dir/$old_library"
              deplibs="$dir/$old_library $deplibs"
              link_static=yes
            fi
-Line 2821 
 EOF
+Line 2990 
 EOF
                *) continue ;;
                esac
                case " $deplibs " in
-               *" $depdepl "*) ;;
+               *" $path "*) ;;
-               *) deplibs="$depdepl $deplibs" ;;
+               *) deplibs="$path $deplibs" ;;
                esac
                case " $deplibs " in
-               *" $path "*) ;;
+               *" $depdepl "*) ;;
-               *) deplibs="$deplibs $path" ;;
+               *) deplibs="$depdepl $deplibs" ;;
                esac
              done
            fi # link_all_deplibs != no
-Line 2863 
 EOF
+Line 3032 
 EOF
            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:
-Line 3091 
 EOF
+Line 3260 
 EOF
          # Check that each of the things are valid numbers.
          case $current in
-| [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
          *)
-           $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+           $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
            $echo "$modename: \`$vinfo' is not valid version information" 1>&2
            exit $EXIT_FAILURE
            ;;
          esac
          case $revision in
-| [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
          *)
-           $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+           $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
            $echo "$modename: \`$vinfo' is not valid version information" 1>&2
            exit $EXIT_FAILURE
            ;;
          esac
          case $age in
-| [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
          *)
-           $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+           $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
            $echo "$modename: \`$vinfo' is not valid version information" 1>&2
            exit $EXIT_FAILURE
            ;;
-Line 3155 
 EOF
+Line 3324 
 EOF
            case $version_type in
              nonstopux) verstring_prefix=nonstopux ;;
              *)         verstring_prefix=sgi ;;
            esac
            verstring="$verstring_prefix$major.$revision"
-Line 3264 
 EOF
+Line 3433 
 EOF
                 ;;
              $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
-Line 3290 
 EOF
+Line 3459 
 EOF
        # 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 3343 
 EOF
+Line 3512 
 EOF
            *-*-netbsd*)
              # Don't link with libc until the a.out ld.so is fixed.
              ;;
-           *-*-openbsd* | *-*-freebsd*)
+           *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
              # Do not include libc due to us having libc/libc_r.
-             test "X$arg" = "X-lc" && continue
              ;;
-           *)
+           *-*-sco3.2v5* | *-*-sco5v6*)
+             # Causes problems with __ctype
+             ;;
+           *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+             # Compiler inserts libc in the correct place for threads to work
+             ;;
+           *)
              # Add libc to deplibs on all other systems if necessary.
              if test "$build_libtool_need_lc" = "yes"; then
                deplibs="$deplibs -lc"
-Line 3374 
 EOF
+Line 3548 
 EOF
          pass_all)
            # Don't check for shared/static.  Everything works.
            # 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 behavior.
            newdeplibs=$deplibs
-Line 3389 
 EOF
+Line 3563 
 EOF
            int main() { return 0; }
  EOF
            $rm conftest
-           $LTCC -o conftest conftest.c $deplibs
+           $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
            if test "$?" -eq 0 ; then
              ldd_output=`ldd conftest`
              for i in $deplibs; do
-               name="`expr $i : '-l\(.*\)'`"
+               name=`expr $i : '-l\(.*\)'`
                # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" -ne "0"; then
                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-Line 3403 
 EOF
+Line 3577 
 EOF
                      i=""
                      ;;
                    esac
                  fi
                  if test -n "$i" ; then
                    libname=`eval \\$echo \"$libname_spec\"`
                    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-Line 3430 
 EOF
+Line 3604 
 EOF
              # 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\(.*\)'`"
+               name=`expr $i : '-l\(.*\)'`
                # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" != "0"; then
                  $rm conftest
-                 $LTCC -o conftest conftest.c $i
+                 $LTCC $LTCFLAGS -o conftest conftest.c $i
                  # Did it work?
                  if test "$?" -eq 0 ; then
                    ldd_output=`ldd conftest`
-Line 3468 
 EOF
+Line 3642 
 EOF
                    droppeddeps=yes
                    $echo
                    $echo "*** Warning!  Library $i is needed by this library but I was not able to"
                    $echo "***  make it link in!  You will probably need to install it or some"
                    $echo "*** library that it depends on before this library will be fully"
                    $echo "*** functional.  Installing it before continuing would be even better."
                  fi
-Line 3482 
 EOF
+Line 3656 
 EOF
            set dummy $deplibs_check_method
            file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
            for a_deplib in $deplibs; do
-             name="`expr $a_deplib : '-l\(.*\)'`"
+             name=`expr $a_deplib : '-l\(.*\)'`
              # If $name is empty we are operating on a -L argument.
              if test "$name" != "" && test  "$name" != "0"; then
                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-Line 3516 
 EOF
+Line 3690 
 EOF
                          *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
                          esac
                        done
+                       # It is ok to link against an archive when
+                       # building a shared library.
+                       if $AR -t $potlib > /dev/null 2>&1; then
+                         newdeplibs="$newdeplibs $a_deplib"
+                         a_deplib=""
+                         break 2
+                       fi
                        if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
                           | ${SED} 10q \
                           | $EGREP "$file_magic_regex" > /dev/null; then
-Line 3551 
 EOF
+Line 3732 
 EOF
            set dummy $deplibs_check_method
            match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
            for a_deplib in $deplibs; do
-             name="`expr $a_deplib : '-l\(.*\)'`"
+             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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-Line 3569 
 EOF
+Line 3750 
 EOF
                    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
-Line 3609 
 EOF
+Line 3790 
 EOF
                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
-Line 3681 
 EOF
+Line 3862 
 EOF
          deplibs=$newdeplibs
        fi
+       # move library search paths that coincide with paths to not yet
+       # installed libraries to the beginning of the library search list
+       new_libs=
+       for path in $notinst_path; do
+         case " $new_libs " in
+         *" -L$path/$objdir "*) ;;
+         *)
+           case " $deplibs " in
+           *" -L$path/$objdir "*)
+             new_libs="$new_libs -L$path/$objdir" ;;
+           esac
+           ;;
+         esac
+       done
+       for deplib in $deplibs; do
+         case $deplib in
+         -L*)
+           case " $new_libs " in
+           *" $deplib "*) ;;
+           *) new_libs="$new_libs $deplib" ;;
+           esac
+           ;;
+         *) new_libs="$new_libs $deplib" ;;
+         esac
+       done
+       deplibs="$new_libs"
        # All the library-specific variables (install_libdir is set above).
        library_names=
        old_library=
-Line 3764 
 EOF
+Line 3974 
 EOF
          fi
          lib="$output_objdir/$realname"
+         linknames=
          for link
          do
            linknames="$linknames $link"
-Line 3785 
 EOF
+Line 3996 
 EOF
                eval cmd=\"$cmd\"
                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=:
+                 # Break out early, otherwise skipped_export may be
+                 # set to false by a later but shorter cmd.
+                 break
                fi
              done
              IFS="$save_ifs"
-Line 3861 
 EOF
+Line 4075 
 EOF
            fi
          fi
-         if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+         if test "X$skipped_export" != "X:" &&
+            len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
             test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
            :
          else
-Line 3880 
 EOF
+Line 4095 
 EOF
              save_libobjs=$libobjs
            fi
            save_output=$output
+           output_la=`$echo "X$output" | $Xsed -e "$basename"`
            # Clear the reloadable object creation command queue and
            # initialize k to one.
-Line 3889 
 EOF
+Line 4105 
 EOF
            delfiles=
            last_robj=
            k=1
-           output=$output_objdir/$save_output-${k}.$objext
+           output=$output_objdir/$output_la-${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" : ".*"` &&
+                { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
                   test "$len" -le "$max_cmd_len"; }; then
                objlist="$objlist $obj"
              else
-Line 3909 
 EOF
+Line 4125 
 EOF
                  # the last one created.
                  eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
                fi
-               last_robj=$output_objdir/$save_output-${k}.$objext
+               last_robj=$output_objdir/$output_la-${k}.$objext
                k=`expr $k + 1`
-               output=$output_objdir/$save_output-${k}.$objext
+               output=$output_objdir/$output_la-${k}.$objext
                objlist=$obj
                len=1
              fi
-Line 3931 
 EOF
+Line 4147 
 EOF
              eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
            fi
-           # Set up a command to remove the reloadale object files
+           # Set up a command to remove the reloadable 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"
+             delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
            done
            $echo "creating a temporary reloadable object file: $output"
-Line 3985 
 EOF
+Line 4201 
 EOF
            IFS="$save_ifs"
            eval cmd=\"$cmd\"
            $show "$cmd"
-           $run eval "$cmd" || exit $?
+           $run eval "$cmd" || {
+             lt_exit=$?
+             # Restore the uninstalled library and exit
+             if test "$mode" = relink; then
+               $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+             fi
+             exit $lt_exit
+           }
          done
          IFS="$save_ifs"
          # Restore the uninstalled library and exit
          if test "$mode" = relink; then
            $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+           if test -n "$convenience"; then
+             if test -z "$whole_archive_flag_spec"; then
+               $show "${rm}r $gentop"
+               $run ${rm}r "$gentop"
+             fi
+           fi
            exit $EXIT_SUCCESS
          fi
-Line 4173 
 EOF
+Line 4406 
 EOF
          ;;
        esac
+       # move library search paths that coincide with paths to not yet
+       # installed libraries to the beginning of the library search list
+       new_libs=
+       for path in $notinst_path; do
+         case " $new_libs " in
+         *" -L$path/$objdir "*) ;;
+         *)
+           case " $compile_deplibs " in
+           *" -L$path/$objdir "*)
+             new_libs="$new_libs -L$path/$objdir" ;;
+           esac
+           ;;
+         esac
+       done
+       for deplib in $compile_deplibs; do
+         case $deplib in
+         -L*)
+           case " $new_libs " in
+           *" $deplib "*) ;;
+           *) new_libs="$new_libs $deplib" ;;
+           esac
+           ;;
+         *) new_libs="$new_libs $deplib" ;;
+         esac
+       done
+       compile_deplibs="$new_libs"
        compile_command="$compile_command $compile_deplibs"
        finalize_command="$finalize_command $finalize_deplibs"
-Line 4217 
 EOF
+Line 4479 
 EOF
          fi
          case $host in
          *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+           testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
            case :$dllsearchpath: in
            *":$libdir:"*) ;;
            *) dllsearchpath="$dllsearchpath:$libdir";;
            esac
+           case :$dllsearchpath: in
+           *":$testbindir:"*) ;;
+           *) dllsearchpath="$dllsearchpath:$testbindir";;
+           esac
            ;;
          esac
        done
-Line 4334 
 extern \"C\" {
+Line 4601 
 extern \"C\" {
              # Prepare the list of exported symbols
              if test -z "$export_symbols"; then
-               export_symbols="$output_objdir/$output.exp"
+               export_symbols="$output_objdir/$outputname.exp"
                $run $rm $export_symbols
-               $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+               $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+               case $host in
+               *cygwin* | *mingw* )
+                 $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                 $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                 ;;
+               esac
              else
-               $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+               $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-               $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+               $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
                $run eval 'mv "$nlist"T "$nlist"'
+               case $host in
+               *cygwin* | *mingw* )
+                 $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                 $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                 ;;
+               esac
              fi
            fi
-Line 4391 
 extern \"C\" {
+Line 4670 
 extern \"C\" {
  #endif
  /* The mapping between symbol names and symbols. */
+ "
+             case $host in
+             *cygwin* | *mingw* )
+           $echo >> "$output_objdir/$dlsyms" "\
+ /* DATA imports from DLLs on WIN32 can't be const, because
+    runtime relocations are performed -- see ld's documentation
+    on pseudo-relocs */
+ struct {
+ "
+               ;;
+             * )
+           $echo >> "$output_objdir/$dlsyms" "\
  const struct {
+ "
+               ;;
+             esac
+           $echo >> "$output_objdir/$dlsyms" "\
    const char *name;
    lt_ptr address;
  }
-Line 4438 
 static const void *lt_preloaded_setup()
+Line 4736 
 static const void *lt_preloaded_setup()
            esac
            # Now compile the dynamic symbol file.
-           $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+           $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-           $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+           $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
            # Clean up the generated files.
            $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
            $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
            # Transform the symbol file into the correct name.
-           compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+           case $host in
-           finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+           *cygwin* | *mingw* )
+             if test -f "$output_objdir/${outputname}.def" ; then
+               compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+               finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+             else
+               compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+               finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              fi
+             ;;
+           * )
+             compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+             finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+             ;;
+           esac
            ;;
          *)
            $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-Line 4472 
 static const void *lt_preloaded_setup()
+Line 4783 
 static const void *lt_preloaded_setup()
          # We have no uninstalled library dependencies, so finalize right now.
          $show "$link_command"
          $run eval "$link_command"
-         status=$?
+         exit_status=$?
          # Delete the generated files.
          if test -n "$dlsyms"; then
-Line 4480 
 static const void *lt_preloaded_setup()
+Line 4791 
 static const void *lt_preloaded_setup()
            $run $rm "$output_objdir/${outputname}S.${objext}"
          fi
-         exit $status
+         exit $exit_status
        fi
        if test -n "$shlibpath_var"; then
-Line 4620 
 static const void *lt_preloaded_setup()
+Line 4931 
 static const void *lt_preloaded_setup()
          esac
          case $host in
            *cygwin* | *mingw* )
-             cwrappersource=`$echo ${objdir}/lt-${output}.c`
+             output_name=`basename $output`
-             cwrapper=`$echo ${output}.exe`
+             output_path=`dirname $output`
-             $rm $cwrappersource $cwrapper
+             cwrappersource="$output_path/$objdir/lt-$output_name.c"
-             trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+             cwrapper="$output_path/$output_name.exe"
+             $rm $cwrappersource $cwrapper
+             trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
              cat > $cwrappersource <<EOF
-Line 4648 
 EOF
+Line 4961 
 EOF
  #include <malloc.h>
  #include <stdarg.h>
  #include <assert.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <sys/stat.h>
  #if defined(PATH_MAX)
  # define LT_PATHMAX PATH_MAX
-Line 4658 
 EOF
+Line 4974 
 EOF
  #endif
  #ifndef DIR_SEPARATOR
- #define DIR_SEPARATOR '/'
+ # define DIR_SEPARATOR '/'
+ # define PATH_SEPARATOR ':'
  #endif
  #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
    defined (__OS2__)
- #define HAVE_DOS_BASED_FILE_SYSTEM
+ # define HAVE_DOS_BASED_FILE_SYSTEM
- #ifndef DIR_SEPARATOR_2
+ # ifndef DIR_SEPARATOR_2
- #define DIR_SEPARATOR_2 '\\'
+ #  define DIR_SEPARATOR_2 '\\'
- #endif
+ # endif
+ # ifndef PATH_SEPARATOR_2
+ #  define PATH_SEPARATOR_2 ';'
+ # endif
  #endif
  #ifndef DIR_SEPARATOR_2
-Line 4676 
 EOF
+Line 4996 
 EOF
          (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
  #endif /* DIR_SEPARATOR_2 */
+ #ifndef PATH_SEPARATOR_2
+ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+ #else /* PATH_SEPARATOR_2 */
+ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+ #endif /* PATH_SEPARATOR_2 */
  #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
  #define XFREE(stale) do { \
    if (stale) { free ((void *) stale); stale = 0; } \
  } while (0)
+ /* -DDEBUG is fairly common in CFLAGS.  */
+ #undef DEBUG
+ #if defined DEBUGWRAPPER
+ # define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+ #else
+ # define DEBUG(format, ...)
+ #endif
  const char *program_name = NULL;
  void * xmalloc (size_t num);
  char * xstrdup (const char *string);
- char * basename (const char *name);
+ const char * base_name (const char *name);
- char * fnqualify(const char *path);
+ char * find_executable(const char *wrapper);
+ int    check_executable(const char *path);
  char * strendzap(char *str, const char *pat);
  void lt_fatal (const char *message, ...);
-Line 4696 
 main (int argc, char *argv[])
+Line 5031 
 main (int argc, char *argv[])
    char **newargz;
    int i;
-   program_name = (char *) xstrdup ((char *) basename (argv[0]));
+   program_name = (char *) xstrdup (base_name (argv[0]));
+   DEBUG("(main) argv[0]      : %s\n",argv[0]);
+   DEBUG("(main) program_name : %s\n",program_name);
    newargz = XMALLOC(char *, argc+2);
  EOF
              cat >> $cwrappersource <<EOF
-   newargz[0] = "$SHELL";
+   newargz[0] = (char *) xstrdup("$SHELL");
  EOF
              cat >> $cwrappersource <<"EOF"
-   newargz[1] = fnqualify(argv[0]);
+   newargz[1] = find_executable(argv[0]);
+   if (newargz[1] == NULL)
+     lt_fatal("Couldn't find %s", argv[0]);
+   DEBUG("(main) found exe at : %s\n",newargz[1]);
    /* we know the script has the same name, without the .exe */
    /* so make sure newargz[1] doesn't end in .exe */
    strendzap(newargz[1],".exe");
    for (i = 1; i < argc; i++)
      newargz[i+1] = xstrdup(argv[i]);
    newargz[argc+1] = NULL;
+   for (i=0; i<argc+1; i++)
+   {
+     DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+     ;
+   }
  EOF
-             cat >> $cwrappersource <<EOF
+             case $host_os in
+               mingw*)
+                 cat >> $cwrappersource <<EOF
+   execv("$SHELL",(char const **)newargz);
+ EOF
+               ;;
+               *)
+                 cat >> $cwrappersource <<EOF
    execv("$SHELL",newargz);
  EOF
+               ;;
+             esac
              cat >> $cwrappersource <<"EOF"
+   return 127;
  }
  void *
-Line 4738 
 xstrdup (const char *string)
+Line 5095 
 xstrdup (const char *string)
  ;
  }
- char *
+ const char *
- basename (const char *name)
+ base_name (const char *name)
  {
    const char *base;
  #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
    /* Skip over the disk name in MSDOS pathnames. */
-   if (isalpha (name[0]) && name[1] == ':')
+   if (isalpha ((unsigned char)name[0]) && name[1] == ':')
      name += 2;
  #endif
    for (base = name; *name; name++)
      if (IS_DIR_SEPARATOR (*name))
        base = name + 1;
-   return (char *) base;
+   return base;
+ }
+ int
+ check_executable(const char * path)
+ {
+   struct stat st;
+   DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+   if ((!path) || (!*path))
+     return 0;
+   if ((stat (path, &st) >= 0) &&
+       (
+         /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+ #if defined (S_IXOTH)
+        ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+ #endif
+ #if defined (S_IXGRP)
+        ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+ #endif
+        ((st.st_mode & S_IXUSR) == S_IXUSR))
+       )
+     return 1;
+   else
+     return 0;
  }
+ /* Searches for the full path of the wrapper.  Returns
+    newly allocated full path name if found, NULL otherwise */
  char *
- fnqualify(const char *path)
+ find_executable (const char* wrapper)
  {
-   size_t size;
+   int has_slash = 0;
-   char *p;
+   const char* p;
+   const char* p_next;
+   /* static buffer for getcwd */
    char tmp[LT_PATHMAX + 1];
+   int tmp_len;
+   char* concat_name;
+   DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-   assert(path != NULL);
+   if ((wrapper == NULL) || (*wrapper == '\0'))
+     return NULL;
-   /* Is it qualified already? */
+   /* Absolute path? */
  #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-   if (isalpha (path[0]) && path[1] == ':')
+   if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-     return xstrdup (path);
+   {
+     concat_name = xstrdup (wrapper);
+     if (check_executable(concat_name))
+       return concat_name;
+     XFREE(concat_name);
+   }
+   else
+   {
+ #endif
+     if (IS_DIR_SEPARATOR (wrapper[0]))
+     {
+       concat_name = xstrdup (wrapper);
+       if (check_executable(concat_name))
+         return concat_name;
+       XFREE(concat_name);
+     }
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   }
  #endif
-   if (IS_DIR_SEPARATOR (path[0]))
-     return xstrdup (path);
-   /* prepend the current directory */
+   for (p = wrapper; *p; p++)
-   /* doesn't handle '~' */
+     if (*p == '/')
+     {
+       has_slash = 1;
+       break;
+     }
+   if (!has_slash)
+   {
+     /* no slashes; search PATH */
+     const char* path = getenv ("PATH");
+     if (path != NULL)
+     {
+       for (p = path; *p; p = p_next)
+       {
+         const char* q;
+         size_t p_len;
+         for (q = p; *q; q++)
+           if (IS_PATH_SEPARATOR(*q))
+             break;
+         p_len = q - p;
+         p_next = (*q == '\0' ? q : q + 1);
+         if (p_len == 0)
+         {
+           /* empty path: current directory */
+           if (getcwd (tmp, LT_PATHMAX) == NULL)
+             lt_fatal ("getcwd failed");
+           tmp_len = strlen(tmp);
+           concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+           memcpy (concat_name, tmp, tmp_len);
+           concat_name[tmp_len] = '/';
+           strcpy (concat_name + tmp_len + 1, wrapper);
+         }
+         else
+         {
+           concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+           memcpy (concat_name, p, p_len);
+           concat_name[p_len] = '/';
+           strcpy (concat_name + p_len + 1, wrapper);
+         }
+         if (check_executable(concat_name))
+           return concat_name;
+         XFREE(concat_name);
+       }
+     }
+     /* not found in PATH; assume curdir */
+   }
+   /* Relative path | not found in path: prepend cwd */
    if (getcwd (tmp, LT_PATHMAX) == NULL)
      lt_fatal ("getcwd failed");
-   size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+   tmp_len = strlen(tmp);
-   p = XMALLOC(char, size);
+   concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-   sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+   memcpy (concat_name, tmp, tmp_len);
-   return p;
+   concat_name[tmp_len] = '/';
+   strcpy (concat_name + tmp_len + 1, wrapper);
+   if (check_executable(concat_name))
+     return concat_name;
+   XFREE(concat_name);
+   return NULL;
  }
  char *
-Line 4823 
 lt_fatal (const char *message, ...)
+Line 5280 
 lt_fatal (const char *message, ...)
    va_end (ap);
  }
  EOF
            # we should really use a build-platform specific compiler
            # here, but OTOH, the wrappers (shell script and this C one)
            # are only useful if you want to execute the "real" binary.
            # Since the "real" binary is built for $host, then this
            # wrapper might as well be built for $host, too.
-           $run $LTCC -s -o $cwrapper $cwrappersource
+           $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
            ;;
          esac
          $rm $output
          trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
          $echo > $output "\
  #! $SHELL
-Line 4977 
 else
+Line 5434 
 else
          $echo >> $output "\
      if test \"\$libtool_execute_magic\" != \"$magic\"; then
        # Run the actual program with our arguments.
+       # Make sure env LD_LIBRARY_PATH does not mess us up
+       if test -n \"\${LD_LIBRARY_PATH+set}\"; then
+         export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
+       fi
  "
          case $host in
          # Backslashes separate directories on plain windows
          *-*-mingw | *-*-os2*)
            $echo >> $output "\
-       exec \$progdir\\\\\$program \${1+\"\$@\"}
+       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
  "
            ;;
          *)
            $echo >> $output "\
-       exec \$progdir/\$program \${1+\"\$@\"}
+       exec \"\$progdir/\$program\" \${1+\"\$@\"}
  "
            ;;
          esac
-Line 4998 
 else
+Line 5460 
 else
      fi
    else
      # The program doesn't exist.
-     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+     \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
      \$echo \"This script is just a wrapper for \$program.\" 1>&2
      $echo \"See the $PACKAGE documentation for more information.\" 1>&2
      exit $EXIT_FAILURE
-Line 5040 
 fi\
+Line 5502 
 fi\
        if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
         cmds=$old_archive_from_new_cmds
        else
+         # POSIX demands no paths to be encoded in archives.  We have
+         # to avoid creating archives with duplicate basenames if we
+         # might have to extract them afterwards, e.g., when creating a
+         # static archive out of a convenience library, or when linking
+         # the entirety of a libtool archive into another (currently
+         # not supported by libtool).
+         if (for obj in $oldobjs
+             do
+               $echo "X$obj" | $Xsed -e 's%^.*/%%'
+             done | sort | sort -uc >/dev/null 2>&1); then
+           :
+         else
+           $echo "copying selected object files to avoid basename conflicts..."
+           if test -z "$gentop"; then
+             gentop="$output_objdir/${outputname}x"
+             generated="$generated $gentop"
+             $show "${rm}r $gentop"
+             $run ${rm}r "$gentop"
+             $show "$mkdir $gentop"
+             $run $mkdir "$gentop"
+             exit_status=$?
+             if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+               exit $exit_status
+             fi
+           fi
+           save_oldobjs=$oldobjs
+           oldobjs=
+           counter=1
+           for obj in $save_oldobjs
+           do
+             objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+             case " $oldobjs " in
+             " ") oldobjs=$obj ;;
+             *[\ /]"$objbase "*)
+               while :; do
+                 # Make sure we don't pick an alternate name that also
+                 # overlaps.
+                 newobj=lt$counter-$objbase
+                 counter=`expr $counter + 1`
+                 case " $oldobjs " in
+                 *[\ /]"$newobj "*) ;;
+                 *) if test ! -f "$gentop/$newobj"; then break; fi ;;
+                 esac
+               done
+               $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+               $run ln "$obj" "$gentop/$newobj" ||
+               $run cp "$obj" "$gentop/$newobj"
+               oldobjs="$oldobjs $gentop/$newobj"
+               ;;
+             *) oldobjs="$oldobjs $obj" ;;
+             esac
+           done
+         fi
          eval cmds=\"$old_archive_cmds\"
          if len=`expr "X$cmds" : ".*"` &&
-Line 5053 
 fi\
+Line 5572 
 fi\
            objlist=
            concat_cmds=
            save_oldobjs=$oldobjs
-           # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-           # encoded into archives.  This makes 'ar r' malfunction in
-           # this piecewise linking case whenever conflicting object
-           # names appear in distinct ar calls; check, warn and compensate.
-             if (for obj in $save_oldobjs
-             do
-               $echo "X$obj" | $Xsed -e 's%^.*/%%'
-             done | sort | sort -uc >/dev/null 2>&1); then
-             :
-           else
-             $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-             $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-             AR_FLAGS=cq
-           fi
            # Is there a better way of finding the last object in the list?
            for obj in $save_oldobjs
            do
-Line 5077 
 fi\
+Line 5583 
 fi\
              oldobjs="$objlist $obj"
              objlist="$objlist $obj"
              eval test_cmds=\"$old_archive_cmds\"
-             if len=`expr "X$test_cmds" : ".*"` &&
+             if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
                 test "$len" -le "$max_cmd_len"; then
                :
              else
                # the above command should be used before it gets too long
                oldobjs=$objlist
                if test "$obj" = "$last_oldobj" ; then
                  RANLIB=$save_RANLIB
                fi
                test -z "$concat_cmds" || concat_cmds=$concat_cmds~
                eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-Line 5160 
 fi\
+Line 5666 
 fi\
                    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                    exit $EXIT_FAILURE
                  fi
-                 newdependency_libs="$newdependency_libs $libdir/$name"
+                 if test "X$EGREP" = X ; then
+                         EGREP=egrep
+                 fi
+                 # We do not want portage's install root ($D) present.  Check only for
+                 # this if the .la is being installed.
+                 if test "$installed" = yes && test "$D"; then
+                   eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+                 else
+                   mynewdependency_lib="$libdir/$name"
+                 fi
+                 # Do not add duplicates
+                 if test "$mynewdependency_lib"; then
+                   my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+                   if test -z "$my_little_ninja_foo_1"; then
+                     newdependency_libs="$newdependency_libs $mynewdependency_lib"
+                   fi
+                 fi
+                 ;;
+                   *)
+                 if test "$installed" = yes; then
+                   # Rather use S=WORKDIR if our version of portage supports it.
+                   # This is because some ebuild (gcc) do not use $S as buildroot.
+                   if test "$PWORKDIR"; then
+                     S="$PWORKDIR"
+                   fi
+                   # We do not want portage's build root ($S) present.
+                   my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+                   # We do not want portage's install root ($D) present.
+                   my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+                   if test -n "$my_little_ninja_foo_2" && test "$S"; then
+                     mynewdependency_lib=""
+                   elif test -n "$my_little_ninja_foo_3" && test "$D"; then
+                     eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+                   else
+                     mynewdependency_lib="$deplib"
+                   fi
+                 else
+                   mynewdependency_lib="$deplib"
+                 fi
+                 # Do not add duplicates
+                 if test "$mynewdependency_lib"; then
+                   my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+                   if test -z "$my_little_ninja_foo_4"; then
+                         newdependency_libs="$newdependency_libs $mynewdependency_lib"
+                   fi
+                 fi
                  ;;
-               *) newdependency_libs="$newdependency_libs $deplib" ;;
                esac
              done
              dependency_libs="$newdependency_libs"
-Line 5214 
 fi\
+Line 5764 
 fi\
            case $host,$output,$installed,$module,$dlname in
              *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
            esac
+           # Do not add duplicates
+           if test "$installed" = yes && test "$D"; then
+             install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+           fi
            $echo > $output "\
  # $outputname - a libtool library file
  # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-Line 5274 
 relink_command=\"$relink_command\""
+Line 5828 
 relink_command=\"$relink_command\""
      # install_prog (especially on Windows NT).
      if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
         # Allow the use of GNU shtool's install command.
-        $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+        $echo "X$nonopt" | grep shtool > /dev/null; then
        # Aesthetically quote it.
        arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
        case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*)
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
          arg="\"$arg\""
          ;;
        esac
-Line 5287 
 relink_command=\"$relink_command\""
+Line 5841 
 relink_command=\"$relink_command\""
        shift
      else
        install_prog=
-       arg="$nonopt"
+       arg=$nonopt
      fi
      # The real first argument should be the name of the installation program.
      # Aesthetically quote it.
      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
      case $arg in
-     *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*)
+     *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
        arg="\"$arg\""
        ;;
      esac
-Line 5312 
 relink_command=\"$relink_command\""
+Line 5866 
 relink_command=\"$relink_command\""
      do
        if test -n "$dest"; then
          files="$files $dest"
-         dest="$arg"
+         dest=$arg
          continue
        fi
        case $arg in
        -d) isdir=yes ;;
-       -f) prev="-f" ;;
+       -f)
-       -g) prev="-g" ;;
+         case " $install_prog " in
-       -m) prev="-m" ;;
+         *[\\\ /]cp\ *) ;;
-       -o) prev="-o" ;;
+         *) prev=$arg ;;
+         esac
+         ;;
+       -g | -m | -o) prev=$arg ;;
        -s)
          stripme=" -s"
          continue
          ;;
-       -*) ;;
+       -*)
+         ;;
        *)
          # If the previous option needed an argument, then skip it.
          if test -n "$prev"; then
            prev=
          else
-           dest="$arg"
+           dest=$arg
            continue
          fi
          ;;
-Line 5342 
 relink_command=\"$relink_command\""
+Line 5899 
 relink_command=\"$relink_command\""
        # Aesthetically quote the argument.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
        case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*)
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
          arg="\"$arg\""
          ;;
        esac
-Line 5511 
 relink_command=\"$relink_command\""
+Line 6068 
 relink_command=\"$relink_command\""
            if test "$#" -gt 0; then
              # Delete the old symlinks, and create new ones.
+             # Try `ln -sf' first, because the `ln' binary might depend on
+             # the symlink we replace!  Solaris /bin/ln does not understand -f,
+             # so we also need to try rm && ln -s.
              for linkname
              do
                if test "$linkname" != "$realname"; then
-                 $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+                 $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                 $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+                 $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
                fi
              done
            fi
-Line 5528 
 relink_command=\"$relink_command\""
+Line 6088 
 relink_command=\"$relink_command\""
              IFS="$save_ifs"
              eval cmd=\"$cmd\"
              $show "$cmd"
-             $run eval "$cmd" || exit $?
+             $run eval "$cmd" || {
+               lt_exit=$?
+               # Restore the uninstalled library and exit
+               if test "$mode" = relink; then
+                 $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+               fi
+               exit $lt_exit
+             }
            done
            IFS="$save_ifs"
          fi
-Line 5622 
 relink_command=\"$relink_command\""
+Line 6191 
 relink_command=\"$relink_command\""
            notinst_deplibs=
            relink_command=
-           # To insure that "foo" is sourced, and not "foo.exe",
+           # Note that it is not necessary on cygwin/mingw to append a dot to
-           # finese the cygwin/MSYS system by explicitly sourcing "foo."
+           # foo even if both foo and FILE.exe exist: automatic-append-.exe
-           # which disallows the automatic-append-.exe behavior.
+           # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-           case $build in
+           # `FILE.' does not work on cygwin managed mounts.
-           *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+           #
-           *) wrapperdot=${wrapper} ;;
-           esac
            # If there is no directory component, then add one.
-           case $file in
+           case $wrapper in
-           */* | *\\*) . ${wrapperdot} ;;
+           */* | *\\*) . ${wrapper} ;;
-           *) . ./${wrapperdot} ;;
+           *) . ./${wrapper} ;;
            esac
            # Check the variables that should have been set.
-Line 5660 
 relink_command=\"$relink_command\""
+Line 6227 
 relink_command=\"$relink_command\""
            done
            relink_command=
-           # To insure that "foo" is sourced, and not "foo.exe",
+           # Note that it is not necessary on cygwin/mingw to append a dot to
-           # finese the cygwin/MSYS system by explicitly sourcing "foo."
+           # foo even if both foo and FILE.exe exist: automatic-append-.exe
-           # which disallows the automatic-append-.exe behavior.
+           # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-           case $build in
+           # `FILE.' does not work on cygwin managed mounts.
-           *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+           #
-           *) wrapperdot=${wrapper} ;;
-           esac
            # If there is no directory component, then add one.
-           case $file in
+           case $wrapper in
-           */* | *\\*) . ${wrapperdot} ;;
+           */* | *\\*) . ${wrapper} ;;
-           *) . ./${wrapperdot} ;;
+           *) . ./${wrapper} ;;
            esac
            outputname=
            if test "$fast_install" = no && test -n "$relink_command"; then
              if test "$finalize" = yes && test -z "$run"; then
-               tmpdir="/tmp"
+               tmpdir=`func_mktempdir`
-               test -n "$TMPDIR" && tmpdir="$TMPDIR"
-               tmpdir="$tmpdir/libtool-$$"
-               save_umask=`umask`
-               umask 0077
-               if $mkdir "$tmpdir"; then
-                 umask $save_umask
-               else
-                 umask $save_umask
-                 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-                 continue
-               fi
                file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
                outputname="$tmpdir/$file"
                # Replace the output file specification.
-Line 5711 
 relink_command=\"$relink_command\""
+Line 6265 
 relink_command=\"$relink_command\""
          fi
          # remove .exe since cygwin /usr/bin/install will append another
-         # one anyways
+         # one anyway
          case $install_prog,$host in
          */usr/bin/install*,*cygwin*)
            case $file:$destfile in
-Line 5811 
 relink_command=\"$relink_command\""
+Line 6365 
 relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = : && exit $EXIT_SUCCESS
-     $echo "----------------------------------------------------------------------"
+     $echo "X----------------------------------------------------------------------" | $Xsed
      $echo "Libraries have been installed in:"
      for libdir in $libdirs; do
        $echo "   $libdir"
-Line 5844 
 relink_command=\"$relink_command\""
+Line 6398 
 relink_command=\"$relink_command\""
      $echo
      $echo "See any operating system documentation about shared libraries for"
      $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-     $echo "----------------------------------------------------------------------"
+     $echo "X----------------------------------------------------------------------" | $Xsed
      exit $EXIT_SUCCESS
      ;;
-Line 6061 
 relink_command=\"$relink_command\""
+Line 6615 
 relink_command=\"$relink_command\""
              rmfiles="$rmfiles $objdir/$n"
            done
            test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-           test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-           if test "$mode" = uninstall; then
+           case "$mode" in
+           clean)
+             case "  $library_names " in
+             # "  " in the beginning catches empty $dlname
+             *" $dlname "*) ;;
+             *) rmfiles="$rmfiles $objdir/$dlname" ;;
+             esac
+              test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+             ;;
+           uninstall)
              if test -n "$library_names"; then
                # Do each command in the postuninstall commands.
                cmds=$postuninstall_cmds
-Line 6096 
 relink_command=\"$relink_command\""
+Line 6658 
 relink_command=\"$relink_command\""
                IFS="$save_ifs"
              fi
              # FIXME: should reinstall the best remaining shared library.
-           fi
+             ;;
+           esac
          fi
          ;;
-Line 6381 
 esac
+Line 6944 
 esac
  $echo
  $echo "Try \`$modename --help' for more information about other modes."
- exit $EXIT_SUCCESS
+ exit $?
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-Line 6395 
 exit $EXIT_SUCCESS
+Line 6958 
 exit $EXIT_SUCCESS
  # configuration.  But we'll never go from static-only to shared-only.
  # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
- build_libtool_libs=no
+ disable_libs=shared
- build_old_libs=yes
  # ### END LIBTOOL TAG CONFIG: disable-shared
  # ### BEGIN LIBTOOL TAG CONFIG: disable-static
- build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+ disable_libs=static
  # ### END LIBTOOL TAG CONFIG: disable-static
  # Local Variables:

 Legend:



Removed from v.75
 


changed lines


 
Added in v.87
 Legend:



Removed from v.75
 


changed lines


 
Added in v.87
-Removed from v.75
+Added in v.87

webmaster@exim.org	ViewVC Help
Powered by ViewVC 1.1.12