[dconf] Some changes suggested/requested by Richard Hughes

[Ryan Lortie <ryanl src gnome org>]

commit 452a6e17b3bd0574a18c3e61f9e02d59ffcffbe1
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat May 15 16:12:06 2010 +0200

    Some changes suggested/requested by Richard Hughes
    
      - make packaging easier by not installing the GSettings backend into
        the gio modules directory; instead, allow the path to be manually
        specified, defaulting to relative to the libdir (or prefix).
    
      - for the GSettings backend, install an unversioned .so file and
        prevent the installation of the useless .la file

 configure.ac          |    3 ++-
 gsettings/Makefile.am |    3 +++
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5e358c0..6fce344 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,8 @@ AC_PROG_LIBTOOL
 AC_PROG_CC
 
 PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.4)
-giomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
+
+AC_ARG_WITH(gio_modules_dir, [  --with-gio-modules-dir=PATH choose directory for the GIO module, [default=LIBDIR/gio/modules]], giomodulesdir="$withval", giomodulesdir=${libdir}/gio/modules)
 AC_SUBST(giomodulesdir)
 
 AC_ARG_WITH(dbus_service_dir, [  --with-dbus-service-dir=PATH choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]], dbusservicedir="$withval", dbusservicedir=${datadir}/dbus-1/services)
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am
index 41b7cc2..db97d91 100644
--- a/gsettings/Makefile.am
+++ b/gsettings/Makefile.am
@@ -3,9 +3,12 @@ AM_CFLAGS = $(gio_CFLAGS) -I$(top_srcdir)/gvdb
 giomodules_LTLIBRARIES = libdconfsettings.la
 
 libdconfsettings_la_LIBADD = $(gio_LIBS)
+libdconfsettings_la_LDFLAGS = -module -avoid-version -shared
 libdconfsettings_la_SOURCES = \
 	../gvdb/gvdb-reader.c	\
 	dconfdatabase.h		\
 	dconfdatabase.c		\
 	dconfsettingsbackend.c
 
+install-data-hook:
+	rm -f $(giomodulesdir)/libdconfsettings.la