From: Darren S. <li...@yo...> - 2009-03-25 16:53:02
|
# HG changeset patch # User Darren Salt <li...@yo...> # Date 1237998576 0 # Node ID f2c4b5864653601480210efe33c56ffd728e6087 # Parent 539c954d158b46770d24abe30a8834e95cf0165e Clean up screensaver binary detection. diff -r f2c4b5864653601480210efe33c56ffd728e6087 -r 539c954d158b46770d24abe30a8834e95cf0165e configure.ac --- a/configure.ac Wed Mar 25 16:29:36 2009 +0000 +++ b/configure.ac Tue Feb 17 00:49:29 2009 +0000 @@ -171,49 +171,30 @@ fi fi dnl --------------------------------------------- -dnl Screensaver command variables -dnl --------------------------------------------- -AC_ARG_VAR([XDGSSCMD], [full pathname for xdg-screensaver (auto-detect)]) -AC_ARG_VAR([GSSCMD], [full pathname for gnome-screensaver-command (auto-detect)]) -AC_ARG_VAR([XSSCMD], [full pathname for xscreensaver-command (auto-detect)]) - -dnl --------------------------------------------- -dnl XDG screensaver -dnl --------------------------------------------- -AC_PATH_PROG(XDGSSCMD, xdg-screensaver) -if test -n "$XDGSSCMD"; then - AC_DEFINE_UNQUOTED(XDG_SCREENSAVER_COMMAND, "$XDGSSCMD", [location of the xdg-screensaver binary]) -fi - -dnl --------------------------------------------- -dnl GNOME screensaver, DBus -dnl --------------------------------------------- -AC_PATH_PROG(GSSCMD, gnome-screensaver-command) -if test -n "$GSSCMD"; then - AC_ARG_WITH([dbus], - AS_HELP_STRING([--without-dbus], [disable dbus support (for GNOME screensaver)]), - [requested=Y], [requested=N]) - if test "x$with_dbus" != 'xno'; 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])]) +dnl Screensaver commands +dnl --------------------------------------------- +AC_ARG_VAR([XDGSSCMD], [full pathname for xdg-screensaver (auto-detect, 'no' to disable)]) +AC_ARG_VAR([GSSCMD], [full pathname for gnome-screensaver-command (auto-detect, 'no' to disable)]) +AC_ARG_VAR([XSSCMD], [full pathname for xscreensaver-command (auto-detect, 'no' to disable)]) + +GXINE_SCREENSAVER_CMD([XDGSSCMD], [XDG], [xdg-screensaver]) +GXINE_SCREENSAVER_CMD([GSSCMD], [GNOME], [gnome-screensaver], + [AC_ARG_WITH([dbus], + AS_HELP_STRING([--without-dbus], [disable dbus support (for GNOME screensaver)]), + [requested=Y], [requested=N]) + if test "x$with_dbus" != 'xno'; 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 - 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 - -dnl --------------------------------------------- -dnl X screensaver -dnl --------------------------------------------- -AC_PATH_PROG(XSSCMD, xscreensaver-command) -if test -n "$XSSCMD"; then - AC_DEFINE_UNQUOTED(X_SCREENSAVER_COMMAND, "$XSSCMD", [location of the xscreensaver-command binary]) -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 + ]) +GXINE_SCREENSAVER_CMD([XSSCMD], [X], [xscreensaver-command]) dnl --------------------------------------------- dnl DPMS Extension diff -r f2c4b5864653601480210efe33c56ffd728e6087 -r 539c954d158b46770d24abe30a8834e95cf0165e m4/_gxine.m4 --- a/m4/_gxine.m4 Wed Mar 25 16:29:36 2009 +0000 +++ b/m4/_gxine.m4 Tue Feb 17 00:49:29 2009 +0000 @@ -109,3 +109,19 @@ AC_DEFUN([GXINE_CHECK_X11_XCB], fi AM_CONDITIONAL([WITH_XCB], [test x"$with_xcb" != xno]) ]) + +dnl Screensaver binaries +dnl Args: config variable, #define variable prefix, binary name, +dnl extra commands if found (optional) +AC_DEFUN([GXINE_SCREENSAVER_CMD], + [if test "$$1" != no; then + AC_PATH_PROG([$1], [$3]) + if test -n "$$1"; then + AC_DEFINE_UNQUOTED([$2_SCREENSAVER_COMMAND], ["$$1"], [location of the $3 binary]) + m4_default([$4], []) + fi + else + AC_MSG_CHECKING([for $3]) + AC_MSG_RESULT([no]) + fi + ]) |