[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: gnome-xine ChangeLog, 1.208, 1.209 configure.ac,
From:       Darren Salt <dsalt () users ! sourceforge ! net>
Date:       2006-08-27 18:34:07
Message-ID: E1GHPSR-0008SK-NQ () sc8-pr-cvs10 ! sourceforge ! net
[Download RAW message or body]

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Don't use dbus if gnome-screensaver isn't available.
Don't provide a default path for it at build time.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- ChangeLog	27 Aug 2006 18:28:40 -0000	1.208
+++ ChangeLog	27 Aug 2006 18:34:05 -0000	1.209
@@ -20,7 +20,9 @@
 	* Improved the toolbar focus handling somewhat.
 	* Fixed F10 in full-screen mode when using combined video/toolbar
 	  window in windowed mode.
-	* Added a JS "eject()" function and a key binding entry for it.
+	* Added a JS "eject()" function and a key binding entry for it. 
+	* Don't use dbus if gnome-screensaver isn't available, and don't
+	  provide a default path for it at build time.
 
 0.5.7:	2006/07/05
 	[dsalt]

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- configure.ac	27 Aug 2006 18:32:11 -0000	1.98
+++ configure.ac	27 Aug 2006 18:34:05 -0000	1.99
@@ -138,24 +138,26 @@
 LIBS="$saved_LIBS"
 
 dnl ---------------------------------------------
-dnl DBus
+dnl GNOME screensaver, DBus
 dnl ---------------------------------------------
-AC_ARG_WITH([dbus],
+AC_PATH_PROG(GSSCMD, gnome-screensaver-command)
+if test -n "$GSSCMD"; then
+  AC_ARG_WITH([dbus],
 	AS_HELP_STRING([--with-dbus], [enable dbus support (for GNOME screensaver)]),
 	[requested=Y], [requested=N])
-if test "x$with_dbus" = "xyes"; then
-  with_dbus=yes
-  if test "x$requested" = "xY"; then
-    PKG_CHECK_MODULES(DBUS, dbus-glib-1)
-  else
-    PKG_CHECK_MODULES(DBUS, dbus-glib-1, [], [with_dbus=no; AC_MSG_RESULT([no])])
+  if test "x$with_dbus" = "xyes"; then
+    with_dbus=yes
+    if test "x$requested" = "xY"; then
+      PKG_CHECK_MODULES(DBUS, dbus-glib-1)
+    else
+      PKG_CHECK_MODULES(DBUS, dbus-glib-1, [], [with_dbus=no; AC_MSG_RESULT([no])])
+    fi
   fi
   if test "$with_dbus" = yes; then
     AC_DEFINE(WITH_DBUS, 1, [Define if dbus-glib is present and you want to use it \
to talk to gnome-screensaver.])  fi
+  AC_DEFINE_UNQUOTED(GNOME_SCREENSAVER_COMMAND, "$GSSCMD", [location of the \
gnome-screensaver-command binary])  fi
-AC_PATH_PROG(GSSCMD, gnome-screensaver-command, /usr/bin/gnome-screensaver-command)
-AC_DEFINE_UNQUOTED(GNOME_SCREENSAVER_COMMAND, "$GSSCMD", [location of the \
gnome-screensaver-command binary])  
 dnl ---------------------------------------------
 dnl DPMS Extension


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]