gvfs r1675 - in trunk: . client gconf hal

[gicmo svn gnome org]

Author: gicmo
Date: Sat Mar 22 14:19:21 2008
New Revision: 1675
URL: http://svn.gnome.org/viewvc/gvfs?rev=1675&view=rev

Log:
2008-03-22  Christian Kellner  <gicmo gnome org>

	* client/Makefile.am:
	* configure.ac:
	* gconf/Makefile.am:
	* hal/Makefile.am:
	Respect the giomoduledir provided in gio's package config
	file. (#523852 and maybe #523039)


Modified:
   trunk/ChangeLog
   trunk/client/Makefile.am
   trunk/configure.ac
   trunk/gconf/Makefile.am
   trunk/hal/Makefile.am

Modified: trunk/client/Makefile.am
==============================================================================
--- trunk/client/Makefile.am	(original)
+++ trunk/client/Makefile.am	Sat Mar 22 14:19:21 2008
@@ -10,7 +10,6 @@
 	-DDBUS_API_SUBJECT_TO_CHANGE
 
 module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_vfs_.*|g_io_module_load|g_io_module_unload'
-giomodulesdir = $(libdir)/gio/modules
 
 ## Common to dynamic and static client libs
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Mar 22 14:19:21 2008
@@ -51,7 +51,9 @@
 DBUS_SERVICE_DIR=$with_dbus_service_dir
 AC_SUBST(DBUS_SERVICE_DIR)
 
-
+dnl **** gio module path handling ****
+giomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
+AC_SUBST(giomodulesdir)
 
 dnl ****************************
 dnl *** Checks for intltool  ***
@@ -534,6 +536,8 @@
 echo 
 echo "gvfs configuration summary:"
 echo "
+        gio module directory : $giomodulesdir
+
         FTP/HTTP/WebDAV support       $msg_http
         ObexFTP support               $msg_obexftp
 	Samba support:	              $msg_samba

Modified: trunk/gconf/Makefile.am
==============================================================================
--- trunk/gconf/Makefile.am	(original)
+++ trunk/gconf/Makefile.am	Sat Mar 22 14:19:21 2008
@@ -7,8 +7,6 @@
 giomodules_LTLIBRARIES = libgiogconf.la
 endif
 
-giomodulesdir = $(libdir)/gio/modules
-
 libgiogconf_la_SOURCES =				\
 	gapplookupgconf.c gapplookupgconf.h		\
 	gconf-module.c					\

Modified: trunk/hal/Makefile.am
==============================================================================
--- trunk/hal/Makefile.am	(original)
+++ trunk/hal/Makefile.am	Sat Mar 22 14:19:21 2008
@@ -4,7 +4,6 @@
 module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
 
 giomodules_LTLIBRARIES = libgiohal-volume-monitor.la
-giomodulesdir = $(libdir)/gio/modules
 
 BUILT_SOURCES =                                         \
 	hal-marshal.h           hal-marshal.c