[glom/glom-1-18] Make glom-1.18 parallel-installable with glom-1.16

[Murray Cumming <murrayc src gnome org>]

commit 074735b1f1aecda178e88857ac96cb293f840cf8
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Mar 14 22:17:45 2011 +0100

    Make glom-1.18 parallel-installable with glom-1.16
    
    	* configure.ac: Increase the ABI version.
    	* glom/python_embed/python_module/py_glom_module.cc: Load the correct
    	python version.
    
    	I forgot to do this before.

 ChangeLog                                         |   10 ++++++++++
 configure.ac                                      |    2 +-
 glom/python_embed/python_module/py_glom_module.cc |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5696ce1..fc525b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-03-14  Murray Cumming  <murrayc murrayc com>
 
+	Make glom-1.18 parallel-installable with glom-1.16
+
+	* configure.ac: Increase the ABI version.
+	* glom/python_embed/python_module/py_glom_module.cc: Load the correct 
+	python version.
+	
+	I forgot to do this before.
+
+2011-03-14  Murray Cumming  <murrayc murrayc com>
+
 	Fix the build.
 
 	* glom/libglom/init.cc: Add an include so we can use std::cerr.
diff --git a/configure.ac b/configure.ac
index 1dadf12..6689def 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ LT_INIT([disable-static win32-dll])
 # Used for the install directories for headers.  The same number is used in
 # the library name, which must be kept in sync, but variables can't be used
 # with that.
-AC_SUBST([GLOM_ABI_VERSION], [1.16])
+AC_SUBST([GLOM_ABI_VERSION], [1.18])
 AC_DEFINE_UNQUOTED([GLOM_ABI_VERSION], ["$GLOM_ABI_VERSION"],
 		   [Define to the Glom ABI version string.])
 
diff --git a/glom/python_embed/python_module/py_glom_module.cc b/glom/python_embed/python_module/py_glom_module.cc
index 57ed235..990a5cb 100644
--- a/glom/python_embed/python_module/py_glom_module.cc
+++ b/glom/python_embed/python_module/py_glom_module.cc
@@ -29,7 +29,7 @@
 
 using namespace Glom;
 
-BOOST_PYTHON_MODULE(glom_1_16)
+BOOST_PYTHON_MODULE(glom_1_18)
 {
   boost::python::docstring_options doc_options(
     true, // show the docstrings from here