--- elinks-0.11.7/config/config.guess.orig 2009-08-22 13:15:08.000000000 +0200 +++ elinks-0.11.7/config/config.guess 2021-11-05 10:20:36.518774600 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2004-09-07' +timestamp='2009-11-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,23 +18,25 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. + +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -53,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -158,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -166,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -196,55 +200,23 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -297,37 +269,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -335,32 +313,51 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -369,10 +366,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -384,10 +381,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -398,40 +395,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -455,32 +452,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -496,29 +494,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -526,7 +524,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -541,15 +539,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -562,28 +564,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -645,9 +647,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -655,11 +667,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -687,216 +699,248 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit 0 ;; + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -904,87 +948,40 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -992,27 +989,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; + exit ;; i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1020,15 +1017,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,69 +1131,94 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1190,22 +1226,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1216,38 +1255,50 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; - esac + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1279,7 +1330,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1368,11 +1419,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1381,22 +1433,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1407,7 +1459,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- elinks-0.11.7/po/fr.po.orig 2009-08-22 13:15:08.000000000 +0200 +++ elinks-0.11.7/po/fr.po 2021-11-05 17:34:40.654132600 +0100 @@ -1,15 +1,15 @@ # French ELinks translation. -# Fabrice Haberer-Proust -# Laurent Monin , 2001 - 2006 +# Eric Lassauge 2021 # msgid "" msgstr "" -"Project-Id-Version: ELinks 0.12.GIT\n" +"Project-Id-Version: ELinks 0.11.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-22 14:10+0300\n" +"POT-Creation-Date: 2021-11-05 17:00+0100\n" "PO-Revision-Date: 2007-04-15 09:20+0200\n" -"Last-Translator: Laurent Monin \n" +"Last-Translator: Eric Lassauge \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,7 +27,7 @@ #: src/bfu/hierbox.c:418 msgid "Press space to expand this folder." -msgstr "Pressez espace pour déployer le dossier." +msgstr "[espace] pour déployer le dossier." #: src/bfu/hierbox.c:429 src/bfu/inpfield.c:254 src/bfu/msgbox.c:172 #: src/bfu/msgbox.c:189 src/config/dialogs.c:57 src/config/dialogs.c:391 @@ -42,24 +42,24 @@ #: src/bfu/hierbox.c:540 #, c-format msgid "Sorry, but the item \"%s\" cannot be deleted." -msgstr "Désolé, mais l'item \"%s\" ne peut être supprimé." +msgstr "Désolé, mais l'élément « %s » ne peut être supprimé." #: src/bfu/hierbox.c:541 #, c-format msgid "Sorry, but the item \"%s\" is being used by something else." -msgstr "Désolé, mais l'item \"%s\" est actuellement utilisé ailleurs." +msgstr "Désolé, mais l'élément « %s » est actuellement utilisé ailleurs." #. cant_delete_folder #: src/bfu/hierbox.c:544 src/bookmarks/dialogs.c:119 #, c-format msgid "Sorry, but the folder \"%s\" cannot be deleted." -msgstr "Désolé, mais le dossier \"%s\" ne peut être supprimé." +msgstr "Désolé, mais le dossier « %s » ne peut être supprimé." #. cant_delete_used_folder #: src/bfu/hierbox.c:545 src/bookmarks/dialogs.c:121 #, c-format msgid "Sorry, but the folder \"%s\" is being used by something else." -msgstr "Désolé, mais le dossier \"%s\" est actuellement utilisé ailleurs." +msgstr "Désolé, mais le dossier « %s » est actuellement utilisé ailleurs." #: src/bfu/hierbox.c:610 msgid "Delete error" @@ -67,11 +67,11 @@ #: src/bfu/hierbox.c:704 msgid "Delete marked items" -msgstr "Supprimer les items marqués" +msgstr "Supprimer les éléments marqués" #: src/bfu/hierbox.c:705 msgid "Delete marked items?" -msgstr "Supprimer les items marqués ?" +msgstr "Supprimer les éléments marqués ?" #: src/bfu/hierbox.c:718 src/bfu/hierbox.c:754 src/bfu/hierbox.c:775 #: src/bfu/hierbox.c:846 src/config/dialogs.c:832 src/dialogs/menu.c:126 @@ -95,7 +95,7 @@ #: src/bfu/hierbox.c:740 #, c-format msgid "Delete the folder \"%s\" and its content?" -msgstr "Supprimer le dossier \"%s\" et son contenu ?" +msgstr "Supprimer le dossier « %s » et son contenu ?" #: src/bfu/hierbox.c:757 msgid "Delete item" @@ -108,17 +108,17 @@ "\n" "%s" msgstr "" -"Supprimer \"%s\" ?\n" +"Supprimer « %s » ?\n" "\n" "%s" #: src/bfu/hierbox.c:815 msgid "Clear all items" -msgstr "Effacer tous les items" +msgstr "Effacer tous les éléments" #: src/bfu/hierbox.c:816 msgid "Do you really want to remove all items?" -msgstr "Êtes-vous sûr de vouloir effacer tous les items ?" +msgstr "Êtes-vous sûr de vouloir effacer tous les éléments ?" #: src/bfu/hierbox.c:913 src/bfu/hierbox.c:944 src/viewer/text/search.c:1013 #: src/viewer/text/search.c:1021 src/viewer/text/search.c:1037 @@ -129,7 +129,7 @@ #: src/bfu/hierbox.c:915 src/viewer/text/search.c:1014 #, c-format msgid "Search string '%s' not found" -msgstr "Chaîne recherchée '%s' introuvable" +msgstr "Chaîne recherchée « %s » introuvable" #: src/bfu/hierbox.c:944 src/config/dialogs.c:168 src/config/dialogs.c:357 #: src/config/dialogs.c:504 src/cookies/dialogs.c:34 src/cookies/dialogs.c:349 @@ -175,18 +175,18 @@ #: src/bfu/leds.c:75 msgid "Digital clock in the status bar." -msgstr "Horloge digitale dans la barre de status." +msgstr "Horloge digitale dans la barre d'état." #: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1127 #: src/config/options.inc:1134 src/ecmascript/ecmascript.c:40 #: src/globhist/globhist.c:63 src/mime/backend/mailcap.c:93 -#: src/mime/backend/mimetypes.c:52 src/network/ssl/ssl.c:80 +#: src/mime/backend/mimetypes.c:52 src/network/ssl/ssl.c:85 msgid "Enable" msgstr "Activation" #: src/bfu/leds.c:79 msgid "Whether to display a digital clock in the status bar." -msgstr "Afficher l'horloge digitale dans la barre de status." +msgstr "Afficher l'horloge digitale dans la barre d'état." #: src/bfu/leds.c:81 msgid "Format" @@ -222,7 +222,6 @@ msgstr "Indicateurs LED" #: src/bfu/leds.c:303 -#, fuzzy msgid "" "What the different LEDs indicate:\n" "\n" @@ -244,7 +243,7 @@ " ||||`-- Inutilisé\n" " |||`--- Une fenêtre Javascript a été bloquée\n" " ||`---- Une erreur JavaScript s'est produite\n" -" |`----- Etat du mode insertion pour les champs texte\n" +" |`----- État du mode insertion pour les champs texte\n" " | 'i' sans mode, 'I' mode insertion activé\n" " `------ Connexion SSL utilisée\n" "\n" @@ -261,7 +260,7 @@ #: src/bookmarks/backend/xbel.c:108 #, c-format msgid "read_bookmarks_xbel(): Error reading %s" -msgstr "read_bookmarks_xbel(): Erreur lors de la lecture de %s" +msgstr "read_bookmarks_xbel(): Erreur lors de la lecture de « %s »" #: src/bookmarks/backend/xbel.c:116 #, c-format @@ -357,10 +356,9 @@ msgid "Title" msgstr "Titre" -#: src/bookmarks/dialogs.c:71 src/cache/dialogs.c:65 -#: src/dialogs/document.c:136 src/dialogs/edit.c:95 src/formhist/dialogs.c:63 -#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:159 -#: src/scripting/lua/core.c:383 +#: src/bookmarks/dialogs.c:71 src/cache/dialogs.c:65 src/dialogs/document.c:136 +#: src/dialogs/edit.c:95 src/formhist/dialogs.c:63 src/globhist/dialogs.c:66 +#: src/protocol/auth/dialogs.c:159 src/scripting/lua/core.c:383 msgid "URL" msgstr "URL" @@ -368,13 +366,13 @@ #: src/bookmarks/dialogs.c:115 #, c-format msgid "Sorry, but the bookmark \"%s\" cannot be deleted." -msgstr "Désolé, mais le signet \"%s\" ne peut être supprimé." +msgstr "Désolé, mais le signet « %s » ne peut être supprimé." #. cant_delete_used_item #: src/bookmarks/dialogs.c:117 #, c-format msgid "Sorry, but the bookmark \"%s\" is being used by something else." -msgstr "Désolé, mais le signet \"%s\" est actuellement utilisé ailleurs." +msgstr "Désolé, mais le signet « %s » est actuellement utilisé ailleurs." #. delete_marked_items_title #: src/bookmarks/dialogs.c:123 @@ -384,13 +382,13 @@ #. delete_marked_items #: src/bookmarks/dialogs.c:125 msgid "Delete marked bookmarks?" -msgstr "Supprimer les signets marqués ?" +msgstr "Supprimer les signets marqués ?" #. delete_folder #: src/bookmarks/dialogs.c:129 #, c-format msgid "Delete the folder \"%s\" and all bookmarks in it?" -msgstr "Supprimer le dossier \"%s\" et tous les signets qu'il contient ?" +msgstr "Supprimer le dossier « %s » et tous les signets qu'il contient ?" #. delete_item_title #: src/bookmarks/dialogs.c:131 @@ -400,7 +398,7 @@ #. delete_item #: src/bookmarks/dialogs.c:133 msgid "Delete this bookmark?" -msgstr "Supprimer ce signet ?" +msgstr "Supprimer ce signet ?" #. clear_all_items_title #: src/bookmarks/dialogs.c:135 @@ -410,7 +408,7 @@ #. clear_all_items_title #: src/bookmarks/dialogs.c:137 msgid "Do you really want to remove all bookmarks?" -msgstr "Êtes-vous sûr de vouloir effacer tous les signets ?" +msgstr "Êtes-vous sûr de vouloir effacer tous les signets ?" #: src/bookmarks/dialogs.c:270 msgid "Add folder" @@ -434,10 +432,10 @@ msgid "~Edit" msgstr "~Modifier" -#: src/bookmarks/dialogs.c:463 src/cache/dialogs.c:230 -#: src/config/dialogs.c:529 src/config/dialogs.c:940 src/cookies/dialogs.c:423 -#: src/dialogs/menu.c:444 src/formhist/dialogs.c:210 -#: src/globhist/dialogs.c:228 src/protocol/auth/dialogs.c:258 +#: src/bookmarks/dialogs.c:463 src/cache/dialogs.c:230 src/config/dialogs.c:529 +#: src/config/dialogs.c:940 src/cookies/dialogs.c:423 src/dialogs/menu.c:444 +#: src/formhist/dialogs.c:210 src/globhist/dialogs.c:228 +#: src/protocol/auth/dialogs.c:258 msgid "~Delete" msgstr "~Supprimer" @@ -458,9 +456,8 @@ msgid "~Move" msgstr "~Déplacer" -#: src/bookmarks/dialogs.c:468 src/cache/dialogs.c:231 -#: src/config/dialogs.c:530 src/config/dialogs.c:942 src/dialogs/menu.c:397 -#: src/globhist/dialogs.c:229 +#: src/bookmarks/dialogs.c:468 src/cache/dialogs.c:231 src/config/dialogs.c:530 +#: src/config/dialogs.c:942 src/dialogs/menu.c:397 src/globhist/dialogs.c:229 msgid "~Search" msgstr "~Chercher" @@ -507,8 +504,8 @@ msgid "Redirect" msgstr "Redirection" -#: src/cache/dialogs.c:85 src/config/options.inc:508 -#: src/dialogs/document.c:156 src/protocol/bittorrent/dialogs.c:126 +#: src/cache/dialogs.c:85 src/config/options.inc:508 src/dialogs/document.c:156 +#: src/protocol/bittorrent/dialogs.c:126 msgid "Size" msgstr "Taille" @@ -561,14 +558,14 @@ #: src/cache/dialogs.c:187 #, c-format msgid "Sorry, but cache entry \"%s\" cannot be deleted." -msgstr "Désolé, mais l'entrée de cache \"%s\" ne peut être supprimé." +msgstr "Désolé, mais l'entrée de cache « %s » ne peut être supprimé." #. cant_delete_used_item #: src/cache/dialogs.c:189 #, c-format msgid "Sorry, but cache entry \"%s\" is being used by something else." msgstr "" -"Désolé, mais l'entrée de cache \"%s\" est actuellement utilisé ailleurs." +"Désolé, mais l'entrée de cache « %s » est actuellement utilisé ailleurs." #. delete_marked_items_title #: src/cache/dialogs.c:195 @@ -578,7 +575,7 @@ #. delete_marked_items #: src/cache/dialogs.c:197 msgid "Delete marked cache entries?" -msgstr "Supprimer les entrées de cache marquées ?" +msgstr "Supprimer les entrées de cache marquées ?" #. delete_item_title #: src/cache/dialogs.c:203 @@ -588,7 +585,7 @@ #. delete_item #: src/cache/dialogs.c:205 msgid "Delete this cache entry?" -msgstr "Supprimer cette entrée de cache ?" +msgstr "Supprimer cette entrée de cache ?" #: src/cache/dialogs.c:228 src/config/dialogs.c:526 src/cookies/dialogs.c:420 #: src/dialogs/download.c:249 src/dialogs/download.c:478 @@ -1219,12 +1216,12 @@ #: src/config/cmdline.c:475 src/config/cmdline.c:504 #, c-format msgid "(default: \"%s\")" -msgstr "(défaut: \"%s\")" +msgstr "(défaut : « %s »)" #: src/config/cmdline.c:480 #, c-format msgid "(alias for %s)" -msgstr "(alias for %s)" +msgstr "(alias pour %s)" #: src/config/cmdline.c:485 src/config/cmdline.c:494 #, c-format @@ -1771,8 +1768,7 @@ msgid "(expand by pressing space)" msgstr "(déployer en pressant espace)" -#: src/config/dialogs.c:176 src/config/dialogs.c:358 -#: src/config/options.inc:788 +#: src/config/dialogs.c:176 src/config/dialogs.c:358 src/config/options.inc:788 msgid "Type" msgstr "Type" @@ -2113,7 +2109,6 @@ msgstr "Essayer IPv4 lors des connexions" #: src/config/options.inc:99 -#, fuzzy msgid "" "Whether to try to connect to a host over IPv4.\n" "Note that if connection.try_ipv6 is enabled too,\n" @@ -2125,14 +2120,13 @@ msgstr "" "Essayer ou non de se connecter en IPv4 à un hôte.\n" "Notez que si connection.try_ipv6 est activé aussi,\n" -"il est prioritaire. Mieux, ne touchez pas à ça du\n" +"il est prioritaire. Il vaut mieux, ne pas touchez à ça du\n" "tout à moins de savoir ce que vous faites.\n" "Vous pouvez toujours forcer l'utilisation d'un\n" "protocole pour une connexion en utilisant une URL\n" "du style http4://elinks.or.cz/." #: src/config/options.inc:109 -#, fuzzy msgid "" "Whether to try to connect to a host over IPv4.\n" "Do not touch this option.\n" @@ -2152,7 +2146,6 @@ msgstr "Essayer IPv6 lors des connexions" #: src/config/options.inc:119 -#, fuzzy msgid "" "Whether to try to connect to a host over IPv6.\n" "Note that you can also force a given protocol\n" @@ -2571,7 +2564,6 @@ msgstr "Utiliser tabindex" #: src/config/options.inc:325 -#, fuzzy msgid "" "Whether to navigate links using tabindex specified ordering.\n" "The TABINDEX attribute in HTML elements specifies the order\n" @@ -2633,12 +2625,11 @@ #. 0 #: src/config/options.inc:352 -#, fuzzy msgid "" "When pressing 'down' on the last link, jump to the first one, and\n" "vice versa." msgstr "" -"En pressant la touche BAS sur le dernier lien, sauter au premier, et\n" +"En pressant la touche [BAS] sur le dernier lien, sauter au premier, et\n" "vice versa." #: src/config/options.inc:356 @@ -2738,7 +2729,6 @@ msgstr "Montrer les dialogues de limite de recherche" #: src/config/options.inc:402 -#, fuzzy msgid "" "Whether to show a dialog when the search hits the top or bottom of the\n" "document." @@ -2868,7 +2858,6 @@ msgstr "Cacher les informations concernant les redirections" #: src/config/options.inc:461 -#, fuzzy msgid "" "Cache even redirects sent by server (usually thru HTTP by a 302\n" "HTTP code and a Location header). This was the original behaviour\n" @@ -3064,7 +3053,6 @@ msgstr "Garantir le contraste" #: src/config/options.inc:576 -#, fuzzy msgid "Makes sure that the back- and foreground colors are never equal." msgstr "Forcer l'utilisation de couleurs différentes pour le fond et le texte." @@ -3287,9 +3275,8 @@ msgstr "Afficher superscripts (comme ^chose)." #: src/config/options.inc:690 -#, fuzzy msgid "Rendering of HTML link element" -msgstr "Rendu des éléments html link" +msgstr "Rendu des éléments HTML link" #: src/config/options.inc:692 msgid "" @@ -3360,7 +3347,6 @@ msgstr "Passage d'URI" #: src/config/options.inc:726 -#, fuzzy msgid "" "Rules for passing URIs to external commands. When one rule\n" "is defined the link and tab menu will have a menu item that\n" @@ -3413,7 +3399,6 @@ msgstr "Intervalle pour la sauvegarde automatique" #: src/config/options.inc:755 -#, fuzzy msgid "" "Interval at which to trigger information files in ~/.elinks\n" "to be saved to disk if they have changed (seconds; 0 to disable)" @@ -4013,7 +3998,6 @@ msgstr "Souligner les raccourcis des menus" #: src/config/options.inc:1112 -#, fuzzy msgid "" "Whether to underline hotkeys in menus to make them more\n" "visible. Requires that underlining is enabled for the terminal." @@ -4026,7 +4010,6 @@ msgstr "Souligner les raccourcis des boutons" #: src/config/options.inc:1117 -#, fuzzy msgid "" "Whether to underline button shortcuts to make them more\n" "visible. Requires that underlining is enabled for the terminal." @@ -4115,12 +4098,11 @@ msgstr "Navigation cyclique dans les onglets" #: src/config/options.inc:1165 -#, fuzzy msgid "" "When moving right from the last tab, jump to the first one, and\n" "vice versa." msgstr "" -"En cas de déplacement à droite sur le dernier onglet, saute au premier\n" +"En cas de déplacement à droite sur le dernier onglet, sauter au premier\n" "et vice-versa." #: src/config/options.inc:1168 @@ -4429,7 +4411,6 @@ msgstr "Sauvegarde" #: src/cookies/cookies.c:113 -#, fuzzy msgid "Whether cookies should be loaded from and saved to disk." msgstr "Charger/sauvegarder ou non les cookies sur disque." @@ -4473,11 +4454,11 @@ #: src/cookies/dialogs.c:69 #, c-format msgid "Do you want to accept a cookie from %s?" -msgstr "Voulez-vous accepter un cookie en provenance de %s ?" +msgstr "Voulez-vous accepter un cookie en provenance de %s ?" #: src/cookies/dialogs.c:77 msgid "Accept cookie?" -msgstr "Accepter le cookie ?" +msgstr "Accepter le cookie ?" #: src/cookies/dialogs.c:80 msgid "~Accept" @@ -4496,26 +4477,26 @@ #: src/cookies/dialogs.c:196 #, c-format msgid "Sorry, but cookie \"%s\" cannot be deleted." -msgstr "Désolé, mais le cookie \"%s\" ne peut être supprimé." +msgstr "Désolé, mais le cookie « %s » ne peut être supprimé." #. cant_delete_used_item #: src/cookies/dialogs.c:198 #, c-format msgid "Sorry, but cookie \"%s\" is being used by something else." -msgstr "Désolé, mais le cookie \"%s\" est actuellement utilisé ailleurs." +msgstr "Désolé, mais le cookie « %s » est actuellement utilisé ailleurs." #. cant_delete_folder #: src/cookies/dialogs.c:200 #, c-format msgid "Sorry, but cookie domain \"%s\" cannot be deleted." -msgstr "Désolé, mais le domaine du cookie \"%s\" ne peut être supprimé." +msgstr "Désolé, mais le domaine du cookie « %s » ne peut être supprimé." #. cant_delete_used_folder #: src/cookies/dialogs.c:202 #, c-format msgid "Sorry, but cookie domain \"%s\" is being used by something else." msgstr "" -"Désolé, mais le domaine du cookie \"%s\" est actuellement utilisé ailleurs." +"Désolé, mais le domaine du cookie « %s » est actuellement utilisé ailleurs." #. delete_marked_items_title #: src/cookies/dialogs.c:204 @@ -4525,7 +4506,7 @@ #. delete_marked_items #: src/cookies/dialogs.c:206 msgid "Delete marked cookies?" -msgstr "Supprimer les cookies marqués ?" +msgstr "Supprimer les cookies marqués ?" #. delete_folder_title #: src/cookies/dialogs.c:208 @@ -4536,7 +4517,7 @@ #: src/cookies/dialogs.c:210 #, c-format msgid "Delete all cookies from domain \"%s\"?" -msgstr "Supprimer tous les cookies du domaine \"%s\" ?" +msgstr "Supprimer tous les cookies du domaine « %s » ?" #. delete_item_title #: src/cookies/dialogs.c:212 @@ -4546,7 +4527,7 @@ #. delete_item #: src/cookies/dialogs.c:214 msgid "Delete this cookie?" -msgstr "Supprimer ce cookie ?" +msgstr "Supprimer ce cookie ?" #. clear_all_items_title #: src/cookies/dialogs.c:216 @@ -4556,7 +4537,7 @@ #. clear_all_items_title #: src/cookies/dialogs.c:218 msgid "Do you really want to remove all cookies?" -msgstr "Êtes-vous sûr de vouloir effacer tous les cookies ?" +msgstr "Êtes-vous sûr de vouloir effacer tous les cookies ?" #: src/cookies/dialogs.c:424 src/dialogs/download.c:484 src/dialogs/edit.c:98 #: src/globhist/dialogs.c:231 src/protocol/auth/dialogs.c:259 @@ -4648,7 +4629,7 @@ #: src/dialogs/download.c:410 #, c-format msgid "Sorry, but download \"%s\" cannot be interrupted." -msgstr "Désolé, mais le téléchargement \"%s\" ne peut être supprimé." +msgstr "Désolé, mais le téléchargement « %s » ne peut être supprimé." #. cant_delete_used_item #: src/dialogs/download.c:412 @@ -4665,7 +4646,7 @@ #. delete_marked_items #: src/dialogs/download.c:420 msgid "Interrupt marked downloads?" -msgstr "Interrompre les téléchargements marqués ?" +msgstr "Interrompre les téléchargements marqués ?" #. delete_item_title #: src/dialogs/download.c:426 @@ -4675,7 +4656,7 @@ #. delete_item #: src/dialogs/download.c:428 msgid "Interrupt this download?" -msgstr "Interrompre ce téléchargement ?" +msgstr "Interrompre ce téléchargement ?" #. clear_all_items_title #: src/dialogs/download.c:430 @@ -4685,7 +4666,7 @@ #. clear_all_items_title #: src/dialogs/download.c:432 msgid "Do you really want to interrupt all downloads?" -msgstr "Interrompre tous les téléchargements en cours ?" +msgstr "Interrompre tous les téléchargements en cours ?" #. This requires more work to make locking work and query the user #: src/dialogs/download.c:482 @@ -4714,7 +4695,7 @@ msgstr "Licence" #: src/dialogs/info.c:142 -#, fuzzy, c-format +#, c-format msgid "" "ELinks %s\n" "\n" @@ -4729,9 +4710,12 @@ msgstr "" "ELinks %s\n" "\n" -"(C) 1999 - 2002 Mikulas Patocka\n" -"(C) 2001 - 2004 Petr Baudis\n" -"(C) 2002 - 2006 Jonas Fonseca\n" +"(c) 1999 - 2002 Mikulas Patocka\n" +"(c) 2001 - 2004 Petr Baudis\n" +"(c) 2002 - 2008 Jonas Fonseca\n" +"et d'autres\n" +"Traductions :\n" +"(c) 2021 Eric Lassauge\n" "et d'autres\n" "\n" "Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le " @@ -4881,11 +4865,11 @@ #: src/dialogs/menu.c:122 msgid "Do you really want to exit ELinks (and terminate all downloads)?" -msgstr "Interrompre les téléchargements en cours et quitter ELinks ?" +msgstr "Interrompre les téléchargements en cours et quitter ELinks ?" #: src/dialogs/menu.c:124 msgid "Do you really want to exit ELinks?" -msgstr "Êtes-vous sûr de vouloir quitter ELinks ?" +msgstr "Êtes-vous sûr de vouloir quitter ELinks ?" #: src/dialogs/menu.c:160 msgid "No history" @@ -4904,7 +4888,6 @@ msgstr "~Signet pour ce document" #: src/dialogs/menu.c:243 src/dialogs/menu.c:403 -#, fuzzy msgid "Toggle ~HTML/plain" msgstr "~Bascule html/source" @@ -5501,13 +5484,13 @@ #: src/formhist/dialogs.c:120 #, c-format msgid "Sorry, but form \"%s\" cannot be deleted." -msgstr "Désolé, mais le formulaire \"%s\" ne peut être supprimé." +msgstr "Désolé, mais le formulaire « %s » ne peut être supprimé." #. cant_delete_used_item #: src/formhist/dialogs.c:122 #, c-format msgid "Sorry, but form \"%s\" is being used by something else." -msgstr "Désolé, mais le formulaire \"%s\" est actuellement utilisé ailleurs." +msgstr "Désolé, mais le formulaire « %s » est actuellement utilisé ailleurs." #. delete_marked_items_title #: src/formhist/dialogs.c:128 @@ -5517,7 +5500,7 @@ #. delete_marked_items #: src/formhist/dialogs.c:130 msgid "Delete marked forms?" -msgstr "Supprimer les formulaires marqués ?" +msgstr "Supprimer les formulaires marqués ?" #. delete_item_title #: src/formhist/dialogs.c:136 @@ -5527,7 +5510,7 @@ #. delete_item #: src/formhist/dialogs.c:138 msgid "Delete this form?" -msgstr "Supprimer ce formulaire ?" +msgstr "Supprimer ce formulaire ?" #. clear_all_items_title #: src/formhist/dialogs.c:140 @@ -5537,7 +5520,7 @@ #. clear_all_items_title #: src/formhist/dialogs.c:142 msgid "Do you really want to remove all forms?" -msgstr "Êtes-vous sûr de vouloir effacer tous les formulaires ?" +msgstr "Êtes-vous sûr de vouloir effacer tous les formulaires ?" #: src/formhist/dialogs.c:173 msgid "Form not saved" @@ -5617,7 +5600,7 @@ #: src/globhist/dialogs.c:105 #, c-format msgid "Sorry, but history entry \"%s\" cannot be deleted." -msgstr "Désolé, mais l'entrée d'historique \"%s\" ne peut être supprimée." +msgstr "Désolé, mais l'entrée d'historique « %s » ne peut être supprimée." #. cant_delete_used_item #: src/globhist/dialogs.c:107 @@ -5634,7 +5617,7 @@ #. delete_marked_items #: src/globhist/dialogs.c:115 msgid "Delete marked history entries?" -msgstr "Supprimer les entrées d'historique marquées ?" +msgstr "Supprimer les entrées d'historique marquées ?" #. delete_item_title #: src/globhist/dialogs.c:121 @@ -5644,7 +5627,7 @@ #. delete_item #: src/globhist/dialogs.c:123 msgid "Delete this history entry?" -msgstr "Supprimer cette entrée d'historique ?" +msgstr "Supprimer cette entrée d'historique ?" #. clear_all_items_title #: src/globhist/dialogs.c:125 @@ -5654,7 +5637,7 @@ #. clear_all_items_title #: src/globhist/dialogs.c:127 msgid "Do you really want to remove all history entries?" -msgstr "Êtes-vous sûr de vouloir effacer toutes les entrées d'historique ?" +msgstr "Êtes-vous sûr de vouloir effacer toutes les entrées d'historique ?" #: src/globhist/dialogs.c:169 msgid "Search history" @@ -6096,7 +6079,7 @@ #: src/mime/backend/mailcap.c:351 #, c-format msgid "Badly formated mailcap entry for type %s in \"%s\" line %d" -msgstr "Entrée mailcap mal formatée pour le type %s dans \"%s\" ligne %d" +msgstr "Entrée mailcap mal formatée pour le type %s dans « %s » ligne %d" #. name: #: src/mime/backend/mimetypes.c:46 src/mime/backend/mimetypes.c:285 @@ -6104,7 +6087,6 @@ msgstr "Fichiers mime.types" #: src/mime/backend/mimetypes.c:48 -#, fuzzy msgid "" "Options for the support of mime.types files. These files\n" "can be used to find the content type of a URL by looking at\n" @@ -6131,7 +6113,7 @@ #: src/mime/dialogs.c:66 #, c-format msgid "Delete extension %s -> %s?" -msgstr "Supprimer l'extension %s -> %s ?" +msgstr "Supprimer l'extension %s -> %s ?" #: src/mime/dialogs.c:126 msgid "Extension" @@ -6170,11 +6152,11 @@ "Type MIME du document par défaut (quand il ne peut être\n" "deviner grâce aux informations connues concernant le document)." -#: src/network/ssl/ssl.c:71 src/network/ssl/ssl.c:151 +#: src/network/ssl/ssl.c:76 src/network/ssl/ssl.c:156 msgid "Verify certificates" msgstr "Vérification des certificats" -#: src/network/ssl/ssl.c:73 +#: src/network/ssl/ssl.c:78 msgid "" "Verify the peer's SSL certificate. Note that this\n" "needs extensive configuration of OpenSSL by the user." @@ -6182,15 +6164,15 @@ "Vérifier le certificat SSL du serveur. Notez que cela nécessite\n" "une configuration particulière de OpenSSL par l'utilisateur." -#: src/network/ssl/ssl.c:76 +#: src/network/ssl/ssl.c:81 msgid "Client Certificates" msgstr "Certificats du client" -#: src/network/ssl/ssl.c:78 +#: src/network/ssl/ssl.c:83 msgid "X509 client certificate options." msgstr "Options concernant les certificats X509 du client." -#: src/network/ssl/ssl.c:82 +#: src/network/ssl/ssl.c:87 msgid "" "Enable or not the sending of X509 client certificates\n" "to servers which request them." @@ -6198,11 +6180,11 @@ "Activer ou non l'envoi des certificats X509 du client aux\n" "serveurs qui le demandent." -#: src/network/ssl/ssl.c:85 +#: src/network/ssl/ssl.c:90 msgid "Certificate File" msgstr "Fichier contenant le certificat" -#: src/network/ssl/ssl.c:87 +#: src/network/ssl/ssl.c:92 msgid "" "The location of a file containing the client certificate\n" "and unencrypted private key in PEM format. If unset, the\n" @@ -6214,7 +6196,7 @@ "indiqué par la variable d'environnement X509_CLIENT_CERT sera\n" "utilisé." -#: src/network/ssl/ssl.c:153 +#: src/network/ssl/ssl.c:158 msgid "" "Verify the peer's SSL certificate. Note that this\n" "probably doesn't work properly at all with GnuTLS." @@ -6223,11 +6205,11 @@ "probablement pas correctement avec GnuTLS." #. name: -#: src/network/ssl/ssl.c:172 src/network/ssl/ssl.c:189 +#: src/network/ssl/ssl.c:177 src/network/ssl/ssl.c:194 msgid "SSL" msgstr "SSL" -#: src/network/ssl/ssl.c:174 +#: src/network/ssl/ssl.c:179 msgid "SSL options." msgstr "Options SSL." @@ -6436,7 +6418,6 @@ "ou la variable d'environnement NNTPSERVER." #: src/network/state.c:100 -#, fuzzy msgid "Server hung up for some reason" msgstr "Le serveur est bloqué pour une raison inconnue" @@ -6564,7 +6545,7 @@ #: src/protocol/auth/dialogs.c:215 #, c-format msgid "Sorry, but auth entry \"%s\" cannot be deleted." -msgstr "Désolé, mais l'authentification \"%s\" ne peut être supprimée." +msgstr "Désolé, mais l'authentification « %s » ne peut être supprimée." #. cant_delete_used_item #: src/protocol/auth/dialogs.c:217 @@ -6581,7 +6562,7 @@ #. delete_marked_items #: src/protocol/auth/dialogs.c:225 msgid "Delete marked auth entries?" -msgstr "Supprimer les authentifications marquées ?" +msgstr "Supprimer les authentifications marquées ?" #. delete_item_title #: src/protocol/auth/dialogs.c:231 @@ -6591,7 +6572,7 @@ #. delete_item #: src/protocol/auth/dialogs.c:233 msgid "Delete this auth entry?" -msgstr "Supprimer cette authentification ?" +msgstr "Supprimer cette authentification ?" #. clear_all_items_title #: src/protocol/auth/dialogs.c:235 @@ -6601,7 +6582,7 @@ #. clear_all_items_title #: src/protocol/auth/dialogs.c:237 msgid "Do you really want to remove all auth entries?" -msgstr "Êtes-vous sûr de vouloir effacer toutes les authentifications ?" +msgstr "Êtes-vous sûr de vouloir effacer toutes les authentifications ?" #: src/protocol/auth/dialogs.c:264 msgid "Authentication manager" @@ -7175,7 +7156,7 @@ #: src/protocol/bittorrent/dialogs.c:725 #, c-format msgid "What would you like to do with the file '%s'?" -msgstr "Que voulez-vous faire avec le fichier '%s' ?" +msgstr "Que voulez-vous faire avec le fichier '%s' ?" #: src/protocol/bittorrent/dialogs.c:741 msgid "Information about the torrent" @@ -7183,7 +7164,7 @@ #: src/protocol/bittorrent/dialogs.c:763 src/session/download.c:1043 msgid "What to do?" -msgstr "Que faire ?" +msgstr "Que faire ?" #: src/protocol/bittorrent/dialogs.c:785 msgid "Down~load" @@ -7245,12 +7226,11 @@ msgstr "Montrer les fichiers cachés" #: src/protocol/file/file.c:64 -#, fuzzy msgid "" "When set to false, files with name starting with a dot will be\n" "hidden in local directory listings." msgstr "" -"Si mis à faux, les fichiers dont le nom commencent par un point\n" +"Si mis à faux, les fichiers dont le nom commence par un point\n" "seront cachés lors de la visualisation du contenu d'un répertoire\n" "local." @@ -7565,7 +7545,6 @@ msgstr "Identification du client" #: src/protocol/http/http.c:189 -#, fuzzy msgid "" "Change the User Agent ID. That means identification string, which\n" "is sent to HTTP server when a document is requested. The 'textmode'\n" @@ -7580,12 +7559,12 @@ "%b in the string means number of bars displayed by ELinks." msgstr "" "Change l'identification du navigateur.\n" -"Il s'agit de l'en-tête User-Agent envoyé aux serveurs lors d'une\n" +"Il s'agit de l'en-tête User-Agent envoyé aux serveurs HTTP lors d'une\n" "requête. Le mot clé 'textmode' dans le premier champ est notre\n" -"tentative silencieuse d'établir un standart pour les nouveaux\n" +"tentative silencieuse d'établir un standard pour les nouveaux\n" "navigateurs en mode texte, ainsi les webmasters ont juste\n" -"à utiliser un simple et uniforme test, pour fournir une version\n" -"du document plus adaptée à ce type de navigateur:\n" +"à utiliser un simple test unique pour fournir une version\n" +"du document plus adaptée à ce type de navigateur :\n" "%v dans la chaîne insère la version d'ELinks\n" "%s dans la chaîne insère l'identifiant du système\n" "%t dans la chaîne insère les dimensions du terminal\n" @@ -7788,7 +7767,6 @@ msgstr "Modèle par défaut" #: src/protocol/rewrite/rewrite.c:95 -#, fuzzy msgid "" "Default URI template used when the string entered in\n" "the goto dialog does not appear to be a URI or a filename\n" @@ -7804,7 +7782,11 @@ "la dialogue \"Atteindre l'URL\" n'est ni une URI ni un fichier\n" "(par exemple, ne contient pas les caractères '.', ':' ou '/'),\n" "et ne correspond à aucun des préfixes définis. Mettre la valeur\n" -"à \"\" pour désactiver l'usage de ce modèle." +"à \"\" pour désactiver l'utilisation de ce modèle.\n" +"%c dans le modèle signifie l'URL courante,\n" +"%s dans le modèle signifie toute la chaîne du dialogue « Atteindre l'URL »,\n" +"%0,%1,...,%9 signifie 1ière,2nde,...,10ième partie délimitée par un espace de %s,\n" +"%% dans le modèle signifie '%'" #. name: #: src/protocol/rewrite/rewrite.c:371 @@ -7984,12 +7966,12 @@ #: src/session/download.c:1066 #, c-format msgid "What would you like to do with the file '%s' (type: %s%s%s)?" -msgstr "Que voulez-vous faire avec le fichier '%s' (type: %s%s%s) ?" +msgstr "Que voulez-vous faire avec le fichier '%s' (type: %s%s%s) ?" #: src/session/download.c:1069 -#, fuzzy, c-format +#, c-format msgid "What would you like to do with the file (type: %s%s%s)?" -msgstr "Que voulez-vous faire avec le fichier '%s' (type: %s%s%s) ?" +msgstr "Que voulez-vous faire avec le fichier « %s » (type: %s%s%s) ?" #: src/session/download.c:1100 #, no-c-format @@ -8003,7 +7985,7 @@ #: src/session/download.c:1110 #, c-format msgid "The file will be opened with the program '%s'." -msgstr "Le fichier sera ouvert avec le programme '%s'." +msgstr "Le fichier sera ouvert avec le programme « %s »." #: src/session/download.c:1131 msgid "~Open" @@ -8019,7 +8001,6 @@ msgstr "Avertissement" #: src/session/session.c:745 -#, fuzzy msgid "" "You have an empty string in protocol.http.user_agent - this was a default " "value in the past, substituted by default ELinks User-Agent string. However, " @@ -8039,7 +8020,6 @@ "faites juste ça. Toutes nos excuses pour ce désagrément." #: src/session/session.c:764 -#, fuzzy msgid "" "You have option config.saving_style set to a de facto obsolete value. The " "configuration saving algorithms of ELinks were changed from the last time " @@ -8051,7 +8031,7 @@ "to 3 in order to get the \"right\" behaviour. Apologies for any inconvience " "caused." msgstr "" -"L'option config.saving_style configurée a une valeur obsolète. Les " +"L'option config.saving_style est configurée a une valeur obsolète. Les " "algorithmes de sauvegarde de la configuration d'ELinks ont changé depuis la " "dernière mise à jour. Maintenant, seules les options qui ont effectivement " "changées sont sauvegardées. Cela simplifie grandement les choses lorsque des " @@ -8110,12 +8090,12 @@ #: src/session/task.c:255 #, c-format msgid "Do you want to post form data to URL %s?" -msgstr "Voulez-vous poster les données de formulaire à l'URL %s ?" +msgstr "Voulez-vous poster les données de formulaire à l'URL %s ?" #: src/session/task.c:258 #, c-format msgid "Do you want to repost form data to URL %s?" -msgstr "Voulez-vous re-poster les données de formulaire à l'URL %s ?" +msgstr "Voulez-vous re-poster les données de formulaire à l'URL %s ?" #: src/terminal/event.c:71 #, c-format @@ -8146,11 +8126,11 @@ #: src/terminal/tab.c:189 msgid "Do you really want to close the current tab?" -msgstr "Êtes-vous sûr de vouloir fermer l'onglet courant ?" +msgstr "Êtes-vous sûr de vouloir fermer l'onglet courant ?" #: src/terminal/tab.c:225 msgid "Do you really want to close all except the current tab?" -msgstr "Êtes-vous sûr de vouloir fermer tout sauf l'onglet courant ?" +msgstr "Êtes-vous sûr de vouloir fermer tout sauf l'onglet courant ?" #: src/viewer/dump/dump.c:79 #, c-format @@ -8458,9 +8438,3 @@ #: src/viewer/text/view.c:1290 msgid "Error writing to file" msgstr "Erreur lors de l'écriture du fichier" - -#~ msgid "Delete text from clipboard" -#~ msgstr "Effacer le texte du tampon" - -#~ msgid "Rules for passing URIs to external commands." -#~ msgstr "Règles de passage d'URIs aux commandes externes." --- elinks-0.11.7/src/network/ssl/socket.c.orig 2009-08-22 13:15:08.000000000 +0200 +++ elinks-0.11.7/src/network/ssl/socket.c 2021-11-05 16:41:20.530864800 +0100 @@ -67,7 +67,9 @@ ssl_set_no_tls(struct socket *socket) { #ifdef CONFIG_OPENSSL - ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1; +#ifdef SSL_OP_NO_TLSv1 + SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1); +#endif #elif defined(CONFIG_GNUTLS) { /* GnuTLS does not support SSLv2 because it is "insecure". @@ -145,7 +147,7 @@ } if (client_cert) { - SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx; + SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl); SSL_CTX_use_certificate_chain_file(ctx, client_cert); SSL_CTX_use_PrivateKey_file(ctx, client_cert, --- elinks-0.11.7/src/network/ssl/ssl.c.orig 2009-08-22 13:15:08.000000000 +0200 +++ elinks-0.11.7/src/network/ssl/ssl.c 2021-11-05 16:39:31.570093600 +0100 @@ -49,11 +49,16 @@ * cannot initialize the PRNG and so every attempt to use SSL fails. * It's actually an OpenSSL FAQ, and according to them, it's up to the * application coders to seed the RNG. -- William Yodlowsky */ - if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) { + RAND_file_name(f_randfile, sizeof(f_randfile)); +#ifdef HAVE_RAND_EGD + if (RAND_egd(f_randfile) < 0) { /* Not an EGD, so read and write to it */ +#endif if (RAND_load_file(f_randfile, -1)) RAND_write_file(f_randfile); +#ifdef HAVE_RAND_EGD } +#endif SSLeay_add_ssl_algorithms(); context = SSL_CTX_new(SSLv23_client_method());