[Commits] [SCM] claws branch, master, updated. 3.9.2-15-gd74bd45

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  d74bd45f9a003128e049a42a5a06606944fc286c (commit)
      from  cfcf045a7abb6f05c074539bfc4710547e63800e (commit)


- Log -----------------------------------------------------------------
commit d74bd45f9a003128e049a42a5a06606944fc286c
Author: Colin Leroy <colin at colino.net>
Date:   Fri Jun 14 10:23:11 2013 +0200

    Fix configure failing when cross-building for win32

diff --git a/configure.ac b/configure.ac
index 3c69211..23b0d20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1198,21 +1198,23 @@ AM_PATH_PYTHON([2.5], [
 	fi
 
 	if test x"$HAVE_PYTHON" = xyes; then
-		# libpython.so
-		PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
-		_save_libs="$LIBS"
-		LIBS="-ldl"
-		AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
-		AC_RUN_IFELSE(
-			[AC_LANG_PROGRAM(
-				[#include <dlfcn.h>
-				 #define PYTHON_SO_FILE "${PYTHON_SHARED_LIB}"
+		if test x"$platform_win32" = xno; then
+			# libpython.so
+			PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
+			_save_libs="$LIBS"
+			LIBS="-ldl"
+			AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
+			AC_RUN_IFELSE(
+				[AC_LANG_PROGRAM(
+					[#include <dlfcn.h>
+					 #define PYTHON_SO_FILE "${PYTHON_SHARED_LIB}"
+					],
+					[if (!dlopen(PYTHON_SO_FILE, RTLD_NOW | RTLD_GLOBAL)) return 1; return 0;])
 				],
-			 	[if (!dlopen(PYTHON_SO_FILE, RTLD_NOW | RTLD_GLOBAL)) return 1; return 0;])
-			],
-			[found_libpython_so="yes"],
-			[found_libpython_so="no"],
-			[AC_MSG_FAILURE([cross-compiling not supported])])
+				[found_libpython_so="yes"],
+				[found_libpython_so="no"],
+				[AC_MSG_FAILURE([cross-compiling not supported])])
+		fi
 		if test x"$found_libpython_so" != x"yes"; then
 			AC_MSG_RESULT(no)
 			AC_MSG_WARN(Could not find Python shared libary: ${PYTHON_SHARED_LIB}. Maybe you need to install development packages for Python.)

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

Summary of changes:
 configure.ac |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Claws Mail