Changeset e03f404 in mod_gnutls for config/ltmain.sh


Ignore:
Timestamp:
Jan 11, 2013, 12:57:52 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
ae015fa
Parents:
4e539d3 (diff), 66b608e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.5.6'

Upstream version 0.5.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • config/ltmain.sh

    r4e539d3 re03f404  
    6666#       compiler flags:         $LTCFLAGS
    6767#       linker:         $LD (gnu? $with_gnu_ld)
    68 #       $progname:              (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
     68#       $progname:              (GNU libtool) 2.2.6 Debian-2.2.6a-4
    6969#       automake:               $automake_version
    7070#       autoconf:               $autoconf_version
     
    7474PROGRAM=ltmain.sh
    7575PACKAGE=libtool
    76 VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
     76VERSION="2.2.6 Debian-2.2.6a-4"
    7777TIMESTAMP=""
    7878package_revision=1.3012
     
    53485348            convenience="$convenience $ladir/$objdir/$old_library"
    53495349            old_convenience="$old_convenience $ladir/$objdir/$old_library"
     5350            tmp_libs=
     5351            for deplib in $dependency_libs; do
     5352              deplibs="$deplib $deplibs"
     5353              if $opt_duplicate_deps ; then
     5354                case "$tmp_libs " in
     5355                *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
     5356                esac
     5357              fi
     5358              tmp_libs="$tmp_libs $deplib"
     5359            done
    53505360          elif test "$linkmode" != prog && test "$linkmode" != lib; then
    53515361            func_fatal_error "\`$lib' is not a convenience library"
    53525362          fi
    5353           tmp_libs=
    5354           for deplib in $dependency_libs; do
    5355             deplibs="$deplib $deplibs"
    5356             if $opt_duplicate_deps ; then
    5357               case "$tmp_libs " in
    5358               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
    5359               esac
    5360             fi
    5361             tmp_libs="$tmp_libs $deplib"
    5362           done
    53635363          continue
    53645364        fi # $pass = conv
     
    58975897            # Add the search paths of all dependency libraries
    58985898            for deplib in $dependency_libs; do
     5899              path=
    58995900              case $deplib in
    59005901              -L*) path="$deplib" ;;
Note: See TracChangeset for help on using the changeset viewer.