~mpt/ubuntu/oneiric/gnome-control-center/bug-844807

« back to all changes in this revision

Viewing changes to ltmain.sh

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya, Micah Gersten, Rodrigo Moya
  • Date: 2011-05-24 10:55:28 UTC
  • mfrom: (1.1.46 upstream)
  • Revision ID: james.westby@ubuntu.com-20110524105528-dlmxhkwzc0t67kzn
Tags: 1:3.0.2-1ubuntu3
[ Micah Gersten ]
* debian/control:
  - Add reaks/Replaces on g-s-d (<< 3.0~) for gnome-control-center-data (LP: #786417)

[ Rodrigo Moya ]
* New upstream release
* debian/watch:
  - Switch to .bz2, as this is what is used in ftp.gnome.org now
* debian/patches/01_git_remove_gettext_calls.patch
* debian/patches/01_git_kill_warning.patch:
  - Remove upstreamed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
69
69
#         compiler:             $LTCC
70
70
#         compiler flags:               $LTCFLAGS
71
71
#         linker:               $LD (gnu? $with_gnu_ld)
72
 
#         $progname:    (GNU libtool) 2.4
 
72
#         $progname:    (GNU libtool) 2.4 Debian-2.4-2ubuntu1
73
73
#         automake:     $automake_version
74
74
#         autoconf:     $autoconf_version
75
75
#
79
79
 
80
80
PROGRAM=libtool
81
81
PACKAGE=libtool
82
 
VERSION=2.4
 
82
VERSION="2.4 Debian-2.4-2ubuntu1"
83
83
TIMESTAMP=""
84
84
package_revision=1.3293
85
85
 
6111
6111
        case $pass in
6112
6112
        dlopen) libs="$dlfiles" ;;
6113
6113
        dlpreopen) libs="$dlprefiles" ;;
6114
 
        link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 
6114
        link)
 
6115
          libs="$deplibs %DEPLIBS%"
 
6116
          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
 
6117
          ;;
6115
6118
        esac
6116
6119
      fi
6117
6120
      if test "$linkmode,$pass" = "lib,dlpreopen"; then
6430
6433
            # It is a libtool convenience library, so add in its objects.
6431
6434
            func_append convenience " $ladir/$objdir/$old_library"
6432
6435
            func_append old_convenience " $ladir/$objdir/$old_library"
 
6436
            tmp_libs=
 
6437
            for deplib in $dependency_libs; do
 
6438
              deplibs="$deplib $deplibs"
 
6439
              if $opt_preserve_dup_deps ; then
 
6440
                case "$tmp_libs " in
 
6441
                *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 
6442
                esac
 
6443
              fi
 
6444
              func_append tmp_libs " $deplib"
 
6445
            done
6433
6446
          elif test "$linkmode" != prog && test "$linkmode" != lib; then
6434
6447
            func_fatal_error "\`$lib' is not a convenience library"
6435
6448
          fi
6436
 
          tmp_libs=
6437
 
          for deplib in $dependency_libs; do
6438
 
            deplibs="$deplib $deplibs"
6439
 
            if $opt_preserve_dup_deps ; then
6440
 
              case "$tmp_libs " in
6441
 
              *" $deplib "*) func_append specialdeplibs " $deplib" ;;
6442
 
              esac
6443
 
            fi
6444
 
            func_append tmp_libs " $deplib"
6445
 
          done
6446
6449
          continue
6447
6450
        fi # $pass = conv
6448
6451
 
7334
7337
            revision="$number_minor"
7335
7338
            lt_irix_increment=no
7336
7339
            ;;
 
7340
          *)
 
7341
            func_fatal_configuration "$modename: unknown library version type \`$version_type'"
 
7342
            ;;
7337
7343
          esac
7338
7344
          ;;
7339
7345
        no)