Difference for utils/ltmain.sh from version 1.6 to 1.7


version 1.6 version 1.7
Line 1
 
Line 1
 # ltmain.sh - Provide generalized library-building support services.  # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.  # 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.  # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996  # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #  #
Line 17
 
Line 17
 #  #
 # You should have received a copy of the GNU General Public License  # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software  # 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  # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a  # distribute this file as part of a program that contains a
Line 43
 
Line 43
   
 PROGRAM=ltmain.sh  PROGRAM=ltmain.sh
 PACKAGE=libtool  PACKAGE=libtool
 VERSION=1.5.6  VERSION=1.5.16
 TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $"  TIMESTAMP=" (1.1220.2.235 2005/04/25 18:13:26)"
   
   # 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.  # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then  if test "X$1" = X--no-reexec; then
Line 107
 
Line 112
 fi  fi
   
 # Make sure IFS has a sensible default  # 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  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
Line 127
 
Line 133
 execute_dlfiles=  execute_dlfiles=
 lo2o="s/\\.lo\$/.${objext}/"  lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"  o2lo="s/\\.${objext}\$/.lo/"
   quote_scanset='[[~#^*{};<>?'"'"' ]'
   
 #####################################  #####################################
 # Shell function definitions:  # Shell function definitions:
Line 138
 
Line 145
 # Need a lot of goo to handle *both* DLLs and import libs  # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument  # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.  # that is supplied when $file_magic_command is called.
 func_win32_libid () {  func_win32_libid ()
   {
   win32_libid_type="unknown"    win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`    win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in    case $win32_fileres in
Line 178
 
Line 186
 # Only attempt this if the compiler in the base compile  # Only attempt this if the compiler in the base compile
 # command doesn't match the default compiler.  # command doesn't match the default compiler.
 # arg is usually of the form 'gcc ...'  # arg is usually of the form 'gcc ...'
 func_infer_tag () {  func_infer_tag ()
   {
     if test -n "$available_tags" && test -z "$tagname"; then      if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=        CC_quoted=
       for arg in $CC; do        for arg in $CC; do
  case $arg in   case $arg in
    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")     *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
    arg="\"$arg\""     arg="\"$arg\""
    ;;     ;;
  esac   esac
Line 204
 
Line 213
      for arg in $CC; do       for arg in $CC; do
      # Double-quote args containing other shell metacharacters.       # Double-quote args containing other shell metacharacters.
      case $arg in       case $arg in
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")         *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
        arg="\"$arg\""         arg="\"$arg\""
        ;;         ;;
      esac       esac
Line 235
 
Line 244
       esac        esac
     fi      fi
 }  }
   
   
   # 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 ()
   {
       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=`$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}"
          cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
          func_extract_an_archive "`pwd`" "${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 -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}r unfat-$$
        cd "$darwin_orig_dir"
      else
        cd "$darwin_orig_dir"
        func_extract_an_archive "$my_xdir" "$my_xabs"
      fi # $darwin_arches
    fi # $run
         ;;
         *)
           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  # End of Shell function definitions
 #####################################  #####################################
   
Line 305
 
Line 416
   --version)    --version)
     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"      $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
     $echo      $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 "This is free software; see the source for copying conditions.  There is NO"
     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."      $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $EXIT_SUCCESS      exit $?
     ;;      ;;
   
   --config)    --config)
Line 317
 
Line 428
     for tagname in $taglist; do      for tagname in $taglist; do
       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"        ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
     done      done
     exit $EXIT_SUCCESS      exit $?
     ;;      ;;
   
   --debug)    --debug)
Line 342
 
Line 453
     else      else
       $echo "disable static libraries"        $echo "disable static libraries"
     fi      fi
     exit $EXIT_SUCCESS      exit $?
     ;;      ;;
   
   --finish) mode="finish" ;;    --finish) mode="finish" ;;
Line 399
 
Line 510
   # Infer the operation mode.    # Infer the operation mode.
   if test -z "$mode"; then    if test -z "$mode"; then
     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2      $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      case $nonopt in
     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)      *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
       mode=link        mode=link
Line 516
 
Line 627
      # 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
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")         *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
        arg="\"$arg\""         arg="\"$arg\""
        ;;         ;;
      esac       esac
Line 547
 
Line 658
       case $lastarg in        case $lastarg in
       # 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, 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.
         *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
  lastarg="\"$lastarg\""   lastarg="\"$lastarg\""
  ;;   ;;
       esac        esac
Line 621
 
Line 735
       esac        esac
     done      done
   
       qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
       case $qlibobj in
         *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
    qlibobj="\"$qlibobj\"" ;;
       esac
       if test "X$libobj" != "X$qlibobj"; then
    $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
    exit $EXIT_FAILURE
       fi
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`      objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`      xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
     if test "X$xdir" = "X$obj"; then      if test "X$xdir" = "X$obj"; then
Line 693
 
Line 816
  $run $rm $removelist   $run $rm $removelist
  exit $EXIT_FAILURE   exit $EXIT_FAILURE
       fi        fi
       $echo $srcfile > "$lockfile"        $echo "$srcfile" > "$lockfile"
     fi      fi
   
     if test -n "$fix_srcfile_path"; then      if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"        eval srcfile=\"$fix_srcfile_path\"
     fi      fi
       qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
       case $qsrcfile in
         *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
         qsrcfile="\"$qsrcfile\"" ;;
       esac
   
     $run $rm "$libobj" "${libobj}T"      $run $rm "$libobj" "${libobj}T"
   
Line 720
 
Line 848
       fbsd_hideous_sh_bug=$base_compile        fbsd_hideous_sh_bug=$base_compile
   
       if test "$pic_mode" != no; then        if test "$pic_mode" != no; then
  command="$base_compile $srcfile $pic_flag"   command="$base_compile $qsrcfile $pic_flag"
       else        else
  # Don't build PIC code   # Don't build PIC code
  command="$base_compile $srcfile"   command="$base_compile $qsrcfile"
       fi        fi
   
       if test ! -d "${xdir}$objdir"; then        if test ! -d "${xdir}$objdir"; then
Line 803
 
Line 931
     if test "$build_old_libs" = yes; then      if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then        if test "$pic_mode" != yes; then
  # Don't build PIC code   # Don't build PIC code
  command="$base_compile $srcfile"   command="$base_compile $qsrcfile"
       else        else
  command="$base_compile $srcfile $pic_flag"   command="$base_compile $qsrcfile $pic_flag"
       fi        fi
       if test "$compiler_c_o" = yes; then        if test "$compiler_c_o" = yes; then
  command="$command -o $obj"   command="$command -o $obj"
Line 983
 
Line 1111
       arg="$1"        arg="$1"
       shift        shift
       case $arg in        case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")        *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
  qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test   qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
  ;;   ;;
       *) qarg=$arg ;;        *) qarg=$arg ;;
Line 1227
 
Line 1355
    prev=     prev=
    continue     continue
    ;;     ;;
           darwin_framework)
      compiler_flags="$compiler_flags $arg"
      prev=
      continue
      ;;
  *)   *)
    eval "$prev=\"\$arg\""     eval "$prev=\"\$arg\""
    prev=     prev=
Line 1285
 
Line 1418
  continue   continue
  ;;   ;;
   
         -framework)
           prev=darwin_framework
           compiler_flags="$compiler_flags $arg"
           continue
           ;;
   
       -inst-prefix-dir)        -inst-prefix-dir)
  prev=inst_prefix   prev=inst_prefix
  continue   continue
Line 1345
 
Line 1484
      # These systems don't actually have a C library (as such)       # These systems don't actually have a C library (as such)
      test "X$arg" = "X-lc" && continue       test "X$arg" = "X-lc" && continue
      ;;       ;;
    *-*-openbsd* | *-*-freebsd*)     *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
      # Do not include libc due to us having libc/libc_r.       # Do not include libc due to us having libc/libc_r.
      test "X$arg" = "X-lc" && continue       test "X$arg" = "X-lc" && continue
      ;;       ;;
Line 1356
 
Line 1495
    esac     esac
  elif test "X$arg" = "X-lc_r"; then   elif test "X$arg" = "X-lc_r"; then
  case $host in   case $host in
  *-*-openbsd* | *-*-freebsd*)   *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
     # Do not include libc_r directly, use -pthread flag.      # Do not include libc_r directly, use -pthread flag.
     continue      continue
     ;;      ;;
Line 1366
 
Line 1505
  continue   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)       -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   continue
  ;;   ;;
   
Line 1376
 
Line 1527
  continue   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*)        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
   
  # Unknown arguments in both finalize_command and compile_command need   # Unknown arguments in both finalize_command and compile_command need
  # to be aesthetically quoted because they are evaled later.   # to be aesthetically quoted because they are evaled later.
  arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`   arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
  case $arg in   case $arg in
  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")   *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
    arg="\"$arg\""     arg="\"$arg\""
    ;;     ;;
  esac   esac
Line 1503
 
Line 1655
  for flag in $args; do   for flag in $args; do
    IFS="$save_ifs"     IFS="$save_ifs"
    case $flag in     case $flag in
      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")       *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
      flag="\"$flag\""       flag="\"$flag\""
      ;;       ;;
    esac     esac
Line 1521
 
Line 1673
  for flag in $args; do   for flag in $args; do
    IFS="$save_ifs"     IFS="$save_ifs"
    case $flag in     case $flag in
      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")       *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
      flag="\"$flag\""       flag="\"$flag\""
      ;;       ;;
    esac     esac
Line 1554
 
Line 1706
  # to be aesthetically quoted because they are evaled later.   # to be aesthetically quoted because they are evaled later.
  arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`   arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
  case $arg in   case $arg in
  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")   *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
    arg="\"$arg\""     arg="\"$arg\""
    ;;     ;;
  esac   esac
Line 1688
 
Line 1840
  # to be aesthetically quoted because they are evaled later.   # to be aesthetically quoted because they are evaled later.
  arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`   arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
  case $arg in   case $arg in
  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")   *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
    arg="\"$arg\""     arg="\"$arg\""
    ;;     ;;
  esac   esac
Line 1838
 
Line 1990
  case $pass in   case $pass in
  dlopen) libs="$dlfiles" ;;   dlopen) libs="$dlfiles" ;;
  dlpreopen) libs="$dlprefiles" ;;   dlpreopen) libs="$dlprefiles" ;;
  link)   link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
    libs="$deplibs %DEPLIBS%"  
    test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"  
    ;;  
  esac   esac
       fi        fi
       if test "$pass" = dlopen; then        if test "$pass" = dlopen; then
Line 1858
 
Line 2007
      compile_deplibs="$deplib $compile_deplibs"       compile_deplibs="$deplib $compile_deplibs"
      finalize_deplibs="$deplib $finalize_deplibs"       finalize_deplibs="$deplib $finalize_deplibs"
    else     else
      deplibs="$deplib $deplibs"       compiler_flags="$compiler_flags $deplib"
    fi     fi
    continue     continue
    ;;     ;;
Line 1977
 
Line 2126
    fi     fi
    case $linkmode in     case $linkmode in
    lib)     lib)
      if test "$deplibs_check_method" != pass_all; then       valid_a_lib=no
        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
      valid_a_lib=yes
    fi
    ;;
          pass_all)
    valid_a_lib=yes
    ;;
               esac
        if test "$valid_a_lib" != yes; then
        $echo         $echo
        $echo "*** Warning: Trying to link with static lib archive $deplib."         $echo "*** Warning: Trying to link with static lib archive $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"
Line 2051
 
Line 2215
  # it will not redefine variables installed, or shouldnotlink   # it will not redefine variables installed, or shouldnotlink
  installed=yes   installed=yes
  shouldnotlink=no   shouldnotlink=no
    avoidtemprpath=
   
   
  # Read the .la file   # Read the .la file
  case $lib in   case $lib in
Line 2149
 
Line 2315
      dir="$libdir"       dir="$libdir"
      absdir="$libdir"       absdir="$libdir"
    fi     fi
      test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
    else
      if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
        dir="$ladir"
        absdir="$abs_ladir"
        # Remove this search path later
        notinst_path="$notinst_path $abs_ladir"
  else   else
    dir="$ladir/$objdir"     dir="$ladir/$objdir"
    absdir="$abs_ladir/$objdir"     absdir="$abs_ladir/$objdir"
    # Remove this search path later     # Remove this search path later
    notinst_path="$notinst_path $abs_ladir"     notinst_path="$notinst_path $abs_ladir"
      fi
  fi # $installed = yes   fi # $installed = yes
  name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`   name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
   
Line 2226
 
Line 2400
    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
      # We need to hardcode the library path       # 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.         # Make sure the rpath contains only unique directories.
        case "$temp_rpath " in         case "$temp_rpath " in
        *" $dir "*) ;;         *" $dir "*) ;;
Line 2670
 
Line 2844
        *) continue ;;         *) continue ;;
        esac         esac
        case " $deplibs " in         case " $deplibs " in
        *" $depdepl "*) ;;         *" $path "*) ;;
        *) deplibs="$depdepl $deplibs" ;;         *) deplibs="$path $deplibs" ;;
        esac         esac
        case " $deplibs " in         case " $deplibs " in
        *" $path "*) ;;         *" $depdepl "*) ;;
        *) deplibs="$deplibs $path" ;;         *) deplibs="$depdepl $deplibs" ;;
        esac         esac
      done       done
    fi # link_all_deplibs != no     fi # link_all_deplibs != no
Line 2929
 
Line 3103
      age="$number_minor"       age="$number_minor"
      revision="$number_minor"       revision="$number_minor"
      ;;       ;;
    *)  
      $echo "$modename: unknown library version type \`$version_type'" 1>&2  
      $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2  
      exit $EXIT_FAILURE  
      ;;  
    esac     esac
    ;;     ;;
  no)   no)
Line 2945
 
Line 3114
   
  # Check that each of the things are valid numbers.   # Check that each of the things are valid numbers.
  case $current in   case $current in
  0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;   0|[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     $echo "$modename: \`$vinfo' is not valid version information" 1>&2
    exit $EXIT_FAILURE     exit $EXIT_FAILURE
    ;;     ;;
  esac   esac
   
  case $revision in   case $revision in
  0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;   0|[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     $echo "$modename: \`$vinfo' is not valid version information" 1>&2
    exit $EXIT_FAILURE     exit $EXIT_FAILURE
    ;;     ;;
  esac   esac
   
  case $age in   case $age in
  0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;   0|[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     $echo "$modename: \`$vinfo' is not valid version information" 1>&2
    exit $EXIT_FAILURE     exit $EXIT_FAILURE
    ;;     ;;
Line 2991
 
Line 3160
    versuffix="$major.$age.$revision"     versuffix="$major.$age.$revision"
    # Darwin ld doesn't like 0 for these options...     # Darwin ld doesn't like 0 for these options...
    minor_current=`expr $current + 1`     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)   freebsd-aout)
Line 3197
 
Line 3366
    *-*-netbsd*)     *-*-netbsd*)
      # Don't link with libc until the a.out ld.so is fixed.       # 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.       # Do not include libc due to us having libc/libc_r.
      test "X$arg" = "X-lc" && continue       test "X$arg" = "X-lc" && continue
      ;;       ;;
Line 3679
 
Line 3848
      eval libobjs=\"\$libobjs $whole_archive_flag_spec\"       eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
    else     else
      gentop="$output_objdir/${outputname}x"       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"       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  
        # 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 $xdir && $AR x $xabs)"  
        $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?  
        if ($AR t "$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 "$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 "$xdir/$name_to"  
     do  
       name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`  
     done  
     $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"  
     $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?  
     i=`expr $i + 1`  
    done  
  done  
        fi  
   
        libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`  
      done  
    fi     fi
  fi   fi
   
Line 3788
 
Line 3903
      save_libobjs=$libobjs       save_libobjs=$libobjs
    fi     fi
    save_output=$output     save_output=$output
      output_la=`$echo "X$output" | $Xsed -e "$basename"`
   
    # Clear the reloadable object creation command queue and     # Clear the reloadable object creation command queue and
    # initialize k to one.     # initialize k to one.
Line 3797
 
Line 3913
    delfiles=     delfiles=
    last_robj=     last_robj=
    k=1     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.     # Loop over the list of objects to be linked.
    for obj in $save_libobjs     for obj in $save_libobjs
    do     do
Line 3817
 
Line 3933
  # the last one created.   # the last one created.
  eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"   eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
        fi         fi
        last_robj=$output_objdir/$save_output-${k}.$objext         last_robj=$output_objdir/$output_la-${k}.$objext
        k=`expr $k + 1`         k=`expr $k + 1`
        output=$output_objdir/$save_output-${k}.$objext         output=$output_objdir/$output_la-${k}.$objext
        objlist=$obj         objlist=$obj
        len=1         len=1
      fi       fi
Line 3839
 
Line 3955
      eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"       eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
           fi            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.     # after they are used.
    i=0     i=0
    while test "$i" -lt "$k"     while test "$i" -lt "$k"
    do     do
      i=`expr $i + 1`       i=`expr $i + 1`
      delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"       delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
    done     done
   
    $echo "creating a temporary reloadable object file: $output"     $echo "creating a temporary reloadable object file: $output"
Line 3977
 
Line 4093
    eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"     eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
  else   else
    gentop="$output_objdir/${obj}x"     gentop="$output_objdir/${obj}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"     generated="$generated $gentop"
   
    for xlib in $convenience; do     func_extract_archives $gentop $convenience
      # Extract the objects.     reload_conv_objs="$reload_objs $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  
      # 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 $xdir && $AR x $xabs)"  
      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?  
      if ($AR t "$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 "$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 "$xdir/$name_to"  
  do  
     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`  
  done  
  $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"  
  $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?  
  i=`expr $i + 1`  
  done  
        done  
      fi  
   
      reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`  
    done  
  fi   fi
       fi        fi
   
Line 4296
 
Line 4358
   
      # Prepare the list of exported symbols       # Prepare the list of exported symbols
      if test -z "$export_symbols"; then       if test -z "$export_symbols"; then
        export_symbols="$output_objdir/$output.exp"         export_symbols="$output_objdir/$outputname.exp"
        $run $rm $export_symbols         $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"'
      else       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"'         $run eval 'mv "$nlist"T "$nlist"'
      fi       fi
    fi     fi
Line 4353
 
Line 4415
 #endif  #endif
   
 /* The mapping between symbol names and symbols. */  /* 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 {  const struct {
   "
          ;;
        esac
   
   
      $echo >> "$output_objdir/$dlsyms" "\
   const char *name;    const char *name;
   lt_ptr address;    lt_ptr address;
 }  }
Line 4582
 
Line 4663
  esac   esac
  case $host in   case $host in
    *cygwin* | *mingw* )     *cygwin* | *mingw* )
      cwrappersource=`$echo ${objdir}/lt-${output}.c`       cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
      cwrapper=`$echo ${output}.exe`       cwrapper=`$echo ${output}.exe`
      $rm $cwrappersource $cwrapper       $rm $cwrappersource $cwrapper
      trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15       trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
Line 4815
 
Line 4896
   
 # The HP-UX ksh and POSIX shell print the target directory to stdout  # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.  # if CDPATH is set.
 if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
   
 relink_command=\"$relink_command\"  relink_command=\"$relink_command\"
   
Line 4992
 
Line 5073
   
       if test -n "$addlibs"; then        if test -n "$addlibs"; then
  gentop="$output_objdir/${outputname}x"   gentop="$output_objdir/${outputname}x"
    generated="$generated $gentop"
   
    func_extract_archives $gentop $addlibs
    oldobjs="$oldobjs $func_extract_archives_result"
         fi
   
         # Do each command in the archive commands.
         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"   $show "${rm}r $gentop"
  $run ${rm}r "$gentop"   $run ${rm}r "$gentop"
  $show "$mkdir $gentop"   $show "$mkdir $gentop"
Line 5000
 
Line 5109
  if test "$status" -ne 0 && test ! -d "$gentop"; then   if test "$status" -ne 0 && test ! -d "$gentop"; then
    exit $status     exit $status
  fi   fi
  generated="$generated $gentop"  
   
  # Add in members from convenience archives.  
  for xlib in $addlibs; do  
    # Extract the objects.  
    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  
    # 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 $xdir && $AR x $xabs)"  
    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?  
    if ($AR t "$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 "$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 "$xdir/$name_to"  
         do  
  name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`  
         done  
         $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"  
         $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?  
         i=`expr $i + 1`  
        done  
      done  
    fi     fi
   
    oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`     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   done
       fi        fi
   
       # Do each command in the archive commands.  
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then  
        cmds=$old_archive_from_new_cmds  
       else  
  eval cmds=\"$old_archive_cmds\"   eval cmds=\"$old_archive_cmds\"
   
  if len=`expr "X$cmds" : ".*"` &&   if len=`expr "X$cmds" : ".*"` &&
Line 5070
 
Line 5153
    objlist=     objlist=
    concat_cmds=     concat_cmds=
    save_oldobjs=$oldobjs     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?     # Is there a better way of finding the last object in the list?
    for obj in $save_oldobjs     for obj in $save_oldobjs
    do     do
Line 5295
 
Line 5365
       # Aesthetically quote it.        # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`        arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case $arg in        case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)        *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
  arg="\"$arg\""   arg="\"$arg\""
  ;;   ;;
       esac        esac
Line 5311
 
Line 5381
     # Aesthetically quote it.      # Aesthetically quote it.
     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
     case $arg in      case $arg in
     *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
       arg="\"$arg\""        arg="\"$arg\""
       ;;        ;;
     esac      esac
Line 5359
 
Line 5429
       # Aesthetically quote the argument.        # Aesthetically quote the argument.
       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
       case $arg in        case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)        *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
  arg="\"$arg\""   arg="\"$arg\""
  ;;   ;;
       esac        esac
Line 6398
 
Line 6468
 $echo  $echo
 $echo "Try \`$modename --help' for more information about other modes."  $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  # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting  # in which we disable both kinds of libraries.  Given conflicting


Legend:
line(s) removed in v.1.6 
line(s) changed
 line(s) added in v.1.7

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:02