mirror of
https://github.com/moparisthebest/hexchat
synced 2024-11-14 21:35:06 -05:00
Merge pull request #343 from bui/master
fix configure error related to Python headers on Ubuntu 13.04
This commit is contained in:
commit
4adb0b386b
@ -341,7 +341,8 @@ if test "$python" = yes; then
|
|||||||
changequote(<<, >>)dnl
|
changequote(<<, >>)dnl
|
||||||
PY_VER=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'`
|
PY_VER=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'`
|
||||||
PY_LIB=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1);'`
|
PY_LIB=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1);'`
|
||||||
PY_INC=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("INCLUDEPY")[0];'`
|
PY_INC=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc();'`
|
||||||
|
PYPLAT_INC=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc(plat_specific=True);'`
|
||||||
$pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)"
|
$pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)"
|
||||||
changequote([, ])dnl
|
changequote([, ])dnl
|
||||||
AC_MSG_RESULT($PY_VER)
|
AC_MSG_RESULT($PY_VER)
|
||||||
@ -349,9 +350,9 @@ if test "$python" = yes; then
|
|||||||
AC_MSG_CHECKING(Python compile flags)
|
AC_MSG_CHECKING(Python compile flags)
|
||||||
PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'`
|
PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'`
|
||||||
PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'`
|
PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'`
|
||||||
if test -f $PY_INC/Python.h; then
|
if test -f $PY_INC/Python.h || test -f $PYPLAT_INC/Python.h; then
|
||||||
PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil"
|
PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil"
|
||||||
PY_CFLAGS="-I$PY_INC"
|
PY_CFLAGS="-I$PY_INC -I$PYPLAT_INC"
|
||||||
AC_MSG_RESULT(ok)
|
AC_MSG_RESULT(ok)
|
||||||
else
|
else
|
||||||
python=no
|
python=no
|
||||||
|
Loading…
Reference in New Issue
Block a user