[Mplayer-cvslog] CVS: main configure,1.59,1.60

[Felix Buenemann]

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

Modified Files:
	configure 
Log Message:
Changed to detect sdl in non-standard location, as suggested by Martin Aumueller <lists at reserv.at>.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** configure	2001/06/04 12:01:22	1.59
--- configure	2001/06/04 14:14:28	1.60
***************
*** 127,131 ****
          --with-csslibdir=DIR    directory contains libcss.so shared library
          --with-cssincdir=DIR    directory contains libcss header file (css.h)
! 				(--with-css* only needed, if libCSS autodetect fails)
  
  	--size-x=SIZE		default screen width
--- 127,133 ----
          --with-csslibdir=DIR    directory contains libcss.so shared library
          --with-cssincdir=DIR    directory contains libcss header file (css.h)
!                                 (--with-css* only needed, if libCSS autodetect fails)
!         --with-sdl-config=PATH  specify location of sdl-config if it's not in your PATH
!                                 (example: --with-sdl-cofig=/usr/sdl/bin/sdl-config)
  
  	--size-x=SIZE		default screen width
***************
*** 177,180 ****
--- 179,183 ----
  
  _skip_cc_check=no
+ _sdlconfig='sdl-config'
  
  for ac_option
***************
*** 196,199 ****
--- 199,205 ----
          _x11=no
          ;;
+   --with-sdl-config=*)
+         _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
+         ;;
   esac
  done
***************
*** 470,476 ****
  # Atmosfear: added SDL versioncheck and autodetect; removed warnings.
  _sdl=no
! if $_cc $TMPC -o $TMPO -L/usr/lib/ -L/usr/local/lib/ -lSDL -lpthread &> /dev/null ; then
! 	if test `sdl-config --version | sed s/[=[:punct:]=]//g` -gt 116 ; then
! 		if test `sdl-config --version | sed s/[=[:punct:]=]//g` -lt 121 ; then
  			_sdlbuggy='#define BUGGY_SDL'
  		else	
--- 476,482 ----
  # Atmosfear: added SDL versioncheck and autodetect; removed warnings.
  _sdl=no
! if $_cc $TMPC -o $TMPO `$_sdlconfig --libs` &> /dev/null ; then
! 	if test `$_sdlconfig --version | sed s/[=[:punct:]=]//g` -gt 116 ; then
! 		if test `$_sdlconfig --version | sed s/[=[:punct:]=]//g` -lt 121 ; then
  			_sdlbuggy='#define BUGGY_SDL'
  		else	
***************
*** 895,899 ****
  
  if [ $_sdl = yes ]; then
!   _sdllib='-lSDL -lpthread' 
  fi
  
--- 901,905 ----
  
  if [ $_sdl = yes ]; then
!   _sdllib=`$_sdlconfig --libs` 
  fi
  


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