← Back to branch summary

~noskcaj/ubuntu/utopic/devhelp/merge

« back to all changes in this revision

Viewing changes to build-aux/ltmain.sh

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-03-27 11:41:53 UTC
  • mfrom: (1.3.24)
  • Revision ID: package-import@ubuntu.com-20120327114153-ugfyr33a5lt0t2fv
Tags: 3.4.0-0ubuntu1
* New upstream release:
  - Fix compilation warnings with -Wunused-but-set-variable
  - Updated translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
build-aux/ltmain.sh
70
70
#         compiler:             $LTCC
71
71
#         compiler flags:               $LTCFLAGS
72
72
#         linker:               $LD (gnu? $with_gnu_ld)
73
 
#         $progname:    (GNU libtool) 2.4.2 Debian-2.4.2-1
 
73
#         $progname:    (GNU libtool) 2.4.2
74
74
#         automake:     $automake_version
75
75
#         autoconf:     $autoconf_version
76
76
#
80
80
 
81
81
PROGRAM=libtool
82
82
PACKAGE=libtool
83
 
VERSION="2.4.2 Debian-2.4.2-1"
 
83
VERSION=2.4.2
84
84
TIMESTAMP=""
85
85
package_revision=1.3337
86
86
 
6124
6124
        case $pass in
6125
6125
        dlopen) libs="$dlfiles" ;;
6126
6126
        dlpreopen) libs="$dlprefiles" ;;
6127
 
        link)
6128
 
          libs="$deplibs %DEPLIBS%"
6129
 
          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
6130
 
          ;;
 
6127
        link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
6131
6128
        esac
6132
6129
      fi
6133
6130
      if test "$linkmode,$pass" = "lib,dlpreopen"; then
6447
6444
            # It is a libtool convenience library, so add in its objects.
6448
6445
            func_append convenience " $ladir/$objdir/$old_library"
6449
6446
            func_append old_convenience " $ladir/$objdir/$old_library"
6450
 
            tmp_libs=
6451
 
            for deplib in $dependency_libs; do
6452
 
              deplibs="$deplib $deplibs"
6453
 
              if $opt_preserve_dup_deps ; then
6454
 
                case "$tmp_libs " in
6455
 
                *" $deplib "*) func_append specialdeplibs " $deplib" ;;
6456
 
                esac
6457
 
              fi
6458
 
              func_append tmp_libs " $deplib"
6459
 
            done
6460
6447
          elif test "$linkmode" != prog && test "$linkmode" != lib; then
6461
6448
            func_fatal_error "\`$lib' is not a convenience library"
6462
6449
          fi
 
6450
          tmp_libs=
 
6451
          for deplib in $dependency_libs; do
 
6452
            deplibs="$deplib $deplibs"
 
6453
            if $opt_preserve_dup_deps ; then
 
6454
              case "$tmp_libs " in
 
6455
              *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 
6456
              esac
 
6457
            fi
 
6458
            func_append tmp_libs " $deplib"
 
6459
          done
6463
6460
          continue
6464
6461
        fi # $pass = conv
6465
6462
 
7352
7349
            revision="$number_minor"
7353
7350
            lt_irix_increment=no
7354
7351
            ;;
7355
 
          *)
7356
 
            func_fatal_configuration "$modename: unknown library version type \`$version_type'"
7357
 
            ;;
7358
7352
          esac
7359
7353
          ;;
7360
7354
        no)