[Mplayer-cvslog] CVS: main configure,1.109,1.110

Jürgen Keil jkeil at mplayer.dev.hu
Thu Jul 19 20:46:32 CEST 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv27670

Modified Files:
	configure 
Log Message:
Remove "sdl-config: not found" error message during configure, when the system
has no SDL installed.

Grab nanosleep from libposix4 on solaris (instead of librt), works on old
solaris versions, too.

Autodetect XDPMS: provide a "#define HAVE_XDPMS", so that C code can leave out
DPMS stuff when DPMS is not available on the target platform.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- configure	16 Jul 2001 18:40:51 -0000	1.109
+++ configure	19 Jul 2001 18:46:29 -0000	1.110
@@ -686,7 +686,7 @@
 
 # Atmosfear: added SDL versioncheck and autodetect; removed warnings.
 _sdl=no
-if test ! -z "`$_sdlconfig --version 2>/dev/null`" ; then
+if test ! -z "`($_sdlconfig --version) 2>/dev/null`" ; then
 if $_cc `$_sdlconfig --cflags` $TMPC -o $TMPO `$_sdlconfig --libs` > /dev/null 2>&1 ; then
 	_sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
 	if test "$_sdlversion" -gt 116 ; then
@@ -732,7 +732,7 @@
 
 _kstat=no
 $_cc $TMPC -o $TMPO -lkstat >/dev/null 2>&1 && _kstat=yes _archlibs="-lkstat $_archlibs"
-$_cc $TMPC -o $TMPO -lrt >/dev/null 2>&1 && _archlibs="-lrt $_archlibs"
+$_cc $TMPC -o $TMPO -lposix4 >/dev/null 2>&1 && _archlibs="-lposix4 $_archlibs"
 
 _binutils=no
 $_as libac3/downmix/downmix_i386.S -o $TMPO > /dev/null 2>&1 && _binutils=yes
@@ -1356,8 +1356,10 @@
 if [ $_x11 = yes ]; then
   if [ $_xdpms = yes ]; then
     _x11lib='-lX11 -lXext -lXdpms'
+    _have_xdpms='#define HAVE_XDPMS 1'
   else
     _x11lib='-lX11 -lXext'
+    _have_xdpms='#undef HAVE_XDPMS'
   fi
 fi
 
@@ -1860,6 +1862,7 @@
 $_syncfb
 $_fbdev
 $_svga
+$_have_xdpms
 
 #if defined(HAVE_GL)||defined(HAVE_X11)||defined(HAVE_XV)
 #define X11_FULLSCREEN




More information about the MPlayer-cvslog mailing list