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

configure: Don't error when python not found

Browse Source
This commit is contained in:
TingPing 2014-01-28 14:45:45 -05:00
parent 6964079673
commit e962039f83
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -293,25 +293,31 @@ if test "x$python" != xno ; then
case $python in case $python in
dnl set python2 default here dnl set python2 default here
python2) python2)
PKG_CHECK_MODULES([PY], [python-2.7], [], [AC_MSG_ERROR(Cannot find python-2.7!)]) PKG_CHECK_MODULES([PY], [python-2.7], [], [AC_MSG_WARN(Cannot find python-2.7!)])
PY_VER="`$PKG_CONFIG --modversion python-2.7`";; PY_VER="`$PKG_CONFIG --modversion python-2.7`";;
dnl set python3 default here dnl set python3 default here
python3) python3)
PKG_CHECK_MODULES([PY], [python-3.3], [], [AC_MSG_ERROR(Cannot find python-3.3!)]) PKG_CHECK_MODULES([PY], [python-3.3], [], [AC_MSG_WARN(Cannot find python-3.3!)])
PY_VER="`$PKG_CONFIG --modversion python-3.3`";; PY_VER="`$PKG_CONFIG --modversion python-3.3`";;
dnl add broken versions here dnl add broken versions here
python2.5|python2.6|python3.1|python3.2) python2.5|python2.6|python3.1|python3.2)
AC_MSG_ERROR(Unsupported Python version ${python}!);; AC_MSG_ERROR(Unsupported Python version ${python}!);;
python*) python*)
python="python-${python#python}" # stay posix compliant python="python-${python#python}" # stay posix compliant
PKG_CHECK_MODULES([PY], [${python}], [], [AC_MSG_ERROR(Cannot find "${python}.pc"!)]) PKG_CHECK_MODULES([PY], [${python}], [], [AC_MSG_WARN(Cannot find "${python}.pc"!)])
PY_VER="`$PKG_CONFIG --modversion ${python}`";; PY_VER="`$PKG_CONFIG --modversion ${python}`";;
*) *)
AC_MSG_ERROR(Unsupported Python ${python}!) AC_MSG_WARN(Unsupported Python ${python}!)
esac esac
AC_MSG_CHECKING(Python version) AC_MSG_CHECKING(Python version)
if test "$PY_VER"; then
AC_MSG_RESULT($PY_VER) AC_MSG_RESULT($PY_VER)
python="python-${PY_VER}" python="python-${PY_VER}"
else
AC_MSG_RESULT(Not found)
python=no
fi
else else
AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Python]) AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Python])
python=no python=no