[MPlayer-cvslog] CVS: main ChangeLog, 1.263, 1.264 configure, 1.1101, 1.1102

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv27405

Modified Files:
	ChangeLog configure 
Log Message:
Configure support for Cyrix C3


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- ChangeLog	6 Nov 2005 17:46:26 -0000	1.263
+++ ChangeLog	12 Nov 2005 08:25:04 -0000	1.264
@@ -126,7 +126,7 @@
     * -rawaudio/-rawvideo requires -demuxer rawaudio/-demuxer rawvideo
     * libdvdcss updated to 1.2.9
     * ~/.dvdcss is used instead of ~/.mplayer/DVDKeys for cached CSS keys
-    * configure check and compiler optimizations for VIA C3 and Pentium-M
+    * configure check and compiler optimizations for VIA C3, C3-2 and Pentium-M
     * configure check and compiler optimizations for AMD-64 extended
     * configure can now run with cross compiling, new configure option
       --enable-cross-compile

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1101
retrieving revision 1.1102
diff -u -r1.1101 -r1.1102
--- configure	7 Nov 2005 10:30:37 -0000	1.1101
+++ configure	12 Nov 2005 08:25:04 -0000	1.1102
@@ -914,6 +914,8 @@
         _mmx2=no
 	if test "$pmodel" -ge 9; then
 		proc=c3-2
+	elif test "$pmodel" -ge 7; then
+		proc=c3
 	else
 		proc=i686
 	fi
@@ -973,7 +975,7 @@
     if test "$proc" = "i686" || test "$proc" = "pentium-mmx" || test "$proc" = "winchip-c6" || test "$proc" = "winchip2"; then
       cc_check -march=$proc $cpuopt=$proc  || proc=i586
     fi
-    if test "$proc" = "i586" || test "$proc" = "c3" ; then
+    if test "$proc" = "i586" || test "$proc" = "c3" || test "$proc" = "c3-2"; then
       cc_check -march=$proc $cpuopt=$proc  || proc=i486
     fi
     if test "$proc" = "i486" ; then