[Mplayer-cvslog] CVS: main configure,1.88,1.89

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv29519

Modified Files:
	configure 
Log Message:
--disable-xmga and alsa detection bug fix

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** configure	2001/06/21 00:06:40	1.88
--- configure	2001/06/21 15:16:52	1.89
***************
*** 346,350 ****
  _mlib=no
  _mpg123=no
! _xmga=no
  _dga=no
  _dga2=no
--- 346,350 ----
  _mlib=no
  _mpg123=no
! _xmga=autodetect
  _dga=no
  _dga2=no
***************
*** 393,414 ****
          _mmx2=yes
          ;;
!   mtrr)
          _mtrr=yes
          ;;
!   k6_mtrr)
!         _mtrr=yes
!         ;;
!   xmm)
!         _sse=yes
!         _mmx2=yes
!         ;;
!   sse)
          _sse=yes
          _mmx2=yes
          ;;
-   kni)
-         _sse=yes
-         _mmx2=yes
-         ;;
   esac
  
--- 393,403 ----
          _mmx2=yes
          ;;
!   mtrr|k6_mtrr)
          _mtrr=yes
          ;;
!   xmm|sse|kni)
          _sse=yes
          _mmx2=yes
          ;;
   esac
  
***************
*** 737,741 ****
  
  _alsaver='not found'
! $_cc -o $TMPO -lasound $TMPC 2> /dev/null || _alsa=no
  [ $_alsa = 'yes' ] && $TMPO && { _alsaver='0.5.x'; }
  
--- 726,730 ----
  
  _alsaver='not found'
! $_cc -o $TMPO -lasound -ldl -lpthread $TMPC 2> /dev/null || _alsa=no
  [ $_alsa = 'yes' ] && $TMPO && { _alsaver='0.5.x'; }
  
***************
*** 748,752 ****
  
  _alsaver='not found'
! $_cc -o $TMPO -lasound $TMPC 2> /dev/null || _alsa=no
  [ $_alsa = 'yes' ] && $TMPO && { _alsaver='0.9.x'; }
  fi
--- 737,741 ----
  
  _alsaver='not found'
! $_cc -o $TMPO -lasound -ldl -lpthread $TMPC 2> /dev/null || _alsa=no
  [ $_alsa = 'yes' ] && $TMPO && { _alsaver='0.9.x'; }
  fi
***************
*** 1086,1092 ****
  fi
  
! if [ $_x11 = 'yes' ]; then
!  if [ $_mga = 'yes' ]; then
    _xmga=yes
   fi
  fi
--- 1075,1083 ----
  fi
  
! if [ "$_xmga" == "autodetect" ]; then
!  if [ $_x11 = 'yes' ] && [ $_mga = 'yes' ]; then
    _xmga=yes
+  else
+   _xmga=no
   fi
  fi
***************
*** 1421,1426 ****
--- 1412,1421 ----
   _mga='#undef HAVE_MGA'
  fi
+ 
  if [ $_xmga = yes ]; then
   _vosrc=$_vosrc' vo_xmga.c'
+  _xmga='#define HAVE_XMGA'
+ else
+  _xmga='#undef HAVE_XMGA' 
  fi
  
***************
*** 1611,1614 ****
--- 1606,1610 ----
  $_3dfx
  $_mga
+ $_xmga
  $_syncfb
  $_fbdev


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog