From 7fb3ef3237ace4489ed7e7f3a2cc0c0169b831ed Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Wed, 1 Apr 2009 01:22:57 +0300 Subject: [PATCH] =?utf8?q?Fix=20bug=20576680=20=E2=80=93=20Introduce=20ver?= =?utf8?q?sionning=20functions=20and=20constants?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- champlain/Makefile.am | 12 ++++++++---- champlain/champlain.h | 1 + configure.ac | 23 +++++++++++++++-------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/champlain/Makefile.am b/champlain/Makefile.am index 3d37e60..14c7afd 100644 --- a/champlain/Makefile.am +++ b/champlain/Makefile.am @@ -4,7 +4,8 @@ BUILT_SOURCES = \ champlain-marshal.c \ champlain-enum-types.h \ champlain-enum-types.c \ - stamp-enum-types + stamp-enum-types \ + champlain-version.h CLEANFILES = $(BUILT_SOURCES) @@ -24,7 +25,8 @@ libchamplain_headers = \ champlain-enum-types.h \ champlain-tile.h \ champlain-map-source.h \ - champlain-network-map-source.h + champlain-network-map-source.h \ + champlain-version.h libchamplain_0_3_la_SOURCES = \ @@ -50,7 +52,8 @@ noinst_HEADERS = \ champlain-tile.h \ champlain-enum-types.h \ champlain-map-source.h \ - champlain-network-map-source.h + champlain-network-map-source.h \ + champlain-version.h libchamplain_include_HEADERS = \ champlain.h \ @@ -62,7 +65,8 @@ libchamplain_include_HEADERS = \ champlain-network-map-source.h \ champlain-tile.h \ champlain-zoom-level.h \ - champlain-marker.h + champlain-marker.h \ + champlain-version.h libchamplain_0_3_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la diff --git a/champlain/champlain.h b/champlain/champlain.h index e8598a1..0d0a59f 100644 --- a/champlain/champlain.h +++ b/champlain/champlain.h @@ -35,6 +35,7 @@ #include "champlain/champlain-enum-types.h" #include "champlain/champlain-map-source.h" #include "champlain/champlain-network-map-source.h" +#include "champlain/champlain-version.h" #undef __CHAMPLAIN_CHAMPLAIN_H_INSIDE__ diff --git a/configure.ac b/configure.ac index a916fd0..b22dbe3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. m4_define([champlain_major_version], [0]) -m4_define([champlain_minor_version], [9]) -m4_define([champlain_micro_version], [2]) +m4_define([champlain_minor_version], [3]) +m4_define([champlain_micro_version], [0]) m4_define([champlain_version], [champlain_major_version.champlain_minor_version.champlain_micro_version]) m4_define([api_version], @@ -27,12 +27,22 @@ AM_PROG_CC_C_O AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) # Checks for libraries. -LIBRARY_VERSION=champlain_version +LIBRARY_VERSION=0:0:0 # API_VERSION is used to generate pc file only API_VERSION=api_version +CHAMPLAIN_MAJOR_VERSION=champlain_major_version +CHAMPLAIN_MINOR_VERSION=champlain_minor_version +CHAMPLAIN_MICRO_VERSION=champlain_micro_version +CHAMPLAIN_VERSION=champlain_version +CHAMPLAIN_MAJORMINOR=champlain_api_version +AC_SUBST(API_VERSION) +AC_SUBST(CHAMPLAIN_MAJOR_VERSION) +AC_SUBST(CHAMPLAIN_MINOR_VERSION) +AC_SUBST(CHAMPLAIN_MICRO_VERSION) +AC_SUBST(CHAMPLAIN_VERSION) +AC_SUBST(CHAMPLAIN_MAJORMINOR) AC_SUBST(LIBRARY_VERSION) -AC_SUBST(API_VERSION) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) @@ -183,12 +193,9 @@ fi AM_CONDITIONAL(ENABLE_PYTHON, test "x$enable_python" = "xyes") # ----------------------------------------------------------- -GETTEXT_PACKAGE="libchamplain-$API_VERSION" -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [The prefix for our gettext translation domains.]) AC_CONFIG_FILES([Makefile champlain/Makefile + champlain/champlain-version.h demos/Makefile tidy/Makefile docs/reference/Makefile -- 2.39.5