[Commits] ChangeLog 1.1.2.94 1.1.2.95 PATCHSETS 1.1.2.69 1.1.2.70 configure.ac 1.1.2.94 1.1.2.95

[holger at claws-mail.org]

Update of /home/claws-mail/plugins/python
In directory srv:/tmp/cvs-serv6967

Modified Files:
      Tag: gtk2
	ChangeLog PATCHSETS configure.ac 
Log Message:
2012-11-06 [holger]	0.10cvs9

	* configure.ac
		dlopen() versioned Python so file during runtime.
		Some distros put the libpythonx.y.so link into a development
		package. Trying to open the file at runtime would require
		end users to install that development package.
		Based on a patch by mjules at free.fr
		Implements enhancement request #2770 

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/plugins/python/Attic/configure.ac,v
retrieving revision 1.1.2.94
retrieving revision 1.1.2.95
diff -u -d -r1.1.2.94 -r1.1.2.95
--- configure.ac	9 Sep 2012 11:17:07 -0000	1.1.2.94
+++ configure.ac	6 Nov 2012 01:05:32 -0000	1.1.2.95
@@ -10,7 +10,7 @@
 MAJOR_VERSION=0
 MINOR_VERSION=10
 MICRO_VERSION=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 
 if test \( $EXTRA_VERSION -eq 0 \); then
     if test \( $MICRO_VERSION -eq 0 \); then
@@ -109,16 +109,18 @@
     fi
 
     # libpython.so
-    PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
+    PYTHON_SO_FILE="libpython${PYTHON_VERSION}.so"
 	found_libpython_so="no"
-	if test -f "$PYTHON_PREFIX/lib/$PYTHON_SHARED_LIB"; then
+	if test -f "$PYTHON_PREFIX/lib/$PYTHON_SO_FILE"; then
 		found_libpython_so="yes"
+		PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib/$PYTHON_SO_FILE\"))"`
 	fi
-	if test -f "$PYTHON_PREFIX/lib64/$PYTHON_SHARED_LIB"; then
+	if test -f "$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE"; then
 		found_libpython_so="yes"
+		PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE\"))"`
 	fi
 	if test x"$found_libpython_so" != x"yes"; then
-	   AC_MSG_ERROR(Could not find Python shared libary: $PYTHON_SHARED_LIB does not exist. Maybe you need to install development packages for Python.)
+	   AC_MSG_ERROR(Could not find Python shared libary: $PYTHON_SO_FILE does not exist. Maybe you need to install development packages for Python.)
 	fi
 
 	# PyGTK

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/plugins/python/Attic/PATCHSETS,v
retrieving revision 1.1.2.69
retrieving revision 1.1.2.70
diff -u -d -r1.1.2.69 -r1.1.2.70
--- PATCHSETS	9 Sep 2012 11:17:07 -0000	1.1.2.69
+++ PATCHSETS	6 Nov 2012 01:05:32 -0000	1.1.2.70
@@ -71,3 +71,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 examples/auto/startup;  ) > 0.10cvs6.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/composewindowtype.c;  ) > 0.10cvs7.patchset
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/composewindowtype.c;  ) > 0.10cvs8.patchset
+( cvs diff -u -r 1.1.2.94 -r 1.1.2.95 configure.ac;  ) > 0.10cvs9.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/plugins/python/Attic/ChangeLog,v
retrieving revision 1.1.2.94
retrieving revision 1.1.2.95
diff -u -d -r1.1.2.94 -r1.1.2.95
--- ChangeLog	9 Sep 2012 11:17:07 -0000	1.1.2.94
+++ ChangeLog	6 Nov 2012 01:05:32 -0000	1.1.2.95
@@ -1,3 +1,13 @@
+2012-11-06 [holger]	0.10cvs9
+
+	* configure.ac
+		dlopen() versioned Python so file during runtime.
+		Some distros put the libpythonx.y.so link into a development
+		package. Trying to open the file at runtime would require
+		end users to install that development package.
+		Based on a patch by mjules at free.fr
+		Implements enhancement request #2770
+
 2012-09-09 [mones]	0.10cvs8
 
 	* src/composewindowtype.c