[gnome-settings-daemon] main: Fix possible crasher on exit

[Bastien Nocera <hadess src gnome org>]

commit 50720bce5a48b2a69eec57a74bb02f0774f5f127
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Mar 14 17:39:14 2011 +0000

    main: Fix possible crasher on exit
    
    Because ORBit sucks, and installs an atexit() handler, even though
    it doesn't need one.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639347

 configure.ac |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a7bd77b..43b660b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,13 @@ LIBNOTIFY_REQUIRED_VERSION=0.6.1
 
 EXTRA_COMPILE_WARNINGS(yes)
 
+dnl FIXME we link against gconf-2.0 until all the plugins are ported
+dnl to GSettings, or we could get crashes on startup
 PKG_CHECK_MODULES(SETTINGS_DAEMON,
         glib-2.0 >= $GLIB_REQUIRED_VERSION
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-	gio-2.0 >= $GIO_REQUIRED_VERSION
+        gio-2.0 >= $GIO_REQUIRED_VERSION
+        gconf-2.0 >= $GCONF_REQUIRED_VERSION
         gmodule-2.0
         gthread-2.0
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION