Changeset 8ce897a in mod_gnutls for config/ltmain.sh


Ignore:
Timestamp:
Jan 11, 2013, 12:57:01 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
54b3065, f8ffc43
Parents:
9d9b093
Message:

Imported Upstream version 0.5.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • config/ltmain.sh

    r9d9b093 r8ce897a  
    33#
    44# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
    5 # 2007  Free Software Foundation, Inc.
     5# 2007, 2008  Free Software Foundation, Inc.
    66# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    77#
     
    4444PROGRAM=ltmain.sh
    4545PACKAGE=libtool
    46 VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
    47 TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
     46VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
     47TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
    4848
    4949# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
     
    114114# e.g. LANG=C (notably SCO).
    115115# We save the old values to restore during execute mode.
    116 for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
     116lt_env=
     117for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
    117118do
    118119  eval "if test \"\${$lt_var+set}\" = set; then
    119120          save_$lt_var=\$$lt_var
     121          lt_env=\"$lt_var=\$$lt_var \$lt_env\"
    120122          $lt_var=C
    121123          export $lt_var
    122124        fi"
    123125done
     126
     127if test -n "$lt_env"; then
     128  lt_env="env $lt_env"
     129fi
    124130
    125131# Make sure IFS has a sensible default
     
    486492$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
    487493
    488 Copyright (C) 2007  Free Software Foundation, Inc.
     494Copyright (C) 2008  Free Software Foundation, Inc.
    489495This is free software; see the source for copying conditions.  There is NO
    490496warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     
    789795    *.java) xform=java ;;
    790796    *.obj) xform=obj ;;
     797    *.sx) xform=sx ;;
    791798    esac
    792799
     
    957964
    958965      $show "$command"
    959       if $run eval "$command"; then :
     966      if $run eval $lt_env "$command"; then :
    960967      else
    961968        test -n "$output_obj" && $run $rm $removelist
     
    10291036      $run $rm "$obj" "$output_obj"
    10301037      $show "$command"
    1031       if $run eval "$command"; then :
     1038      if $run eval $lt_env "$command"; then :
    10321039      else
    10331040        $run $rm $removelist
     
    11621169    vinfo=
    11631170    vinfo_number=no
     1171    single_module="${wl}-single_module"
    11641172
    11651173    func_infer_tag $base_compile
     
    16471655        ;;
    16481656
     1657      -multi_module)
     1658        single_module="${wl}-multi_module"
     1659        continue
     1660        ;;
     1661
    16491662      -module)
    16501663        module=yes
     
    21532166          fi
    21542167          name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
    2155           for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
     2168          if test "$linkmode" = lib; then
     2169            searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
     2170          else
     2171            searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
     2172          fi
     2173          for searchdir in $searchdirs; do
    21562174            for search_ext in .la $std_shrext .so .a; do
    21572175              # Search the libtool library
     
    29492967                  # but need to link against shared
    29502968                  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
     2969                  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
    29512970                  if test -n "$deplibrary_names" ; then
    29522971                    for tmp in $deplibrary_names ; do
    29532972                      depdepl=$tmp
    29542973                    done
    2955                     if test -f "$path/$depdepl" ; then
     2974                    if test -f "$deplibdir/$depdepl" ; then
     2975                      depdepl="$deplibdir/$depdepl"
     2976                    elif test -f "$path/$depdepl" ; then
    29562977                      depdepl="$path/$depdepl"
     2978                    else
     2979                      # Can't find it, oh well...
     2980                      depdepl=
    29572981                    fi
    29582982                    # do not add paths which are already there
     
    31023126    case $linkmode in
    31033127    oldlib)
    3104       if test -n "$deplibs"; then
    3105         $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
    3106       fi
     3128      case " $deplibs" in
     3129      *\ -l* | *\ -L*)
     3130        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
     3131      esac
    31073132
    31083133      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
     
    42464271
    42474272    obj)
    4248       if test -n "$deplibs"; then
    4249         $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
    4250       fi
     4273      case " $deplibs" in
     4274      *\ -l* | *\ -L*)
     4275        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
     4276      esac
    42514277
    42524278      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
     
    64876513
    64886514      # Restore saved environment variables
    6489       for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
     6515      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
    64906516      do
    64916517        eval "if test \"\${save_$lt_var+set}\" = set; then
Note: See TracChangeset for help on using the changeset viewer.