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

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

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

Modified Files:
	configure.ac 
Log Message:
Make XTest optional; fix XRandR test (wrong variable).

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- configure.ac	6 Sep 2005 18:25:41 -0000	1.64
+++ configure.ac	7 Sep 2005 18:24:13 -0000	1.65
@@ -130,12 +130,21 @@
 dnl ---------------------------------------------
 dnl XTest Extension
 dnl ---------------------------------------------
-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_SUBST(XTEST_LIBS)
-AM_CONDITIONAL(HAVE_XTESTEXTENSION, test x$ac_have_xtest = "xyes")
+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]),
+	    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_SUBST(XTEST_LIBS)
+else
+  ac_have_xtest=no
+fi
+AM_CONDITIONAL([HAVE_XTESTEXTENSION], [test x$ac_have_xtest = "xyes"])
 
 dnl ---------------------------------------------
 dnl XRandR Extension (check via GDK)
@@ -146,7 +155,7 @@
 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_xtest = "xyes")
+AM_CONDITIONAL([HAVE_XTESTEXTENSION], [test x$ac_have_xrandr = "xyes"])
 CFLAGS="$saved_CFLAGS"
 LIBS="$saved_LIBS"