[SCM] xvidcore/master: Refresh build system patches.
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Thu Feb 24 13:52:52 UTC 2011
The following commit has been merged in the master branch:
commit 9b22d302ac19fc253766d0d97fa087c6371b4b6d
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Thu Feb 24 14:11:42 2011 +0100
Refresh build system patches.
diff --git a/debian/patches/build-system-update.patch b/debian/patches/build-system-update.patch
index 8323bca..231a7b9 100644
--- a/debian/patches/build-system-update.patch
+++ b/debian/patches/build-system-update.patch
@@ -1,27 +1,37 @@
Patch to update the build system (autoreconf -vif build/generic)
==========================================================================
---- a/build/generic/config.guess
-+++ b/build/generic/config.guess
+--- xvidcore.orig/build/generic/config.guess
++++ xvidcore/build/generic/config.guess
@@ -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, 2005 Free Software Foundation, Inc.
+-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Free Software Foundation, Inc.
--timestamp='2005-07-08'
+-timestamp='2003-06-17'
+timestamp='2009-12-30'
# 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
-@@ -26,16 +27,16 @@
+@@ -17,23 +18,25 @@ timestamp='2003-06-17'
+ #
+ # 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 <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
++
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches at gnu.org> and include a ChangeLog
+# entry.
@@ -37,11 +47,11 @@ Patch to update the build system (autoreconf -vif build/generic)
me=`echo "$0" | sed -e 's,.*/,,'`
-@@ -55,8 +56,9 @@
+@@ -53,8 +56,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
@@ -49,7 +59,22 @@ Patch to update the build system (autoreconf -vif build/generic)
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -106,7 +108,7 @@
+@@ -66,11 +70,11 @@ Try \`$me --help' for more information."
+ 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 +108,7 @@ set_cc_for_build='
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} ;
@@ -58,24 +83,30 @@ Patch to update the build system (autoreconf -vif build/generic)
{ 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 ; } ;
-@@ -138,16 +140,6 @@
+@@ -123,7 +127,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ;;
+ ,,*) 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 at noc.rutgers.edu 1994-08-24)
+@@ -136,13 +140,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
--case "${UNAME_MACHINE}" in
-- i?86)
-- test -z "$VENDOR" && VENDOR=pc
-- ;;
-- *)
-- test -z "$VENDOR" && VENDOR=unknown
-- ;;
--esac
--test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-## for Red Hat Linux
+-if test -f /etc/redhat-release ; then
+- VENDOR=redhat ;
+-else
+- VENDOR= ;
+-fi
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -170,6 +162,7 @@
+@@ -165,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
@@ -83,7 +114,7 @@ Patch to update the build system (autoreconf -vif build/generic)
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
-@@ -178,7 +171,7 @@
+@@ -173,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -92,34 +123,177 @@ Patch to update the build system (autoreconf -vif build/generic)
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -216,8 +209,11 @@
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
+@@ -203,50 +201,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+- exit 0 ;;
+- amiga:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- arc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- hp300:OpenBSD:*:*)
+- echo m68k-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 ;;
+- pmax:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- sgi:OpenBSD:*:*)
+- echo mipseb-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- sun3:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- wgrisc:OpenBSD:*:*)
+- echo mipsel-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 ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++ macppc:MirBSD:*:*)
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -329,14 +325,33 @@
++ exit ;;
++ *:MirBSD:*:*)
++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++ exit ;;
+ alpha:OSF1:*:*)
+- if test $UNAME_RELEASE = "V4.0"; then
++ case $UNAME_RELEASE in
++ *4.0)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+- fi
++ ;;
++ *5.*)
++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ ;;
++ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+@@ -284,42 +264,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
++ # A Pn.n version is a patched version.
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # 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/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- exit 0 ;;
+- Alpha*:OpenVMS:*:*)
+- echo alpha-hp-vms
+- exit 0 ;;
++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++ 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 ;;
+ 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 at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+@@ -327,32 +314,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 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 ;;
+- 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 ;;
+- exit 0 ;;
++ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+- 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 ;;
@@ -138,32 +312,418 @@ Patch to update the build system (autoreconf -vif build/generic)
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
++ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
-@@ -537,7 +552,7 @@
+ # 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*)
+@@ -361,10 +367,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 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
+@@ -376,10 +382,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 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
+@@ -390,37 +396,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # 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 ;;
+ 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
+@@ -444,32 +453,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 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`
+@@ -485,29 +495,29 @@ EOF
+ 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 '
++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
++ 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`
+@@ -515,7 +525,7 @@ EOF
+ 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
+@@ -530,15 +540,19 @@ EOF
+ exit(0);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+- echo rs6000-ibm-aix3.2.5
++ 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 ;;
+- 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
-@@ -645,7 +660,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
+@@ -551,28 +565,28 @@ EOF
+ 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
+@@ -634,9 +648,19 @@ EOF
+ 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
-@@ -774,12 +789,19 @@
+@@ -644,11 +668,11 @@ EOF
+ 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
+@@ -676,208 +700,248 @@ EOF
+ 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 nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ 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 ;;
+ 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 ;;
- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+- exit 0 ;;
+- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+- # Determine whether the default compiler uses glibc.
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #if __GLIBC__ >= 2
+- LIBC=gnu
+- #else
+- LIBC=
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+- exit 0 ;;
++ exit ;;
++ *:FreeBSD:*:*)
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
@@ -172,22 +732,27 @@ Patch to update the build system (autoreconf -vif build/generic)
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
- exit ;;
++ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
+- exit 0 ;;
- i*:MINGW*:*)
++ exit ;;
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-@@ -789,12 +811,24 @@
+- 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 ;;
+- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-- exit ;;
+- exit 0 ;;
++ exit ;;
+ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
@@ -202,26 +767,46 @@ Patch to update the build system (autoreconf -vif build/generic)
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit ;;
+- 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
-@@ -804,7 +838,7 @@
+ # 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 ;;
-- amd64:CYGWIN*:*:*)
+- exit 0 ;;
++ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
++ echo x86_64-unknown-cygwin
++ exit ;;
p*:CYGWIN*:*)
-@@ -824,170 +858,125 @@
+ 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 ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit ;;
+- exit 0 ;;
++ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
@@ -237,7 +822,6 @@ Patch to update the build system (autoreconf -vif build/generic)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
-- echo ${UNAME_MACHINE}-${VENDOR}-linux
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
@@ -248,46 +832,30 @@ Patch to update the build system (autoreconf -vif build/generic)
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
cris:Linux:*:*)
-- echo cris-axis-linux
-+ echo cris-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
-- echo crisv32-axis-linux
+ echo cris-axis-linux-gnu
+- exit 0 ;;
+- ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
+- exit 0 ;;
+- m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
+- mips:Linux:*:*)
++ exit ;;
++ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
-- echo frv-${VENDOR}-linux
++ exit ;;
++ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ 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}-${VENDOR}-linux
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m32r*:Linux:*:*)
-- echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m68*:Linux:*:*)
-- echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
@@ -299,12 +867,26 @@ Patch to update the build system (autoreconf -vif build/generic)
- #else
- CPU=
- #endif
-- #endif
--EOF
++ #ifdef __dietlibc__
++ LIBC=dietlibc
+ #endif
+ EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- ;;
- mips64:Linux:*:*)
++ 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 ;;
++ m32r*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ m68*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -326,20 +908,16 @@ Patch to update the build system (autoreconf -vif build/generic)
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+- 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; }
;;
- ppc:Linux:*:*)
-- echo powerpc-${VENDOR}-linux
-+ or32:Linux:*:*)
-+ echo or32-unknown-linux-gnu
- exit ;;
+- echo powerpc-${VENDOR:-unknown}-linux-gnu
+- exit 0 ;;
- ppc64:Linux:*:*)
-- echo powerpc64-${VENDOR}-linux
-+ padre:Linux:*:*)
-+ echo sparc-unknown-linux-gnu
- exit ;;
+- echo powerpc64-${VENDOR:-unknown}-linux-gnu
+- exit 0 ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
@@ -352,54 +930,58 @@ Patch to update the build system (autoreconf -vif build/generic)
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-- echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+- 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 ;;
++ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-- PA7*) echo hppa1.1-${VENDOR}-linux ;;
-- PA8*) echo hppa2.0-${VENDOR}-linux ;;
-- *) echo hppa-${VENDOR}-linux ;;
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
+@@ -885,84 +949,40 @@ EOF
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
- exit ;;
+- exit 0 ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-${VENDOR}-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 ;;
++ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
+- echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
+- exit 0 ;;
++ echo ${UNAME_MACHINE}-ibm-linux
++ exit ;;
sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
sh*:Linux:*:*)
-- echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
-- echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
-- echo x86_64-${VENDOR}-linux
-+ echo x86_64-unknown-linux-gnu
+ exit ;;
-+ xtensa*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-${VENDOR:-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
@@ -413,19 +995,19 @@ Patch to update the build system (autoreconf -vif build/generic)
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
-- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
-- exit ;;
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit 0 ;;
- coff-i386)
-- echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
-- exit ;;
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit 0 ;;
- "")
-- # Either a pre-BFD a.out linker (linuxoldld) or
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
-- exit ;;
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit 0 ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
@@ -448,47 +1030,147 @@ Patch to update the build system (autoreconf -vif build/generic)
- 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}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/'
-- exit
-- }
-- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
+- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
++ echo x86_64-unknown-linux-gnu
++ 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
-@@ -1016,7 +1005,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
+ # 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...
+@@ -970,24 +990,27 @@ EOF
+ # 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 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++ exit ;;
++ i*86:syllable:*:*)
++ echo ${UNAME_MACHINE}-pc-syllable
++ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
+- exit 0 ;;
++ exit ;;
i*86:*DOS:*:*)
-@@ -1060,8 +1049,11 @@
+ 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
+@@ -995,15 +1018,16 @@ EOF
+ 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' </usr/options/cb.name`
+@@ -1021,73 +1045,86 @@ EOF
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+- exit 0 ;;
++ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+- exit 0 ;;
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
- exit ;;
++ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
-@@ -1099,6 +1091,16 @@
+- exit 0 ;;
++ exit ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+- exit 0 ;;
++ exit ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/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 ;;
+- M68*:*:R3V[567]*:*)
+- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+- 3[34]??:*: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)
++ exit ;;
++ M68*:*:R3V[5678]*:*)
++ 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; } ;;
+- && echo i486-ncr-sysv4 && exit 0 ;;
++ && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
@@ -501,30 +1183,114 @@ Patch to update the build system (autoreconf -vif build/generic)
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-@@ -1111,7 +1113,7 @@
+- 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 ;;
+- 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 ;;
+- exit 0 ;;
++ exit ;;
SM[BE]S:UNIX_SV:*:*)
-@@ -1174,6 +1176,9 @@
+ 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`
+@@ -1095,68 +1132,94 @@ EOF
+ else
+ echo ns32k-sni-sysv
+ fi
+- exit 0 ;;
++ exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+- exit 0 ;;
++ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes at openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+- exit 0 ;;
++ exit ;;
+ *:*:*:FTX*)
+ # From seanf at swdc.stratus.com.
+ echo i860-stratus-sysv4
+- exit 0 ;;
++ exit ;;
++ i*86:VOS:*:*)
++ # From Paul.Green at stratus.com.
++ echo ${UNAME_MACHINE}-stratus-vos
++ exit ;;
+ *:VOS:*:*)
+ # From Paul.Green at 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 ;;
+- 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 ;;
-@@ -1183,6 +1188,15 @@
+- 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 ;;
+- exit 0 ;;
++ exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
@@ -536,12 +1302,18 @@ Patch to update the build system (autoreconf -vif build/generic)
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
-@@ -1192,7 +1206,16 @@
+- 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
+- case `uname -p` in
- *86) UNAME_PROCESSOR=i686 ;;
+- powerpc) UNAME_PROCESSOR=powerpc ;;
++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
@@ -552,13 +1324,97 @@ Patch to update the build system (autoreconf -vif build/generic)
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
++ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1271,6 +1294,12 @@
- i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- exit ;;
+- exit 0 ;;
++ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+@@ -1164,22 +1227,25 @@ EOF
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+- exit 0 ;;
+- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
++ 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
+@@ -1190,28 +1256,50 @@ EOF
+ 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 ;;
++ *:*VMS:*:*)
++ UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ case "${UNAME_MACHINE}" in
++ 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 ;;
@@ -568,36 +1424,100 @@ Patch to update the build system (autoreconf -vif build/generic)
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1431,9 +1460,9 @@
+@@ -1243,7 +1331,7 @@ main ()
+ #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)
+@@ -1332,11 +1420,12 @@ main ()
+ }
+ 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)
+
+@@ -1345,22 +1434,22 @@ then
+ 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
+
+@@ -1371,7 +1460,9 @@ This script, last modified $timestamp, h
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+- 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://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++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
---- a/build/generic/config.sub
-+++ b/build/generic/config.sub
+--- xvidcore.orig/build/generic/config.sub
++++ xvidcore/build/generic/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Free Software Foundation, Inc.
--timestamp='2005-07-08'
+-timestamp='2003-06-18'
+timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -31,13 +32,16 @@
-
+@@ -21,22 +22,26 @@ timestamp='2003-06-18'
+ #
+ # 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.
++
# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
@@ -613,11 +1533,11 @@ Patch to update the build system (autoreconf -vif build/generic)
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
-@@ -71,8 +75,9 @@
+@@ -70,8 +75,9 @@ Report bugs and patches to <config-patch
version="\
GNU config.sub ($timestamp)
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
@@ -625,12 +1545,35 @@ Patch to update the build system (autoreconf -vif build/generic)
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -119,8 +124,10 @@
+@@ -83,11 +89,11 @@ Try \`$me --help' for more information."
+ 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.
+@@ -99,7 +105,7 @@ while test $# -gt 0 ; do
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+- exit 0;;
++ exit ;;
+
+ * )
+ break ;;
+@@ -118,7 +124,10 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
@@ -638,11 +1581,11 @@ Patch to update the build system (autoreconf -vif build/generic)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
-@@ -146,10 +153,13 @@
+@@ -144,10 +153,13 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple | -axis | -knuth | -cray)
+- -apple | -axis)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
@@ -653,7 +1596,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -171,6 +181,10 @@
+@@ -169,6 +181,10 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
@@ -664,7 +1607,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -187,6 +201,10 @@
+@@ -185,6 +201,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -675,21 +1618,23 @@ Patch to update the build system (autoreconf -vif build/generic)
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -231,20 +249,24 @@
+@@ -228,54 +248,71 @@ case $basic_machine in
+ | a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
++ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+- | ip2k \
+- | m32r | m68000 | m68k | m88k | mcore \
++ | ip2k | iq2000 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
@@ -704,27 +1649,32 @@ Patch to update the build system (autoreconf -vif build/generic)
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
-@@ -257,35 +279,40 @@
++ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
++ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
-- | ms1 \
+ | moxie \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
- | or32 \
+- | openrisc | or32 \
++ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+- | s390 | s390x \
+- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
-- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-- | sparcv8 | sparcv9 | sparcv9b \
+- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -733,11 +1683,8 @@ Patch to update the build system (autoreconf -vif build/generic)
+ | ubicom32 \
| v850 | v850e \
| we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | x86 | xscale | xstormy16 | xtensa \
- | z8k)
-- basic_machine=$basic_machine-unknown
-- ;;
-- m32c)
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
basic_machine=$basic_machine-unknown
@@ -756,15 +1703,17 @@ Patch to update the build system (autoreconf -vif build/generic)
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
-@@ -305,25 +332,28 @@
+@@ -295,55 +332,69 @@ case $basic_machine in
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+- | bs2000-* \
+ | avr-* | avr32-* \
- | bfin-* | bs2000-* \
++ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
+- | clipper-* | cydra-* \
++ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -772,12 +1721,13 @@ Patch to update the build system (autoreconf -vif build/generic)
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
+- | ip2k-* \
+- | m32r-* \
++ | ip2k-* | iq2000-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* \
+- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
@@ -790,28 +1740,34 @@ Patch to update the build system (autoreconf -vif build/generic)
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
-@@ -336,30 +366,35 @@
++ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
++ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
- | mmix-* \
-- | ms1-* \
++ | mmix-* \
+ | mt-* \
| msp430-* \
+- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
++ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+- | s390-* | s390x-* \
+- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
+- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
++ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -820,22 +1776,41 @@ Patch to update the build system (autoreconf -vif build/generic)
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-- | xstormy16-* | xtensa-* \
+- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+- | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*)
- ;;
-- m32c-*)
++ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
-@@ -423,6 +458,10 @@
+@@ -361,6 +412,9 @@ case $basic_machine in
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
++ abacus)
++ basic_machine=abacus-unknown
++ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+@@ -378,6 +432,9 @@ case $basic_machine in
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
++ amd64-*)
++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+@@ -401,6 +458,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
@@ -846,7 +1821,7 @@ Patch to update the build system (autoreconf -vif build/generic)
aux)
basic_machine=m68k-apple
os=-aux
-@@ -431,10 +470,26 @@
+@@ -409,10 +470,26 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
@@ -873,18 +1848,35 @@ Patch to update the build system (autoreconf -vif build/generic)
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -463,8 +518,8 @@
- basic_machine=craynv-cray
- os=-unicosmp
+@@ -437,12 +514,27 @@ case $basic_machine in
+ basic_machine=j90-cray
+ os=-unicos
;;
-- cr16c)
-- basic_machine=cr16c-unknown
++ craynv)
++ basic_machine=craynv-cray
++ os=-unicosmp
++ ;;
+ cr16)
+ basic_machine=cr16-unknown
- os=-elf
- ;;
++ os=-elf
++ ;;
crds | unos)
-@@ -502,6 +557,10 @@
+ basic_machine=m68k-crds
+ ;;
++ crisv32 | crisv32-* | etraxfs*)
++ basic_machine=crisv32-axis
++ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
++ crx)
++ basic_machine=crx-unknown
++ os=-elf
++ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+@@ -465,6 +557,14 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
@@ -892,10 +1884,14 @@ Patch to update the build system (autoreconf -vif build/generic)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
-@@ -656,6 +715,14 @@
++ djgpp)
++ basic_machine=i586-pc
++ os=-msdosdjgpp
++ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+@@ -615,6 +715,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
@@ -910,7 +1906,7 @@ Patch to update the build system (autoreconf -vif build/generic)
m88k-omron*)
basic_machine=m88k-omron
;;
-@@ -667,10 +734,17 @@
+@@ -626,10 +734,17 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
@@ -928,7 +1924,18 @@ Patch to update the build system (autoreconf -vif build/generic)
miniframe)
basic_machine=m68000-convergent
;;
-@@ -696,6 +770,9 @@
+@@ -643,10 +758,6 @@ case $basic_machine in
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+- mmix*)
+- basic_machine=mmix-knuth
+- os=-mmixware
+- ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+@@ -659,6 +770,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
@@ -938,7 +1945,33 @@ Patch to update the build system (autoreconf -vif build/generic)
mvs)
basic_machine=i370-ibm
os=-mvs
-@@ -794,6 +871,14 @@
+@@ -727,10 +841,6 @@ case $basic_machine in
+ np1)
+ basic_machine=np1-gould
+ ;;
+- nv1)
+- basic_machine=nv1-cray
+- os=-unicosmp
+- ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+@@ -738,9 +848,12 @@ case $basic_machine in
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+- or32 | or32-*)
++ openrisc | openrisc-*)
+ basic_machine=or32-unknown
+- os=-coff
++ ;;
++ os400)
++ basic_machine=powerpc-ibm
++ os=-os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+@@ -758,6 +871,14 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
@@ -953,7 +1986,7 @@ Patch to update the build system (autoreconf -vif build/generic)
pbd)
basic_machine=sparc-tti
;;
-@@ -803,6 +888,12 @@
+@@ -767,6 +888,12 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
@@ -966,7 +1999,7 @@ Patch to update the build system (autoreconf -vif build/generic)
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
-@@ -859,6 +950,10 @@
+@@ -823,6 +950,10 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
@@ -977,7 +2010,20 @@ Patch to update the build system (autoreconf -vif build/generic)
rom68k)
basic_machine=m68k-rom68k
os=-coff
-@@ -885,6 +980,10 @@
+@@ -833,6 +964,12 @@ case $basic_machine in
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
++ s390 | s390-*)
++ basic_machine=s390-ibm
++ ;;
++ s390x | s390x-*)
++ basic_machine=s390x-ibm
++ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+@@ -843,6 +980,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
@@ -988,7 +2034,7 @@ Patch to update the build system (autoreconf -vif build/generic)
sei)
basic_machine=mips-sei
os=-seiux
-@@ -896,6 +995,9 @@
+@@ -854,6 +995,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
@@ -998,7 +2044,7 @@ Patch to update the build system (autoreconf -vif build/generic)
sh64)
basic_machine=sh64-unknown
;;
-@@ -985,6 +1087,15 @@
+@@ -943,6 +1087,15 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
@@ -1014,7 +2060,29 @@ Patch to update the build system (autoreconf -vif build/generic)
tx39)
basic_machine=mipstx39-unknown
;;
-@@ -1060,6 +1171,10 @@
+@@ -956,6 +1109,10 @@ case $basic_machine in
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
++ tpf)
++ basic_machine=s390x-ibm
++ os=-tpf
++ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+@@ -999,6 +1156,10 @@ case $basic_machine in
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
++ xbox)
++ basic_machine=i686-pc
++ os=-mingw32
++ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+@@ -1010,6 +1171,10 @@ case $basic_machine in
basic_machine=z8k-unknown
os=-sim
;;
@@ -1025,20 +2093,33 @@ Patch to update the build system (autoreconf -vif build/generic)
none)
basic_machine=none-none
os=-none
-@@ -1098,10 +1213,10 @@
+@@ -1029,6 +1194,9 @@ case $basic_machine in
+ romp)
+ basic_machine=romp-ibm
+ ;;
++ mmix)
++ basic_machine=mmix-knuth
++ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+@@ -1045,13 +1213,10 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
-- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
+- sh64)
+- basic_machine=sh64-unknown
+- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
-@@ -1148,6 +1263,9 @@
+@@ -1098,6 +1263,9 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
@@ -1048,7 +2129,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
-@@ -1168,27 +1286,30 @@
+@@ -1118,25 +1286,30 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -1062,17 +2143,18 @@ Patch to update the build system (autoreconf -vif build/generic)
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1080,26 +2162,66 @@ Patch to update the build system (autoreconf -vif build/generic)
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku*)
+- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1215,6 +1336,9 @@
- -linux-dietlibc)
- os=-linux-dietlibc
+@@ -1154,12 +1327,15 @@ case $os in
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
;;
-+ -linux*)
-+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
++ -linux-dietlibc)
++ os=-linux-dietlibc
+ ;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-@@ -1315,6 +1439,11 @@
- -zvmoe)
- os=-zvmoe
+@@ -1172,6 +1348,9 @@ case $os in
+ -opened*)
+ os=-openedition
;;
++ -os400*)
++ os=-os400
++ ;;
+ -wince*)
+ os=-wince
+ ;;
+@@ -1193,6 +1372,9 @@ case $os in
+ -atheos*)
+ os=-atheos
+ ;;
++ -syllable*)
++ os=-syllable
++ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+@@ -1215,6 +1397,9 @@ case $os in
+ -sinix*)
+ os=-sysv4
+ ;;
++ -tpf*)
++ os=-tpf
++ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+@@ -1251,6 +1436,14 @@ case $os in
+ -kaos*)
+ os=-kaos
+ ;;
++ -zvmoe)
++ os=-zvmoe
++ ;;
+ -dicos*)
+ os=-dicos
+ ;;
@@ -1108,7 +2230,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-none)
;;
*)
-@@ -1337,6 +1466,12 @@
+@@ -1273,6 +1466,12 @@ else
# system, and we'll never get to this point.
case $basic_machine in
@@ -1121,20 +2243,18 @@ Patch to update the build system (autoreconf -vif build/generic)
*-acorn)
os=-riscix1.2
;;
-@@ -1346,9 +1481,9 @@
+@@ -1282,8 +1481,8 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
+- c4x-* | tic4x-*)
+- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
-+ ;;
+ ;;
# This must come before the *-dec entry.
pdp10-*)
- os=-tops20
-@@ -1374,6 +1509,9 @@
+@@ -1310,6 +1509,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
@@ -1144,7 +2264,23 @@ Patch to update the build system (autoreconf -vif build/generic)
mips*-cisco)
os=-elf
;;
-@@ -1503,7 +1641,7 @@
+@@ -1328,9 +1530,15 @@ case $basic_machine in
+ *-be)
+ os=-beos
+ ;;
++ *-haiku)
++ os=-haiku
++ ;;
+ *-ibm)
+ os=-aix
+ ;;
++ *-knuth)
++ os=-mmixware
++ ;;
+ *-wec)
+ os=-proelf
+ ;;
+@@ -1433,7 +1641,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
@@ -1153,13 +2289,38 @@ Patch to update the build system (autoreconf -vif build/generic)
vendor=ibm
;;
-beos*)
---- a/build/generic/configure
-+++ b/build/generic/configure
+@@ -1463,9 +1671,15 @@ case $basic_machine in
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
++ -os400*)
++ vendor=ibm
++ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
++ -tpf*)
++ vendor=ibm
++ ;;
+ -vxsim* | -vxworks* | -windiss*)
+ vendor=wrs
+ ;;
+@@ -1490,7 +1704,7 @@ case $basic_machine in
+ esac
+
+ echo $basic_machine$os
+-exit 0
++exit
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+--- xvidcore.orig/build/generic/configure
++++ xvidcore/build/generic/configure
@@ -1,83 +1,418 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for Xvid 1.2.2.
-+# Generated by GNU Autoconf 2.67 for Xvid 1.2.2.
+-# Generated by GNU Autoconf 2.59 for Xvid 1.3.0.
++# Generated by GNU Autoconf 2.67 for Xvid 1.3.0.
#
# Report bugs to <xvid-devel at xvid.org>.
#
@@ -1614,7 +2775,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -85,146 +420,107 @@
+@@ -85,146 +420,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -1834,7 +2995,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -233,38 +529,25 @@
+@@ -233,38 +529,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -1878,9 +3039,9 @@ Patch to update the build system (autoreconf -vif build/generic)
# Identity of this package.
PACKAGE_NAME='Xvid'
-@@ -272,52 +555,161 @@
- PACKAGE_VERSION='1.2.2'
- PACKAGE_STRING='Xvid 1.2.2'
+@@ -272,52 +555,163 @@ PACKAGE_TARNAME='xvid'
+ PACKAGE_VERSION='1.3.0'
+ PACKAGE_STRING='Xvid 1.3.0'
PACKAGE_BUGREPORT='xvid-devel at xvid.org'
+PACKAGE_URL=''
@@ -1935,9 +3096,10 @@ Patch to update the build system (autoreconf -vif build/generic)
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB CPP EGREP ac_yasm ac_nasm FEATURES ARCHITECTURE BUS ENDIANNESS SHARED_EXTENSION STATIC_EXTENSION OBJECT_EXTENSION NASM_FORMAT AS AFLAGS ASSEMBLY_EXTENSION GENERIC_SOURCES ASSEMBLY_SOURCES SPECIFIC_LDFLAGS SPECIFIC_CFLAGS DCT_IA64_SOURCES PPC_ALTIVEC_SOURCES API_MAJOR API_MINOR STATIC_LIB PRE_SHARED_LIB SHARED_LIB LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR ac_ct_AR CPP EGREP ac_yasm ac_nasm FEATURES ARCHITECTURE BUS ENDIANNESS SHARED_EXTENSION STATIC_EXTENSION OBJECT_EXTENSION NASM_FORMAT AS AFLAGS ASSEMBLY_EXTENSION GENERIC_SOURCES ASSEMBLY_SOURCES SPECIFIC_LDFLAGS SPECIFIC_CFLAGS DCT_IA64_SOURCES PPC_ALTIVEC_SOURCES API_MAJOR API_MINOR STATIC_LIB PRE_SHARED_LIB SHARED_LIB ALTIVEC_CFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
++ALTIVEC_CFLAGS
+SHARED_LIB
+PRE_SHARED_LIB
+STATIC_LIB
@@ -1965,6 +3127,7 @@ Patch to update the build system (autoreconf -vif build/generic)
+EGREP
+GREP
+CPP
++AR
+RANLIB
+INSTALL_DATA
+INSTALL_SCRIPT
@@ -2054,7 +3217,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
-@@ -340,34 +732,49 @@
+@@ -340,34 +734,49 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
@@ -2111,7 +3274,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -389,33 +796,59 @@
+@@ -389,33 +798,59 @@ do
--config-cache | -C)
cache_file=config.cache ;;
@@ -2189,7 +3352,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -442,6 +875,12 @@
+@@ -442,6 +877,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -2202,7 +3365,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -466,13 +905,16 @@
+@@ -466,13 +907,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -2223,7 +3386,7 @@ Patch to update the build system (autoreconf -vif build/generic)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -537,6 +979,16 @@
+@@ -537,6 +981,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -2240,7 +3403,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -587,26 +1039,36 @@
+@@ -587,26 +1041,36 @@ do
ac_init_version=: ;;
-with-* | --with-*)
@@ -2292,7 +3455,7 @@ Patch to update the build system (autoreconf -vif build/generic)
--x)
# Obsolete; use --with-x.
-@@ -626,26 +1088,25 @@
+@@ -626,26 +1090,25 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -2328,7 +3491,7 @@ Patch to update the build system (autoreconf -vif build/generic)
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
-@@ -654,31 +1115,36 @@
+@@ -654,31 +1117,36 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -2383,7 +3546,7 @@ Patch to update the build system (autoreconf -vif build/generic)
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -692,8 +1158,8 @@
+@@ -692,8 +1160,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -2394,7 +3557,7 @@ Patch to update the build system (autoreconf -vif build/generic)
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -705,74 +1171,72 @@
+@@ -705,74 +1173,72 @@ test -n "$host_alias" && ac_tool_prefix=
test "$silent" = yes && exec 6>/dev/null
@@ -2526,7 +3689,7 @@ Patch to update the build system (autoreconf -vif build/generic)
#
# Report the --help message.
-@@ -795,20 +1259,17 @@
+@@ -795,20 +1261,17 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -2550,7 +3713,7 @@ Patch to update the build system (autoreconf -vif build/generic)
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -818,18 +1279,25 @@
+@@ -818,18 +1281,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
@@ -2588,7 +3751,7 @@ Patch to update the build system (autoreconf -vif build/generic)
_ACEOF
cat <<\_ACEOF
-@@ -848,6 +1316,7 @@
+@@ -848,6 +1318,7 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
@@ -2596,7 +3759,7 @@ Patch to update the build system (autoreconf -vif build/generic)
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-idebug Enable internal debug function
-@@ -861,8 +1330,9 @@
+@@ -861,8 +1332,9 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -2608,7 +3771,7 @@ Patch to update the build system (autoreconf -vif build/generic)
CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
-@@ -870,159 +1340,594 @@
+@@ -870,159 +1342,594 @@ it to find libraries and programs with n
Report bugs to <xvid-devel at xvid.org>.
_ACEOF
@@ -2748,7 +3911,7 @@ Patch to update the build system (autoreconf -vif build/generic)
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- Xvid configure 1.2.2
+ Xvid configure 1.3.0
-generated by GNU Autoconf 2.59
+generated by GNU Autoconf 2.67
@@ -2765,7 +3928,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
--It was created by Xvid $as_me 1.2.2, which was
+-It was created by Xvid $as_me 1.3.0, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-
- $ $0 $@
@@ -3274,7 +4437,7 @@ Patch to update the build system (autoreconf -vif build/generic)
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
-+It was created by Xvid $as_me 1.2.2, which was
++It was created by Xvid $as_me 1.3.0, which was
+generated by GNU Autoconf 2.67. Invocation command line was
+
+ $ $0 $@
@@ -3324,7 +4487,7 @@ Patch to update the build system (autoreconf -vif build/generic)
## Core tests. ##
## ----------- ##
-@@ -1037,7 +1942,6 @@
+@@ -1037,7 +1944,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -3332,7 +4495,7 @@ Patch to update the build system (autoreconf -vif build/generic)
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1048,13 +1952,13 @@
+@@ -1048,13 +1954,13 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -3350,7 +4513,7 @@ Patch to update the build system (autoreconf -vif build/generic)
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1070,104 +1974,115 @@
+@@ -1070,104 +1976,115 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -3514,7 +4677,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# Predefined preprocessor variables.
-@@ -1175,112 +2090,137 @@
+@@ -1175,112 +2092,137 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
@@ -3701,7 +4864,7 @@ Patch to update the build system (autoreconf -vif build/generic)
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1291,31 +2231,6 @@
+@@ -1291,31 +2233,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3731,9 +4894,9 @@ Patch to update the build system (autoreconf -vif build/generic)
-
-
API_MAJOR="4"
- API_MINOR="2"
+ API_MINOR="3"
-@@ -1335,35 +2250,34 @@
+@@ -1335,35 +2252,34 @@ our_cflags_defaults="$our_cflags_default
FEATURES=""
@@ -3787,7 +4950,7 @@ Patch to update the build system (autoreconf -vif build/generic)
assembly="no"
else
if test "$enable_assembly" = "yes" ; then
-@@ -1372,121 +2286,154 @@
+@@ -1372,121 +2288,154 @@ if test "${enable_assembly+set}" = set;
fi
else
assembly="yes"
@@ -4024,7 +5187,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# The aliases save the names the user supplied, while $host etc.
-@@ -1497,16 +2444,16 @@
+@@ -1497,16 +2446,16 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
@@ -4047,7 +5210,7 @@ Patch to update the build system (autoreconf -vif build/generic)
fi
ac_ext=c
-@@ -1517,10 +2464,10 @@
+@@ -1517,10 +2466,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -4062,7 +5225,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1530,35 +2477,37 @@
+@@ -1530,35 +2479,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4112,7 +5275,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1568,39 +2517,50 @@
+@@ -1568,39 +2519,50 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4178,7 +5341,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1610,77 +2570,37 @@
+@@ -1610,77 +2572,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4270,7 +5433,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1691,18 +2611,19 @@
+@@ -1691,18 +2613,19 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4294,7 +5457,7 @@ Patch to update the build system (autoreconf -vif build/generic)
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -1720,24 +2641,25 @@
+@@ -1720,24 +2643,25 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4329,7 +5492,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1747,39 +2669,41 @@
+@@ -1747,39 +2671,41 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4384,7 +5547,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1789,66 +2713,78 @@
+@@ -1789,66 +2715,78 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4499,7 +5662,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
int
-@@ -1860,112 +2796,108 @@
+@@ -1860,112 +2798,108 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -4690,7 +5853,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -1973,38 +2905,90 @@
+@@ -1973,38 +2907,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -4802,7 +5965,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
int
-@@ -2016,45 +3000,46 @@
+@@ -2016,45 +3002,46 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -4874,7 +6037,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
int
-@@ -2068,55 +3053,34 @@
+@@ -2068,55 +3055,34 @@ main ()
return 0;
}
_ACEOF
@@ -4950,7 +6113,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
int
-@@ -2127,39 +3091,49 @@
+@@ -2127,39 +3093,49 @@ main ()
return 0;
}
_ACEOF
@@ -5028,7 +6191,7 @@ Patch to update the build system (autoreconf -vif build/generic)
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -2175,18 +3149,14 @@
+@@ -2175,18 +3151,14 @@ else
CFLAGS=
fi
fi
@@ -5053,7 +6216,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -2214,12 +3184,17 @@
+@@ -2214,12 +3186,17 @@ static char *f (char * (*g) (char **, in
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
@@ -5073,7 +6236,7 @@ Patch to update the build system (autoreconf -vif build/generic)
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
-@@ -2234,205 +3209,37 @@
+@@ -2234,205 +3211,37 @@ return f (e, argv, 0) != argv[0] || f
return 0;
}
_ACEOF
@@ -5298,7 +6461,7 @@ Patch to update the build system (autoreconf -vif build/generic)
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2454,22 +3261,23 @@
+@@ -2454,22 +3263,23 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -5330,7 +6493,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2477,7 +3285,7 @@
+@@ -2477,7 +3287,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5339,7 +6502,7 @@ Patch to update the build system (autoreconf -vif build/generic)
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2487,30 +3295,43 @@
+@@ -2487,30 +3297,43 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -5391,7 +6554,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2525,10 +3346,10 @@
+@@ -2525,10 +3348,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -5406,7 +6569,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -2538,35 +3359,37 @@
+@@ -2538,35 +3361,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5456,7 +6619,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -2576,28 +3399,38 @@
+@@ -2576,28 +3401,38 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5505,7 +6668,121 @@ Patch to update the build system (autoreconf -vif build/generic)
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -2607,43 +3440,43 @@
+@@ -2605,10 +3440,10 @@ fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_AR+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+@@ -2618,35 +3453,37 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+@@ -2656,28 +3493,38 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar-not-found"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+- AR=$ac_ct_AR
++ if test "x$ac_ct_AR" = x; then
++ AR="ar-not-found"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ AR=$ac_ct_AR
++ fi
+ else
+ AR="$ac_cv_prog_AR"
+ fi
+@@ -2687,43 +3534,43 @@ fi
ARCHITECTURE=""
@@ -5567,7 +6844,7 @@ Patch to update the build system (autoreconf -vif build/generic)
ARCHITECTURE="GENERIC"
fi
-@@ -2655,15 +3488,15 @@
+@@ -2735,15 +3582,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5587,7 +6864,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2677,11 +3510,7 @@
+@@ -2757,11 +3604,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5600,7 +6877,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2690,78 +3519,34 @@
+@@ -2770,78 +3613,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5618,22 +6895,20 @@ Patch to update the build system (autoreconf -vif build/generic)
- else
- ac_cpp_err=
- fi
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
- else
+-else
- ac_cpp_err=yes
-+ # Broken: fails on valid input.
-+continue
- fi
+-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- # Broken: fails on valid input.
--continue
--fi
++if ac_fn_c_try_cpp "$LINENO"; then :
+
++else
+ # Broken: fails on valid input.
+ continue
+ fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
@@ -5690,7 +6965,7 @@ Patch to update the build system (autoreconf -vif build/generic)
break
fi
-@@ -2773,8 +3558,8 @@
+@@ -2853,8 +3652,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -5701,7 +6976,7 @@ Patch to update the build system (autoreconf -vif build/generic)
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -2784,11 +3569,7 @@
+@@ -2864,11 +3663,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5714,7 +6989,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2797,85 +3578,40 @@
+@@ -2877,85 +3672,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5814,7 +7089,7 @@ Patch to update the build system (autoreconf -vif build/generic)
fi
ac_ext=c
-@@ -2885,31 +3621,142 @@
+@@ -2965,31 +3715,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5881,21 +7156,21 @@ Patch to update the build system (autoreconf -vif build/generic)
+ fi
+else
+ ac_cv_path_GREP=$GREP
-+fi
-+
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
@@ -5977,7 +7252,7 @@ Patch to update the build system (autoreconf -vif build/generic)
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -2924,51 +3771,23 @@
+@@ -3004,51 +3865,23 @@ main ()
return 0;
}
_ACEOF
@@ -6035,7 +7310,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
ac_cv_header_stdc=no
fi
-@@ -2978,18 +3797,14 @@
+@@ -3058,18 +3891,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6057,7 +7332,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
ac_cv_header_stdc=no
fi
-@@ -2999,16 +3814,13 @@
+@@ -3079,16 +3908,13 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6077,10 +7352,11 @@ Patch to update the build system (autoreconf -vif build/generic)
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3021,532 +3833,81 @@
+@@ -3100,533 +3926,82 @@ cat >>conftest.$ac_ext <<_ACEOF
+ # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
- #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
@@ -6546,9 +7822,10 @@ Patch to update the build system (autoreconf -vif build/generic)
-unsigned long ulongval () { return (long) (sizeof (int *)); }
-#include <stdio.h>
-#include <stdlib.h>
--int
--main ()
--{
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
@@ -6570,9 +7847,6 @@ Patch to update the build system (autoreconf -vif build/generic)
- exit (ferror (f) || fclose (f) != 0);
-
- ;
-+int
-+main ()
-+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
@@ -6620,7 +7894,8 @@ Patch to update the build system (autoreconf -vif build/generic)
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
-+fi
+ fi
+-rm -f conftest.val
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
@@ -6634,8 +7909,7 @@ Patch to update the build system (autoreconf -vif build/generic)
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
- fi
--rm -f conftest.val
++fi
+
+done
+
@@ -6674,7 +7948,7 @@ Patch to update the build system (autoreconf -vif build/generic)
cat >>confdefs.h <<_ACEOF
#define SIZEOF_INT_P $ac_cv_sizeof_int_p
_ACEOF
-@@ -3560,278 +3921,273 @@
+@@ -3640,278 +4015,273 @@ case "$ac_cv_sizeof_int_p" in
BUS="64BIT"
;;
*)
@@ -7134,7 +8408,7 @@ Patch to update the build system (autoreconf -vif build/generic)
STATIC_EXTENSION="a"
SHARED_EXTENSION="so"
OBJECT_EXTENSION="o"
-@@ -3839,31 +4195,31 @@
+@@ -3919,32 +4289,32 @@ echo "${ECHO_T}Unknown OS - Using .so .a
esac
@@ -7144,6 +8418,7 @@ Patch to update the build system (autoreconf -vif build/generic)
+$as_echo_n "checking for platform specific LDFLAGS/CFLAGS... " >&6; }
SPECIFIC_LDFLAGS=""
SPECIFIC_CFLAGS=""
+ ALTIVEC_CFLAGS=""
PRE_SHARED_LIB=""
case "$target_os" in
linux*|solaris*)
@@ -7174,7 +8449,7 @@ Patch to update the build system (autoreconf -vif build/generic)
STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
-@@ -3873,29 +4229,29 @@
+@@ -3954,29 +4324,29 @@ echo "${ECHO_T}ok" >&6
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
if test x"$macosx_module" = x"no"; then
@@ -7212,7 +8487,7 @@ Patch to update the build system (autoreconf -vif build/generic)
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
SPECIFIC_LDFLAGS=""
-@@ -3923,10 +4279,10 @@
+@@ -4004,10 +4374,10 @@ if test "$ARCHITECTURE" = "IA32" -o "$AR
# Extract the first word of "$yasm_prog", so it can be a program name with args.
set dummy $yasm_prog; ac_word=$2
@@ -7227,7 +8502,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$ac_yasm"; then
ac_cv_prog_ac_yasm="$ac_yasm" # Let the user override the test.
-@@ -3937,18 +4293,19 @@
+@@ -4018,18 +4388,19 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7251,7 +8526,7 @@ Patch to update the build system (autoreconf -vif build/generic)
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -3967,26 +4324,27 @@
+@@ -4048,26 +4419,27 @@ fi
fi
ac_yasm=$ac_cv_prog_ac_yasm
if test -n "$ac_yasm"; then
@@ -7272,16 +8547,16 @@ Patch to update the build system (autoreconf -vif build/generic)
-echo $ECHO_N "checking for yasm version... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yasm version" >&5
+$as_echo_n "checking for yasm version... " >&6; }
- yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`
- if test -z $yasm_minor ; then
- yasm_minor=-1
+ yasm_major=`$yasm_prog --version | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 2`
+ if test -z $yasm_major ; then
+ yasm_major=-1
fi
-- echo "$as_me:$LINENO: result: $yasm_minor" >&5
--echo "${ECHO_T}$yasm_minor" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $yasm_minor" >&5
-+$as_echo "$yasm_minor" >&6; }
+- echo "$as_me:$LINENO: result: $yasm_major" >&5
+-echo "${ECHO_T}$yasm_major" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $yasm_major" >&5
++$as_echo "$yasm_major" >&6; }
- if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then
+ if test "$yasm_major" -lt "$minimum_yasm_major_version" ; then
- { echo "$as_me:$LINENO: WARNING: yasm version is too old" >&5
-echo "$as_me: WARNING: yasm version is too old" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: yasm version is too old" >&5
@@ -7289,7 +8564,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
found_nasm_comp_prog="yes"
chosen_asm_prog="$yasm_prog"
-@@ -3996,10 +4354,10 @@
+@@ -4077,10 +4449,10 @@ echo "$as_me: WARNING: yasm version is t
if test "$found_nasm_comp_prog" = "no" ; then
# Extract the first word of "$nasm_prog", so it can be a program name with args.
set dummy $nasm_prog; ac_word=$2
@@ -7304,7 +8579,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
if test -n "$ac_nasm"; then
ac_cv_prog_ac_nasm="$ac_nasm" # Let the user override the test.
-@@ -4010,18 +4368,19 @@
+@@ -4091,18 +4463,19 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7328,7 +8603,7 @@ Patch to update the build system (autoreconf -vif build/generic)
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -4040,16 +4399,17 @@
+@@ -4121,16 +4494,17 @@ fi
fi
ac_nasm=$ac_cv_prog_ac_nasm
if test -n "$ac_nasm"; then
@@ -7352,7 +8627,7 @@ Patch to update the build system (autoreconf -vif build/generic)
nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1`
nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3`
if test -z $nasm_minor ; then
-@@ -4058,12 +4418,12 @@
+@@ -4139,12 +4513,12 @@ echo $ECHO_N "checking for nasm version.
if test -z $nasm_major ; then
nasm_major=-1
fi
@@ -7369,7 +8644,7 @@ Patch to update the build system (autoreconf -vif build/generic)
else
found_nasm_comp_prog="yes"
chosen_asm_prog="$nasm_prog"
-@@ -4072,17 +4432,17 @@
+@@ -4153,17 +4527,17 @@ echo "$as_me: WARNING: nasm version is t
fi
if test "$found_nasm_comp_prog" = "yes" ; then
@@ -7393,7 +8668,7 @@ Patch to update the build system (autoreconf -vif build/generic)
NASM_FORMAT="elf"
fi
MARK_FUNCS="-DMARK_FUNCS"
-@@ -4090,20 +4450,20 @@
+@@ -4171,12 +4545,12 @@ echo "${ECHO_T}elf" >&6
;;
[cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
if test "$ARCHITECTURE" = "X86_64" ; then
@@ -7410,17 +8685,24 @@ Patch to update the build system (autoreconf -vif build/generic)
NASM_FORMAT="win32"
fi
PREFIX="-DWINDOWS"
- MARK_FUNCS=""
+@@ -4184,12 +4558,12 @@ echo "${ECHO_T}win32" >&6
;;
*darwin*)
-- echo "$as_me:$LINENO: result: macho" >&5
--echo "${ECHO_T}macho" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: macho" >&5
-+$as_echo "macho" >&6; }
- NASM_FORMAT="macho"
+ if test "$ARCHITECTURE" = "X86_64" ; then
+- echo "$as_me:$LINENO: result: macho64" >&5
+-echo "${ECHO_T}macho64" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: macho64" >&5
++$as_echo "macho64" >&6; }
+ NASM_FORMAT="macho64"
+ else
+- echo "$as_me:$LINENO: result: macho32" >&5
+-echo "${ECHO_T}macho32" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: macho32" >&5
++$as_echo "macho32" >&6; }
+ NASM_FORMAT="macho32"
+ fi
PREFIX="-DPREFIX"
- MARK_FUNCS=""
-@@ -4118,8 +4478,8 @@
+@@ -4205,8 +4579,8 @@ echo "${ECHO_T}macho32" >&6
AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
fi
else
@@ -7431,7 +8713,7 @@ Patch to update the build system (autoreconf -vif build/generic)
ARCHITECTURE="GENERIC"
fi
fi
-@@ -4131,26 +4491,26 @@
+@@ -4218,26 +4592,26 @@ if test "$ARCHITECTURE" = "PPC" ; then
ASSEMBLY_EXTENSION=".s"
ASSEMBLY_SOURCES=""
@@ -7466,7 +8748,7 @@ Patch to update the build system (autoreconf -vif build/generic)
cat > conftest.c << EOF
#ifdef HAVE_ALTIVEC_H
#include <altivec.h>
-@@ -4165,8 +4525,8 @@
+@@ -4252,8 +4626,8 @@ int main()
}
EOF
if $CC $TEMP_ALTIVEC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then
@@ -7477,7 +8759,7 @@ Patch to update the build system (autoreconf -vif build/generic)
SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -arch ppc -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"
PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
else
-@@ -4184,13 +4544,13 @@
+@@ -4271,14 +4645,14 @@ int main()
}
EOF
if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
@@ -7485,8 +8767,9 @@ Patch to update the build system (autoreconf -vif build/generic)
-echo "${ECHO_T}yes (GNU)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (GNU)" >&5
+$as_echo "yes (GNU)" >&6; }
- SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
+ SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
+ ALTIVEC_CFLAGS="-maltivec -mabi=altivec"
else
- echo "$as_me:$LINENO: result: no (ppc support won't be compiled in)" >&5
-echo "${ECHO_T}no (ppc support won't be compiled in)" >&6
@@ -7495,7 +8778,7 @@ Patch to update the build system (autoreconf -vif build/generic)
ARCHITECTURE="GENERIC"
fi
fi
-@@ -4221,12 +4581,6 @@
+@@ -4309,12 +4683,6 @@ if test "$ARCHITECTURE" = "IA64" ; then
fi
@@ -7508,7 +8791,7 @@ Patch to update the build system (autoreconf -vif build/generic)
for ac_header in stdio.h \
signal.h \
stdlib.h \
-@@ -4234,443 +4588,113 @@
+@@ -4322,373 +4690,71 @@ for ac_header in stdio.h \
assert.h \
math.h \
@@ -7890,100 +9173,12 @@ Patch to update the build system (autoreconf -vif build/generic)
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-if test $ac_cv_lib_pthread_pthread_create = yes; then
-- echo "$as_me:$LINENO: checking for pthread_join in -lpthread" >&5
--echo $ECHO_N "checking for pthread_join in -lpthread... $ECHO_C" >&6
--if test "${ac_cv_lib_pthread_pthread_join+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
-+$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
-+if test "${ac_cv_lib_pthread_pthread_join+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char pthread_join ();
- int
- main ()
- {
--pthread_join ();
-+return pthread_join ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_pthread_pthread_join=yes
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_pthread_pthread_join=no
-+ ac_cv_lib_pthread_pthread_join=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_join" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_join" >&6
--if test $ac_cv_lib_pthread_pthread_join = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_join" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_join" = x""yes; then :
SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-- SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"
-+ SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"
- else
-- { echo "$as_me:$LINENO: WARNING: Pthread not supported. No SMP support" >&5
--echo "$as_me: WARNING: Pthread not supported. No SMP support" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Pthread not supported. No SMP support" >&5
-+$as_echo "$as_me: WARNING: Pthread not supported. No SMP support" >&2;}
- fi
-
+- SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"
++ SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"
else
- { echo "$as_me:$LINENO: WARNING: Pthread not supported. No SMP support" >&5
-echo "$as_me: WARNING: Pthread not supported. No SMP support" >&2;}
@@ -7999,7 +9194,7 @@ Patch to update the build system (autoreconf -vif build/generic)
fi
-@@ -4755,7 +4779,7 @@
+@@ -4775,7 +4841,7 @@ fi
@@ -8008,7 +9203,7 @@ Patch to update the build system (autoreconf -vif build/generic)
cat >confcache <<\_ACEOF
-@@ -4776,39 +4800,59 @@
+@@ -4796,39 +4862,59 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -8086,7 +9281,7 @@ Patch to update the build system (autoreconf -vif build/generic)
fi
fi
rm -f confcache
-@@ -4817,63 +4861,55 @@
+@@ -4837,63 +4923,55 @@ test "x$prefix" = xNONE && prefix=$ac_de
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -8184,7 +9379,7 @@ Patch to update the build system (autoreconf -vif build/generic)
done
LIBOBJS=$ac_libobjs
-@@ -4881,12 +4917,15 @@
+@@ -4901,12 +4979,15 @@ LTLIBOBJS=$ac_ltlibobjs
@@ -8203,7 +9398,7 @@ Patch to update the build system (autoreconf -vif build/generic)
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -4896,81 +4935,252 @@
+@@ -4916,81 +4997,252 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -8500,7 +9695,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -4978,148 +5188,123 @@
+@@ -4998,148 +5250,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -8750,7 +9945,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -5128,31 +5313,20 @@
+@@ -5148,31 +5375,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -8786,13 +9981,13 @@ Patch to update the build system (autoreconf -vif build/generic)
-
+# values after options handling.
+ac_log="
- This file was extended by Xvid $as_me 1.2.2, which was
+ This file was extended by Xvid $as_me 1.3.0, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -5160,125 +5334,117 @@
+@@ -5180,125 +5396,117 @@ generated by GNU Autoconf 2.59. Invocat
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -8867,7 +10062,7 @@ Patch to update the build system (autoreconf -vif build/generic)
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- Xvid config.status 1.2.2
+ Xvid config.status 1.3.0
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.67,
@@ -8978,7 +10173,7 @@ Patch to update the build system (autoreconf -vif build/generic)
esac
shift
-@@ -5292,30 +5458,44 @@
+@@ -5312,30 +5520,44 @@ if $ac_cs_silent; then
fi
_ACEOF
@@ -9035,7 +10230,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -5325,372 +5505,416 @@
+@@ -5345,375 +5567,416 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -9296,6 +10491,8 @@ Patch to update the build system (autoreconf -vif build/generic)
-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-s, at RANLIB@,$RANLIB,;t t
-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s, at AR@,$AR,;t t
+-s, at ac_ct_AR@,$ac_ct_AR,;t t
-s, at CPP@,$CPP,;t t
-s, at EGREP@,$EGREP,;t t
-s, at ac_yasm@,$ac_yasm,;t t
@@ -9322,6 +10519,7 @@ Patch to update the build system (autoreconf -vif build/generic)
-s, at STATIC_LIB@,$STATIC_LIB,;t t
-s, at PRE_SHARED_LIB@,$PRE_SHARED_LIB,;t t
-s, at SHARED_LIB@,$SHARED_LIB,;t t
+-s, at ALTIVEC_CFLAGS@,$ALTIVEC_CFLAGS,;t t
-s, at LIBOBJS@,$LIBOBJS,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
@@ -9769,7 +10967,7 @@ Patch to update the build system (autoreconf -vif build/generic)
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -5710,6 +5934,10 @@
+@@ -5733,6 +5996,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
diff --git a/debian/patches/configure.in-fix.patch b/debian/patches/configure.in-fix.patch
index dc613cb..b7afc7f 100644
--- a/debian/patches/configure.in-fix.patch
+++ b/debian/patches/configure.in-fix.patch
@@ -1,8 +1,8 @@
Patch to fix issue where autoconf outputs badly formatted configure script
==========================================================================
---- a/build/generic/configure.in
-+++ b/build/generic/configure.in
-@@ -585,17 +585,17 @@
+--- xvidcore.orig/build/generic/configure.in
++++ xvidcore/build/generic/configure.in
+@@ -593,13 +593,13 @@ dnl
dnl ==========================================================================
AC_CHECK_HEADER(
@@ -10,23 +10,15 @@ Patch to fix issue where autoconf outputs badly formatted configure script
- AC_CHECK_LIB(
- pthread,
- pthread_create,
-- AC_CHECK_LIB(
-- pthread,
-- pthread_join,
-- SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-- SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
-- AC_MSG_WARN(Pthread not supported. No SMP support)),
+- SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+- SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
- AC_MSG_WARN(Pthread not supported. No SMP support)),
+ [pthread.h],
+ [AC_CHECK_LIB(
+ [pthread],
+ [pthread_create],
-+ [AC_CHECK_LIB(
-+ [pthread],
-+ [pthread_join],
-+ [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-+ SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
-+ AC_MSG_WARN(Pthread not supported. No SMP support))],
++ [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
++ SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
+ AC_MSG_WARN(Pthread not supported. No SMP support))],
AC_MSG_WARN(Pthread not supported. No SMP support))
--
xvidcore packaging
More information about the pkg-multimedia-commits
mailing list