[glom/glom-1-14] Python module: Use _ instead of . in the .so file name.

[Murray Cumming <murrayc src gnome org>]

commit 66ea5124aaee486370343ad9955fc6fb3f28c870
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 19 13:07:06 2010 +0200

    Python module: Use _ instead of . in the .so file name.
    
    * Makefile.am: This was broken by the commit on 2010-09-10.
    * tests/test_load_python_library.cc: Use the variable instead of hard-coding.

 ChangeLog                         |    7 +++++++
 Makefile.am                       |    8 ++++----
 tests/test_load_python_library.cc |    5 +++--
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9e48abb..504b512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-19  Murray Cumming  <murrayc murrayc com>
+
+	Python module: Use _ instead of . in the .so file name.
+
+	* Makefile.am: This was broken by the commit on 2010-09-10.
+	* tests/test_load_python_library.cc: Use the variable instead of hard-coding.
+
 2010-10-11  David King  <davidk openismus com>
 
 	Change some uses of long to more appropriate types
diff --git a/Makefile.am b/Makefile.am
index 8cb99ad..0c3554f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,17 +51,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)
 
@@ -71,7 +71,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/tests/test_load_python_library.cc b/tests/test_load_python_library.cc
index 85ec613..b0ab963 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, 
+  // Attempt to dynamically load the python module,
   // attempting to resolve all symbols immediately:
-  const char* path = "glom/python_embed/python_module/.libs/glom_1_14.so";
+  const char* path = "glom/python_embed/python_module/.libs/glom_" GLOM_ABI_VERSION_UNDERLINED ".so";
   void* lib = dlopen(path, RTLD_NOW);
 
   if(!lib)