[Xfce4-commits] r29413 - in xfce4-settings/trunk: . dialogs xfce4-settings-helper

[Nick Schermer]

Author: nick
Date: 2009-01-31 12:02:10 +0000 (Sat, 31 Jan 2009)
New Revision: 29413

Modified:
   xfce4-settings/trunk/NEWS
   xfce4-settings/trunk/configure.ac.in
   xfce4-settings/trunk/dialogs/Makefile.am
   xfce4-settings/trunk/xfce4-settings-helper/Makefile.am
   xfce4-settings/trunk/xfce4-settings-helper/main.c
Log:
Make the Xrandr dependency optional. If Xrandr is disabled, the
display plugin won't be compiled at all (bug #4836).


Modified: xfce4-settings/trunk/NEWS
===================================================================
--- xfce4-settings/trunk/NEWS	2009-01-30 19:20:31 UTC (rev 29412)
+++ xfce4-settings/trunk/NEWS	2009-01-31 12:02:10 UTC (rev 29413)
@@ -1,3 +1,8 @@
+4.x.xx
+======
+- Make the Xrandr dependency optional. If Xrandr is disabled, the
+  display plugin won't be compiled at all (bug #4836).
+
 4.5.99.1 (Xfce 4.6rc1)
 ======================
 - Properly handle missing RandR extension in xfce4-settings-helper

Modified: xfce4-settings/trunk/configure.ac.in
===================================================================
--- xfce4-settings/trunk/configure.ac.in	2009-01-30 19:20:31 UTC (rev 29412)
+++ xfce4-settings/trunk/configure.ac.in	2009-01-31 12:02:10 UTC (rev 29413)
@@ -84,9 +84,14 @@
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
 XDT_CHECK_PACKAGE([XI], [xi], [1.0.0])
 XDT_CHECK_PACKAGE([LIBX11], [x11], [1.0.0])
-XDT_CHECK_PACKAGE([XRANDR], [xrandr], [1.1.0])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12.0])
 
+dnl ***********************************
+dnl *** Optional support for Xrandr ***
+dnl ***********************************
+XDT_CHECK_OPTIONAL_PACKAGE([XRANDR], [xrandr], [1.1.0],
+                           [xrandr], [Xrandr support])
+
 dnl **************************************
 dnl *** Optional support for Libnotify ***
 dnl **************************************
@@ -102,11 +107,12 @@
 dnl ****************************************
 dnl *** Optional support for Libxklavier ***
 dnl ****************************************
-
 XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER], [libxklavier], [0.3.0],
                            [libxklavier], [Keyboard layout selection])
 
-dnl make xsettings daemon optional
+dnl ************************************
+dnl *** Xsettings daemon is optional ***
+dnl ************************************
 AC_ARG_ENABLE([xsettings-daemon],
               [AC_HELP_STRING([--disable-xsettings-daemon],
                               [Don't build the XSETTINGS daemon (default=yes)])],
@@ -114,7 +120,9 @@
               [build_xfsettingsd=yes])
 AM_CONDITIONAL([BUILD_XFSETTINGSD], [test "x$build_xfsettingsd" = "xyes"])
 
-dnl Camberra XSettings
+dnl ****************************************
+dnl *** Optional support for Libcamberra ***
+dnl ****************************************
 AC_ARG_ENABLE([sound-settings],
               [AC_HELP_STRING([--enable-sound-settings],
                               [Enable sound XSETTINGS in GUI (from libcamberra) (default=no)])],
@@ -245,6 +253,11 @@
 echo
 echo "* Installation prefix:       $prefix"
 echo "* Debug Support:             $enable_debug"
+if test x"$XRANDR_FOUND" = x"yes"; then
+echo "* Xrandr support:            yes"
+else
+echo "* Xrandr support:            no"
+fi
 if test x"$LIBNOTIFY_FOUND" = x"yes"; then
 echo "* Libnotify support:         yes"
 else

Modified: xfce4-settings/trunk/dialogs/Makefile.am
===================================================================
--- xfce4-settings/trunk/dialogs/Makefile.am	2009-01-30 19:20:31 UTC (rev 29412)
+++ xfce4-settings/trunk/dialogs/Makefile.am	2009-01-31 12:02:10 UTC (rev 29413)
@@ -3,6 +3,10 @@
 SUBDIRS = \
 	appearance-settings \
 	accessibility-settings \
-	display-settings \
 	keyboard-settings \
 	mouse-settings
+
+if HAVE_XRANDR
+SUBDIRS += \
+	display-settings
+endif

Modified: xfce4-settings/trunk/xfce4-settings-helper/Makefile.am
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/Makefile.am	2009-01-30 19:20:31 UTC (rev 29412)
+++ xfce4-settings/trunk/xfce4-settings-helper/Makefile.am	2009-01-31 12:02:10 UTC (rev 29413)
@@ -18,8 +18,6 @@
 	main.c \
 	accessibility.c \
 	accessibility.h \
-	displays.c \
-	displays.h \
 	keyboards.c \
 	keyboards.h \
 	keyboard-shortcuts.c \
@@ -45,7 +43,6 @@
 	$(LIBXKLAVIER_CFLAGS) \
 	$(XI_CFLAGS) \
 	$(LIBX11_CFLAGS) \
-	$(XRANDR_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
 	$(PLATFORM_CFLAGS)
@@ -66,10 +63,24 @@
 	$(LIBXKLAVIER_LIBS) \
 	$(XI_LIBS) \
 	$(LIBX11_LIBS) \
-	$(XRANDR_LIBS) \
 	$(LIBNOTIFY_LIBS) \
 	$(LIBWNCK_LIBS)
 
+#
+# Optional support for the display settings
+#
+if HAVE_XRANDR
+xfce4_settings_helper_SOURCES += \
+	displays.c \
+	displays.h
+
+xfce4_settings_helper_CFLAGS += \
+	$(XRANDR_CFLAGS)
+
+xfce4_settings_helper_LDADD += \
+	$(XRANDR_LIBS)
+endif
+
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = xfce4-settings-helper-autostart.desktop
 

Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/main.c	2009-01-30 19:20:31 UTC (rev 29412)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c	2009-01-31 12:02:10 UTC (rev 29413)
@@ -50,15 +50,18 @@
 #include <libxfcegui4/libxfcegui4.h>
 
 #include "accessibility.h"
-#include "displays.h"
 #include "pointers.h"
 #include "keyboards.h"
 #include "keyboard-layout.h"
 #include "keyboard-shortcuts.h"
 #include "workspaces.h"
 
+#ifdef HAVE_XRANDR
+#include "displays.h"
+#endif
 
 
+
 static gboolean opt_version = FALSE;
 static gboolean opt_debug = FALSE;
 static gchar   *opt_sm_client_id = NULL;
@@ -223,7 +226,9 @@
     GObject    *accessibility_helper;
     GObject    *shortcuts_helper;
     GObject    *keyboard_layout_helper;
+#ifdef HAVE_XRANDR
     GObject    *displays_helper;
+#endif
     GObject    *workspaces_helper;
     pid_t       pid;
     guint       i;
@@ -311,7 +316,9 @@
     accessibility_helper = g_object_new (XFCE_TYPE_ACCESSIBILITY_HELPER, NULL);
     shortcuts_helper = g_object_new (XFCE_TYPE_KEYBOARD_SHORTCUTS_HELPER, NULL);
     keyboard_layout_helper = g_object_new (XFCE_TYPE_KEYBOARD_LAYOUT_HELPER, NULL);
+#ifdef HAVE_XRANDR
     displays_helper = g_object_new (XFCE_TYPE_DISPLAYS_HELPER, NULL);
+#endif
     workspaces_helper = g_object_new (XFCE_TYPE_WORKSPACES_HELPER, NULL);
 
     /* setup signal handlers to properly quit the main loop */
@@ -330,7 +337,9 @@
     g_object_unref (G_OBJECT (accessibility_helper));
     g_object_unref (G_OBJECT (shortcuts_helper));
     g_object_unref (G_OBJECT (keyboard_layout_helper));
+#ifdef HAVE_XRANDR
     g_object_unref (G_OBJECT (displays_helper));
+#endif
     g_object_unref (G_OBJECT (workspaces_helper));
 
     /* shutdown xfconf */