[glom] libglom: Change the ABI to 1.20, to avoid clashing with 1.16.

[Murray Cumming <murrayc src gnome org>]

commit b9c6f810393ef1435d833de94b50ffeef2061f5f
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 19 13:05:55 2010 +0200

    libglom: Change the ABI to 1.20, to avoid clashing with 1.16.
    
    * configure.ac:
    * glom/libglom/init.h:
    * glom/python_embed/python_module/py_glom_module.cc:
    * tests/test_load_python_library.cc: Change it everywhere, also correcting
    the python library name, which should have _ instead of . That was broken
    recently.

 ChangeLog                         |    4 +++-
 Makefile.am                       |    8 ++++----
 docs/pyglom_reference/Makefile.am |    2 +-
 tests/test_load_python_library.cc |    3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6194d9c..98be3eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,9 @@
 	* configure.ac:
 	* glom/libglom/init.h:
 	* glom/python_embed/python_module/py_glom_module.cc:
-	* tests/test_load_python_library.cc: Change it everywhere.
+	* tests/test_load_python_library.cc: Change it everywhere, also correcting
+	the python library name, which should have _ instead of . That was broken
+	recently.
 
 2010-10-19  Murray Cumming  <murrayc murrayc com>
 
diff --git a/Makefile.am b/Makefile.am
index 4d7f892..cc2a8ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,17 +56,17 @@ SUFFIXES = .rc .res
 
 bin_PROGRAMS = glom/glom
 lib_LTLIBRARIES = glom/libglom/libglom- GLOM_ABI_VERSION@.la
-pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_ GLOM_ABI_VERSION@.la
+pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_ GLOM_ABI_VERSION_UNDERLINED@.la
 
 include Makefile_libglom.am
 include Makefile_glom.am
 include Makefile_tests.am
 
-glom_python_embed_python_module_glom_ GLOM_ABI_VERSION@_la_SOURCES = \
+glom_python_embed_python_module_glom_ GLOM_ABI_VERSION_UNDERLINED@_la_SOURCES = \
 	glom/python_embed/python_module/py_glom_module.cc	\
 	glom/python_embed/python_module/py_glom_module.h
 
-glom_python_embed_python_module_glom_ GLOM_ABI_VERSION@_la_LIBADD = \
+glom_python_embed_python_module_glom_ GLOM_ABI_VERSION_UNDERLINED@_la_LIBADD = \
 	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
 	$(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 
@@ -76,7 +76,7 @@ else
 pymod_ldflags = -module -avoid-version -no-undefined
 endif
 glom_pyexport = -export-symbols-regex '^_*initglom'
-glom_python_embed_python_module_glom_ GLOM_ABI_VERSION@_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
+glom_python_embed_python_module_glom_ GLOM_ABI_VERSION_UNDERLINED@_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = glom/libglom/glom- GLOM_ABI_VERSION@.pc
diff --git a/docs/pyglom_reference/Makefile.am b/docs/pyglom_reference/Makefile.am
index dfe097b..88cde8f 100644
--- a/docs/pyglom_reference/Makefile.am
+++ b/docs/pyglom_reference/Makefile.am
@@ -6,7 +6,7 @@
 # html:
 #	pydoc -w $(top_builddir)/glom/python_embed/python_module/.libs/
 #	mkdir html
-#	mv glom_1_16.html html/index.html
+#	mv glom_1_20.html html/index.html
 
 book_name = pyglom_$(GLOM_ABI_VERSION_UNDERLINED)
 
diff --git a/tests/test_load_python_library.cc b/tests/test_load_python_library.cc
index a8dc3e0..e018dba 100644
--- a/tests/test_load_python_library.cc
+++ b/tests/test_load_python_library.cc
@@ -1,12 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <dlfcn.h>
+#include "config.h"
 
 int main()
 {
   // Attempt to dynamically load the python module,
   // attempting to resolve all symbols immediately:
-  const char* path = "glom/python_embed/python_module/.libs/glom_1.20.so";
+  const char* path = "glom/python_embed/python_module/.libs/glom_" GLOM_ABI_VERSION_UNDERLINED ".so";;
   void* lib = dlopen(path, RTLD_NOW);
 
   if(!lib)