CVS: main configure,1.19,1.20

14 Apr 2001


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

Modified Files:
	configure 
Log Message:
small fixes, x11libdir and --disable-x11 works before the detection

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** configure	2001/04/11 20:08:27	1.19
--- configure	2001/04/14 21:16:23	1.20
***************
*** 131,135 ****
--- 131,145 ----
  
  _cc=gcc
+ _x11=auto
  
+ _x11libdir=
+ if [ -e /usr/X11R6 ]; then
+  _x11libdir=-L/usr/X11R6/lib
+ else
+  if [ -e /usr/X11 ]; then
+   _x11libdir=-L/usr/X11/lib
+  fi
+ fi
+ 
  for ac_option
  do
***************
*** 138,141 ****
--- 148,160 ----
          _cc=`echo $ac_option | cut -d '=' -f 2`
          ;;
+   --with-x11libdir=*)
+         _x11libdir=-L`echo $ac_option | cut -d '=' -f 2`
+         ;;
+   --enable-x11)
+         _x11=yes
+         ;;
+   --disable-x11)
+         _x11=no
+         ;;
   esac
  done
***************
*** 164,168 ****
  _xv=no
  _vm=no
- _x11=no
  _3dfx=no
  _syncfb=no
--- 183,186 ----
***************
*** 173,177 ****
  _dga2=no
  _svga=no
! _fbdev=no
  _lirc=no
  _xdpms=no
--- 191,195 ----
  _dga2=no
  _svga=no
! _fbdev=yes
  _lirc=no
  _xdpms=no
***************
*** 182,188 ****
  _gllib=
  _sdllib=
- _x11lib=
  _xvlib=
! _xlibdir=
  
  for i in `echo $pparam`; do
--- 200,205 ----
  _gllib=
  _sdllib=
  _xvlib=
! _x11lib=
  
  for i in `echo $pparam`; do
***************
*** 221,231 ****
  done
  
- if [ -e /usr/X11R6 ]; then
-  _x11libdir=-L/usr/X11R6/lib
- else
-  if [ -e /usr/X11 ]; then
-   _x11libdir=-L/usr/X11/lib
-  fi
- fi
  
  _win32libdirnotify=no
--- 238,241 ----
***************
*** 367,379 ****
  
  
- # check GL & X11 & Xext & Xv & SDL & termcap libs
- 
- $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes
- $_cc $TMPC -o $TMPO $_x11libdir/ -lXxf86vm &> /dev/null && _vm=yes
  $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes
! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes
! $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes
! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lpthread &> /dev/null || \
   { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; }
  
--- 377,383 ----
  
  
  $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes
! 
! $_cc $TMPC -o $TMPO -lpthread &> /dev/null || \
   { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; }
  
***************
*** 381,385 ****
  # this is very buggy & experimental code, use it only if you really need it!!
  _have_sdl=no
! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes
  
  _termcap=no
--- 385,389 ----
  # this is very buggy & experimental code, use it only if you really need it!!
  _have_sdl=no
! $_cc $TMPC -o $TMPO -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes
  
  _termcap=no
***************
*** 389,395 ****
  as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes
  
! # LGB: Check DGA
  
  cat > $TMPC << EOF
  #include <stdio.h>
  #include <X11/Xlib.h>
--- 393,420 ----
  as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes
  
! # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) --------------
  
+ if [ $_x11 = auto ]; then
+   _x11=no
+   $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
+ fi
+ 
+ if [ $_x11 = yes ]; then
+ 
+ $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes
+ $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes
+ 
+ $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null && _gl=yes
+ 
  cat > $TMPC << EOF
+ #include <GL/gl.h>
+ int main( void ) { return 0; }
+ EOF
+ $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null || \
+  { _gl=no; echo "GL includes not found!";}
+ 
+ $_cc $TMPC -o $TMPO $_x11libdir -lXxf86vm &> /dev/null && _vm=yes
+ 
+ cat > $TMPC << EOF
  #include <stdio.h>
  #include <X11/Xlib.h>
***************
*** 398,402 ****
  EOF
  
- _dga=no
  $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga=yes
  # Note: the -lXxf86vm library is the VideoMode extension and though it's
--- 423,426 ----
***************
*** 406,411 ****
  # If you run into problems, remove '-lXxf86vm'.
  
- # ---
- 
  # Check if DGA is 2.0 or greater
  cat > $TMPC << EOF
--- 430,433 ----
***************
*** 418,440 ****
  _dga2=no
  $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes
- 
- 
- cat > $TMPC << EOF
- #include <GL/gl.h>
- int main( void ) { return 0; }
- EOF
  
! $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null || \
!  { _gl=no; echo "GL includes not found!";}
  
  rm -f $TMPC $TMPO
  
- 
- if [ $_x11 = 'yes' ]; then
-  if [ $_mga = 'yes' ]; then
-   _xmga=yes
-  fi
- fi
- 
  # ---
  
--- 440,448 ----
  _dga2=no
  $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes
  
! fi
  
  rm -f $TMPC $TMPO
  
  # ---
  
***************
*** 486,492 ****
          _vm=yes
          ;;
-   --enable-x11)
-         _x11=yes
-         ;;
    --enable-3dfx)
          _3dfx=yes
--- 494,497 ----
***************
*** 541,547 ****
          _vm=no
          ;;
-   --disable-x11)
-         _x11=no
-         ;;
    --disable-mlib)
  	_mlib=no
--- 546,549 ----
***************
*** 562,568 ****
  	_termcap=no
  	;;
-   --with-x11libdir=*)
-         _x11libdir=-L`echo $ac_option | cut -d '=' -f 2`
-         ;;
    --with-win32libdir=*)
          _win32libdir=`echo $ac_option | cut -d '=' -f 2`
--- 564,567 ----
***************
*** 575,582 ****
--- 574,589 ----
  	_y=`echo $ac_option | cut -d '=' -f 2`
  	;;
+   --with-x11libdir=*)
+         ;;
    --cc=*)
  	;;
   esac
  done
+ 
+ if [ $_x11 = 'yes' ]; then
+  if [ $_mga = 'yes' ]; then
+   _xmga=yes
+  fi
+ fi
  
  # to screen.


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

GEREOFFY

tags

participants (1)