Changeset 8ce897a in mod_gnutls for config


Ignore:
Timestamp:
Jan 11, 2013, 12:57:01 AM (8 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

Location:
config
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • config/config.guess

    r9d9b093 r8ce897a  
    55#   Inc.
    66
    7 timestamp='2007-03-06'
     7timestamp='2007-07-22'
    88
    99# This file is free software; you can redistribute it and/or modify it
     
    331331        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    332332        exit ;;
    333     i86pc:SunOS:5.*:*)
     333    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
    334334        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    335335        exit ;;
     
    794794    *:Interix*:[3456]*)
    795795        case ${UNAME_MACHINE} in
    796             x86) 
     796            x86)
    797797                echo i586-pc-interix${UNAME_RELEASE}
    798798                exit ;;
  • config/config.sub

    r9d9b093 r8ce897a  
    55#   Inc.
    66
    7 timestamp='2007-01-18'
     7timestamp='2007-06-28'
    88
    99# This file is (in principle) common to ALL GNU software.
     
    476476                os=-unicosmp
    477477                ;;
    478         cr16c)
    479                 basic_machine=cr16c-unknown
     478        cr16)
     479                basic_machine=cr16-unknown
    480480                os=-elf
    481481                ;;
     
    683683                basic_machine=i386-pc
    684684                os=-mingw32
     685                ;;
     686        mingw32ce)
     687                basic_machine=arm-unknown
     688                os=-mingw32ce
    685689                ;;
    686690        miniframe)
  • config/depcomp

    r9d9b093 r8ce897a  
    22# depcomp - compile a program generating dependencies as side-effects
    33
    4 scriptversion=2006-10-15.18
    5 
    6 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
     4scriptversion=2007-03-29.01
     5
     6# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
    77# Foundation, Inc.
    88
     
    216216  # start of each line; $object doesn't have directory information.
    217217  # Version 6 uses the directory in both cases.
    218   stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
    219   tmpdepfile="$stripped.u"
     218  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
     219  test "x$dir" = "x$object" && dir=
     220  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
    220221  if test "$libtool" = yes; then
     222    tmpdepfile1=$dir$base.u
     223    tmpdepfile2=$base.u
     224    tmpdepfile3=$dir.libs/$base.u
    221225    "$@" -Wc,-M
    222226  else
     227    tmpdepfile1=$dir$base.u
     228    tmpdepfile2=$dir$base.u
     229    tmpdepfile3=$dir$base.u
    223230    "$@" -M
    224231  fi
    225232  stat=$?
    226233
    227   if test -f "$tmpdepfile"; then :
    228   else
    229     stripped=`echo "$stripped" | sed 's,^.*/,,'`
    230     tmpdepfile="$stripped.u"
    231   fi
    232 
    233234  if test $stat -eq 0; then :
    234235  else
    235     rm -f "$tmpdepfile"
     236    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
    236237    exit $stat
    237238  fi
    238239
     240  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     241  do
     242    test -f "$tmpdepfile" && break
     243  done
    239244  if test -f "$tmpdepfile"; then
    240     outname="$stripped.o"
    241245    # Each line is of the form `foo.o: dependent.h'.
    242246    # Do two passes, one to just change these to
    243247    # `$object: dependent.h' and one to simply `dependent.h:'.
    244     sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
    245     sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
     248    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
     249    # That's a tab and a space in the [].
     250    sed -e 's,^.*\.[a-z]*:[      ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    246251  else
    247252    # The sourcefile does not contain any dependencies, so just
  • config/install-sh

    r9d9b093 r8ce897a  
    22# install - install a program, script, or datafile
    33
    4 scriptversion=2006-10-14.15
     4scriptversion=2006-12-25.00
    55
    66# This originates from X11R5 (mit/util/scripts/install.sh), which was
     
    4949
    5050# Don't use :- since 4.3BSD and earlier shells don't like it.
    51 doit="${DOITPROG-}"
     51doit=${DOITPROG-}
    5252if test -z "$doit"; then
    5353  doit_exec=exec
     
    5959# or use environment vars.
    6060
    61 mvprog="${MVPROG-mv}"
    62 cpprog="${CPPROG-cp}"
    63 chmodprog="${CHMODPROG-chmod}"
    64 chownprog="${CHOWNPROG-chown}"
    65 chgrpprog="${CHGRPPROG-chgrp}"
    66 stripprog="${STRIPPROG-strip}"
    67 rmprog="${RMPROG-rm}"
    68 mkdirprog="${MKDIRPROG-mkdir}"
    69 
    70 posix_glob=
     61chgrpprog=${CHGRPPROG-chgrp}
     62chmodprog=${CHMODPROG-chmod}
     63chownprog=${CHOWNPROG-chown}
     64cmpprog=${CMPPROG-cmp}
     65cpprog=${CPPROG-cp}
     66mkdirprog=${MKDIRPROG-mkdir}
     67mvprog=${MVPROG-mv}
     68rmprog=${RMPROG-rm}
     69stripprog=${STRIPPROG-strip}
     70
     71posix_glob='?'
     72initialize_posix_glob='
     73  test "$posix_glob" != "?" || {
     74    if (set -f) 2>/dev/null; then
     75      posix_glob=
     76    else
     77      posix_glob=:
     78    fi
     79  }
     80'
     81
    7182posix_mkdir=
    7283
     
    7485mode=0755
    7586
     87chgrpcmd=
    7688chmodcmd=$chmodprog
    7789chowncmd=
    78 chgrpcmd=
     90mvcmd=$mvprog
     91rmcmd="$rmprog -f"
    7992stripcmd=
    80 rmcmd="$rmprog -f"
    81 mvcmd="$mvprog"
     93
    8294src=
    8395dst=
    8496dir_arg=
    85 dstarg=
     97dst_arg=
     98
     99copy_on_change=false
    86100no_target_directory=
    87101
    88 usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
     102usage="\
     103Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    89104   or: $0 [OPTION]... SRCFILES... DIRECTORY
    90105   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
     
    96111
    97112Options:
    98 -c         (ignored)
    99 -d         create directories instead of installing files.
    100 -g GROUP   $chgrpprog installed files to GROUP.
    101 -m MODE    $chmodprog installed files to MODE.
    102 -o USER    $chownprog installed files to USER.
    103 -s         $stripprog installed files.
    104 -t DIRECTORY  install into DIRECTORY.
    105 -T         report an error if DSTFILE is a directory.
    106 --help     display this help and exit.
    107 --version  display version info and exit.
     113     --help     display this help and exit.
     114     --version  display version info and exit.
     115
     116  -c            (ignored)
     117  -C            install only if different (preserve the last data modification time)
     118  -d            create directories instead of installing files.
     119  -g GROUP      $chgrpprog installed files to GROUP.
     120  -m MODE       $chmodprog installed files to MODE.
     121  -o USER       $chownprog installed files to USER.
     122  -s            $stripprog installed files.
     123  -t DIRECTORY  install into DIRECTORY.
     124  -T            report an error if DSTFILE is a directory.
    108125
    109126Environment variables override the default commands:
    110   CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
     127  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
     128  RMPROG STRIPPROG
    111129"
    112130
    113131while test $# -ne 0; do
    114132  case $1 in
    115     -c) shift
    116         continue;;
    117 
    118     -d) dir_arg=true
    119         shift
    120         continue;;
     133    -c) ;;
     134
     135    -C) copy_on_change=true;;
     136
     137    -d) dir_arg=true;;
    121138
    122139    -g) chgrpcmd="$chgrpprog $2"
    123         shift
    124         shift
    125         continue;;
     140        shift;;
    126141
    127142    --help) echo "$usage"; exit $?;;
    128143
    129144    -m) mode=$2
    130         shift
    131         shift
    132145        case $mode in
    133146          *' '* | *'    '* | *'
     
    136149            exit 1;;
    137150        esac
    138         continue;;
     151        shift;;
    139152
    140153    -o) chowncmd="$chownprog $2"
    141         shift
    142         shift
    143         continue;;
    144 
    145     -s) stripcmd=$stripprog
    146         shift
    147         continue;;
    148 
    149     -t) dstarg=$2
    150         shift
    151         shift
    152         continue;;
    153 
    154     -T) no_target_directory=true
    155         shift
    156         continue;;
     154        shift;;
     155
     156    -s) stripcmd=$stripprog;;
     157
     158    -t) dst_arg=$2
     159        shift;;
     160
     161    -T) no_target_directory=true;;
    157162
    158163    --version) echo "$0 $scriptversion"; exit $?;;
     
    166171    *)  break;;
    167172  esac
     173  shift
    168174done
    169175
    170 if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
     176if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
    171177  # When -d is used, all remaining arguments are directories to create.
    172178  # When -t is used, the destination is already specified.
     
    174180  for arg
    175181  do
    176     if test -n "$dstarg"; then
     182    if test -n "$dst_arg"; then
    177183      # $@ is not empty: it contains at least $arg.
    178       set fnord "$@" "$dstarg"
     184      set fnord "$@" "$dst_arg"
    179185      shift # fnord
    180186    fi
    181187    shift # arg
    182     dstarg=$arg
     188    dst_arg=$arg
    183189  done
    184190fi
     
    225231  # Protect names starting with `-'.
    226232  case $src in
    227     -*) src=./$src ;;
     233    -*) src=./$src;;
    228234  esac
    229235
     
    243249    fi
    244250
    245     if test -z "$dstarg"; then
     251    if test -z "$dst_arg"; then
    246252      echo "$0: no destination specified." >&2
    247253      exit 1
    248254    fi
    249255
    250     dst=$dstarg
     256    dst=$dst_arg
    251257    # Protect names starting with `-'.
    252258    case $dst in
    253       -*) dst=./$dst ;;
     259      -*) dst=./$dst;;
    254260    esac
    255261
     
    258264    if test -d "$dst"; then
    259265      if test -n "$no_target_directory"; then
    260         echo "$0: $dstarg: Is a directory" >&2
     266        echo "$0: $dst_arg: Is a directory" >&2
    261267        exit 1
    262268      fi
     
    379385
    380386      case $dstdir in
    381         /*) prefix=/ ;;
    382         -*) prefix=./ ;;
    383         *)  prefix= ;;
     387        /*) prefix='/';;
     388        -*) prefix='./';;
     389        *)  prefix='';;
    384390      esac
    385391
    386       case $posix_glob in
    387         '')
    388           if (set -f) 2>/dev/null; then
    389             posix_glob=true
    390           else
    391             posix_glob=false
    392           fi ;;
    393       esac
     392      eval "$initialize_posix_glob"
    394393
    395394      oIFS=$IFS
    396395      IFS=/
    397       $posix_glob && set -f
     396      $posix_glob set -f
    398397      set fnord $dstdir
    399398      shift
    400       $posix_glob && set +f
     399      $posix_glob set +f
    401400      IFS=$oIFS
    402401
     
    460459    # errors from the above "$doit $cpprog $src $dsttmp" command.
    461460    #
    462     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
    463       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
    464       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
    465       && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    466 
    467     # Now rename the file to the real destination.
    468     { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
    469       || {
    470            # The rename failed, perhaps because mv can't rename something else
    471            # to itself, or perhaps because mv is so ancient that it does not
    472            # support -f.
    473 
    474            # Now remove or move aside any old file at destination location.
    475            # We try this two ways since rm can't unlink itself on some
    476            # systems and the destination file might be busy for other
    477            # reasons.  In this case, the final cleanup might fail but the new
    478            # file should still install successfully.
    479            {
    480              if test -f "$dst"; then
    481                $doit $rmcmd -f "$dst" 2>/dev/null \
    482                || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
    483                      && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
    484                || {
    485                  echo "$0: cannot unlink or rename $dst" >&2
    486                  (exit 1); exit 1
    487                }
    488              else
    489                :
    490              fi
    491            } &&
    492 
    493            # Now rename the file to the real destination.
    494            $doit $mvcmd "$dsttmp" "$dst"
    495          }
    496     } || exit 1
     461    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
     462    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
     463    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
     464    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
     465
     466    # If -C, don't bother to copy if it wouldn't change the file.
     467    if $copy_on_change &&
     468       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
     469       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
     470
     471       eval "$initialize_posix_glob" &&
     472       $posix_glob set -f &&
     473       set X $old && old=:$2:$4:$5:$6 &&
     474       set X $new && new=:$2:$4:$5:$6 &&
     475       $posix_glob set +f &&
     476
     477       test "$old" = "$new" &&
     478       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     479    then
     480      rm -f "$dsttmp"
     481    else
     482      # Rename the file to the real destination.
     483      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
     484
     485      # The rename failed, perhaps because mv can't rename something else
     486      # to itself, or perhaps because mv is so ancient that it does not
     487      # support -f.
     488      {
     489        # Now remove or move aside any old file at destination location.
     490        # We try this two ways since rm can't unlink itself on some
     491        # systems and the destination file might be busy for other
     492        # reasons.  In this case, the final cleanup might fail but the new
     493        # file should still install successfully.
     494        {
     495          test ! -f "$dst" ||
     496          $doit $rmcmd -f "$dst" 2>/dev/null ||
     497          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
     498            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
     499          } ||
     500          { echo "$0: cannot unlink or rename $dst" >&2
     501            (exit 1); exit 1
     502          }
     503        } &&
     504
     505        # Now rename the file to the real destination.
     506        $doit $mvcmd "$dsttmp" "$dst"
     507      }
     508    fi || exit 1
    497509
    498510    trap '' 0
  • 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.