[Mplayer-cvslog] CVS: main configure,1.85,1.86

[Felix Buenemann]

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

Modified Files:
	configure 
Log Message:
Added GGI autodetect, fixed --enable-debug=* for solaris n stuff.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** configure	2001/06/13 00:50:21	1.85
--- configure	2001/06/15 16:32:21	1.86
***************
*** 111,114 ****
--- 111,115 ----
          --enable-svga           build with SVGAlib support [autodetect]
          --enable-sdl            build with SDL render support [autodetect]
+         --enable-ggi            build with GGI render support [autodetect]
          --enable-mga            build with mga_vid support [autodetect, if /dev/mga_vid
                                  is available]
***************
*** 292,295 ****
--- 293,297 ----
  _gl=no
  _sdl=no
+ _ggi=no
  _xv=no
  _vm=no
***************
*** 317,320 ****
--- 319,323 ----
  _sdllib=
  _sdlcflags=
+ _ggilib=
  _xvlib=
  _x11lib=
***************
*** 569,572 ****
--- 572,578 ----
  $_cc $TMPC -o $TMPO -lpng -lz -lm > /dev/null 2>&1 && _png=yes
  
+ _ggi=no
+ $_cc $TMPC -o $TMPO -lggi > /dev/null 2>&1 && _ggi=yes
+ 
  _binutils=no
  $_as libac3/downmix/downmix_i386.S -o $TMPO > /dev/null 2>&1 && _binutils=yes
***************
*** 712,716 ****
  	;;
    --enable-debug=*)
!         _debug=`echo -n '-g'; echo $ac_option | cut -d '=' -f 2`
  	;;
    --enable-css)
--- 718,722 ----
  	;;
    --enable-debug=*)
!         _debug=`echo $_echo_n '-g'$_echo_c; echo $ac_option | cut -d '=' -f 2`
  	;;
    --enable-css)
***************
*** 745,748 ****
--- 751,757 ----
          _sdl=yes
          ;;
+   --enable-ggi)
+         _ggi=yes
+         ;;
    --enable-mga)
          _mga=yes
***************
*** 834,837 ****
--- 843,849 ----
          _sdl=no
          ;;
+   --disable-ggi)
+         _ggi=no
+         ;;
    --disable-mga)
          _mga=no
***************
*** 1030,1033 ****
--- 1042,1046 ----
  echo "Checking for xmga ... $_xmga" 
  echo "Checking for SDL ... $_sdl"
+ echo "Checking for GGI ... $_ggi"
  echo "Checking for OpenGL ... $_gl"
  echo "Checking for Xv ... $_xv"
***************
*** 1109,1112 ****
--- 1122,1129 ----
  fi
  
+ if [ $_ggi = yes ]; then
+   _ggilib='-lggi'
+ fi
+ 
  if [ $_dga = yes ]; then
    _dgalib='-lXxf86dga'
***************
*** 1204,1209 ****
  # OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
  OPTFLAGS=$CFLAGS
! # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib
! X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
--- 1221,1226 ----
  # OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
  OPTFLAGS=$CFLAGS
! # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib
! X_LIBS=$_x11libdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
***************
*** 1294,1297 ****
--- 1311,1321 ----
  fi
  
+ if [ $_ggi = yes ]; then
+  _ggi='#define HAVE_GGI'
+  _vosrc=$_vosrc' vo_ggi.c'
+ else
+  _ggi='#undef HAVE_GGI'
+ fi
+ 
  if [ $_x11 = yes ]; then
   _x11='#define HAVE_X11'
***************
*** 1509,1512 ****
--- 1533,1537 ----
  /* defined for SDLlib with keyrepeat bugs (before 1.2.1) */
  $_sdlbuggy
+ $_ggi
  $_3dfx
  $_mga


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