gir-repository r144 - in trunk: . gir

[lucasr svn gnome org]

Author: lucasr
Date: Tue Oct 21 08:37:11 2008
New Revision: 144
URL: http://svn.gnome.org/viewvc/gir-repository?rev=144&view=rev

Log:
2008-10-21  Lucas Rocha  <lucasr gnome org>

	* configure.ac, gir/Makefile.am: the gupnp typelib build should
	be optional.


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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Oct 21 08:37:11 2008
@@ -131,8 +131,12 @@
 AM_CONDITIONAL(BUILD_GSSDP, $have_gssdp)
 
 dnl gupnp
-PKG_CHECK_MODULES(GUPNP, gupnp-1.0,
-                  have_gupnp=true, have_gupnp=false)
+if test $have_gssdp; then
+    PKG_CHECK_MODULES(GUPNP, gupnp-1.0,
+                      have_gupnp=true, have_gupnp=false)
+else
+    have_gupnp=false
+fi
 AM_CONDITIONAL(BUILD_GUPNP, $have_gupnp)
 
 AC_CONFIG_FILES([Makefile

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Oct 21 08:37:11 2008
@@ -588,6 +588,7 @@
 BUILT_GIRSOURCES += Gssdp-1.0.gir
 endif BUILD_GSSDP
 
+if BUILD_GUPNP
 GUPNP_INCLUDEDIR=`pkg-config --variable=includedir gupnp-1.0`/gupnp-1.0
 GUPNP_LIBDIR=`pkg-config --variable=libdir gupnp-1.0`
 Gupnp-1.0.gir: libxml2-2.0.gir Gssdp-1.0.gir Soup-2.0.gir $(G_IR_SCANNER)
@@ -604,6 +605,7 @@
 	     -I$(GUPNP_INCLUDEDIR) \
              $(GUPNP_INCLUDEDIR)/libgupnp/*.h
 BUILT_GIRSOURCES += Gupnp-1.0.gir
+endif BUILD_GUPNP
 
 girdir = $(datadir)/gir
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)