[tracker/bump_api_version_0.12] build: Bump tracker_api_version to 0.12 but keep major/miner as 0.11

[Martyn James Russell <mr src gnome org>]

commit 45b4be2259ac6f5f5fc7773226456d2d9077554d
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Aug 3 09:41:06 2011 +0100

    build: Bump tracker_api_version to 0.12 but keep major/miner as 0.11
    
    Add AX_DOTS_TO_UNDERSCORES macro to allow independent
    TRACKER_API_VERSION_UNDERSCORES value (which is used to convert "0.12" to
    "0_12".
    
    We need this because for 0.11.x releases, we want the files to be named *0.12*
    which requires changing only tracker_api_version in configure. This breaks
    Makefiles which build introspection files because they use
    $TRACKER_MAJOR_VERSION_$TRACKER_MINER_VERSION and that's not updated.
    Additionally, $TRACKER_API_VERSION can't be used because it contains a dot not
    an underscore. The only way to fix this was to do it in configure.

 acinclude.m4                       |    6 ++++++
 configure.ac                       |    5 ++++-
 src/libtracker-extract/Makefile.am |   10 +++++-----
 src/libtracker-miner/Makefile.am   |   12 ++++++------
 4 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 82bc493..9a29d21 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,10 @@
 dnl #########################################################################
+AC_DEFUN([AX_DOTS_TO_UNDERSCORES], [
+  $1[]_UNDERSCORES=`echo "$$1" | sed -e 's/\./_/g'`
+  AC_SUBST($1[]_UNDERSCORES)
+]) dnl AX_DOTS_TO_UNDERSCORES
+
+dnl #########################################################################
 AC_DEFUN([AX_COMPARE_VERSION], [
   # Used to indicate true or false condition
   ax_compare_version=false
diff --git a/configure.ac b/configure.ac
index 09dbe00..54fbbc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ m4_define([tracker_binary_age],
 m4_define([tracker_version],
           [tracker_major_version.tracker_minor_version.tracker_micro_version])
 # This is the X.Y used in -llibtracker-FOO-X.Y
-m4_define([tracker_api_version], [0.11])
+m4_define([tracker_api_version], [0.12])
 
 # libtool version related macros
 m4_define([tracker_lt_release], [tracker_major_version.tracker_minor_version])
@@ -65,6 +65,9 @@ TRACKER_VERSION=tracker_version
 TRACKER_API_VERSION=tracker_api_version
 TRACKER_BINARY_VERSION=tracker_binary_version
 
+dnl Note: this creates TRACKER_API_VERSION_UNDERSCORES and AC_SUBST's it
+AX_DOTS_TO_UNDERSCORES(TRACKER_API_VERSION, tracker_api_version)
+
 AC_SUBST(TRACKER_MAJOR_VERSION)
 AC_SUBST(TRACKER_MINOR_VERSION)
 AC_SUBST(TRACKER_MICRO_VERSION)
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 6007011..79ed232 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -80,12 +80,12 @@ if HAVE_INTROSPECTION
 INTROSPECTION_CFLAGS += $(AM_CPPFLAGS)
 introspection_sources = $(libtracker_extract_ TRACKER_API_VERSION@_la_SOURCES)
 TrackerExtract- TRACKER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(lib_LTLIBRARIES) Makefile
-TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GModule-2.0
-TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_SCANNERFLAGS = \
+TrackerExtract_ TRACKER_API_VERSION_UNDERSCORES@_gir_INCLUDES = GObject-2.0 GModule-2.0
+TrackerExtract_ TRACKER_API_VERSION_UNDERSCORES@_gir_SCANNERFLAGS = \
 	--include-uninstalled=$(top_srcdir)/src/libtracker-sparql/Tracker-$(TRACKER_API_VERSION).gir
-TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
-TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_LIBS = $(lib_LTLIBRARIES)
-TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+TrackerExtract_ TRACKER_API_VERSION_UNDERSCORES@_gir_CFLAGS = $(INCLUDES)
+TrackerExtract_ TRACKER_API_VERSION_UNDERSCORES@_gir_LIBS = $(lib_LTLIBRARIES)
+TrackerExtract_ TRACKER_API_VERSION_UNDERSCORES@_gir_FILES = $(introspection_sources)
 
 INTROSPECTION_GIRS += TrackerExtract-$(TRACKER_API_VERSION).gir
 
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 17f34be..0577626 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -160,13 +160,13 @@ introspection_sources = \
 	  $(libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES))
 
 TrackerMiner- TRACKER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(lib_LTLIBRARIES) Makefile
-TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GModule-2.0 Gio-2.0
-TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_SCANNERFLAGS = \
+TrackerMiner_ TRACKER_API_VERSION_UNDERSCORES@_gir_INCLUDES = GObject-2.0 GModule-2.0 Gio-2.0
+TrackerMiner_ TRACKER_API_VERSION_UNDERSCORES@_gir_SCANNERFLAGS = \
 	--include-uninstalled=$(top_srcdir)/src/libtracker-sparql/Tracker-$(TRACKER_API_VERSION).gir
-TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
-TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_NAMESPACE = "TrackerMiner"
-TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_LIBS = $(lib_LTLIBRARIES)
-TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+TrackerMiner_ TRACKER_API_VERSION_UNDERSCORES@_gir_CFLAGS = $(INCLUDES)
+TrackerMiner_ TRACKER_API_VERSION_UNDERSCORES@_gir_NAMESPACE = "TrackerMiner"
+TrackerMiner_ TRACKER_API_VERSION_UNDERSCORES@_gir_LIBS = $(lib_LTLIBRARIES)
+TrackerMiner_ TRACKER_API_VERSION_UNDERSCORES@_gir_FILES = $(introspection_sources)
 
 INTROSPECTION_GIRS += TrackerMiner-$(TRACKER_API_VERSION).gir