[MPlayer-cvslog] CVS: main configure,1.1162,1.1163

Diego Biurrun CVS syncmail at mplayerhq.hu
Sat Apr 22 13:03:48 CEST 2006


CVS change done by Diego Biurrun CVS

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

Modified Files:
	configure 
Log Message:
Blacklist certain gcc versions instead of running an expensive compilation
during the internal FAAD check.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -u -r1.1162 -r1.1163
--- configure	18 Apr 2006 21:16:46 -0000	1.1162
+++ configure	22 Apr 2006 11:03:45 -0000	1.1163
@@ -5665,22 +5665,17 @@
 echores "$_faac"
 
 echocheck "internal FAAD2 (AAC) support"
-_inc_faad="-I`pwd`/libfaad2"
 if test "$_faad_internal" = auto ; then
-  # the faad check needs a config.h file
-  if not test -f "config.h" ; then
-    cat > config.h << EOF
-/* C99 lrintf function available */
-$_def_lrintf
-EOF
-  fi
-  # internal faad: check if our dear gcc is able to compile it...
-  cp "`pwd`/libfaad2/cfft.c" $TMPC
-  if ( cc_check -c -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer -D_GNU_SOURCE $_inc_faad ); then
-    _faad_internal=yes
-  else
-    _faad_internal=no
-    _res_comment="(broken gcc)"
+  if x86 && test cc_vendor=gnu; then
+    case $cc_version in
+      3.1*|3.2) # ICE/insn with these versions
+        _faad_internal=no
+        _res_comment="broken gcc"
+        ;;
+      *)
+        _faad_internal=yes
+        ;;
+    esac
   fi
 fi
 if test "$_faad_internal" = yes ; then




More information about the MPlayer-cvslog mailing list