[Commits] [SCM] claws branch, master, updated. 3.9.1-17-g533722f

claws at claws-mail.org claws at claws-mail.org
Wed May 29 19:26:48 CEST 2013


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


- Log -----------------------------------------------------------------
commit 533722f52efcce1117503d5263efbbd4702c9c09
Author: Paul <paul at claws-mail.org>
Date:   Wed May 29 18:26:39 2013 +0100

    put back this cruft until a better solution presents itself

diff --git a/configure.ac b/configure.ac
index 56dd35a..fe478cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1240,7 +1240,15 @@ AM_PATH_PYTHON([2.5], [
 		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_SO_FILE_LOCATION/$PYTHON_SO_FILE"; 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 x"$found_libpython_so" != x"yes" && 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" && 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_SO_FILE_LOCATION/$PYTHON_SO_FILE\"))"`
 		fi

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

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list