[clutter/wip/actor-content: 1/22] Add a modules directory

[Emmanuele Bassi <ebassi src gnome org>]

commit 1b4c824cb46a6b25838f252b0c25022ee3aa98a5
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Dec 6 15:33:30 2010 +0000

    Add a modules directory
    
    The directory will be used to load GIO extension points.
    
    The default directory, ${libdir}/clutter/modules, can be changed on a
    per-compilation basis.
    
    The directory is specified in the pkg-config file for third party
    extensions.

 clutter/Makefile.am   |    1 +
 clutter/clutter.pc.in |    1 +
 configure.ac          |   10 ++++++++++
 3 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 480474d..c5158c8 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -40,6 +40,7 @@ AM_CPPFLAGS = \
 	-DCLUTTER_LIBDIR=\""$(libdir)"\"	\
 	-DCLUTTER_DATADIR=\""$(datadir)"\"	\
 	-DCLUTTER_LOCALEDIR=\""$(localedir)"\"	\
+	-DCLUTTER_MODULEDIR=\""$(CLUTTER_MODULE_DIR)"\"	\
 	-DCLUTTER_COMPILATION=1			\
 	-DCLUTTER_DISABLE_DEPRECATED		\
 	-DCOGL_DISABLE_DEPRECATED		\
diff --git a/clutter/clutter.pc.in b/clutter/clutter.pc.in
index 4a5afe9..da85ca3 100644
--- a/clutter/clutter.pc.in
+++ b/clutter/clutter.pc.in
@@ -3,6 +3,7 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
+modulesdir= CLUTTER_MODULE_DIR@
 apiversion= CLUTTER_API_VERSION@
 winsys= CLUTTER_WINSYS@
 soname_infix= CLUTTER_SONAME_INFIX@
diff --git a/configure.ac b/configure.ac
index 8184696..c1b2d2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -970,6 +970,15 @@ AS_IF([test "x$SUPPORT_XLIB" = "x1"],
 AM_CONDITIONAL([BUILD_XI2], [test "x$have_xinput2" = "xyes"])
 AM_CONDITIONAL(X11_TESTS, [test "x$x11_tests" = "xyes"])
 
+dnl Modules directory
+
+AC_ARG_WITH([clutter-module-dir],
+            [AC_HELP_STRING([--with-clutter-module-dir=PATH],
+                            [Load clutter modules from this directory [LIBDIR/gio/modules]])],
+            [],
+            [with_clutter_module_dir='${libdir}/clutter/modules'])
+AC_SUBST([CLUTTER_MODULE_DIR], [$with_clutter_module_dir])
+
 dnl === Enable debug level ====================================================
 
 m4_define([debug_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [minimum])])
@@ -1294,6 +1303,7 @@ echo " â?¢ Global:"
 echo "        Prefix: ${prefix}"
 echo "        Flavour: ${CLUTTER_WINSYS}/${COGL_DRIVER}"
 echo "        Target library: ${CLUTTER_WINSYS_LIB}"
+echo "        Modules directory: ${with_clutter_module_dir}"
 
 # Compiler/Debug related flags
 echo ""