[gnome-disk-utility] Avoid needing gsd during build when --disable-gsd-plugin is used

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 15ebcb9dc201ec4a29958e736fb143f969e7af3b
Author: Andreas Henriksson <andreas fatal se>
Date:   Fri Apr 5 12:42:06 2013 +0200

    Avoid needing gsd during build when --disable-gsd-plugin is used
    
    PKG_CHECK_MODULES was previously unconditionally requiring
    gnome-settings-daemon to be available, even when it was later
    not going to be used because the --disable-gsd-plugin configure
    switch was passed.
    
    Move the check to only require g-s-d when it's actually going to be
    used.
    
    While at it, also fix the indentation of the msg_gsd_plugin=yes line.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=697146

 configure.ac |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1c3772f..52460a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,9 +115,13 @@ PKG_CHECK_MODULES(LIBSECRET1, [libsecret-1 >= $LIBSECRET1_REQUIRED])
 PKG_CHECK_MODULES(PWQUALITY, [pwquality >= $PWQUALITY_REQUIRED])
 PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk3 >= $CANBERRA_REQUIRED])
 PKG_CHECK_MODULES(LIBDVDREAD, [dvdread >= $LIBDVDREAD_REQUIRED])
+<<<<<<< HEAD
 PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= $GSD_PLUGIN_REQUIRED])
 PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
 PKG_CHECK_MODULES(LIBLZMA, [liblzma >= $LIBLZMA_REQUIRED])
+=======
+PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= LIBNOTIFY_REQUIRED])
+>>>>>>> Avoid needing gsd during build when --disable-gsd-plugin is used
 
 gsd_plugindir='${libdir}/gnome-settings-daemon-3.0'
 AC_SUBST([gsd_plugindir])
@@ -154,7 +158,8 @@ 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
+  msg_gsd_plugin=yes
+  PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= GSD_PLUGIN_REQUIRED])
 fi
 AM_CONDITIONAL(USE_GSD_PLUGIN, [test "$msg_gsd_plugin" = "yes"])