gir-repository r186 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Thu Oct 30 21:18:28 2008
New Revision: 186
URL: http://svn.gnome.org/viewvc/gir-repository?rev=186&view=rev

Log:
Remove xlib-2.0 dependency on clutter when it's not needed

	* configure.ac:
	* gir/Makefile.am: Remove xlib-2.0 dependency on clutter when
	it's not needed (backends other than glx)

Modified:
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Oct 30 21:18:28 2008
@@ -123,8 +123,12 @@
                   have_clutter=true, have_clutter=false)
 AM_CONDITIONAL(BUILD_CLUTTER, $have_clutter)
 CLUTTER_BACKEND=
+CLUTTER_BACKEND_GIRS=
 if $have_clutter; then
     CLUTTER_BACKEND="$($PKG_CONFIG --variable=backend clutter-0.8)"
+    if test "$CLUTTER_BACKEND" = glx; then
+        CLUTTER_BACKEND_GIRS=xlib-2.0
+    fi
     # check if depending on clutter also brings usable gdk-pixbuf, clutter
     # doesn't necessarily use (win32,osx) or export (Requires.private) it
     save_CFLAGS="$CFLAGS"; CFLAGS="$CLUTTER_CFLAGS"
@@ -137,6 +141,7 @@
     LDFLAGS="$save_LDFLAGS"
 fi
 AC_SUBST(CLUTTER_BACKEND)
+AC_SUBST(CLUTTER_BACKEND_GIRS)
 
 dnl clutter-gtk
 PKG_CHECK_MODULES(CLUTTERGTK, clutter-gtk-0.8 >= 0.8,

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Oct 30 21:18:28 2008
@@ -424,12 +424,12 @@
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
 
-Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterJson-0.8.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(G_IR_SCANNER) clutter-0.8.c
+Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterJson-0.8.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(CLUTTER_BACKEND_GIRS:%=%.gir) $(G_IR_SCANNER) clutter-0.8.c
 	$(G_IR_SCANNER) -v --namespace Clutter --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GL-1.0 \
              --include=GObject-2.0 \
-             --include=xlib-2.0 \
+	     $(CLUTTER_BACKEND_GIRS:%=--include=%) \
              --include=Pango-1.0 \
              --include=PangoCairo-1.0 \
              --include=GdkPixbuf-2.0 \