From ca03ae38fb85e6ccb34e911a76a4076d8a9b1192 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Anders=20M=C3=B8rk-Pedersen?= <s071313@student.dtu.dk>
Date: Wed, 11 Feb 2009 16:12:42 +0100
Subject: [PATCH] should somehow be compatilble with current branch(es)

---
 champlain-cil/champlain-sources.xml         | 48 ++++++++++-----------
 champlain-gtk-cil/champlain-gtk-sources.xml |  3 +-
 configure.ac                                |  3 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/champlain-cil/champlain-sources.xml b/champlain-cil/champlain-sources.xml
index a6b12e8..5ebddfe 100644
--- a/champlain-cil/champlain-sources.xml
+++ b/champlain-cil/champlain-sources.xml
@@ -2,30 +2,30 @@
 	<api filename="champlain-api.raw">
 		<library name="champlain">
 			<namespace name="Champlain">
-				<file>../../champlain/champlain/champlain.h</file>
-				<file>../../champlain/champlain/champlain-view.h</file>
-				<file>../../champlain/champlain/champlain-defines.h</file>
-				<file>../../champlain/champlain/champlain-layer.h</file>
-				<file>../../champlain/champlain/champlain-marker.h</file>
-				<file>../../champlain/champlain/champlain-debug.c</file>
-				<file>../../champlain/champlain/champlain-view.c</file>
-				<file>../../champlain/champlain/champlain-layer.c</file>
-				<file>../../champlain/champlain/champlain-marker.c</file>
-				<file>../../champlain/champlain/champlain-map.c</file>
-				<file>../../champlain/champlain/champlain-zoom-level.c</file>
-				<file>../../champlain/champlain/champlain-tile.c</file>
-				<file>../../champlain/champlain/sources/oam.c</file>
-				<file>../../champlain/champlain/sources/osmmapnik.c</file>
-				<file>../../champlain/champlain/sources/mffrelief.c</file>
-				<file>../../champlain/champlain/sources/googlemap.c</file>
-				<file>../../champlain/champlain/sources/googlesat.c</file>
-				<file>../../champlain/champlain/sources/googleterrain.c</file>
-				<file>../../champlain/champlain/sources/debugmap.c</file>
-				<file>../../champlain/champlain/champlain-marshal.h</file>
-				<file>../../champlain/champlain/champlain-marshal.c</file>
-				<file>../../champlain/champlain/champlain-enum-types.h</file>
-				<file>../../champlain/champlain/champlain-enum-types.c</file>
-				<file>../../champlain/champlain/stamp-enum-types</file>
+				<file>../champlain/champlain.h</file>
+				<file>../champlain/champlain-view.h</file>
+				<file>../champlain/champlain-defines.h</file>
+				<file>../champlain/champlain-layer.h</file>
+				<file>../champlain/champlain-marker.h</file>
+				<file>../champlain/champlain-debug.c</file>
+				<file>../champlain/champlain-view.c</file>
+				<file>../champlain/champlain-layer.c</file>
+				<file>../champlain/champlain-marker.c</file>
+				<file>../champlain/champlain-map.c</file>
+				<file>../champlain/champlain-zoom-level.c</file>
+				<file>../champlain/champlain-tile.c</file>
+				<file>../champlain/sources/oam.c</file>
+				<file>../champlain/sources/osmmapnik.c</file>
+				<file>../champlain/sources/mffrelief.c</file>
+				<file>../champlain/sources/googlemap.c</file>
+				<file>../champlain/sources/googlesat.c</file>
+				<file>../champlain/sources/googleterrain.c</file>
+				<file>../champlain/sources/debugmap.c</file>
+				<file>../champlain/champlain-marshal.h</file>
+				<file>../champlain/champlain-marshal.c</file>
+				<file>../champlain/champlain-enum-types.h</file>
+				<file>../champlain/champlain-enum-types.c</file>
+				<file>../champlain/stamp-enum-types</file>
 			</namespace>
 		</library>
 	</api>
diff --git a/champlain-gtk-cil/champlain-gtk-sources.xml b/champlain-gtk-cil/champlain-gtk-sources.xml
index fbf52ec..8ef00a7 100644
--- a/champlain-gtk-cil/champlain-gtk-sources.xml
+++ b/champlain-gtk-cil/champlain-gtk-sources.xml
@@ -2,9 +2,8 @@
 	<api filename="champlain-gtk-api.raw">
 		<library name="champlain-gtk">
 			<namespace name="Champlain">
-				<dir>../../champlain-gtk/champlain-gtk</dir>
+				<dir>../champlain-gtk</dir>
 			</namespace>
 		</library>
 	</api>
 </gapi-parser-input>
-
diff --git a/configure.ac b/configure.ac
index 17957fc..b21ba3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,8 @@ AC_SUBST(CLUTTER_GTK_SHARP_LIBS)
 
 PKG_CHECK_MODULES(CHAMPLAIN, champlain-0.3 >= 0.3)
 
-CHAMPLAIN_APIVERSION=$(pkg-config --variable apiversion champlain-0.3)
+dnl CHAMPLAIN_APIVERSION=$(pkg-config --variable apiversion champlain-0.3)
+CHAMPLAIN_APIVERSION=0.3
 
 CHAMPLAIN_GTK_REQUIRED_VERSION=0.3
 PKG_CHECK_MODULES(CHAMPLAIN_GTK, champlain-gtk-0.3 >= $CHAMPLAIN_GTK_REQUIRED_VERSION, enable_gtk=yes, enable_gtk=no)
-- 
2.39.5