gir-repository r170 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Mon Oct 27 11:29:20 2008
New Revision: 170
URL: http://svn.gnome.org/viewvc/gir-repository?rev=170&view=rev

Log:
Build Clutter with all backends, not just glx

	* configure.ac:
	* gir/Makefile.am: Build Clutter with all backends, not just
	glx. Replace hardcoded glx backend in library and package names
	with a variable checked in configure.

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 27 11:29:20 2008
@@ -112,9 +112,14 @@
 AM_CONDITIONAL(BUILD_NOTIFY, $have_notify)
 
 dnl clutter
-PKG_CHECK_MODULES(CLUTTER, clutter-glx-0.8 >= 0.8,
+PKG_CHECK_MODULES(CLUTTER, clutter-0.8 >= 0.8,
                   have_clutter=true, have_clutter=false)
 AM_CONDITIONAL(BUILD_CLUTTER, $have_clutter)
+CLUTTER_BACKEND=
+if $have_clutter; then
+    CLUTTER_BACKEND="$($PKG_CONFIG --variable=backend clutter-0.8)"
+fi
+AC_SUBST(CLUTTER_BACKEND)
 
 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	Mon Oct 27 11:29:20 2008
@@ -409,16 +409,16 @@
 	Clutter-custom.c \
 	Clutter-custom.h
 
-CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-glx-0.8`
-CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-glx-0.8`
+CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-$(CLUTTER_BACKEND)-0.8`
+CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-$(CLUTTER_BACKEND)-0.8`
 ClutterJson-0.8.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GObject-2.0 \
-	     --library=clutter-glx-0.8 \
+	     --library=clutter-$(CLUTTER_BACKEND)-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
-             --pkg clutter-glx-0.8 \
+             --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
@@ -433,11 +433,11 @@
              --include=PangoCairo-1.0 \
              --include=GdkPixbuf-2.0 \
              --include=ClutterJson-0.8 \
-	     --library=clutter-glx-0.8 \
+	     --library=clutter-$(CLUTTER_BACKEND)-0.8 \
 	     --library=girepo-Clutter-custom \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
-             --pkg clutter-glx-0.8 \
+             --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
 	     $(srcdir)/clutter-0.8.c \
@@ -464,7 +464,7 @@
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
              --pkg gtk+-2.0 \
-             --pkg clutter-glx-0.8 \
+             --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h