From 8dd1802d1f588a14c5fadbf71a03d792ae00b13d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@src.gnome.org>
Date: Thu, 28 Aug 2008 22:13:00 +0000
Subject: [PATCH] Fix --includedir handling

	* tests/scanner/Makefile.am: Pass the right
	--includedir args.  Add a Makefile dep.
	* tools/compiler.c: Pass includedirs down.
	* girepository/girparser.c: Actually put
	includedirs in context, pass down.  Fix
	locate_gir.

svn path=/trunk/; revision=514
---
 girepository/tools/compiler.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/girepository/tools/compiler.c b/girepository/tools/compiler.c
index 4c47cb6d8..68568b604 100644
--- a/girepository/tools/compiler.c
+++ b/girepository/tools/compiler.c
@@ -201,13 +201,14 @@ main (int argc, char ** argv)
       return 1;
     }
 
-  g_debug ("[parsing] start");
+  g_debug ("[parsing] start, %d includes", 
+	   includedirs ? g_strv_length (includedirs) : 0);
 
   modules = NULL;
   for (i = 0; input[i]; i++)
     {
       GList *mods;
-      mods = g_ir_parse_file (input[i], &error);
+      mods = g_ir_parse_file (input[i], (const char*const*) includedirs, &error);
       
       if (mods == NULL) 
 	{