[gnome-disk-utility] Add --disable-gsd-plugin option and use it at distcheck

[David Zeuthen <davidz src gnome org>]

commit 409f0f4e37c301cf05839a00f445fe3dcd933197
Author: David Zeuthen <zeuthen gmail com>
Date:   Tue Dec 18 16:19:50 2012 -0500

    Add --disable-gsd-plugin option and use it at distcheck
    
    Really, really annoying that gnome-settings-daemon breaks API like
    this - especially when there's no package in Fedora Rawhide.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 Makefile.am            |    8 ++++++++
 configure.ac           |   12 ++++++++++++
 src/notify/Makefile.am |    8 ++++++++
 3 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f2761d7..0f4b6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,12 @@
+NULL =
+
 SUBDIRS = src data po doc
 
+# TODO: remove --disable-gsd-plugin when the g-s-d ABI settles again
+#
+DISTCHECK_CONFIGURE_FLAGS=                                      \
+	--disable-gsd-plugin					\
+        $(NULL)
+
 clean-local :
 	rm -f *~ po/*~
diff --git a/configure.ac b/configure.ac
index 4deac78..c8fb2ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,17 @@ fi
 
 AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
 
+dnl *************************************
+dnl *** gnome-settings-daemon plug-in ***
+dnl *************************************
+
+AC_ARG_ENABLE(gsd_plugin, AS_HELP_STRING([--disable-gsd-plugin],[don't build gnome-settings-daemon plug-in]))
+msg_gsd_plugin=no
+if test "x$enable_gsd_plugin" != "xno"; then
+   msg_gsd_plugin=yes
+fi
+AM_CONDITIONAL(USE_GSD_PLUGIN, [test "$enable_gsd_plugin" = "yes"])
+
 # ********************
 # Internationalization
 # ********************
@@ -188,6 +199,7 @@ echo "
         localstatedir:              ${localstatedir}
 
         Use libsystem-login:        ${msg_libsystemd_login}
+        Build g-s-d plug-in:        ${msg_gsd_plugin}
 
         compiler:                   ${CC}
         cflags:                     ${CFLAGS}
diff --git a/src/notify/Makefile.am b/src/notify/Makefile.am
index 9c82e69..4175f8d 100644
--- a/src/notify/Makefile.am
+++ b/src/notify/Makefile.am
@@ -1,6 +1,8 @@
 
 NULL =
 
+if USE_GSD_PLUGIN
+
 gdu_sd_plugin_name = gdu-sd
 
 gdu_sd_plugindir=$(gsd_plugindir)
@@ -42,6 +44,8 @@ libgdu_sd_la_LIBADD  = 						\
 	$(LIBNOTIFY_LIBS)					\
 	$(NULL)
 
+endif # USE_GSD_PLUGIN
+
 # ----------------------------------------------------------------------
 
 noinst_PROGRAMS = test-plugin
@@ -74,8 +78,12 @@ gdu_sd_plugin_in_files = 					\
 	gdu-sd-plugin.gnome-settings-plugin.in			\
 	$(NULL)
 
+if USE_GSD_PLUGIN
+
 gdu_sd_plugin_DATA = $(gdu_sd_plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
+endif # USE_GSD_PLUGIN
+
 %.gnome-settings-plugin: %.gnome-settings-plugin.in
 	LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@