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 8f6cb33bae62c572c72775d91af5a8d55f85ee1b..23616cb7c8ba6a24f21d1ae447fe120d340a10a0 100644 (file)
--- 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 4f32a5b65f554c7d0259a672f3527a5bf9f3fb01..2ab0e6826467c6f8dc9c9642c289a5a103d81f5c 100644 (file)
--- 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 04a05da5ace0443489fe97f62044a7ad3d3d639c..3d52031cb36ca9bfac68c6799cd890cfa1daf146 100644 (file)
--- 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@