should somehow be compatilble with current branch(es)

diff --git a/champlain-cil/champlain-sources.xml b/champlain-cil/champlain-sources.xml
index a6b12e82e04b4884389cdb1109c81aa0d2256698..5ebddfe721ddf782af0dcdbe3474106c936ac97f 100644 (file)
--- 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 fbf52ec954c67a08aa933435e719b9f9f0ffba6d..8ef00a72adc684ccbe9dd590fca6c26ddd0a8edd 100644 (file)
--- 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 17957fc284122dbddc45351524d94235493819e4..b21ba3e95cf65db74f3f3b6fa9533126a528e949 100644 (file)
--- 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)