GNOME.org
 

[libchamplain] Use stable api version in soname also in development releases

commit 35a54ad90cca8b9c0b09fec9ede26ebf629d0012
Author: JiÅ?í Techet <techet gmail com>
Date:   Tue Aug 24 01:33:17 2010 +0200

    Use stable api version in soname also in development releases
    
    This will simplify transition of programs depending on libchamplain
    when migrating from development version of the library to the stable
    version.
    
    This commit also contains some updates of the vala bindings.
    
    Signed-off-by: JiÅ?í Techet <techet gmail com>

 bindings/vala/champlain-gtk/champlain-gtk-0.7.deps |    2 -
 .../champlain-gtk-0.7/champlain-gtk-0.7.files      |    2 -
 bindings/vala/champlain-gtk/champlain-gtk-0.8.deps |    2 +
 ...amplain-gtk-0.7.vapi => champlain-gtk-0.8.vapi} |    2 +-
 .../champlain-gtk-0.8.defines}                     |    0
 .../champlain-gtk-0.8/champlain-gtk-0.8.files      |    2 +
 .../champlain-gtk-0.8.metadata}                    |    0
 .../champlain-gtk-0.8.namespace}                   |    0
 .../champlain-memphis/champlain-memphis-0.7.deps   |    2 -
 .../champlain-memphis/champlain-memphis-0.7.vapi   |   57 ------------
 .../champlain-memphis-0.7.files                    |    8 --
 .../champlain-memphis/champlain-memphis-0.8.deps   |    2 +
 .../champlain-memphis/champlain-memphis-0.8.vapi   |   53 +++++++++++
 .../champlain-memphis-0.8.defines}                 |    0
 .../champlain-memphis-0.8.files                    |    3 +
 .../champlain-memphis-0.8.metadata}                |    0
 .../champlain-memphis-0.8.namespace}               |    0
 .../{champlain-0.7.deps => champlain-0.8.deps}     |    0
 .../{champlain-0.7.vapi => champlain-0.8.vapi}     |   92 +++++++++++++++++---
 .../champlain-0.8.defines}                         |    0
 .../champlain-0.8.files}                           |   11 ++-
 .../champlain-0.8.metadata}                        |    4 +
 .../champlain-0.8.namespace}                       |    0
 configure.ac                                       |    8 +-
 24 files changed, 158 insertions(+), 92 deletions(-)
---
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.8.deps b/bindings/vala/champlain-gtk/champlain-gtk-0.8.deps
new file mode 100644
index 0000000..cdd80f3
--- /dev/null
+++ b/bindings/vala/champlain-gtk/champlain-gtk-0.8.deps
@@ -0,0 +1,2 @@
+gtk+-2.0
+champlain-0.8
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.7.vapi b/bindings/vala/champlain-gtk/champlain-gtk-0.8.vapi
similarity index 87%
rename from bindings/vala/champlain-gtk/champlain-gtk-0.7.vapi
rename to bindings/vala/champlain-gtk/champlain-gtk-0.8.vapi
index 1492b60..6593f34 100644
--- a/bindings/vala/champlain-gtk/champlain-gtk-0.7.vapi
+++ b/bindings/vala/champlain-gtk/champlain-gtk-0.8.vapi
@@ -1,4 +1,4 @@
-/* champlain-gtk-0.7.vapi generated by vapigen, do not modify. */
+/* champlain-gtk-0.8.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "GtkChamplain", lower_case_cprefix = "gtk_champlain_")]
 namespace GtkChamplain {
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.7/champlain-gtk-0.7.defines b/bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.defines
similarity index 100%
rename from bindings/vala/champlain-gtk/champlain-gtk-0.7/champlain-gtk-0.7.defines
rename to bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.defines
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.files b/bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.files
new file mode 100644
index 0000000..a64342c
--- /dev/null
+++ b/bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.files
@@ -0,0 +1,2 @@
+../../../champlain-gtk/.libs/libchamplain-gtk-0.8.so
+../../../champlain-gtk/
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.7/champlain-gtk-0.7.metadata b/bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.metadata
similarity index 100%
rename from bindings/vala/champlain-gtk/champlain-gtk-0.7/champlain-gtk-0.7.metadata
rename to bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.metadata
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.7/champlain-gtk-0.7.namespace b/bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.namespace
similarity index 100%
rename from bindings/vala/champlain-gtk/champlain-gtk-0.7/champlain-gtk-0.7.namespace
rename to bindings/vala/champlain-gtk/champlain-gtk-0.8/champlain-gtk-0.8.namespace
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.8.deps b/bindings/vala/champlain-memphis/champlain-memphis-0.8.deps
new file mode 100644
index 0000000..279ef9b
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.8.deps
@@ -0,0 +1,2 @@
+champlain-0.8
+memphis-0.2
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.8.vapi b/bindings/vala/champlain-memphis/champlain-memphis-0.8.vapi
new file mode 100644
index 0000000..cb49c76
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.8.vapi
@@ -0,0 +1,53 @@
+/* champlain-memphis-0.8.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "Champlain", lower_case_cprefix = "champlain_")]
+namespace Champlain {
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class MemphisRenderer : Champlain.Renderer {
+		[CCode (has_construct_function = false)]
+		public MemphisRenderer.full (uint tile_size);
+		public Clutter.Color get_background_color ();
+		public unowned Champlain.BoundingBox get_bounding_box ();
+		public unowned Champlain.MemphisRule get_rule (string id);
+		public unowned GLib.List get_rule_ids ();
+		public uint get_tile_size ();
+		public void load_rules (string rules_path);
+		public void remove_rule (string id);
+		public void set_background_color (Clutter.Color color);
+		public void set_rule (Champlain.MemphisRule rule);
+		public void set_tile_size (uint size);
+		[NoAccessorMethod]
+		public Champlain.BoundingBox bounding_box { owned get; set; }
+		public uint tile_size { get; set; }
+	}
+	[Compact]
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class MemphisRule {
+		public weak Champlain.MemphisRuleAttr border;
+		public weak string keys;
+		public weak Champlain.MemphisRuleAttr line;
+		public weak Champlain.MemphisRuleAttr polygon;
+		public weak Champlain.MemphisRuleAttr text;
+		public Champlain.MemphisRuleType type;
+		public weak string values;
+	}
+	[Compact]
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class MemphisRuleAttr {
+		public uchar color_alpha;
+		public uchar color_blue;
+		public uchar color_green;
+		public uchar color_red;
+		public double size;
+		public weak string style;
+		public uchar z_max;
+		public uchar z_min;
+	}
+	[CCode (cprefix = "CHAMPLAIN_MEMPHIS_RULE_TYPE_", has_type_id = false, cheader_filename = "champlain/champlain.h")]
+	public enum MemphisRuleType {
+		UNKNOWN,
+		NODE,
+		WAY,
+		RELATION
+	}
+}
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.7/champlain-memphis-0.7.defines b/bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.defines
similarity index 100%
rename from bindings/vala/champlain-memphis/champlain-memphis-0.7/champlain-memphis-0.7.defines
rename to bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.defines
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.files b/bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.files
new file mode 100644
index 0000000..d81aca6
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.files
@@ -0,0 +1,3 @@
+../../../champlain/.libs/libchamplain-0.8.so
+../../../champlain/champlain-memphis-renderer.h
+
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.7/champlain-memphis-0.7.metadata b/bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.metadata
similarity index 100%
rename from bindings/vala/champlain-memphis/champlain-memphis-0.7/champlain-memphis-0.7.metadata
rename to bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.metadata
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.7/champlain-memphis-0.7.namespace b/bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.namespace
similarity index 100%
rename from bindings/vala/champlain-memphis/champlain-memphis-0.7/champlain-memphis-0.7.namespace
rename to bindings/vala/champlain-memphis/champlain-memphis-0.8/champlain-memphis-0.8.namespace
diff --git a/bindings/vala/champlain/champlain-0.7.deps b/bindings/vala/champlain/champlain-0.8.deps
similarity index 100%
rename from bindings/vala/champlain/champlain-0.7.deps
rename to bindings/vala/champlain/champlain-0.8.deps
diff --git a/bindings/vala/champlain/champlain-0.7.vapi b/bindings/vala/champlain/champlain-0.8.vapi
similarity index 84%
rename from bindings/vala/champlain/champlain-0.7.vapi
rename to bindings/vala/champlain/champlain-0.8.vapi
index bb61632..95ac84f 100644
--- a/bindings/vala/champlain/champlain-0.7.vapi
+++ b/bindings/vala/champlain/champlain-0.8.vapi
@@ -1,4 +1,4 @@
-/* champlain-0.7.vapi generated by vapigen, do not modify. */
+/* champlain-0.8.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Champlain", lower_case_cprefix = "champlain_")]
 namespace Champlain {
@@ -21,17 +21,30 @@ namespace Champlain {
 		[NoAccessorMethod]
 		public double longitude { get; set; }
 	}
+	[Compact]
+	[CCode (copy_function = "champlain_bounding_box_copy", type_id = "CHAMPLAIN_TYPE_BOUNDING_BOX", cheader_filename = "champlain/champlain.h")]
+	public class BoundingBox {
+		public double bottom;
+		public double left;
+		public double right;
+		public double top;
+		[CCode (has_construct_function = false)]
+		public BoundingBox ();
+		public unowned Champlain.BoundingBox copy ();
+		public void get_center (out double lat, out double lon);
+	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class ErrorTileSource : Champlain.TileSource {
+	public class ErrorTileRenderer : Champlain.Renderer {
 		[CCode (has_construct_function = false)]
-		public ErrorTileSource.full (uint tile_size);
+		public ErrorTileRenderer (uint tile_size);
+		public uint get_tile_size ();
+		public void set_tile_size (uint size);
+		public uint tile_size { get; set; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class FileCache : Champlain.TileCache {
 		[CCode (has_construct_function = false)]
-		public FileCache ();
-		[CCode (has_construct_function = false)]
-		public FileCache.full (uint size_limit, string cache_dir, bool persistent);
+		public FileCache.full (uint size_limit, string cache_dir, Champlain.Renderer renderer);
 		public unowned string get_cache_dir ();
 		public uint get_size_limit ();
 		public void purge ();
@@ -41,6 +54,17 @@ namespace Champlain {
 		public uint size_limit { get; set construct; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class FileTileSource : Champlain.TileSource {
+		[CCode (has_construct_function = false)]
+		public FileTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, Champlain.Renderer renderer);
+		public void load_map_data (string map_path);
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class ImageRenderer : Champlain.Renderer {
+		[CCode (has_construct_function = false)]
+		public ImageRenderer ();
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class Layer : Clutter.Group, Clutter.Scriptable, Clutter.Container {
 		[CCode (has_construct_function = false)]
 		public Layer ();
@@ -68,15 +92,15 @@ namespace Champlain {
 		public virtual unowned string get_name ();
 		public unowned Champlain.MapSource get_next_source ();
 		public virtual Champlain.MapProjection get_projection ();
+		public unowned Champlain.Renderer get_renderer ();
 		public uint get_row_count (uint zoom_level);
 		public virtual uint get_tile_size ();
 		public uint get_x (uint zoom_level, double longitude);
 		public uint get_y (uint zoom_level, double latitude);
-		[NoWrapper]
-		public virtual void on_set_next_source (Champlain.MapSource next_source, Champlain.MapSource new_next_source);
 		public void set_next_source (Champlain.MapSource next_source);
+		public void set_renderer (Champlain.Renderer renderer);
 		public Champlain.MapSource next_source { get; set; }
-		public virtual signal void reload_tiles ();
+		public Champlain.Renderer renderer { get; set; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class MapSourceChain : Champlain.MapSource {
@@ -106,6 +130,7 @@ namespace Champlain {
 	public class MapSourceFactory : GLib.Object {
 		public unowned Champlain.MapSource create (string id);
 		public unowned Champlain.MapSource create_cached_source (string id);
+		public unowned Champlain.MapSource create_error_source (uint tile_size);
 		public static unowned Champlain.MapSourceFactory dup_default ();
 		public unowned GLib.SList dup_list ();
 		public bool register (Champlain.MapSourceDesc desc, Champlain.MapSourceConstructor constructor, void* data);
@@ -168,9 +193,31 @@ namespace Champlain {
 		public Pango.WrapMode wrap_mode { get; set; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class MemoryCache : Champlain.TileCache {
+		public void clean ();
+		[CCode (has_construct_function = false)]
+		public MemoryCache.full (uint size_limit, Champlain.Renderer renderer);
+		public uint get_size_limit ();
+		public void set_size_limit (uint size_limit);
+		public uint size_limit { get; set construct; }
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class NetworkBboxTileSource : Champlain.TileSource {
+		[CCode (has_construct_function = false)]
+		public NetworkBboxTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, Champlain.Renderer renderer);
+		public unowned string get_api_uri ();
+		public void load_map_data (double bound_left, double bound_bottom, double bound_right, double bound_top);
+		public void set_api_uri (string api_uri);
+		public string api_uri { get; set; }
+		[NoAccessorMethod]
+		public string proxy_uri { owned get; set; }
+		[NoAccessorMethod]
+		public Champlain.State state { get; set; }
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class NetworkTileSource : Champlain.TileSource {
 		[CCode (has_construct_function = false)]
-		public NetworkTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, string uri_format);
+		public NetworkTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, string uri_format, Champlain.Renderer renderer);
 		public bool get_offline ();
 		public unowned string get_proxy_uri ();
 		public unowned string get_uri_format ();
@@ -181,6 +228,11 @@ namespace Champlain {
 		public string proxy_uri { get; set; }
 		public string uri_format { get; set construct; }
 	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class NullTileSource : Champlain.TileSource {
+		[CCode (has_construct_function = false)]
+		public NullTileSource.full (Champlain.Renderer renderer);
+	}
 	[Compact]
 	[CCode (copy_function = "champlain_point_copy", type_id = "CHAMPLAIN_TYPE_POINT", cheader_filename = "champlain/champlain.h")]
 	public class Point {
@@ -225,6 +277,18 @@ namespace Champlain {
 		[NoAccessorMethod]
 		public bool visible { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class RenderCallbackData {
+		public weak string data;
+		public bool error;
+		public uint size;
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class Renderer : GLib.InitiallyUnowned {
+		public virtual void render (Champlain.Tile tile);
+		public virtual void set_data (string data, uint size);
+	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class SelectionLayer : Champlain.Layer, Clutter.Scriptable, Clutter.Container {
 		[CCode (type = "ChamplainLayer*", has_construct_function = false)]
@@ -246,6 +310,7 @@ namespace Champlain {
 	public class Tile : Clutter.Group, Clutter.Scriptable, Clutter.Container {
 		[CCode (has_construct_function = false)]
 		public Tile ();
+		public void display_content ();
 		[CCode (has_construct_function = false)]
 		public Tile.full (int x, int y, uint size, int zoom_level);
 		public unowned Clutter.Actor get_content ();
@@ -274,16 +339,13 @@ namespace Champlain {
 		public int x { get; set; }
 		public int y { get; set; }
 		public int zoom_level { get; set; }
+		public virtual signal void render_complete (void* p0);
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class TileCache : Champlain.MapSource {
-		public virtual void clean ();
-		public bool get_persistent ();
 		public virtual void on_tile_filled (Champlain.Tile tile);
 		public virtual void refresh_tile_time (Champlain.Tile tile);
 		public virtual void store_tile (Champlain.Tile tile, string contents, size_t size);
-		[NoAccessorMethod]
-		public bool persistent_cache { get; construct; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class TileSource : Champlain.MapSource {
@@ -340,6 +402,7 @@ namespace Champlain {
 		public int get_zoom_level ();
 		public bool get_zoom_on_double_click ();
 		public void go_to (double latitude, double longitude);
+		public void reload_tiles ();
 		public void remove_layer (Champlain.Layer layer);
 		public void remove_polygon (Champlain.Polygon polygon);
 		public void set_decel_rate (double rate);
@@ -399,6 +462,7 @@ namespace Champlain {
 	public enum State {
 		NONE,
 		LOADING,
+		LOADED,
 		DONE
 	}
 	[CCode (cprefix = "CHAMPLAIN_UNIT_", has_type_id = false, cheader_filename = "champlain/champlain.h")]
diff --git a/bindings/vala/champlain/champlain-0.7/champlain-0.7.defines b/bindings/vala/champlain/champlain-0.8/champlain-0.8.defines
similarity index 100%
rename from bindings/vala/champlain/champlain-0.7/champlain-0.7.defines
rename to bindings/vala/champlain/champlain-0.8/champlain-0.8.defines
diff --git a/bindings/vala/champlain/champlain-0.7/champlain-0.7.files b/bindings/vala/champlain/champlain-0.8/champlain-0.8.files
similarity index 65%
rename from bindings/vala/champlain/champlain-0.7/champlain-0.7.files
rename to bindings/vala/champlain/champlain-0.8/champlain-0.8.files
index 3ba48aa..c68c518 100644
--- a/bindings/vala/champlain/champlain-0.7/champlain-0.7.files
+++ b/bindings/vala/champlain/champlain-0.8/champlain-0.8.files
@@ -1,4 +1,4 @@
-../../../champlain/.libs/libchamplain-0.7.so
+../../../champlain/.libs/libchamplain-0.8.so
 ../../../champlain/champlain.h
 ../../../champlain/champlain-defines.h
 ../../../champlain/champlain-point.h
@@ -13,9 +13,16 @@
 ../../../champlain/champlain-tile-source.h
 ../../../champlain/champlain-tile-cache.h
 ../../../champlain/champlain-network-tile-source.h
-../../../champlain/champlain-error-tile-source.h
+../../../champlain/champlain-null-tile-source.h
+../../../champlain/champlain-file-tile-source.h
+../../../champlain/champlain-network-bbox-tile-source.h
 ../../../champlain/champlain-file-cache.h
+../../../champlain/champlain-memory-cache.h
+../../../champlain/champlain-renderer.h
+../../../champlain/champlain-image-renderer.h
+../../../champlain/champlain-error-tile-renderer.h
 ../../../champlain/champlain-map-source-factory.h
 ../../../champlain/champlain-map-source-desc.h
 ../../../champlain/champlain-polygon.h
 ../../../champlain/champlain-version.h
+../../../champlain/champlain-bounding-box.h
diff --git a/bindings/vala/champlain/champlain-0.7/champlain-0.7.metadata b/bindings/vala/champlain/champlain-0.8/champlain-0.8.metadata
similarity index 80%
rename from bindings/vala/champlain/champlain-0.7/champlain-0.7.metadata
rename to bindings/vala/champlain/champlain-0.8/champlain-0.8.metadata
index bbb5d62..91597f2 100644
--- a/bindings/vala/champlain/champlain-0.7/champlain-0.7.metadata
+++ b/bindings/vala/champlain/champlain-0.8/champlain-0.8.metadata
@@ -7,3 +7,7 @@ champlain_view_get_coords_from_event.lon is_out="1"
 champlain_marker_new_with_text.font nullable="1"
 champlain_marker_new_with_text.text_color nullable="1"
 champlain_marker_new_with_text.marker_color nullable="1"
+
+champlain_bounding_box_get_center.lat is_out="1"
+champlain_bounding_box_get_center.lon is_out="1"
+
diff --git a/bindings/vala/champlain/champlain-0.7/champlain-0.7.namespace b/bindings/vala/champlain/champlain-0.8/champlain-0.8.namespace
similarity index 100%
rename from bindings/vala/champlain/champlain-0.7/champlain-0.7.namespace
rename to bindings/vala/champlain/champlain-0.8/champlain-0.8.namespace
diff --git a/configure.ac b/configure.ac
index af8770c..527827f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,9 @@ m4_define([champlain_minor_version], [7])
 m4_define([champlain_micro_version], [0])
 m4_define([champlain_version],
           [champlain_major_version.champlain_minor_version.champlain_micro_version])
+m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)])
 m4_define([champlain_api_version],
-          [champlain_major_version.champlain_minor_version])
+          [champlain_major_version.champlain_minor_api_version])
 AC_PREREQ([2.64])
 AC_INIT([libchamplain],
         [champlain_version],
@@ -18,14 +19,13 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([-Wno-portability])
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 LT_PREREQ([2.2.6])
 LT_INIT([dlopen])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -39,7 +39,7 @@ AM_PROG_CC_C_O
 # - If the interface is the same as the previous version, change to C:R+1:A
 LIBRARY_VERSION=0:0:0
 CHAMPLAIN_API_VERSION=champlain_api_version
-CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_version
+CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version
 CHAMPLAIN_MAJOR_VERSION=champlain_major_version
 CHAMPLAIN_MINOR_VERSION=champlain_minor_version
 CHAMPLAIN_MICRO_VERSION=champlain_micro_version
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]