[Mplayer-cvslog] CVS: main configure,1.266,1.267
pl
pl at mplayer.dev.hu
Mon Nov 19 13:04:21 CET 2001
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv16609
Modified Files:
configure
Log Message:
better support for --target: new boolean function x86()
added 3dfx & tdfx to --help
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- configure 19 Nov 2001 10:37:48 -0000 1.266
+++ configure 19 Nov 2001 12:04:19 -0000 1.267
@@ -61,6 +61,14 @@
bsd() { freebsd || netbsd || bsdos || openbsd ; return "$?" ; }
qnx() { test "$system_name" = "QNX" ; return "$?" ; }
+# arch test boolean functions
+x86() {
+ case "$host_arch" in
+ i[3-9]86|x86*) return 0 ;;
+ *) return 1 ;;
+ esac
+}
+
# Use this before starting a check
echocheck() {
echo "============ Checking for $@ ============" >> "$TMPLOG"
@@ -131,6 +139,8 @@
--enable-x11 build with X11 render support [autodetect]
--enable-fbdev build with FBDev render support [disable]
--enable-mlib build with MLIB support (Solaris only) [disable]
+ --enable-3dfx build with 3dfx support [disable]
+ --enable-tdfxfb build with tdfxfb support [disable]
Audio:
--disable-ossaudio disable OSS sound support [autodetect]
@@ -147,8 +157,6 @@
(Available: $LANGUAGES)
--disable-select disable audio select() support (for example, required
for ALSA or Vortex2 driver) [enable]
- --size-x=SIZE default screen width
- --size-y=SIZE default screen height
Advanced options:
--enable-mmx build with mmx support [autodetect]
@@ -371,8 +379,7 @@
fi
# Try to find the available options for the current CPU
-if test "$host_arch" = i386 || test "$host_arch" = i486 ||
- test "$host_arch" = i586 || test "$host_arch" = i686; then
+if x86 ; then
if test -r /proc/cpuinfo ; then
# linux with /proc mounted, extract cpu information from it
_cpuinfo="cat /proc/cpuinfo"
@@ -427,7 +434,7 @@
case "$host_arch" in
- i386|i486|i586|i686)
+ i[3-9]86|x86*)
_def_arch="#define ARCH_X86 1"
_target_arch="TARGET_ARCH_X86 = yes"
_def_words_endian="#undef WORDS_BIGENDIAN"
@@ -583,7 +590,7 @@
echores "$_binutils"
-if test "$host_arch" = i386 ; then
+if x86 ; then
extcheck() {
if test "$1" = yes ; then
echocheck "kernel support of $2"
@@ -852,7 +859,7 @@
-if test "$host_arch" = i386 ; then
+if x86 ; then
# Checking assembler (_as) compatibility...
# Added workaround for older as that reads from stdin by default - atmos
as_version=`echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p'`
@@ -907,7 +914,7 @@
# Checking kernel version...
-if test "$host_arch" = i386 && linux ; then
+if x86 && linux ; then
_k_verc_problem=no
kernel_version=`uname -r 2>&1`
echocheck "$system_name kernel version"
@@ -1842,8 +1849,7 @@
echocheck "Win32 DLL support"
if test "$_win32" = auto ; then
_win32=no
- if test "$host_arch" = i386 || test "$host_arch" = i486 ||
- test "$host_arch" = i586 || test "$host_arch" = i686; then
+ if x86 ; then
if test -z "$_win32libdir" ; then
for I in /usr/local/lib/win32 /usr/lib/win32 ; do
if test -d "$I" ; then
@@ -1917,8 +1923,7 @@
if test "$_xanim" = auto ; then
_xanim=no
if test "$_dl" = yes ; then
- if test "$host_arch" = i386 || test "$host_arch" = i486 ||
- test "$host_arch" = i586 || test "$host_arch" = i686; then
+ if x86 ; then
if test -z "$_xanimlibdir" ; then
for I in /usr/local/lib/xanim/mods /usr/lib/xanim/mods ; do
if test -d "$I" ; then
@@ -2219,7 +2224,7 @@
if test "$_profile" || test "$_debug" ; then
CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
elif test -z "$CFLAGS" ; then
- if [ "$host_arch" != "mips" ]; then
+ if test "$host_arch" != "mips" ; then
CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
else
CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer"
@@ -2659,7 +2664,7 @@
EOF
fi
-if test "$host_arch" = "i386" ; then
+if x86 ; then
if test "$_win32" = no ; then
if test "$_win32libdir" ; then
cat <<EOF
More information about the MPlayer-cvslog
mailing list