[gnome-desktop] libgnome-desktop: add an option to disable gnome-rr-debug

[Bastien Nocera <hadess src gnome org>]

commit 6f50c8a1e13169f7d748580517c48a27bdf32e5c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Jan 28 16:58:54 2016 +0100

    libgnome-desktop: add an option to disable gnome-rr-debug
    
    Not everyone needs to have this program installed - e.g. when
    gnome-desktop is bundled in an xdg-app.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761258

 configure.ac                 |    8 ++++++++
 libgnome-desktop/Makefile.am |    8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index eafe461..8c76880 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,13 @@ AC_ARG_ENABLE([desktop-docs],
        [],[enable_desktop_docs=yes])
 AM_CONDITIONAL(DESKTOP_DOCS_ENABLED, test "x$enable_desktop_docs" = "xyes")
 
+# Should we build debug tools? Useful to bundle the gnome-desktop library
+# e.g. with a xdg-app runtime
+AC_ARG_ENABLE([debug-tools],
+        [AS_HELP_STRING([--disable-debug-tools],[do not build debug tools])],
+        [],[enable_debug_tools=yes])
+AM_CONDITIONAL(DEBUG_TOOLS_ENABLED, test "x$enable_debug_tools" = "xyes")
+
 # Path to the pnp.ids file -- to know if we use one shipped with another
 # package, or an internal file
 
@@ -245,6 +252,7 @@ echo "
 
         GNOME Distributor:            ${GNOME_DISTRIBUTOR}
         Build desktop-wide docs:      ${enable_desktop_docs}
+        Build debug tools:            ${enable_debug_tools}
         Date in gnome-version.xml:    ${enable_date_in_gnome_version}
         Use external pnp.ids:         ${EXTERNAL_PNP_IDS}
         Build gtk-doc documentation:  ${enable_gtk_doc}
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index 3a4f84f..0c8f3ae 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -143,17 +143,17 @@ EXTRA_DIST += \
 MAINTAINERCLEANFILES = \
        pnp.ids
 
-libexec_PROGRAMS =             \
-       gnome-rr-debug
-
 gnome_rr_debug_SOURCES =       \
        gnome-rr-debug.c
-
 gnome_rr_debug_LDADD =         \
        $(GNOME_DESKTOP_LIBS)   \
        $(lib_LTLIBRARIES)      \
        $(XLIB_LIBS)
 
+if DEBUG_TOOLS_ENABLED
+libexec_PROGRAMS = gnome-rr-debug
+endif
+
 noinst_PROGRAMS = test-xkb-info test-pnp-ids test-wall-clock test-desktop-thumbnail test-idle-monitor 
test-languages
 test_xkb_info_LDADD =          \
        $(GNOME_DESKTOP_LIBS)   \