Allow configuration of gio-module-dir

2007-11-27  Alexander Larsson  <alexl@redhat.com>

        * configure.in:
	Allow configuration of gio-module-dir

        * gio-2.0.pc.in:
	Export giomodules location as giomodule variable

2007-11-27  Alexander Larsson  <alexl@redhat.com>

        * Makefile.am:
        * fam/Makefile.am:
        * inotify/Makefile.am:
	Use the user-specified giomoduledir

svn path=/trunk/; revision=5951

diff --git a/ChangeLog b/ChangeLog
index 96b268bbf6e7bfeb8825bf3875a6c2372373a71e..9adc1bc9607f7f1846047cf7d94cc7f1c8454574 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-27  Alexander Larsson  <alexl@redhat.com>
+
+        * configure.in:
+       Allow configuration of gio-module-dir
+       
+        * gio-2.0.pc.in:
+       Export giomodules location as giomodule variable
+
 2007-11-26  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/markup-collect.c: Add some tests for invalid booleans

diff --git a/configure.in b/configure.in
index 2048a4e7a65a99a81d4047a0aff6f566118d84a5..b1dd4b2b0e7992ae91c458f3e643b046318114b4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1448,6 +1448,17 @@ esac
 AC_MSG_RESULT($GIO)
 AC_SUBST(GIO)
 
+dnl *********************************
+dnl *** Directory for GIO modules ***
+dnl *********************************
+
+AC_ARG_WITH(gio-module-dir,
+           [AC_HELP_STRING([--with-gio-module-dir=PATH],
+                           [Load gio modules from this directory [LIBDIR/gio/modules]])],
+           [],
+          [with_gio_module_dir='${libdir}/gio/modules'])
+GIO_MODULE_DIR=$with_gio_module_dir
+AC_SUBST(GIO_MODULE_DIR)
 
 dnl **********************************
 dnl *** Check for libselinux (GIO) ***

diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
index 4c62e34c38f6c0fc2c65f978766efc163e47cde1..0396af5cf5c25b4caec5451a2533d97be1e391a4 100644 (file)
--- a/gio-2.0.pc.in
+++ b/gio-2.0.pc.in
@@ -3,6 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
+giomoduledir=@GIO_MODULE_DIR@
+
 Name: GIO
 Description: glib I/O library
 Version: @VERSION@

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 9caf92d7fda5c73347f426882a90043eda46002f..07725e2d7e81919d01ad257fe35a5db742cd0f68 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-27  Alexander Larsson  <alexl@redhat.com>
+
+        * Makefile.am:
+        * fam/Makefile.am:
+        * inotify/Makefile.am:
+       Use the user-specified giomoduledir
+
 2007-11-27  Alexander Larsson  <alexl@redhat.com>
 
        * Makefile.am

diff --git a/gio/Makefile.am b/gio/Makefile.am
index b45874a34b23c248bdf88c413b252f1c6229cbe8..4141162ef2723764a7c445fbbba5d8e920668556 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/gmodule                         \
        $(GLIB_DEBUG_FLAGS)                             \
        -DG_DISABLE_DEPRECATED                          \
-       -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\"      
+       -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  
 
 lib_LTLIBRARIES = libgio-2.0.la
 

diff --git a/gio/fam/Makefile.am b/gio/fam/Makefile.am
index 0e8b79969e171eb506823ec0856bbd8d06cfdf63..053c74163257be8a4ef9c0dcbcc50aff068345e5 100644 (file)
--- a/gio/fam/Makefile.am
+++ b/gio/fam/Makefile.am
@@ -21,7 +21,7 @@ libgiofam_la_CFLAGS = \
        -I$(top_srcdir)/glib            \
        -I$(top_srcdir)/gmodule         \
        -I$(top_srcdir)/gio             \
-       -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\"  \
+       -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
        -DG_DISABLE_DEPRECATED
 
 libgiofam_la_LDFLAGS = $(module_flags)

diff --git a/gio/inotify/Makefile.am b/gio/inotify/Makefile.am
index 191f27dd2ef6a5b458599f5a52b6b3c671fd6605..765437ead85da0e306d7bacf54b3ec5ca7f241f3 100644 (file)
--- a/gio/inotify/Makefile.am
+++ b/gio/inotify/Makefile.am
@@ -29,6 +29,6 @@ libinotify_la_CFLAGS = \
        -I$(top_srcdir)/glib            \
        -I$(top_srcdir)/gmodule         \
        -I$(top_srcdir)/gio             \
-       -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\"  \
+       -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
        -DG_DISABLE_DEPRECATED