iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CONFIGURE: allow to pass specific python version

Browse Source 
This is useful if distros support installing multiple python versions
in parallel such as: 2.5, 2.6, 2.7.
For python3.* we will get syntax error during the imports, so the checks
will successfully disable it.
It defaults to python2.
This commit is contained in:
hasufell 2013-03-31 16:57:26 +02:00
parent 477bbbb340
commit ae5d7e29e3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -114,8 +114,8 @@ AC_ARG_ENABLE(xlib,
xlib=$enableval, xlib=yes) xlib=$enableval, xlib=yes)
AC_ARG_ENABLE(python, AC_ARG_ENABLE(python,
[AS_HELP_STRING([--disable-python],[don't build the python plugin])], [AS_HELP_STRING([--enable-python=pythonversion],[build the python plugin (default on, python2)])],
python=$enableval, python=yes) python=$enableval, python=python2)
AC_ARG_ENABLE(perl, AC_ARG_ENABLE(perl,
[AS_HELP_STRING([--disable-perl],[don't build the perl plugin])], [AS_HELP_STRING([--disable-perl],[don't build the perl plugin])],
@ -333,9 +333,13 @@ dnl *********************************************************************
dnl ** PYTHON *********************************************************** dnl ** PYTHON ***********************************************************
dnl ********************************************************************* dnl *********************************************************************
if test "$python" = yes; then if test "x$python" != xno ; then
AC_PATH_PROG(pythonpath, python2) if test "$python" = yes ; then
if test "_$pythonpath" = _ ; then # default
python="python2"
fi
AC_PATH_PROG(pythonpath, $python)
if test "_$pythonpath" = _ ; then
AC_PATH_PROG(pythonpath, python) AC_PATH_PROG(pythonpath, python)
fi fi
if test "_$pythonpath" = _ ; then if test "_$pythonpath" = _ ; then
@ -363,7 +367,7 @@ if test "$python" = yes; then
AC_MSG_RESULT([Can't find Python.h]) AC_MSG_RESULT([Can't find Python.h])
fi fi
else else
echo "Python too old. Only 2.2 or above is supported." echo "Python is too old or too new. Only 2.2-2.7 are supported."
python=no python=no
fi fi
fi fi
@ -696,7 +700,7 @@ AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes") AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes") AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") AM_CONDITIONAL(DO_PYTHON, test "x$python" != "xno")
dnl AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes") dnl AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes") AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes") AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")