[SCM] xvidcore/master: Fix issue where autoconf outputs badly formatted configure script. AC_CHECK_HEADER and AC_CHECK_LIB arguments have to be sandwiched between [].
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sat Sep 11 19:30:31 UTC 2010
The following commit has been merged in the master branch:
commit f0d9c85fb2fbdebd9645e5cbbf2d7138ed991ee5
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sat Sep 11 15:19:44 2010 -0400
Fix issue where autoconf outputs badly formatted configure script.
AC_CHECK_HEADER and AC_CHECK_LIB arguments have to be sandwiched between [].
diff --git a/debian/patches/build-system-update.patch b/debian/patches/build-system-update.patch
index 00fef6f..6f385d4 100644
--- a/debian/patches/build-system-update.patch
+++ b/debian/patches/build-system-update.patch
@@ -1,7 +1,7 @@
Patch to update the build system via libtoolize and autoreconf.
==========================================================================
---- xvidcore.orig/build/generic/config.guess
-+++ xvidcore/build/generic/config.guess
+--- a/build/generic/config.guess
++++ b/build/generic/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -15,7 +15,7 @@ Patch to update the build system via libtoolize and autoreconf.
# 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 @@ timestamp='2005-07-08'
+@@ -26,16 +27,16 @@
# the same distribution terms that you use for the rest of that program.
@@ -37,7 +37,7 @@ Patch to update the build system via libtoolize and autoreconf.
me=`echo "$0" | sed -e 's,.*/,,'`
-@@ -55,8 +56,9 @@ version="\
+@@ -55,8 +56,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
@@ -49,7 +49,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 @@ set_cc_for_build='
+@@ -106,7 +108,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
@@ -58,7 +58,7 @@ Patch to update the build system via libtoolize and autoreconf.
{ 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 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+@@ -138,16 +140,6 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
@@ -75,7 +75,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -170,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -170,6 +162,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
@@ -83,7 +83,7 @@ Patch to update the build system via libtoolize and autoreconf.
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
-@@ -178,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -178,7 +171,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -92,7 +92,7 @@ Patch to update the build system via libtoolize and autoreconf.
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -216,8 +209,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -216,8 +209,11 @@
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
@@ -105,7 +105,7 @@ Patch to update the build system via libtoolize and autoreconf.
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -329,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -329,14 +325,33 @@
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
@@ -141,7 +141,7 @@ Patch to update the build system via libtoolize and autoreconf.
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
-@@ -537,7 +552,7 @@ EOF
+@@ -537,7 +552,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
@@ -150,7 +150,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 @@ EOF
+@@ -645,7 +660,7 @@
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -159,7 +159,7 @@ Patch to update the build system via libtoolize and autoreconf.
then
HP_ARCH="hppa2.0w"
else
-@@ -774,12 +789,19 @@ EOF
+@@ -774,12 +789,19 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
@@ -181,7 +181,7 @@ Patch to update the build system via libtoolize and autoreconf.
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
-@@ -789,12 +811,24 @@ EOF
+@@ -789,12 +811,24 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
@@ -209,7 +209,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 @@ EOF
+@@ -804,7 +838,7 @@
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
@@ -218,7 +218,7 @@ Patch to update the build system via libtoolize and autoreconf.
echo x86_64-unknown-cygwin
exit ;;
p*:CYGWIN*:*)
-@@ -824,170 +858,125 @@ EOF
+@@ -824,170 +858,125 @@
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
@@ -462,7 +462,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 @@ EOF
+@@ -1016,7 +1005,7 @@
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -471,7 +471,7 @@ Patch to update the build system via libtoolize and autoreconf.
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1060,8 +1049,11 @@ EOF
+@@ -1060,8 +1049,11 @@
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -485,7 +485,7 @@ Patch to update the build system via libtoolize and autoreconf.
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
-@@ -1099,6 +1091,16 @@ EOF
+@@ -1099,6 +1091,16 @@
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -502,7 +502,7 @@ Patch to update the build system via libtoolize and autoreconf.
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
-@@ -1111,7 +1113,7 @@ EOF
+@@ -1111,7 +1113,7 @@
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -511,7 +511,7 @@ Patch to update the build system via libtoolize and autoreconf.
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
-@@ -1174,6 +1176,9 @@ EOF
+@@ -1174,6 +1176,9 @@
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
@@ -521,7 +521,7 @@ Patch to update the build system via libtoolize and autoreconf.
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
-@@ -1183,6 +1188,15 @@ EOF
+@@ -1183,6 +1188,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
@@ -537,7 +537,7 @@ Patch to update the build system via libtoolize and autoreconf.
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
-@@ -1192,7 +1206,16 @@ EOF
+@@ -1192,7 +1206,16 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
@@ -555,7 +555,7 @@ Patch to update the build system via libtoolize and autoreconf.
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1271,6 +1294,12 @@ EOF
+@@ -1271,6 +1294,12 @@
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
exit ;;
@@ -568,7 +568,7 @@ Patch to update the build system via libtoolize and autoreconf.
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1431,9 +1460,9 @@ This script, last modified $timestamp, h
+@@ -1431,9 +1460,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
@@ -580,8 +580,8 @@ Patch to update the build system via libtoolize and autoreconf.
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
---- xvidcore.orig/build/generic/config.sub
-+++ xvidcore/build/generic/config.sub
+--- a/build/generic/config.sub
++++ b/build/generic/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -595,7 +595,7 @@ Patch to update the build system via libtoolize and autoreconf.
# 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 @@ timestamp='2005-07-08'
+@@ -31,13 +32,16 @@
# Please send patches to <config-patches at gnu.org>. Submit a context
@@ -613,7 +613,7 @@ Patch to update the build system via libtoolize and autoreconf.
# 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 @@ Report bugs and patches to <config-patch
+@@ -71,8 +75,9 @@
version="\
GNU config.sub ($timestamp)
@@ -625,7 +625,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 @@ esac
+@@ -119,8 +124,10 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
@@ -638,7 +638,7 @@ Patch to update the build system via libtoolize and autoreconf.
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
-@@ -146,10 +153,13 @@ case $os in
+@@ -146,10 +153,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -653,7 +653,7 @@ Patch to update the build system via libtoolize and autoreconf.
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -171,6 +181,10 @@ case $os in
+@@ -171,6 +181,10 @@
-hiux*)
os=-hiuxwe2
;;
@@ -664,7 +664,7 @@ Patch to update the build system via libtoolize and autoreconf.
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -187,6 +201,10 @@ case $os in
+@@ -187,6 +201,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -675,7 +675,7 @@ Patch to update the build system via libtoolize and autoreconf.
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -231,20 +249,24 @@ case $basic_machine in
+@@ -231,20 +249,24 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
@@ -704,7 +704,7 @@ Patch to update the build system via libtoolize and autoreconf.
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
-@@ -257,35 +279,40 @@ case $basic_machine in
+@@ -257,35 +279,40 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
@@ -756,7 +756,7 @@ Patch to update the build system via libtoolize and autoreconf.
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
-@@ -305,25 +332,28 @@ case $basic_machine in
+@@ -305,25 +332,28 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
@@ -790,7 +790,7 @@ Patch to update the build system via libtoolize and autoreconf.
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
-@@ -336,30 +366,35 @@ case $basic_machine in
+@@ -336,30 +366,35 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
@@ -835,7 +835,7 @@ Patch to update the build system via libtoolize and autoreconf.
;;
# 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 @@ case $basic_machine in
+@@ -423,6 +458,10 @@
basic_machine=m68k-apollo
os=-bsd
;;
@@ -846,7 +846,7 @@ Patch to update the build system via libtoolize and autoreconf.
aux)
basic_machine=m68k-apple
os=-aux
-@@ -431,10 +470,26 @@ case $basic_machine in
+@@ -431,10 +470,26 @@
basic_machine=ns32k-sequent
os=-dynix
;;
@@ -873,7 +873,7 @@ Patch to update the build system via libtoolize and autoreconf.
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -463,8 +518,8 @@ case $basic_machine in
+@@ -463,8 +518,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
@@ -884,7 +884,7 @@ Patch to update the build system via libtoolize and autoreconf.
os=-elf
;;
crds | unos)
-@@ -502,6 +557,10 @@ case $basic_machine in
+@@ -502,6 +557,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
@@ -895,7 +895,7 @@ Patch to update the build system via libtoolize and autoreconf.
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
-@@ -656,6 +715,14 @@ case $basic_machine in
+@@ -656,6 +715,14 @@
basic_machine=m68k-isi
os=-sysv
;;
@@ -910,7 +910,7 @@ Patch to update the build system via libtoolize and autoreconf.
m88k-omron*)
basic_machine=m88k-omron
;;
-@@ -667,10 +734,17 @@ case $basic_machine in
+@@ -667,10 +734,17 @@
basic_machine=ns32k-utek
os=-sysv
;;
@@ -928,7 +928,7 @@ Patch to update the build system via libtoolize and autoreconf.
miniframe)
basic_machine=m68000-convergent
;;
-@@ -696,6 +770,9 @@ case $basic_machine in
+@@ -696,6 +770,9 @@
basic_machine=i386-pc
os=-msdos
;;
@@ -938,7 +938,7 @@ Patch to update the build system via libtoolize and autoreconf.
mvs)
basic_machine=i370-ibm
os=-mvs
-@@ -794,6 +871,14 @@ case $basic_machine in
+@@ -794,6 +871,14 @@
basic_machine=i860-intel
os=-osf
;;
@@ -953,7 +953,7 @@ Patch to update the build system via libtoolize and autoreconf.
pbd)
basic_machine=sparc-tti
;;
-@@ -803,6 +888,12 @@ case $basic_machine in
+@@ -803,6 +888,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
@@ -966,7 +966,7 @@ Patch to update the build system via libtoolize and autoreconf.
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
-@@ -859,6 +950,10 @@ case $basic_machine in
+@@ -859,6 +950,10 @@
basic_machine=i586-unknown
os=-pw32
;;
@@ -977,7 +977,7 @@ Patch to update the build system via libtoolize and autoreconf.
rom68k)
basic_machine=m68k-rom68k
os=-coff
-@@ -885,6 +980,10 @@ case $basic_machine in
+@@ -885,6 +980,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
@@ -988,7 +988,7 @@ Patch to update the build system via libtoolize and autoreconf.
sei)
basic_machine=mips-sei
os=-seiux
-@@ -896,6 +995,9 @@ case $basic_machine in
+@@ -896,6 +995,9 @@
basic_machine=sh-hitachi
os=-hms
;;
@@ -998,7 +998,7 @@ Patch to update the build system via libtoolize and autoreconf.
sh64)
basic_machine=sh64-unknown
;;
-@@ -985,6 +1087,15 @@ case $basic_machine in
+@@ -985,6 +1087,15 @@
basic_machine=tic6x-unknown
os=-coff
;;
@@ -1014,7 +1014,7 @@ Patch to update the build system via libtoolize and autoreconf.
tx39)
basic_machine=mipstx39-unknown
;;
-@@ -1060,6 +1171,10 @@ case $basic_machine in
+@@ -1060,6 +1171,10 @@
basic_machine=z8k-unknown
os=-sim
;;
@@ -1025,7 +1025,7 @@ Patch to update the build system via libtoolize and autoreconf.
none)
basic_machine=none-none
os=-none
-@@ -1098,10 +1213,10 @@ case $basic_machine in
+@@ -1098,10 +1213,10 @@
we32k)
basic_machine=we32k-att
;;
@@ -1038,7 +1038,7 @@ Patch to update the build system via libtoolize and autoreconf.
basic_machine=sparc-sun
;;
cydra)
-@@ -1148,6 +1263,9 @@ case $os in
+@@ -1148,6 +1263,9 @@
# 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 +1048,7 @@ Patch to update the build system via libtoolize and autoreconf.
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
-@@ -1168,27 +1286,30 @@ case $os in
+@@ -1168,27 +1286,30 @@
# 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* \
@@ -1086,7 +1086,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1215,6 +1336,9 @@ case $os in
+@@ -1215,6 +1336,9 @@
-linux-dietlibc)
os=-linux-dietlibc
;;
@@ -1096,7 +1096,7 @@ Patch to update the build system via libtoolize and autoreconf.
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`
;;
-@@ -1315,6 +1439,11 @@ case $os in
+@@ -1315,6 +1439,11 @@
-zvmoe)
os=-zvmoe
;;
@@ -1108,7 +1108,7 @@ Patch to update the build system via libtoolize and autoreconf.
-none)
;;
*)
-@@ -1337,6 +1466,12 @@ else
+@@ -1337,6 +1466,12 @@
# system, and we'll never get to this point.
case $basic_machine in
@@ -1121,7 +1121,7 @@ Patch to update the build system via libtoolize and autoreconf.
*-acorn)
os=-riscix1.2
;;
-@@ -1346,9 +1481,9 @@ case $basic_machine in
+@@ -1346,9 +1481,9 @@
arm*-semi)
os=-aout
;;
@@ -1134,7 +1134,7 @@ Patch to update the build system via libtoolize and autoreconf.
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
-@@ -1374,6 +1509,9 @@ case $basic_machine in
+@@ -1374,6 +1509,9 @@
m68*-cisco)
os=-aout
;;
@@ -1144,7 +1144,7 @@ Patch to update the build system via libtoolize and autoreconf.
mips*-cisco)
os=-elf
;;
-@@ -1503,7 +1641,7 @@ case $basic_machine in
+@@ -1503,7 +1641,7 @@
-sunos*)
vendor=sun
;;
@@ -1153,8 +1153,8 @@ Patch to update the build system via libtoolize and autoreconf.
vendor=ibm
;;
-beos*)
---- xvidcore.orig/build/generic/configure
-+++ xvidcore/build/generic/configure
+--- a/build/generic/configure
++++ b/build/generic/configure
@@ -1,83 +1,418 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -1614,7 +1614,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -85,146 +420,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+@@ -85,146 +420,107 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -1834,7 +1834,7 @@ Patch to update the build system via libtoolize and autoreconf.
# 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 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -233,38 +529,25 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -1878,7 +1878,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Identity of this package.
PACKAGE_NAME='Xvid'
-@@ -272,52 +555,161 @@ PACKAGE_TARNAME='xvid'
+@@ -272,52 +555,161 @@
PACKAGE_VERSION='1.2.2'
PACKAGE_STRING='Xvid 1.2.2'
PACKAGE_BUGREPORT='xvid-devel at xvid.org'
@@ -2054,7 +2054,7 @@ Patch to update the build system via libtoolize and autoreconf.
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
-@@ -340,34 +732,49 @@ x_libraries=NONE
+@@ -340,34 +732,49 @@
# 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 +2111,7 @@ Patch to update the build system via libtoolize and autoreconf.
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -389,33 +796,59 @@ do
+@@ -389,33 +796,59 @@
--config-cache | -C)
cache_file=config.cache ;;
@@ -2189,7 +2189,7 @@ Patch to update the build system via libtoolize and autoreconf.
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -442,6 +875,12 @@ do
+@@ -442,6 +875,12 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -2202,7 +2202,7 @@ Patch to update the build system via libtoolize and autoreconf.
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -466,13 +905,16 @@ do
+@@ -466,13 +905,16 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -2223,7 +2223,7 @@ Patch to update the build system via libtoolize and autoreconf.
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -537,6 +979,16 @@ do
+@@ -537,6 +979,16 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -2240,7 +2240,7 @@ Patch to update the build system via libtoolize and autoreconf.
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -587,26 +1039,36 @@ do
+@@ -587,26 +1039,36 @@
ac_init_version=: ;;
-with-* | --with-*)
@@ -2292,7 +2292,7 @@ Patch to update the build system via libtoolize and autoreconf.
--x)
# Obsolete; use --with-x.
-@@ -626,26 +1088,25 @@ do
+@@ -626,26 +1088,25 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -2328,7 +2328,7 @@ Patch to update the build system via libtoolize and autoreconf.
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
-@@ -654,31 +1115,36 @@ done
+@@ -654,31 +1115,36 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -2383,7 +2383,7 @@ Patch to update the build system via libtoolize and autoreconf.
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -692,8 +1158,8 @@ target=$target_alias
+@@ -692,8 +1158,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -2394,7 +2394,7 @@ Patch to update the build system via libtoolize and autoreconf.
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -705,74 +1171,72 @@ test -n "$host_alias" && ac_tool_prefix=
+@@ -705,74 +1171,72 @@
test "$silent" = yes && exec 6>/dev/null
@@ -2526,7 +2526,7 @@ Patch to update the build system via libtoolize and autoreconf.
#
# Report the --help message.
-@@ -795,20 +1259,17 @@ Configuration:
+@@ -795,20 +1259,17 @@
--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 +2550,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 @@ for instance \`--prefix=\$HOME'.
+@@ -818,18 +1279,25 @@
For better control, use the options below.
Fine tuning of the installation directories:
@@ -2588,7 +2588,7 @@ Patch to update the build system via libtoolize and autoreconf.
_ACEOF
cat <<\_ACEOF
-@@ -848,6 +1316,7 @@ if test -n "$ac_init_help"; then
+@@ -848,6 +1316,7 @@
cat <<\_ACEOF
Optional Features:
@@ -2596,7 +2596,7 @@ Patch to update the build system via libtoolize and autoreconf.
--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 @@ Some influential environment variables:
+@@ -861,8 +1330,9 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -2608,7 +2608,7 @@ Patch to update the build system via libtoolize and autoreconf.
CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
-@@ -870,159 +1340,548 @@ it to find libraries and programs with n
+@@ -870,159 +1340,594 @@
Report bugs to <xvid-devel at xvid.org>.
_ACEOF
@@ -3224,6 +3224,52 @@ Patch to update the build system via libtoolize and autoreconf.
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_try_link LINENO
++# -----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_link ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ rm -f conftest.$ac_objext conftest$ac_exeext
++ if { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ grep -v '^ *+' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ mv -f conftest.er1 conftest.err
++ fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext && {
++ test "$cross_compiling" = yes ||
++ $as_test_x conftest$ac_exeext
++ }; then :
++ ac_retval=0
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_retval=1
++fi
++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
++ # interfere with the next link command; also delete a directory that is
++ # left behind by Apple's compiler. We do this before executing the actions.
++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_link
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
@@ -3278,7 +3324,7 @@ Patch to update the build system via libtoolize and autoreconf.
## Core tests. ##
## ----------- ##
-@@ -1037,7 +1896,6 @@ _ACEOF
+@@ -1037,7 +1942,6 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -3286,7 +3332,7 @@ Patch to update the build system via libtoolize and autoreconf.
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1048,13 +1906,13 @@ do
+@@ -1048,13 +1952,13 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -3304,7 +3350,7 @@ Patch to update the build system via libtoolize and autoreconf.
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1070,104 +1928,115 @@ do
+@@ -1070,104 +1974,115 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -3468,7 +3514,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Predefined preprocessor variables.
-@@ -1175,112 +2044,137 @@ cat >>confdefs.h <<_ACEOF
+@@ -1175,112 +2090,137 @@
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
@@ -3655,7 +3701,7 @@ Patch to update the build system via libtoolize and autoreconf.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1291,31 +2185,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1291,31 +2231,6 @@
@@ -3687,7 +3733,7 @@ Patch to update the build system via libtoolize and autoreconf.
API_MAJOR="4"
API_MINOR="2"
-@@ -1335,35 +2204,34 @@ our_cflags_defaults="$our_cflags_default
+@@ -1335,35 +2250,34 @@
FEATURES=""
@@ -3741,7 +3787,7 @@ Patch to update the build system via libtoolize and autoreconf.
assembly="no"
else
if test "$enable_assembly" = "yes" ; then
-@@ -1372,121 +2240,154 @@ if test "${enable_assembly+set}" = set;
+@@ -1372,121 +2286,154 @@
fi
else
assembly="yes"
@@ -3978,7 +4024,7 @@ Patch to update the build system via libtoolize and autoreconf.
# The aliases save the names the user supplied, while $host etc.
-@@ -1497,16 +2398,16 @@ test -n "$target_alias" &&
+@@ -1497,16 +2444,16 @@
program_prefix=${target_alias}-
@@ -4001,7 +4047,7 @@ Patch to update the build system via libtoolize and autoreconf.
fi
ac_ext=c
-@@ -1517,10 +2418,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1517,10 +2464,10 @@
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
@@ -4016,7 +4062,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1530,35 +2431,37 @@ for as_dir in $PATH
+@@ -1530,35 +2477,37 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4066,7 +4112,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 +2471,50 @@ for as_dir in $PATH
+@@ -1568,39 +2517,50 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4132,7 +4178,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1610,77 +2524,37 @@ for as_dir in $PATH
+@@ -1610,77 +2570,37 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4224,7 +4270,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1691,18 +2565,19 @@ for as_dir in $PATH
+@@ -1691,18 +2611,19 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4248,7 +4294,7 @@ Patch to update the build system via libtoolize and autoreconf.
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -1720,24 +2595,25 @@ fi
+@@ -1720,24 +2641,25 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4283,7 +4329,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1747,39 +2623,41 @@ for as_dir in $PATH
+@@ -1747,39 +2669,41 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4338,7 +4384,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 +2667,78 @@ for as_dir in $PATH
+@@ -1789,66 +2713,78 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4453,7 +4499,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -1860,112 +2750,108 @@ main ()
+@@ -1860,112 +2796,108 @@
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -4644,7 +4690,7 @@ Patch to update the build system via libtoolize and autoreconf.
# 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 +2859,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -1973,38 +2905,90 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -4756,7 +4802,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -2016,45 +2954,46 @@ main ()
+@@ -2016,45 +3000,46 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -4828,7 +4874,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -2068,55 +3007,34 @@ main ()
+@@ -2068,55 +3053,34 @@
return 0;
}
_ACEOF
@@ -4904,7 +4950,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -2127,39 +3045,49 @@ main ()
+@@ -2127,39 +3091,49 @@
return 0;
}
_ACEOF
@@ -4982,7 +5028,7 @@ Patch to update the build system via libtoolize and autoreconf.
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -2175,18 +3103,14 @@ else
+@@ -2175,18 +3149,14 @@
CFLAGS=
fi
fi
@@ -5007,7 +5053,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -2214,12 +3138,17 @@ static char *f (char * (*g) (char **, in
+@@ -2214,12 +3184,17 @@
/* 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
@@ -5027,7 +5073,7 @@ Patch to update the build system via libtoolize and autoreconf.
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
-@@ -2234,205 +3163,37 @@ return f (e, argv, 0) != argv[0] || f
+@@ -2234,205 +3209,37 @@
return 0;
}
_ACEOF
@@ -5104,7 +5150,8 @@ Patch to update the build system via libtoolize and autoreconf.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
--
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
@@ -5231,9 +5278,8 @@ Patch to update the build system via libtoolize and autoreconf.
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-
- fi
+-
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
@@ -5241,18 +5287,18 @@ Patch to update the build system via libtoolize and autoreconf.
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
--fi
--
+ fi
+
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2454,22 +3215,23 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2454,22 +3261,23 @@
# 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.
@@ -5284,7 +5330,7 @@ Patch to update the build system via libtoolize and autoreconf.
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2477,7 +3239,7 @@ case $as_dir/ in
+@@ -2477,7 +3285,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5293,7 +5339,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 +3249,43 @@ case $as_dir/ in
+@@ -2487,30 +3295,43 @@
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -5345,7 +5391,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2525,10 +3300,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
+@@ -2525,10 +3346,10 @@
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
@@ -5360,7 +5406,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -2538,35 +3313,37 @@ for as_dir in $PATH
+@@ -2538,35 +3359,37 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5410,7 +5456,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 +3353,38 @@ for as_dir in $PATH
+@@ -2576,28 +3399,38 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5459,7 +5505,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -2607,43 +3394,43 @@ fi
+@@ -2607,43 +3440,43 @@
ARCHITECTURE=""
@@ -5521,7 +5567,7 @@ Patch to update the build system via libtoolize and autoreconf.
ARCHITECTURE="GENERIC"
fi
-@@ -2655,15 +3442,15 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -2655,15 +3488,15 @@
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
@@ -5541,7 +5587,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2677,11 +3464,7 @@ do
+@@ -2677,11 +3510,7 @@
# <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.
@@ -5554,7 +5600,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2690,78 +3473,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2690,78 +3519,34 @@
#endif
Syntax error
_ACEOF
@@ -5572,20 +5618,22 @@ Patch to update the build system via libtoolize and autoreconf.
- else
- ac_cpp_err=
- fi
--else
++if ac_fn_c_try_cpp "$LINENO"; then :
++
+ else
- ac_cpp_err=yes
--fi
++ # Broken: fails on valid input.
++continue
+ fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_cpp "$LINENO"; then :
-
-+else
- # Broken: fails on valid input.
- continue
- fi
+-
+- # Broken: fails on valid input.
+-continue
+-fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
@@ -5642,7 +5690,7 @@ Patch to update the build system via libtoolize and autoreconf.
break
fi
-@@ -2773,8 +3512,8 @@ fi
+@@ -2773,8 +3558,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -5653,7 +5701,7 @@ Patch to update the build system via libtoolize and autoreconf.
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -2784,11 +3523,7 @@ do
+@@ -2784,11 +3569,7 @@
# <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.
@@ -5666,7 +5714,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2797,85 +3532,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2797,85 +3578,40 @@
#endif
Syntax error
_ACEOF
@@ -5766,7 +5814,7 @@ Patch to update the build system via libtoolize and autoreconf.
fi
ac_ext=c
-@@ -2885,31 +3575,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -2885,31 +3621,142 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5816,7 +5864,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
-+ fi
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -5835,17 +5883,29 @@ Patch to update the build system via libtoolize and autoreconf.
+ ac_cv_path_GREP=$GREP
+fi
+
-+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
+{ $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 :
+ $as_echo_n "(cached) " >&6
-+else
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -5882,7 +5942,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
- fi
++ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -5899,37 +5959,25 @@ Patch to update the build system via libtoolize and autoreconf.
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
- 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
++
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
-
--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 ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -2924,51 +3725,23 @@ main ()
+@@ -2924,51 +3771,23 @@
return 0;
}
_ACEOF
@@ -5987,7 +6035,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
ac_cv_header_stdc=no
fi
-@@ -2978,18 +3751,14 @@ fi
+@@ -2978,18 +3797,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6009,7 +6057,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
ac_cv_header_stdc=no
fi
-@@ -2999,16 +3768,13 @@ fi
+@@ -2999,16 +3814,13 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6029,16 +6077,21 @@ Patch to update the build system via libtoolize and autoreconf.
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3028,810 +3794,354 @@ main ()
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
+@@ -3021,532 +3833,81 @@
+ #endif
+
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+- int i;
+- for (i = 0; i < 256; i++)
+- if (XOR (islower (i), ISLOWER (i))
+- || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
@@ -6055,50 +6108,29 @@ Patch to update the build system via libtoolize and autoreconf.
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-
+-
-( exit $ac_status )
-ac_cv_header_stdc=no
-+else
-+ ac_cv_header_stdc=no
- fi
+-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-+
- fi
- fi
+-fi
+-fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
+-if test $ac_cv_header_stdc = yes; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
- fi
-
- # 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 \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
-+done
-
-
+-
+-fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
-
-
-
@@ -6112,15 +6144,7 @@ Patch to update the build system via libtoolize and autoreconf.
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
-+$as_echo_n "checking size of int *... " >&6; }
-+if test "${ac_cv_sizeof_int_p+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -6128,8 +6152,7 @@ Patch to update the build system via libtoolize and autoreconf.
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
-
+-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
@@ -6155,36 +6178,26 @@ Patch to update the build system via libtoolize and autoreconf.
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
- else
+-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ if test "$ac_cv_type_int_p" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error 77 "cannot compute sizeof (int *)
-+See \`config.log' for more details" "$LINENO" 5 ; }
-+ else
-+ ac_cv_sizeof_int_p=0
-+ fi
- fi
+-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5
-+$as_echo "$ac_cv_sizeof_int_p" >&6; }
-
+-
+-fi
+-
-done
-
-
+-
+-
-echo "$as_me:$LINENO: checking for int *" >&5
-echo $ECHO_N "checking for int *... $ECHO_C" >&6
-if test "${ac_cv_type_int_p+set}" = set; then
@@ -6207,9 +6220,7 @@ Patch to update the build system via libtoolize and autoreconf.
- ;
- return 0;
-}
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT_P $ac_cv_sizeof_int_p
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6236,37 +6247,19 @@ Patch to update the build system via libtoolize and autoreconf.
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
-ac_cv_type_int_p=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int_p" >&5
-echo "${ECHO_T}$ac_cv_type_int_p" >&6
-
+-
-echo "$as_me:$LINENO: checking size of int *" >&5
-echo $ECHO_N "checking size of int *... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int_p+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+case "$ac_cv_sizeof_int_p" in
-+ 4)
-+ BUS="32BIT"
-+ ;;
-+ 8)
-+ BUS="64BIT"
-+ ;;
-+ *)
-+ as_fn_error $? "Xvid supports only 32/64 bit architectures" "$LINENO" 5
-+ ;;
-+esac
-+
-+ENDIANNESS=""
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-+if test "${ac_cv_c_bigendian+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- if test "$ac_cv_type_int_p" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
@@ -6279,64 +6272,18 @@ Patch to update the build system via libtoolize and autoreconf.
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_cv_c_bigendian=unknown
-+ # See if we're dealing with a universal compiler.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#ifndef __APPLE_CC__
-+ not a universal capable compiler
-+ #endif
-+ typedef int dummy;
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ # Check for potential -arch flags. It is not universal unless
-+ # there are at least two -arch flags with different values.
-+ ac_arch=
-+ ac_prev=
-+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-+ if test -n "$ac_prev"; then
-+ case $ac_word in
-+ i?86 | x86_64 | ppc | ppc64)
-+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-+ ac_arch=$ac_word
-+ else
-+ ac_cv_c_bigendian=universal
-+ break
-+ fi
-+ ;;
-+ esac
-+ ac_prev=
-+ elif test "x$ac_word" = "x-arch"; then
-+ ac_prev=arch
-+ fi
-+ done
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # See if sys/param.h defines the BYTE_ORDER macro.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+ #include <sys/param.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static int test_array [1 - 2 * !(((long) (sizeof (int *))) >= 0)];
-test_array [0] = 0
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-+ && LITTLE_ENDIAN)
-+ bogus endian macros
-+ #endif
-
- ;
- return 0;
- }
- _ACEOF
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6366,27 +6313,18 @@ Patch to update the build system via libtoolize and autoreconf.
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ # It does; now see whether it defined to BIG_ENDIAN or not.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <sys/types.h>
-+ #include <sys/param.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static int test_array [1 - 2 * !(((long) (sizeof (int *))) <= $ac_mid)];
-test_array [0] = 0
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+ #endif
-
- ;
- return 0;
- }
- _ACEOF
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6410,9 +6348,7 @@ Patch to update the build system via libtoolize and autoreconf.
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_bigendian=yes
- else
+-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -6422,8 +6358,7 @@ Patch to update the build system via libtoolize and autoreconf.
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ ac_cv_c_bigendian=no
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
@@ -6435,30 +6370,18 @@ Patch to update the build system via libtoolize and autoreconf.
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <limits.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static int test_array [1 - 2 * !(((long) (sizeof (int *))) < 0)];
-test_array [0] = 0
-+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-+ bogus endian macros
-+ #endif
-
- ;
- return 0;
- }
- _ACEOF
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6488,26 +6411,18 @@ Patch to update the build system via libtoolize and autoreconf.
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ # It does; now see whether it defined to _BIG_ENDIAN or not.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <limits.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static int test_array [1 - 2 * !(((long) (sizeof (int *))) >= $ac_mid)];
-test_array [0] = 0
-+#ifndef _BIG_ENDIAN
-+ not big endian
-+ #endif
-
- ;
- return 0;
- }
- _ACEOF
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6544,18 +6459,14 @@ Patch to update the build system via libtoolize and autoreconf.
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_bigendian=yes
- else
+-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-+ ac_cv_c_bigendian=no
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
@@ -6565,42 +6476,18 @@ Patch to update the build system via libtoolize and autoreconf.
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # Compile a test program.
-+ if test "$cross_compiling" = yes; then :
-+ # Try to guess by grepping values from an object file.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+short int ascii_mm[] =
-+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+ short int ascii_ii[] =
-+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+ int use_ascii (int i) {
-+ return ascii_mm[i] + ascii_ii[i];
-+ }
-+ short int ebcdic_ii[] =
-+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+ short int ebcdic_mm[] =
-+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+ int use_ebcdic (int i) {
-+ return ebcdic_mm[i] + ebcdic_ii[i];
-+ }
-+ extern int foo;
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static int test_array [1 - 2 * !(((long) (sizeof (int *))) <= $ac_mid)];
-test_array [0] = 0
-
-+return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6629,19 +6516,7 @@ Patch to update the build system via libtoolize and autoreconf.
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-+ ac_cv_c_bigendian=yes
-+ fi
-+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+ if test "$ac_cv_c_bigendian" = unknown; then
-+ ac_cv_c_bigendian=no
-+ else
-+ # finding both strings is unlikely to happen, but who knows?
-+ ac_cv_c_bigendian=unknown
-+ fi
-+ fi
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
@@ -6659,24 +6534,22 @@ Patch to update the build system via libtoolize and autoreconf.
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
+-else
- 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. */
- $ac_includes_default
+-/* end confdefs.h. */
+-$ac_includes_default
-long longval () { return (long) (sizeof (int *)); }
-unsigned long ulongval () { return (long) (sizeof (int *)); }
-#include <stdio.h>
-#include <stdlib.h>
- int
- main ()
- {
-
+-int
+-main ()
+-{
+-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- exit (1);
@@ -6695,16 +6568,16 @@ Patch to update the build system via libtoolize and autoreconf.
- fprintf (f, "%lu\n", i);
- }
- exit (ferror (f) || fclose (f) != 0);
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long int l;
-+ char c[sizeof (long int)];
-+ } u;
-+ u.l = 1;
-+ return u.c[sizeof (long int) - 1] == 1;
-
- ;
+-
+- ;
++int
++main ()
++{
++ int i;
++ for (i = 0; i < 256; i++)
++ if (XOR (islower (i), ISLOWER (i))
++ || toupper (i) != TOUPPER (i))
++ return 2;
return 0;
}
_ACEOF
@@ -6721,55 +6594,99 @@ Patch to update the build system via libtoolize and autoreconf.
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int_p=`cat conftest.val`
+if ac_fn_c_try_run "$LINENO"; then :
-+ ac_cv_c_bigendian=no
++
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int *), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int *), 77
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
--fi
+ fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_c_bigendian=yes
fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++
++fi
++
++# 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 \
++ inttypes.h stdint.h unistd.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
fi
-rm -f conftest.val
--else
++
++done
++
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
++$as_echo_n "checking size of int *... " >&6; }
++if test "${ac_cv_sizeof_int_p+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
++
+ else
- ac_cv_sizeof_int_p=0
++ if test "$ac_cv_type_int_p" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error 77 "cannot compute sizeof (int *)
++See \`config.log' for more details" "$LINENO" 5 ; }
++ else
++ ac_cv_sizeof_int_p=0
++ fi
+ fi
+
-+ fi
fi
--fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int_p" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_INT_P $ac_cv_sizeof_int_p
--_ACEOF
--
--
--case "$ac_cv_sizeof_int_p" in
-- 4)
-- BUS="32BIT"
-- ;;
-- 8)
-- BUS="64BIT"
-- ;;
-- *)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5
++$as_echo "$ac_cv_sizeof_int_p" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT_P $ac_cv_sizeof_int_p
+ _ACEOF
+@@ -3560,278 +3921,273 @@
+ BUS="64BIT"
+ ;;
+ *)
- { { echo "$as_me:$LINENO: error: Xvid supports only 32/64 bit architectures" >&5
-echo "$as_me: error: Xvid supports only 32/64 bit architectures" >&2;}
- { (exit 1); exit 1; }; }
-- ;;
--esac
--
--ENDIANNESS=""
--
++ as_fn_error $? "Xvid supports only 32/64 bit architectures" "$LINENO" 5
+ ;;
+ esac
+
+ ENDIANNESS=""
+
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
@@ -6781,21 +6698,70 @@ Patch to update the build system via libtoolize and autoreconf.
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <sys/types.h>
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
++$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_cv_c_bigendian=unknown
++ # See if we're dealing with a universal compiler.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifndef __APPLE_CC__
++ not a universal capable compiler
++ #endif
++ typedef int dummy;
++
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ # Check for potential -arch flags. It is not universal unless
++ # there are at least two -arch flags with different values.
++ ac_arch=
++ ac_prev=
++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++ if test -n "$ac_prev"; then
++ case $ac_word in
++ i?86 | x86_64 | ppc | ppc64)
++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++ ac_arch=$ac_word
++ else
++ ac_cv_c_bigendian=universal
++ break
++ fi
++ ;;
++ esac
++ ac_prev=
++ elif test "x$ac_word" = "x-arch"; then
++ ac_prev=arch
++ fi
++ done
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ if test $ac_cv_c_bigendian = unknown; then
++ # See if sys/param.h defines the BYTE_ORDER macro.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <sys/types.h>
-#include <sys/param.h>
--
--int
--main ()
--{
++ #include <sys/param.h>
+
+ int
+ main ()
+ {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
--
-- ;
-- return 0;
--}
--_ACEOF
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
++ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
++ && LITTLE_ENDIAN)
++ bogus endian macros
++ #endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6818,27 +6784,32 @@ Patch to update the build system via libtoolize and autoreconf.
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- # It does; now see whether it defined to BIG_ENDIAN or not.
++if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <sys/types.h>
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <sys/types.h>
-#include <sys/param.h>
--
--int
--main ()
--{
--#if BYTE_ORDER != BIG_ENDIAN
++ #include <sys/param.h>
+
+ int
+ main ()
+ {
+ #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
--
-- ;
-- return 0;
--}
--_ACEOF
++ not big endian
++ #endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6861,42 +6832,72 @@ Patch to update the build system via libtoolize and autoreconf.
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_c_bigendian=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
+ else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
--fi
++ ac_cv_c_bigendian=no
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
++ if test $ac_cv_c_bigendian = unknown; then
++ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <limits.h>
+
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
- # try to guess the endianness by grepping values into an object file
- ac_cv_c_bigendian=unknown
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++int
++main ()
++{
++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
++ bogus endian macros
++ #endif
++
++ ;
++ return 0;
++}
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++if ac_fn_c_try_compile "$LINENO"; then :
++ # It does; now see whether it defined to _BIG_ENDIAN or not.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
--int
--main ()
--{
++#include <limits.h>
++
+ int
+ main ()
+ {
- _ascii (); _ebcdic ();
-- ;
-- return 0;
--}
--_ACEOF
++#ifndef _BIG_ENDIAN
++ not big endian
++ #endif
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
@@ -6920,8 +6921,11 @@ Patch to update the build system via libtoolize and autoreconf.
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-- ac_cv_c_bigendian=yes
--fi
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
++else
++ ac_cv_c_bigendian=no
+ fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
- if test "$ac_cv_c_bigendian" = unknown; then
- ac_cv_c_bigendian=no
@@ -6929,23 +6933,70 @@ Patch to update the build system via libtoolize and autoreconf.
- # finding both strings is unlikely to happen, but who knows?
- ac_cv_c_bigendian=unknown
- fi
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
++ if test $ac_cv_c_bigendian = unknown; then
++ # Compile a test program.
++ if test "$cross_compiling" = yes; then :
++ # Try to guess by grepping values from an object file.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++short int ascii_mm[] =
++ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++ short int ascii_ii[] =
++ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++ int use_ascii (int i) {
++ return ascii_mm[i] + ascii_ii[i];
++ }
++ short int ebcdic_ii[] =
++ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++ short int ebcdic_mm[] =
++ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++ int use_ebcdic (int i) {
++ return ebcdic_mm[i] + ebcdic_ii[i];
++ }
++ extern int foo;
+
++int
++main ()
++{
++return use_ascii (foo) == use_ebcdic (foo);
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
++ ac_cv_c_bigendian=yes
++ fi
++ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++ if test "$ac_cv_c_bigendian" = unknown; then
++ ac_cv_c_bigendian=no
++ else
++ # finding both strings is unlikely to happen, but who knows?
++ ac_cv_c_bigendian=unknown
++ fi
++ fi
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--int
--main ()
--{
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++$ac_includes_default
+ int
+ main ()
+ {
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
@@ -6954,8 +7005,20 @@ Patch to update the build system via libtoolize and autoreconf.
- } u;
- u.l = 1;
- exit (u.c[sizeof (long) - 1] == 1);
--}
--_ACEOF
++
++ /* Are we little or big endian? From Harbison&Steele. */
++ union
++ {
++ long int l;
++ char c[sizeof (long int)];
++ } u;
++ u.l = 1;
++ return u.c[sizeof (long int) - 1] == 1;
++
++ ;
++ return 0;
+ }
+ _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
@@ -6967,8 +7030,9 @@ Patch to update the build system via libtoolize and autoreconf.
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_c_bigendian=no
--else
++if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_bigendian=no
+ else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -6977,10 +7041,15 @@ Patch to update the build system via libtoolize and autoreconf.
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
++ ac_cv_c_bigendian=yes
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++ fi
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-case $ac_cv_c_bigendian in
@@ -7065,7 +7134,7 @@ Patch to update the build system via libtoolize and autoreconf.
STATIC_EXTENSION="a"
SHARED_EXTENSION="so"
OBJECT_EXTENSION="o"
-@@ -3839,31 +4149,31 @@ echo "${ECHO_T}Unknown OS - Using .so .a
+@@ -3839,31 +4195,31 @@
esac
@@ -7105,7 +7174,7 @@ Patch to update the build system via libtoolize and autoreconf.
STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
-@@ -3873,29 +4183,29 @@ echo "${ECHO_T}ok" >&6
+@@ -3873,29 +4229,29 @@
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
if test x"$macosx_module" = x"no"; then
@@ -7143,7 +7212,7 @@ Patch to update the build system via libtoolize and autoreconf.
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
SPECIFIC_LDFLAGS=""
-@@ -3923,10 +4233,10 @@ if test "$ARCHITECTURE" = "IA32" -o "$AR
+@@ -3923,10 +4279,10 @@
# Extract the first word of "$yasm_prog", so it can be a program name with args.
set dummy $yasm_prog; ac_word=$2
@@ -7158,7 +7227,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
if test -n "$ac_yasm"; then
ac_cv_prog_ac_yasm="$ac_yasm" # Let the user override the test.
-@@ -3937,18 +4247,19 @@ for as_dir in $PATH
+@@ -3937,18 +4293,19 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7182,7 +7251,7 @@ Patch to update the build system via libtoolize and autoreconf.
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -3967,26 +4278,27 @@ fi
+@@ -3967,26 +4324,27 @@
fi
ac_yasm=$ac_cv_prog_ac_yasm
if test -n "$ac_yasm"; then
@@ -7220,7 +7289,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
found_nasm_comp_prog="yes"
chosen_asm_prog="$yasm_prog"
-@@ -3996,10 +4308,10 @@ echo "$as_me: WARNING: yasm version is t
+@@ -3996,10 +4354,10 @@
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
@@ -7235,7 +7304,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
if test -n "$ac_nasm"; then
ac_cv_prog_ac_nasm="$ac_nasm" # Let the user override the test.
-@@ -4010,18 +4322,19 @@ for as_dir in $PATH
+@@ -4010,18 +4368,19 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7259,7 +7328,7 @@ Patch to update the build system via libtoolize and autoreconf.
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -4040,16 +4353,17 @@ fi
+@@ -4040,16 +4399,17 @@
fi
ac_nasm=$ac_cv_prog_ac_nasm
if test -n "$ac_nasm"; then
@@ -7283,7 +7352,7 @@ Patch to update the build system via libtoolize and autoreconf.
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 +4372,12 @@ echo $ECHO_N "checking for nasm version.
+@@ -4058,12 +4418,12 @@
if test -z $nasm_major ; then
nasm_major=-1
fi
@@ -7300,7 +7369,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
found_nasm_comp_prog="yes"
chosen_asm_prog="$nasm_prog"
-@@ -4072,17 +4386,17 @@ echo "$as_me: WARNING: nasm version is t
+@@ -4072,17 +4432,17 @@
fi
if test "$found_nasm_comp_prog" = "yes" ; then
@@ -7324,7 +7393,7 @@ Patch to update the build system via libtoolize and autoreconf.
NASM_FORMAT="elf"
fi
MARK_FUNCS="-DMARK_FUNCS"
-@@ -4090,20 +4404,20 @@ echo "${ECHO_T}elf" >&6
+@@ -4090,20 +4450,20 @@
;;
[cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
if test "$ARCHITECTURE" = "X86_64" ; then
@@ -7351,7 +7420,7 @@ Patch to update the build system via libtoolize and autoreconf.
NASM_FORMAT="macho"
PREFIX="-DPREFIX"
MARK_FUNCS=""
-@@ -4118,8 +4432,8 @@ echo "${ECHO_T}macho" >&6
+@@ -4118,8 +4478,8 @@
AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
fi
else
@@ -7362,7 +7431,7 @@ Patch to update the build system via libtoolize and autoreconf.
ARCHITECTURE="GENERIC"
fi
fi
-@@ -4131,26 +4445,26 @@ if test "$ARCHITECTURE" = "PPC" ; then
+@@ -4131,26 +4491,26 @@
ASSEMBLY_EXTENSION=".s"
ASSEMBLY_SOURCES=""
@@ -7397,7 +7466,7 @@ Patch to update the build system via libtoolize and autoreconf.
cat > conftest.c << EOF
#ifdef HAVE_ALTIVEC_H
#include <altivec.h>
-@@ -4165,8 +4479,8 @@ int main()
+@@ -4165,8 +4525,8 @@
}
EOF
if $CC $TEMP_ALTIVEC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then
@@ -7408,7 +7477,7 @@ Patch to update the build system via libtoolize and autoreconf.
SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -arch ppc -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"
PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
else
-@@ -4184,13 +4498,13 @@ int main()
+@@ -4184,13 +4544,13 @@
}
EOF
if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
@@ -7426,7 +7495,7 @@ Patch to update the build system via libtoolize and autoreconf.
ARCHITECTURE="GENERIC"
fi
fi
-@@ -4221,12 +4535,6 @@ if test "$ARCHITECTURE" = "IA64" ; then
+@@ -4221,12 +4581,6 @@
fi
@@ -7439,7 +7508,7 @@ Patch to update the build system via libtoolize and autoreconf.
for ac_header in stdio.h \
signal.h \
stdlib.h \
-@@ -4234,443 +4542,160 @@ for ac_header in stdio.h \
+@@ -4234,443 +4588,113 @@
assert.h \
math.h \
@@ -7745,9 +7814,7 @@ Patch to update the build system via libtoolize and autoreconf.
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "{ $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;}
-+"
++ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
@@ -7842,54 +7909,6 @@ Patch to update the build system via libtoolize and autoreconf.
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+# ac_fn_c_try_link LINENO
-+# -----------------------
-+# Try to link conftest.$ac_ext
-+else
-+ and return whether this succeeded.
-+ac_fn_c_try_link ()
-+{
-+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+ if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_link") 2>conftest.err
-+ ac_status=$?
-+ if test -s conftest.err; then
-+ grep -v '^ *+' conftest.err >conftest.er1
-+ cat conftest.er1 >&5
-+ mv -f conftest.er1 conftest.err
-+ fi
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then :
-+ ac_retval=0
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_retval=1
-+fi
-+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-+ # interfere with the next link command; also delete a directory that is
-+ # left behind by Apple's compiler. We do this before executing the actions.
-+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_link
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -7956,7 +7975,8 @@ Patch to update the build system via libtoolize and autoreconf.
+$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"
++ 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;}
@@ -7971,13 +7991,15 @@ Patch to update the build system via libtoolize and autoreconf.
+$as_echo "$as_me: WARNING: Pthread not supported. No SMP support" >&2;}
fi
--else
+ 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
-@@ -4755,7 +4780,7 @@ fi
+@@ -4755,7 +4779,7 @@
@@ -7986,7 +8008,7 @@ Patch to update the build system via libtoolize and autoreconf.
cat >confcache <<\_ACEOF
-@@ -4776,39 +4801,59 @@ _ACEOF
+@@ -4776,39 +4800,59 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -8064,7 +8086,7 @@ Patch to update the build system via libtoolize and autoreconf.
fi
fi
rm -f confcache
-@@ -4817,63 +4862,55 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -4817,63 +4861,55 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -8162,7 +8184,7 @@ Patch to update the build system via libtoolize and autoreconf.
done
LIBOBJS=$ac_libobjs
-@@ -4881,12 +4918,15 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -4881,12 +4917,15 @@
@@ -8181,7 +8203,7 @@ Patch to update the build system via libtoolize and autoreconf.
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -4896,81 +4936,252 @@ cat >$CONFIG_STATUS <<_ACEOF
+@@ -4896,81 +4935,252 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -8221,14 +8243,8 @@ Patch to update the build system via libtoolize and autoreconf.
+ *) :
+ ;;
+esac
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
-
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-- as_unset=unset
--else
-- as_unset=false
++fi
++
+
+as_nl='
+'
@@ -8267,7 +8283,13 @@ Patch to update the build system via libtoolize and autoreconf.
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+- as_unset=unset
+-else
+- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
@@ -8275,9 +8297,11 @@ Patch to update the build system via libtoolize and autoreconf.
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
-+fi
-+
-+
+ fi
+
+
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
@@ -8296,9 +8320,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
-
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
++
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -8368,9 +8390,7 @@ Patch to update the build system via libtoolize and autoreconf.
+{
+ return $1
+} # as_fn_set_status
-
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
++
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
@@ -8424,7 +8444,9 @@ Patch to update the build system via libtoolize and autoreconf.
+ }
+fi # as_fn_arith
+
-+
+
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -8478,7 +8500,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -4978,148 +5189,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+@@ -4978,148 +5188,123 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -8728,7 +8750,7 @@ Patch to update the build system via libtoolize and autoreconf.
# 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 +5314,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -5128,31 +5313,20 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -8770,7 +8792,7 @@ Patch to update the build system via libtoolize and autoreconf.
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -5160,125 +5335,117 @@ generated by GNU Autoconf 2.59. Invocat
+@@ -5160,125 +5334,117 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -8879,14 +8901,14 @@ Patch to update the build system via libtoolize and autoreconf.
+ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- -*)
++ ac_shift=:
++ ;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
-+ ac_shift=:
-+ ;;
+ ac_shift=:
+ ;;
+- -*)
+ *)
ac_option=$1
ac_optarg=$2
@@ -8956,7 +8978,7 @@ Patch to update the build system via libtoolize and autoreconf.
esac
shift
-@@ -5292,30 +5459,44 @@ if $ac_cs_silent; then
+@@ -5292,30 +5458,44 @@
fi
_ACEOF
@@ -9013,7 +9035,7 @@ Patch to update the build system via libtoolize and autoreconf.
# 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 +5506,416 @@ if $ac_need_defaults; then
+@@ -5325,372 +5505,416 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -9747,7 +9769,7 @@ Patch to update the build system via libtoolize and autoreconf.
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -5710,6 +5935,10 @@ if test "$no_create" != yes; then
+@@ -5710,6 +5934,10 @@
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
new file mode 100644
index 0000000..dc613cb
--- /dev/null
+++ b/debian/patches/configure.in-fix.patch
@@ -0,0 +1,33 @@
+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 @@
+ dnl ==========================================================================
+
+ AC_CHECK_HEADER(
+- 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)),
+- 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))],
++ AC_MSG_WARN(Pthread not supported. No SMP support))],
+ AC_MSG_WARN(Pthread not supported. No SMP support))
+
+ dnl ==========================================================================
diff --git a/debian/patches/series b/debian/patches/series
index 47ae338..6949659 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+configure.in-fix.patch
build-system-update.patch
--
xvidcore packaging
More information about the pkg-multimedia-commits
mailing list