From 5d2382caab50d046a1a8abddeb34d7a545b9ea12 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Thu, 31 Jan 2013 17:14:34 +0100 Subject: [PATCH] core: fix detection of python on Ubuntu Raring --- ChangeLog | 3 ++- cmake/FindPython.cmake | 2 +- configure.in | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 959967f47..e8b026b9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,13 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.4.1-dev, 2013-01-29 +v0.4.1-dev, 2013-01-31 Version 0.4.1 (under dev!) -------------------------- +* core: fix detection of python on Ubuntu Raring * core: fix hidden lines for messages without date when option weechat.history.max_buffer_lines_minutes is set (bug #38197) * core: use default hash/comparison callback for keys of type diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake index 801655a92..7e88cbb06 100644 --- a/cmake/FindPython.cmake +++ b/cmake/FindPython.cmake @@ -47,7 +47,7 @@ ENDIF(ENABLE_PYTHON3) IF(PYTHON_EXECUTABLE) EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('CONFINCLUDEPY'))" + COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))" OUTPUT_VARIABLE PYTHON_INC_DIR ) diff --git a/configure.in b/configure.in index 75e7082a3..e9f359769 100644 --- a/configure.in +++ b/configure.in @@ -481,7 +481,7 @@ if test "x$enable_python" = "xyes" ; then else PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; sys.stdout.write("%s" % sys.prefix)'` PYTHON_VERSION=`$PYTHON -c 'import sys; sys.stdout.write(sys.version[[:3]])'` - PYTHON_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('CONFINCLUDEPY'))"` + PYTHON_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('INCLUDEPY'))"` PYTHON_OLD_VERSION=`$PYTHON -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"` if test "x$PYTHON_OLD_VERSION" = "xTrue" ; then AC_MSG_WARN([