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
This commit is contained in:
Alexander Larsson 2007-11-27 12:39:14 +00:00 committed by Alexander Larsson
parent 9bd5e0d8e2
commit 2490a699be
7 changed files with 31 additions and 3 deletions

View File

@ -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

View File

@ -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) ***

View File

@ -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@

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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