gir-repository r83 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Sun Sep  7 03:26:07 2008
New Revision: 83
URL: http://svn.gnome.org/viewvc/gir-repository?rev=83&view=rev

Log:
Add GConf and GnomeKeyring


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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Sep  7 03:26:07 2008
@@ -46,6 +46,16 @@
                   have_gtk=true, have_gtk=false)
 AM_CONDITIONAL(BUILD_GTK, $have_gtk)
 
+dnl gconf
+PKG_CHECK_MODULES(GCONF, gconf-2.0,
+                  have_gconf=true, have_gconf=false)
+AM_CONDITIONAL(BUILD_GCONF, $have_gconf)
+
+dnl gnome-keyring
+PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1,
+                  have_gnomekeyring=true, have_gnomekeyring=false)
+AM_CONDITIONAL(BUILD_GNOMEKEYRING, $have_gnomekeyring)
+
 dnl webkit
 PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= 1.0,
                   have_webkit=true, have_webkit=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Sun Sep  7 03:26:07 2008
@@ -11,6 +11,36 @@
 	GL.gir
 BUILT_GIRSOURCES =
 
+if BUILD_GCONF
+GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
+GCONF_LIBDIR=`pkg-config --variable=libdir gconf-2.0`
+GConf.gir: $(G_IR_SCANNER) 
+	$(G_IR_SCANNER) -v --namespace GConf \
+            --include=GObject.gir \
+            --library=gconf-2 \
+	    $(NOCLOSURE) \
+            --output $@ \
+            --pkg gconf-2.0 \
+            -I$(GCONF_INCLUDEDIR) \
+            $(GCONF_INCLUDEDIR)/gconf/*.h
+BUILT_GIRSOURCES += GConf.gir
+endif
+
+if BUILD_GNOMEKEYRING
+GNOMEKEYRING_INCLUDEDIR=`pkg-config --variable=includedir gnome-keyring-1`/gnome-keyring-1
+GNOMEKEYRING_LIBDIR=`pkg-config --variable=libdir gnome-keyring-1`
+GnomeKeyring.gir: $(G_IR_SCANNER) 
+	$(G_IR_SCANNER) -v --namespace GnomeKeyring \
+            --include=GObject.gir \
+            --library=gnome-keyring \
+	    $(NOCLOSURE) \
+            --output $@ \
+            --pkg gnome-keyring-1 \
+            -I$(GNOMEKEYRING_INCLUDEDIR) \
+            $(GNOMEKEYRING_INCLUDEDIR)/*.h
+BUILT_GIRSOURCES += GnomeKeyring.gir
+endif
+
 # pango
 
 if BUILD_PANGO