From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 20 Feb 2009 18:25:23 +0000 (+0000)
Subject: Output 'vapigen' 'gen_introspect' and 'vala_gen_introspect' variables into
X-Git-Tag: 0.5.7~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8a774a681741a5b9399640cbecc8aa7e331184e;p=thirdparty%2Fvala.git

Output 'vapigen' 'gen_introspect' and 'vala_gen_introspect' variables into

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

svn path=/trunk/; revision=2465
---

diff --git a/ChangeLog b/ChangeLog
index 8f6cb33ba..23616cb7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
+
 2009-02-20  Jürg Billeter  <j@bitron.ch>
 
 	* gobject/valadbusclientmodule.vala:
diff --git a/configure.ac b/configure.ac
index 4f32a5b65..2ab0e6826 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,19 @@ AC_SUBST(LDFLAGS)
 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)
diff --git a/vala-1.0.pc.in b/vala-1.0.pc.in
index 04a05da5a..3d52031cb 100644
--- a/vala-1.0.pc.in
+++ b/vala-1.0.pc.in
@@ -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@