vala r2465 - trunk

[juergbi svn gnome org]

Author: juergbi
Date: Fri Feb 20 18:25:23 2009
New Revision: 2465
URL: http://svn.gnome.org/viewvc/vala?rev=2465&view=rev

Log:
2009-02-20  Ryan Lortie  <desrt desrt ca>

	* configure.ac:
	* vala-1.0.pc.in:

	Output 'vapigen' 'gen_introspect' and 'vala_gen_introspect' variables
	into the vala-1.0.pc file if --enable-vapigen, fixes bug 572554


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/vala-1.0.pc.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 20 18:25:23 2009
@@ -30,6 +30,19 @@
 AC_ARG_ENABLE(vapigen, AS_HELP_STRING([--enable-vapigen], [Enable VAPI generator]), enable_vapigen=$enableval, enable_vapigen=no)
 AM_CONDITIONAL(ENABLE_VAPIGEN, test x$enable_vapigen = xyes)
 
+if test "$enable_vapigen" = "yes"; then
+  vapigen_decl='vapigen=${bindir}/vapigen'
+  gen_introspect_decl='gen_introspect=${libdir}/vala/gen-introspect'
+  vala_gen_introspect_decl='vala_gen_introspect=${bindir}/vala-gen-introspect'
+else
+  vapigen_decl=''
+  gen_introspect_decl=''
+  vala_gen_introspect_decl=''
+fi
+AC_SUBST(vapigen_decl)
+AC_SUBST(gen_introspect_decl)
+AC_SUBST(vala_gen_introspect_decl)
+
 GLIB_REQUIRED=2.12.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED)

Modified: trunk/vala-1.0.pc.in
==============================================================================
--- trunk/vala-1.0.pc.in	(original)
+++ trunk/vala-1.0.pc.in	Fri Feb 20 18:25:23 2009
@@ -1,11 +1,16 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
+bindir= bindir@
 includedir= includedir@
 datarootdir= datarootdir@
 datadir= datadir@
 vapidir= datadir@/vala/vapi
 
+ vapigen_decl@
+ gen_introspect_decl@
+ vala_gen_introspect_decl@
+
 Name: Vala
 Description: The Vala compiler library
 Version: @VERSION@