[xine-cvs] CVS: gnome-xine configure.ac,1.65,1.66

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21460

Modified Files:
	configure.ac 
Log Message:
Add DPMS extension test; clean up other X extension tests.

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- configure.ac	7 Sep 2005 18:24:13 -0000	1.65
+++ configure.ac	16 Sep 2005 18:57:42 -0000	1.66
@@ -128,18 +128,28 @@
 LIBS="$saved_LIBS"
 
 dnl ---------------------------------------------
+dnl DPMS Extension
+dnl ---------------------------------------------
+AC_CHECK_LIB(Xtst, DPMSQueryExtension, 
+	     XTEST_LIBS="-lXtst"
+	     AC_DEFINE(HAVE_DPMS_EXTENSION,,[Define this to use DPMS to defeat the screen blanker (requires libXtst)])
+	     ac_have_dpms="yes", ac_have_dpms="no", $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
+AC_SUBST(XTEST_LIBS)
+AM_CONDITIONAL([HAVE_DPMS_EXTENSION], [test x$ac_have_dpms = "xyes"])
+
+dnl ---------------------------------------------
 dnl XTest Extension
 dnl ---------------------------------------------
 AC_ARG_ENABLE(defeat-screensaver-via-xtest,
 	    AS_HELP_STRING(--enable-defeat-screensaver-via-xtest,
-			   [defeat the screen blanker via fake key presses (if XTest is supported) instead of its own method]),
+			   [enable defeating the screen blanker via fake key presses (if XTest is supported)]),
 	    if test "x$enableval" = xno; then xtest=no; else xtest=yes; fi,
 	    xtest=no)
 if test "$xtest" = yes; then
   AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, 
 	       XTEST_LIBS="-lXtst"
-	       AC_DEFINE(HAVE_XTESTEXTENSION,,[Define this if you have libXtst installed])
-	       ac_have_xtest="yes",, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
+	       AC_DEFINE(HAVE_XTESTEXTENSION,,[Define this to use XTest to defeat the screen blanker (requires libXtst)])
+	       ac_have_xtest="yes", ac_have_xtest="no", $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
   AC_SUBST(XTEST_LIBS)
 else
   ac_have_xtest=no
@@ -154,8 +164,8 @@
 CFLAGS="$CFLAGS $GTK2_CFLAGS"
 AC_CHECK_LIB(Xrandr, XRRQueryExtension,
              AC_DEFINE(HAVE_XRANDR,,[Define this if you have libXrandr installed (and GTK+2 uses it)])
-	     ac_have_xrandr="yes",, $X_LIBS $X_PRE_LIBS $GTK2_LIBS $X_EXTRA_LIBS)
-AM_CONDITIONAL([HAVE_XTESTEXTENSION], [test x$ac_have_xrandr = "xyes"])
+	     ac_have_xrandr="yes", ac_have_randr="no", $X_LIBS $X_PRE_LIBS $GTK2_LIBS $X_EXTRA_LIBS)
+AM_CONDITIONAL([HAVE_XRANDR], [test x$ac_have_xrandr = "xyes"])
 CFLAGS="$saved_CFLAGS"
 LIBS="$saved_LIBS"