From 2490a699be480e519b4ecfd8e6e5c3995d1ec384 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 27 Nov 2007 12:39:14 +0000 Subject: [PATCH] Allow configuration of gio-module-dir 2007-11-27 Alexander Larsson * configure.in: Allow configuration of gio-module-dir * gio-2.0.pc.in: Export giomodules location as giomodule variable 2007-11-27 Alexander Larsson * Makefile.am: * fam/Makefile.am: * inotify/Makefile.am: Use the user-specified giomoduledir svn path=/trunk/; revision=5951 --- ChangeLog | 8 ++++++++ configure.in | 11 +++++++++++ gio-2.0.pc.in | 2 ++ gio/ChangeLog | 7 +++++++ gio/Makefile.am | 2 +- gio/fam/Makefile.am | 2 +- gio/inotify/Makefile.am | 2 +- 7 files changed, 31 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96b268bb..9adc1bc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-11-27 Alexander Larsson + + * configure.in: + Allow configuration of gio-module-dir + + * gio-2.0.pc.in: + Export giomodules location as giomodule variable + 2007-11-26 Matthias Clasen * tests/markup-collect.c: Add some tests for invalid booleans diff --git a/configure.in b/configure.in index 2048a4e7..b1dd4b2b 100644 --- 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 4c62e34c..0396af5c 100644 --- 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 9caf92d7..07725e2d 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,10 @@ +2007-11-27 Alexander Larsson + + * Makefile.am: + * fam/Makefile.am: + * inotify/Makefile.am: + Use the user-specified giomoduledir + 2007-11-27 Alexander Larsson * Makefile.am diff --git a/gio/Makefile.am b/gio/Makefile.am index b45874a3..4141162e 100644 --- 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 0e8b7996..053c7416 100644 --- 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 191f27dd..765437ea 100644 --- 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 -- 2.34.1