+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
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) ***
libdir=@libdir@
includedir=@includedir@
+giomoduledir=@GIO_MODULE_DIR@
+
Name: GIO
Description: glib I/O library
Version: @VERSION@
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
* gio.h:
Add catch-all gio.h header
-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
-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)
-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