[Commits] [SCM] claws branch, master, updated. 3.9.1-16-g7a8ee41

[claws at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  7a8ee419bf23dd5d84275e29cdd04bbb35d47b8d (commit)
      from  7e2654802e7eb97090da16bdf0fc3e4adf4fd283 (commit)


- Log -----------------------------------------------------------------
commit 7a8ee419bf23dd5d84275e29cdd04bbb35d47b8d
Author: Paul <paul at claws-mail.org>
Date:   Mon May 27 13:52:48 2013 +0100

    fix locating of pythonXX.so, with thanks to Ricardo

diff --git a/configure.ac b/configure.ac
index 07cda6f..56dd35a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1237,15 +1237,12 @@ AM_PATH_PYTHON([2.5], [
 
 	if test x"$HAVE_PYTHON" = xyes; then
 		# libpython.so
+		PYTHON_SO_FILE_LOCATION=`python-config --ldflags|sed 's/-L//'|awk '{print $1}'`
 		PYTHON_SO_FILE="libpython${PYTHON_VERSION}.so"
 		found_libpython_so="no"
-		if test -f "$PYTHON_PREFIX/lib/$PYTHON_SO_FILE"; then
+		if test -f "$PYTHON_SO_FILE_LOCATION/$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_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\"))"`
+			PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_SO_FILE_LOCATION/$PYTHON_SO_FILE\"))"`
 		fi
 		if test x"$found_libpython_so" != x"yes"; then
 			AC_MSG_WARN(Could not find Python shared libary: $PYTHON_SO_FILE does not exist. Maybe you need to install development packages for Python.)

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Claws Mail