gir-repository r53 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Thu Aug 21 20:59:47 2008
New Revision: 53
URL: http://svn.gnome.org/viewvc/gir-repository?rev=53&view=rev

Log:
2008-08-21  Johan Dahlin  <johan gnome org>

    * configure.ac:
    * gir/Makefile.am:
    Check for the packages in configure.ac



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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Aug 21 20:59:47 2008
@@ -7,6 +7,7 @@
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADER([config.h])
 
+# GObject Introspection, required
 PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0])
 
 G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
@@ -18,6 +19,34 @@
 GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
 AC_SUBST(GIRDIR)
 
+m4_define(pango_required_version,      1.16.0)
+m4_define(atk_required_version,        1.12.0)
+m4_define(gtk_required_version,        2.8.0)
+m4_define(libglade_required_version,   2.5.0)
+m4_define(gtkunixprint_required_version,  2.9.0)
+m4_define(pycairo_required_version,    1.0.2) dnl or 1.1.7
+m4_define(pygobject_required_version,  2.14.0)
+
+dnl atk
+PKG_CHECK_MODULES(ATK, atk >= 1.12.0, have_atk=true, have_atk=false)
+AC_SUBST(ATK_CFLAGS)
+AM_CONDITIONAL(BUILD_ATK, $have_atk)
+
+dnl pango
+PKG_CHECK_MODULES(PANGO, pango >= 1.16.0, have_pango=true, have_pango=false)
+AC_SUBST(PANGO_CFLAGS)
+AM_CONDITIONAL(BUILD_PANGO, $have_pango)
+
+dnl gtk+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.12.0, have_gtk=true, have_gtk=false)
+AC_SUBST(GTK_CFLAGS)
+AM_CONDITIONAL(BUILD_GTK, $have_gtk)
+
+dnl webkit
+PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= 1.0, have_webkit=true, have_webkit=false)
+AC_SUBST(WEBKIT_CFLAGS)
+AM_CONDITIONAL(BUILD_WEBKIT, $have_webkit)
+
 AC_CONFIG_FILES([Makefile
                  gir/Makefile
                  gir-repository-1.0.pc])

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Aug 21 20:59:47 2008
@@ -4,6 +4,8 @@
 BUILT_GIRSOURCES =
 
 # pango
+
+if BUILD_PANGO
 PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
 PANGO_LIBDIR=`pkg-config --variable=libdir pango`
 Pango.gir: $(G_IR_SCANNER)
@@ -94,8 +96,10 @@
             -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangox.h
 BUILT_GIRSOURCES += PangoX.gir
+endif
 
 # atk
+if BUILD_ATK
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
 Atk.gir: $(G_IR_SCANNER)
@@ -109,8 +113,10 @@
              -I$(ATK_INCLUDEDIR) \
              $(ATK_INCLUDEDIR)/atk/*.h
 BUILT_GIRSOURCES += Atk.gir
+endif
 
 # gdk
+if BUILD_GTK
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
 GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
 GdkPixbuf.gir: $(G_IR_SCANNER)
@@ -182,9 +188,10 @@
 	     $(srcdir)/gtk-x11-2.0.c \
              $(GTK_INCLUDEDIR)/gtk/*.h
 BUILT_GIRSOURCES += Gtk.gir
+endif
 
 # webkit
-
+if BUILD_WEBKIT
 WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
 WEBKIT_LIBDIR=`pkg-config --variable=libdir webkit-1.0`
 WebKit.gir: JSCore.gir Gtk.gir $(G_IR_SCANNER)
@@ -203,12 +210,11 @@
              $(WEBKIT_INCLUDEDIR)/webkit-1.0/webkit/*.h
 BUILT_GIRSOURCES += WebKit.gir
 CUSTOM_GIRSOURCES += JSCore.gir
+endif BUILD_WEBKIT
 
 girdir = $(datadir)/gir
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)
 
-CLEANFILES += $(typelibs_DATA)
-
 typelibsdir = $(datadir)/gitypelibs
 typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)