[SCM] xvidcore packaging branch, master, updated. debian/1.2.2+debian-1-7-g90d380f
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Fri Aug 6 13:09:12 UTC 2010
The following commit has been merged in the master branch:
commit 90d380fbe91ced879011653d5406f57e887ede1b
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Fri Aug 6 15:10:17 2010 +0200
Update debian/patches/build-system-update.patch with a recent autoconf and autotools-dev.
diff --git a/debian/patches/build-system-update.patch b/debian/patches/build-system-update.patch
index f9f08eb..00fef6f 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.
==========================================================================
---- 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.
@@ -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 @@
+@@ -26,16 +27,16 @@ timestamp='2005-07-08'
# 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 @@
+@@ -55,8 +56,9 @@ version="\
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 @@
+@@ -106,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,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 @@
+@@ -138,16 +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
@@ -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 @@
+@@ -170,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
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 @@
+@@ -178,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,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 @@
+@@ -216,8 +209,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
*: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 @@
+@@ -329,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
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 @@
+@@ -537,7 +552,7 @@ EOF
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 @@
+@@ -645,7 +660,7 @@ EOF
# => 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 @@
+@@ -774,12 +789,19 @@ EOF
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 @@
+@@ -789,12 +811,24 @@ EOF
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 @@
+@@ -804,7 +838,7 @@ EOF
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 @@
+@@ -824,170 +858,125 @@ EOF
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 @@
+@@ -1016,7 +1005,7 @@ EOF
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 @@
+@@ -1060,8 +1049,11 @@ EOF
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 @@
+@@ -1099,6 +1091,16 @@ EOF
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 @@
+@@ -1111,7 +1113,7 @@ EOF
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 @@
+@@ -1174,6 +1176,9 @@ EOF
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 @@
+@@ -1183,6 +1188,15 @@ EOF
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 @@
+@@ -1192,7 +1206,16 @@ EOF
*: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 @@
+@@ -1271,6 +1294,12 @@ EOF
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 @@
+@@ -1431,9 +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
@@ -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
---- 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.
@@ -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 @@
+@@ -31,13 +32,16 @@ timestamp='2005-07-08'
# 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 @@
+@@ -71,8 +75,9 @@ Report bugs and patches to <config-patch
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 @@
+@@ -119,8 +124,10 @@ esac
# 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 @@
+@@ -146,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 | \
@@ -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 @@
+@@ -171,6 +181,10 @@ case $os in
-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 @@
+@@ -187,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,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 @@
+@@ -231,20 +249,24 @@ case $basic_machine in
| 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 @@
+@@ -257,35 +279,40 @@ case $basic_machine in
| 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 @@
+@@ -305,25 +332,28 @@ case $basic_machine in
| 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 @@
+@@ -336,30 +366,35 @@ case $basic_machine in
| 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 @@
+@@ -423,6 +458,10 @@ case $basic_machine in
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 @@
+@@ -431,10 +470,26 @@ case $basic_machine in
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 @@
+@@ -463,8 +518,8 @@ case $basic_machine in
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 @@
+@@ -502,6 +557,10 @@ case $basic_machine in
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 @@
+@@ -656,6 +715,14 @@ case $basic_machine in
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 @@
+@@ -667,10 +734,17 @@ case $basic_machine in
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 @@
+@@ -696,6 +770,9 @@ case $basic_machine in
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 @@
+@@ -794,6 +871,14 @@ case $basic_machine in
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 @@
+@@ -803,6 +888,12 @@ case $basic_machine in
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 @@
+@@ -859,6 +950,10 @@ case $basic_machine in
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 @@
+@@ -885,6 +980,10 @@ case $basic_machine in
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 @@
+@@ -896,6 +995,9 @@ case $basic_machine in
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 @@
+@@ -985,6 +1087,15 @@ case $basic_machine in
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 @@
+@@ -1060,6 +1171,10 @@ case $basic_machine in
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 @@
+@@ -1098,10 +1213,10 @@ case $basic_machine in
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 @@
+@@ -1148,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 +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 @@
+@@ -1168,27 +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* \
@@ -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 @@
+@@ -1215,6 +1336,9 @@ case $os in
-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 @@
+@@ -1315,6 +1439,11 @@ case $os in
-zvmoe)
os=-zvmoe
;;
@@ -1108,7 +1108,7 @@ Patch to update the build system via libtoolize and autoreconf.
-none)
;;
*)
-@@ -1337,6 +1466,12 @@
+@@ -1337,6 +1466,12 @@ else
# 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 @@
+@@ -1346,9 +1481,9 @@ case $basic_machine in
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 @@
+@@ -1374,6 +1509,9 @@ case $basic_machine in
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 @@
+@@ -1503,7 +1641,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
@@ -1153,21 +1153,21 @@ Patch to update the build system via libtoolize and autoreconf.
vendor=ibm
;;
-beos*)
---- a/build/generic/configure
-+++ b/build/generic/configure
+--- 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.65 for Xvid 1.2.2.
++# Generated by GNU Autoconf 2.67 for Xvid 1.2.2.
#
# Report bugs to <xvid-devel at xvid.org>.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
@@ -1503,7 +1503,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
@@ -1543,19 +1543,19 @@ Patch to update the build system via libtoolize and autoreconf.
+fi # as_fn_arith
+
+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
-+ $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
@@ -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 @@
+@@ -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 +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 @@
+@@ -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'"
@@ -1851,7 +1851,8 @@ Patch to update the build system via libtoolize and autoreconf.
+exec 6>&1
# Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -1877,7 +1878,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Identity of this package.
PACKAGE_NAME='Xvid'
-@@ -272,52 +555,161 @@
+@@ -272,52 +555,161 @@ PACKAGE_TARNAME='xvid'
PACKAGE_VERSION='1.2.2'
PACKAGE_STRING='Xvid 1.2.2'
PACKAGE_BUGREPORT='xvid-devel at xvid.org'
@@ -2053,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,48 @@
+@@ -340,34 +732,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.
@@ -2096,8 +2097,9 @@ Patch to update the build system via libtoolize and autoreconf.
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in
-+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+ *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -2109,7 +2111,7 @@ Patch to update the build system via libtoolize and autoreconf.
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -389,33 +795,59 @@
+@@ -389,33 +796,59 @@ do
--config-cache | -C)
cache_file=config.cache ;;
@@ -2138,7 +2140,7 @@ Patch to update the build system via libtoolize and autoreconf.
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
@@ -2172,7 +2174,7 @@ Patch to update the build system via libtoolize and autoreconf.
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
@@ -2187,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 +874,12 @@
+@@ -442,6 +875,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -2200,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 +904,16 @@
+@@ -466,13 +905,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -2221,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 +978,16 @@
+@@ -537,6 +979,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -2238,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 +1038,36 @@
+@@ -587,26 +1039,36 @@ do
ac_init_version=: ;;
-with-* | --with-*)
@@ -2253,7 +2255,7 @@ Patch to update the build system via libtoolize and autoreconf.
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
@@ -2276,7 +2278,7 @@ Patch to update the build system via libtoolize and autoreconf.
- ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+ as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
@@ -2290,15 +2292,15 @@ Patch to update the build system via libtoolize and autoreconf.
--x)
# Obsolete; use --with-x.
-@@ -626,26 +1087,25 @@
+@@ -626,26 +1088,25 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
-+ -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
;;
*=*)
@@ -2311,7 +2313,7 @@ Patch to update the build system via libtoolize and autoreconf.
- eval "$ac_envvar='$ac_optarg'"
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
-+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -2326,13 +2328,13 @@ Patch to update the build system via libtoolize and autoreconf.
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
-@@ -654,31 +1114,36 @@
+@@ -654,31 +1115,36 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "missing argument to $ac_option"
++ as_fn_error $? "missing argument to $ac_option"
fi
-# Be sure to have absolute paths.
@@ -2346,7 +2348,7 @@ Patch to update the build system via libtoolize and autoreconf.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
-+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
-done
@@ -2377,29 +2379,31 @@ Patch to update the build system via libtoolize and autoreconf.
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
-+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -692,7 +1157,7 @@
+@@ -692,8 +1158,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
+- If a cross compiler is detected then cross compile mode will be used." >&2
++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
-@@ -705,74 +1170,72 @@
+ fi
+@@ -705,74 +1171,72 @@ test -n "$host_alias" && ac_tool_prefix=
test "$silent" = yes && exec 6>/dev/null
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+ as_fn_error "working directory cannot be determined"
++ as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ as_fn_error "pwd does not report name of working directory"
++ as_fn_error $? "pwd does not report name of working directory"
+
+
# Find the source files, if location was not specified.
@@ -2497,11 +2501,11 @@ Patch to update the build system via libtoolize and autoreconf.
-ac_cv_env_CPP_value=$CPP
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2522,7 +2526,14 @@ Patch to update the build system via libtoolize and autoreconf.
#
# Report the --help message.
-@@ -801,14 +1264,11 @@
+@@ -795,20 +1259,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
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
@@ -2539,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 +1278,25 @@
+@@ -818,18 +1279,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
@@ -2577,7 +2588,7 @@ Patch to update the build system via libtoolize and autoreconf.
_ACEOF
cat <<\_ACEOF
-@@ -848,6 +1315,7 @@
+@@ -848,6 +1316,7 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
@@ -2585,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 +1329,9 @@
+@@ -861,8 +1330,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>
@@ -2597,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 +1339,550 @@
+@@ -870,159 +1340,548 @@ it to find libraries and programs with n
Report bugs to <xvid-devel at xvid.org>.
_ACEOF
@@ -2739,10 +2750,10 @@ Patch to update the build system via libtoolize and autoreconf.
cat <<\_ACEOF
Xvid configure 1.2.2
-generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.67
-Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -3076,7 +3087,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
@@ -3101,7 +3112,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3131,10 +3142,10 @@ Patch to update the build system via libtoolize and autoreconf.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
@@ -3170,7 +3181,7 @@ Patch to update the build system via libtoolize and autoreconf.
+else
+ ac_header_preproc=no
+fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
@@ -3193,17 +3204,15 @@ Patch to update the build system via libtoolize and autoreconf.
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+( cat <<\_ASBOX
-+## ---------------------------------- ##
++( $as_echo "## ---------------------------------- ##
+## Report this to xvid-devel at xvid.org ##
-+## ---------------------------------- ##
-+_ASBOX
++## ---------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
@@ -3220,7 +3229,7 @@ Patch to update the build system via libtoolize and autoreconf.
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by Xvid $as_me 1.2.2, which was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ $ $0 $@
+
@@ -3269,7 +3278,7 @@ Patch to update the build system via libtoolize and autoreconf.
## Core tests. ##
## ----------- ##
-@@ -1037,7 +1897,6 @@
+@@ -1037,7 +1896,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -3277,7 +3286,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 +1907,13 @@
+@@ -1048,13 +1906,13 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -3295,7 +3304,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,21 +1929,19 @@
+@@ -1070,104 +1928,115 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -3322,8 +3331,15 @@ Patch to update the build system via libtoolize and autoreconf.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1097,20 +1954,35 @@
- _ASBOX
+ echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
++ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
-{
@@ -3367,8 +3383,13 @@ Patch to update the build system via libtoolize and autoreconf.
+)
echo
- cat <<\_ASBOX
-@@ -1121,22 +1993,28 @@
+- cat <<\_ASBOX
+-## ----------------- ##
++ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -3383,14 +3404,14 @@ Patch to update the build system via libtoolize and autoreconf.
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
+- cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-+## ------------------- ##
+-_ASBOX
++ $as_echo "## ------------------- ##
+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
++## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@ -3404,9 +3425,15 @@ Patch to update the build system via libtoolize and autoreconf.
done | sort
echo
fi
-@@ -1148,26 +2026,26 @@
- ## ----------- ##
- _ASBOX
+
+ if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
++ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
echo
- sed "/^$/d" confdefs.h | sort
+ cat confdefs.h
@@ -3441,7 +3468,7 @@ Patch to update the build system via libtoolize and autoreconf.
# Predefined preprocessor variables.
-@@ -1175,112 +2053,128 @@
+@@ -1175,112 +2044,137 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
@@ -3482,7 +3509,12 @@ Patch to update the build system via libtoolize and autoreconf.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
-+ ac_site_file1=$CONFIG_SITE
++ # We do not want a PATH search for config.site.
++ case $CONFIG_SITE in #((
++ -*) ac_site_file1=./$CONFIG_SITE;;
++ */*) ac_site_file1=$CONFIG_SITE;;
++ *) ac_site_file1=./$CONFIG_SITE;;
++ esac
+elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
@@ -3501,7 +3533,12 @@ Patch to update the build system via libtoolize and autoreconf.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+- . "$ac_site_file"
++ . "$ac_site_file" \
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
@@ -3610,7 +3647,7 @@ Patch to update the build system via libtoolize and autoreconf.
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
@@ -3618,7 +3655,7 @@ Patch to update the build system via libtoolize and autoreconf.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1291,31 +2185,6 @@
+@@ -1291,31 +2185,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3650,7 +3687,7 @@ Patch to update the build system via libtoolize and autoreconf.
API_MAJOR="4"
API_MINOR="2"
-@@ -1335,35 +2204,34 @@
+@@ -1335,35 +2204,34 @@ our_cflags_defaults="$our_cflags_default
FEATURES=""
@@ -3665,12 +3702,12 @@ Patch to update the build system via libtoolize and autoreconf.
fi
-fi;
+fi
-+
-# Check whether --enable-iprofile or --disable-iprofile was given.
-if test "${enable_iprofile+set}" = set; then
- enableval="$enable_iprofile"
- if test "$enable_iprofile" = "yes" ; then
++
+# Check whether --enable-iprofile was given.
+if test "${enable_iprofile+set}" = set; then :
+ enableval=$enable_iprofile; if test "$enable_iprofile" = "yes" ; then
@@ -3678,12 +3715,12 @@ Patch to update the build system via libtoolize and autoreconf.
fi
-fi;
+fi
-+
-# Check whether --enable-gnuprofile or --disable-gnuprofile was given.
-if test "${enable_gnuprofile+set}" = set; then
- enableval="$enable_gnuprofile"
- if test "$enable_gnuprofile" = "yes" ; then
++
+# Check whether --enable-gnuprofile was given.
+if test "${enable_gnuprofile+set}" = set; then :
+ enableval=$enable_gnuprofile; if test "$enable_gnuprofile" = "yes" ; then
@@ -3692,30 +3729,30 @@ Patch to update the build system via libtoolize and autoreconf.
fi
-fi;
+fi
-+
-# Check whether --enable-assembly or --disable-assembly was given.
-if test "${enable_assembly+set}" = set; then
- enableval="$enable_assembly"
- if test "$enable_assembly" = "no" ; then
++
+# Check whether --enable-assembly was given.
+if test "${enable_assembly+set}" = set; then :
+ enableval=$enable_assembly; if test "$enable_assembly" = "no" ; then
assembly="no"
else
if test "$enable_assembly" = "yes" ; then
-@@ -1372,121 +2240,148 @@
+@@ -1372,121 +2240,154 @@ if test "${enable_assembly+set}" = set;
fi
else
assembly="yes"
-fi;
+fi
-+
-# Check whether --enable-macosx_module or --disable-macosx_module was given.
-if test "${enable_macosx_module+set}" = set; then
- enableval="$enable_macosx_module"
- if test "$enable_macosx_module" = "yes" ; then
++
+# Check whether --enable-macosx_module was given.
+if test "${enable_macosx_module+set}" = set; then :
+ enableval=$enable_macosx_module; if test "$enable_macosx_module" = "yes" ; then
@@ -3734,26 +3771,22 @@ Patch to update the build system via libtoolize and autoreconf.
ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install-sh -c"
-- break
++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
++ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
- elif test -f $ac_dir/install.sh; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install.sh -c"
-- break
++ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
- elif test -f $ac_dir/shtool; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/shtool install -c"
-- break
-- fi
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+ for ac_t in install-sh install.sh shtool; do
-+ if test -f "$ac_dir/$ac_t"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/$ac_t -c"
-+ break 2
-+ fi
-+ done
++ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
@@ -3763,7 +3796,7 @@ Patch to update the build system via libtoolize and autoreconf.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
@@ -3798,7 +3831,7 @@ Patch to update the build system via libtoolize and autoreconf.
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
@@ -3812,16 +3845,16 @@ Patch to update the build system via libtoolize and autoreconf.
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
-+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+esac
build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -3863,7 +3896,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
fi
@@ -3873,7 +3906,7 @@ Patch to update the build system via libtoolize and autoreconf.
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+esac
host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -3915,7 +3948,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ ac_cv_target=$ac_cv_host
+else
+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
fi
@@ -3925,7 +3958,7 @@ Patch to update the build system via libtoolize and autoreconf.
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+esac
target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -3945,7 +3978,7 @@ Patch to update the build system via libtoolize and autoreconf.
# The aliases save the names the user supplied, while $host etc.
-@@ -1497,16 +2392,16 @@
+@@ -1497,16 +2398,16 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
@@ -3968,7 +4001,7 @@ Patch to update the build system via libtoolize and autoreconf.
fi
ac_ext=c
-@@ -1517,10 +2412,10 @@
+@@ -1517,10 +2418,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
@@ -3983,7 +4016,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 +2425,37 @@
+@@ -1530,35 +2431,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4033,7 +4066,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 +2465,50 @@
+@@ -1568,39 +2471,50 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4099,7 +4132,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 +2518,37 @@
+@@ -1610,77 +2524,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4191,7 +4224,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 +2559,19 @@
+@@ -1691,18 +2565,19 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4215,7 +4248,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 +2589,25 @@
+@@ -1720,24 +2595,25 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4250,7 +4283,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 +2617,41 @@
+@@ -1747,39 +2623,41 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4305,7 +4338,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 +2661,78 @@
+@@ -1789,66 +2667,78 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4366,8 +4399,8 @@ Patch to update the build system via libtoolize and autoreconf.
- { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
@@ -4420,7 +4453,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -1860,112 +2744,109 @@
+@@ -1860,112 +2750,108 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -4534,9 +4567,8 @@ Patch to update the build system via libtoolize and autoreconf.
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
@@ -4612,7 +4644,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 +2854,90 @@
+@@ -1973,38 +2859,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
@@ -4637,8 +4669,8 @@ Patch to update the build system via libtoolize and autoreconf.
-echo "${ECHO_T}$ac_cv_exeext" >&6
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4704,9 +4736,9 @@ Patch to update the build system via libtoolize and autoreconf.
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+fi
@@ -4724,7 +4756,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -2016,45 +2949,46 @@
+@@ -2016,45 +2954,46 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -4766,8 +4798,8 @@ Patch to update the build system via libtoolize and autoreconf.
- { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -4796,7 +4828,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -2068,55 +3002,34 @@
+@@ -2068,55 +3007,34 @@ main ()
return 0;
}
_ACEOF
@@ -4872,7 +4904,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
int
-@@ -2127,39 +3040,49 @@
+@@ -2127,39 +3045,49 @@ main ()
return 0;
}
_ACEOF
@@ -4934,6 +4966,8 @@ Patch to update the build system via libtoolize and autoreconf.
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -4941,8 +4975,6 @@ Patch to update the build system via libtoolize and autoreconf.
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
@@ -4950,7 +4982,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 +3098,14 @@
+@@ -2175,18 +3103,14 @@ else
CFLAGS=
fi
fi
@@ -4975,7 +5007,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -2214,12 +3133,17 @@
+@@ -2214,12 +3138,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
@@ -4995,7 +5027,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 +3158,37 @@
+@@ -2234,205 +3163,37 @@ return f (e, argv, 0) != argv[0] || f
return 0;
}
_ACEOF
@@ -5072,8 +5104,7 @@ 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
@@ -5200,8 +5231,9 @@ Patch to update the build system via libtoolize and autoreconf.
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
@@ -5209,18 +5241,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 +3210,23 @@
+@@ -2454,22 +3215,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.
@@ -5252,7 +5284,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 +3234,7 @@
+@@ -2477,7 +3239,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5261,7 +5293,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 +3244,43 @@
+@@ -2487,30 +3249,43 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -5313,7 +5345,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 +3295,10 @@
+@@ -2525,10 +3300,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
@@ -5328,7 +5360,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 +3308,37 @@
+@@ -2538,35 +3313,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5378,7 +5410,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 +3348,38 @@
+@@ -2576,28 +3353,38 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5427,7 +5459,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -2607,43 +3389,43 @@
+@@ -2607,43 +3394,43 @@ fi
ARCHITECTURE=""
@@ -5489,7 +5521,7 @@ Patch to update the build system via libtoolize and autoreconf.
ARCHITECTURE="GENERIC"
fi
-@@ -2655,15 +3437,15 @@
+@@ -2655,15 +3442,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
@@ -5509,7 +5541,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 +3459,7 @@
+@@ -2677,11 +3464,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.
@@ -5522,7 +5554,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2690,68 +3468,24 @@
+@@ -2690,78 +3473,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5554,7 +5586,8 @@ Patch to update the build system via libtoolize and autoreconf.
# Broken: fails on valid input.
continue
fi
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
@@ -5596,16 +5629,20 @@ Patch to update the build system via libtoolize and autoreconf.
# Passes both tests.
ac_preproc_ok=:
break
-@@ -2761,7 +3495,7 @@
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
++rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
break
fi
-@@ -2773,8 +3507,8 @@
+@@ -2773,8 +3512,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -5616,7 +5653,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 +3518,7 @@
+@@ -2784,11 +3523,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.
@@ -5629,7 +5666,7 @@ Patch to update the build system via libtoolize and autoreconf.
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2797,68 +3527,24 @@
+@@ -2797,85 +3532,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5661,7 +5698,8 @@ Patch to update the build system via libtoolize and autoreconf.
# Broken: fails on valid input.
continue
fi
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
@@ -5703,12 +5741,16 @@ Patch to update the build system via libtoolize and autoreconf.
# Passes both tests.
ac_preproc_ok=:
break
-@@ -2868,14 +3554,13 @@
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
++rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
else
@@ -5719,12 +5761,12 @@ Patch to update the build system via libtoolize and autoreconf.
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
-@@ -2885,31 +3570,142 @@
+@@ -2885,31 +3575,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5774,7 +5816,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
@@ -5787,35 +5829,23 @@ Patch to update the build system via libtoolize and autoreconf.
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
-+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ 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 :
+ $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
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -5852,7 +5882,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
@@ -5865,29 +5895,41 @@ Patch to update the build system via libtoolize and autoreconf.
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
-+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
-+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
+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
+ 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. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -2924,51 +3720,23 @@
+@@ -2924,51 +3725,23 @@ main ()
return 0;
}
_ACEOF
@@ -5945,7 +5987,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
ac_cv_header_stdc=no
fi
-@@ -2978,18 +3746,14 @@
+@@ -2978,18 +3751,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5967,7 +6009,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
ac_cv_header_stdc=no
fi
-@@ -2999,16 +3763,13 @@
+@@ -2999,16 +3768,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.
@@ -5987,7 +6029,7 @@ 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 +3789,356 @@
+@@ -3028,810 +3794,354 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -6047,8 +6089,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ 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
+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++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
@@ -6124,9 +6165,8 @@ Patch to update the build system via libtoolize and autoreconf.
+ 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_set_status 77
-+as_fn_error "cannot compute sizeof (int *)
-+See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (int *)
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ac_cv_sizeof_int_p=0
+ fi
@@ -6216,7 +6256,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ BUS="64BIT"
+ ;;
+ *)
-+ as_fn_error "Xvid supports only 32/64 bit architectures" "$LINENO" 5
++ as_fn_error $? "Xvid supports only 32/64 bit architectures" "$LINENO" 5
+ ;;
+esac
+
@@ -6612,15 +6652,15 @@ Patch to update the build system via libtoolize and autoreconf.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-esac
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
+-else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
--else
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -6693,19 +6733,19 @@ Patch to update the build system via libtoolize and autoreconf.
-echo "$as_me: error: cannot compute sizeof (int *), 77
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+-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 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
-rm -f conftest.val
-else
- ac_cv_sizeof_int_p=0
--fi
++
++ fi
+ fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int_p" >&6
@@ -6968,8 +7008,8 @@ Patch to update the build system via libtoolize and autoreconf.
+
+ ;; #(
+ *)
-+ as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ as_fn_error $? "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
@@ -7025,7 +7065,7 @@ Patch to update the build system via libtoolize and autoreconf.
STATIC_EXTENSION="a"
SHARED_EXTENSION="so"
OBJECT_EXTENSION="o"
-@@ -3839,31 +4146,31 @@
+@@ -3839,31 +4149,31 @@ echo "${ECHO_T}Unknown OS - Using .so .a
esac
@@ -7065,7 +7105,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 +4180,29 @@
+@@ -3873,29 +4183,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
@@ -7103,7 +7143,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 +4230,10 @@
+@@ -3923,10 +4233,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
@@ -7118,7 +7158,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 +4244,19 @@
+@@ -3937,18 +4247,19 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7142,7 +7182,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 +4275,27 @@
+@@ -3967,26 +4278,27 @@ fi
fi
ac_yasm=$ac_cv_prog_ac_yasm
if test -n "$ac_yasm"; then
@@ -7180,7 +7220,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
found_nasm_comp_prog="yes"
chosen_asm_prog="$yasm_prog"
-@@ -3996,10 +4305,10 @@
+@@ -3996,10 +4308,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
@@ -7195,7 +7235,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 +4319,19 @@
+@@ -4010,18 +4322,19 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7219,7 +7259,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 +4350,17 @@
+@@ -4040,16 +4353,17 @@ fi
fi
ac_nasm=$ac_cv_prog_ac_nasm
if test -n "$ac_nasm"; then
@@ -7243,7 +7283,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 +4369,12 @@
+@@ -4058,12 +4372,12 @@ echo $ECHO_N "checking for nasm version.
if test -z $nasm_major ; then
nasm_major=-1
fi
@@ -7260,7 +7300,7 @@ Patch to update the build system via libtoolize and autoreconf.
else
found_nasm_comp_prog="yes"
chosen_asm_prog="$nasm_prog"
-@@ -4072,17 +4383,17 @@
+@@ -4072,17 +4386,17 @@ echo "$as_me: WARNING: nasm version is t
fi
if test "$found_nasm_comp_prog" = "yes" ; then
@@ -7284,7 +7324,7 @@ Patch to update the build system via libtoolize and autoreconf.
NASM_FORMAT="elf"
fi
MARK_FUNCS="-DMARK_FUNCS"
-@@ -4090,20 +4401,20 @@
+@@ -4090,20 +4404,20 @@ echo "${ECHO_T}elf" >&6
;;
[cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
if test "$ARCHITECTURE" = "X86_64" ; then
@@ -7311,7 +7351,7 @@ Patch to update the build system via libtoolize and autoreconf.
NASM_FORMAT="macho"
PREFIX="-DPREFIX"
MARK_FUNCS=""
-@@ -4118,8 +4429,8 @@
+@@ -4118,8 +4432,8 @@ echo "${ECHO_T}macho" >&6
AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
fi
else
@@ -7322,7 +7362,7 @@ Patch to update the build system via libtoolize and autoreconf.
ARCHITECTURE="GENERIC"
fi
fi
-@@ -4131,26 +4442,26 @@
+@@ -4131,26 +4445,26 @@ if test "$ARCHITECTURE" = "PPC" ; then
ASSEMBLY_EXTENSION=".s"
ASSEMBLY_SOURCES=""
@@ -7357,7 +7397,7 @@ Patch to update the build system via libtoolize and autoreconf.
cat > conftest.c << EOF
#ifdef HAVE_ALTIVEC_H
#include <altivec.h>
-@@ -4165,8 +4476,8 @@
+@@ -4165,8 +4479,8 @@ int main()
}
EOF
if $CC $TEMP_ALTIVEC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then
@@ -7368,7 +7408,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 +4495,13 @@
+@@ -4184,13 +4498,13 @@ int main()
}
EOF
if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
@@ -7386,7 +7426,7 @@ Patch to update the build system via libtoolize and autoreconf.
ARCHITECTURE="GENERIC"
fi
fi
-@@ -4221,12 +4532,6 @@
+@@ -4221,12 +4535,6 @@ if test "$ARCHITECTURE" = "IA64" ; then
fi
@@ -7399,7 +7439,7 @@ Patch to update the build system via libtoolize and autoreconf.
for ac_header in stdio.h \
signal.h \
stdlib.h \
-@@ -4234,443 +4539,159 @@
+@@ -4234,443 +4542,160 @@ for ac_header in stdio.h \
assert.h \
math.h \
@@ -7546,8 +7586,7 @@ Patch to update the build system via libtoolize and autoreconf.
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -7557,7 +7596,7 @@ Patch to update the build system via libtoolize and autoreconf.
- { { echo "$as_me:$LINENO: error: Missing header file" >&5
-echo "$as_me: error: Missing header file" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "Missing header file" "$LINENO" 5
++ as_fn_error $? "Missing header file" "$LINENO" 5
fi
done
@@ -7806,7 +7845,9 @@ Patch to update the build system via libtoolize and autoreconf.
+
+# ac_fn_c_try_link LINENO
+# -----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded.
++# 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
@@ -7936,7 +7977,7 @@ Patch to update the build system via libtoolize and autoreconf.
fi
-@@ -4755,7 +4776,7 @@
+@@ -4755,7 +4780,7 @@ fi
@@ -7945,7 +7986,7 @@ Patch to update the build system via libtoolize and autoreconf.
cat >confcache <<\_ACEOF
-@@ -4776,39 +4797,59 @@
+@@ -4776,39 +4801,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.
@@ -8023,7 +8064,7 @@ Patch to update the build system via libtoolize and autoreconf.
fi
fi
rm -f confcache
-@@ -4817,63 +4858,54 @@
+@@ -4817,63 +4862,55 @@ test "x$prefix" = xNONE && prefix=$ac_de
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -8104,6 +8145,7 @@ Patch to update the build system via libtoolize and autoreconf.
ac_libobjs=
ac_ltlibobjs=
++U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
@@ -8120,7 +8162,7 @@ Patch to update the build system via libtoolize and autoreconf.
done
LIBOBJS=$ac_libobjs
-@@ -4881,12 +4913,15 @@
+@@ -4881,12 +4918,15 @@ LTLIBOBJS=$ac_ltlibobjs
@@ -8139,7 +8181,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 +4931,252 @@
+@@ -4896,81 +4936,252 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -8234,9 +8276,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ PATH_SEPARATOR=';'
+ }
+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
@@ -8256,7 +8296,9 @@ 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'
@@ -8302,24 +8344,22 @@ Patch to update the build system via libtoolize and autoreconf.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
-+ $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
++
+
+# as_fn_set_status STATUS
+# -----------------------
@@ -8328,7 +8368,9 @@ 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.
@@ -8436,7 +8478,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 +5184,123 @@
+@@ -4978,148 +5189,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -8603,7 +8645,7 @@ Patch to update the build system via libtoolize and autoreconf.
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
-
++
+
+# as_fn_mkdir_p
+# -------------
@@ -8648,9 +8690,9 @@ Patch to update the build system via libtoolize and autoreconf.
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
@@ -8686,7 +8728,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 +5309,20 @@
+@@ -5128,31 +5314,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -8724,11 +8766,11 @@ Patch to update the build system via libtoolize and autoreconf.
+ac_log="
This file was extended by Xvid $as_me 1.2.2, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -5160,125 +5330,111 @@
+@@ -5160,125 +5335,117 @@ generated by GNU Autoconf 2.59. Invocat
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -8806,11 +8848,11 @@ Patch to update the build system via libtoolize and autoreconf.
Xvid config.status 1.2.2
-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.65,
++configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
@@ -8831,14 +8873,20 @@ Patch to update the build system via libtoolize and autoreconf.
while test $# != 0
do
case $1 in
- --*=*)
+- --*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- -*)
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
ac_option=$1
ac_optarg=$2
@@ -8883,6 +8931,7 @@ Patch to update the build system via libtoolize and autoreconf.
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -8898,7 +8947,7 @@ Patch to update the build system via libtoolize and autoreconf.
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ -*) as_fn_error "unrecognized option: \`$1'
++ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1" ;;
@@ -8907,7 +8956,7 @@ Patch to update the build system via libtoolize and autoreconf.
esac
shift
-@@ -5292,30 +5448,44 @@
+@@ -5292,30 +5459,44 @@ if $ac_cs_silent; then
fi
_ACEOF
@@ -8956,7 +9005,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ case $ac_config_target in
+ "platform.inc") CONFIG_FILES="$CONFIG_FILES platform.inc" ;;
+
-+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -8964,7 +9013,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 +5495,408 @@
+@@ -5325,372 +5506,416 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -8999,7 +9048,7 @@ Patch to update the build system via libtoolize and autoreconf.
-} ||
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
@@ -9016,7 +9065,7 @@ Patch to update the build system via libtoolize and autoreconf.
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+ ac_cs_awk_cr='\r'
++ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
@@ -9030,18 +9079,18 @@ Patch to update the build system via libtoolize and autoreconf.
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
@@ -9132,21 +9181,29 @@ Patch to update the build system via libtoolize and autoreconf.
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[ ]*\):*/\1/
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
++h
++s///
++s/^/:/
++s/[ ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+s/:*$//
++x
++s/\(=[ ]*\).*/\1/
++G
++s/\n//
+s/^[^=]*=[ ]*$//
+}'
+fi
@@ -9291,7 +9348,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
-+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
@@ -9319,7 +9376,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
-+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
@@ -9363,7 +9420,7 @@ Patch to update the build system via libtoolize and autoreconf.
- * ) ac_file_in=$ac_file.in ;;
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
esac
@@ -9650,15 +9707,15 @@ Patch to update the build system via libtoolize and autoreconf.
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
++which seems to be undefined. Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&2;}
++which seems to be undefined. Please make sure it is defined" >&2;}
-done
-_ACEOF
@@ -9667,7 +9724,7 @@ Patch to update the build system via libtoolize and autoreconf.
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
@@ -9685,17 +9742,17 @@ Patch to update the build system via libtoolize and autoreconf.
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
-+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -5710,6 +5916,10 @@
+@@ -5710,6 +5935,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.
- $ac_cs_success || { (exit 1); exit 1; }
-+ $ac_cs_success || as_fn_exit $?
++ $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--
xvidcore packaging
More information about the pkg-multimedia-commits
mailing list