anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-21 17:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Autotool python support: allow to set version in configure.ac.

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2015-03-24 12:09:21 +01:00
parent 1780cb4896
commit 3d7ec5e25f
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config/lyxpython.m4
View File

@ -10,23 +10,21 @@
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
dnl The minimum version for a python2 interpreter dnl Usage: LYX_PATH_PYTHON23(PY2-MIN-VERSION, PYTHON3-MIN-VERSION)
m4_define(py2_ver, 2.7.0) dnl Find a suitable Python interpreter, that is either python2 >= $1
dnl The minimum version for a python3 interpreter dnl or python3 >= $2. Stop with an error message if it has not been found.
m4_define(py3_ver, 3.3.0) AC_DEFUN([LYX_PATH_PYTHON23],
dnl Usage: LYX_PATH_PYTHON
dnl Find a suitable Python interpreter, that is either python2 >= py2_ver
dnl or python3 >= py3_ver. Stop with an error message if it has not been found.
AC_DEFUN([LYX_PATH_PYTHON],
[ [
m4_define(py2_ver, [patsubst($1,[\.],[,])])
m4_define(py3_ver, [patsubst($2,[\.],[,])])
m4_define_default([_AM_PYTHON_INTERPRETER_LIST], m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl [python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
if test -n "$PYTHON"; then if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else. # If the user set $PYTHON, use it and don't search something else.
AC_MSG_CHECKING([whether $PYTHON version is >= py2_ver or py3_ver]) AC_MSG_CHECKING([whether $PYTHON version is >= $1 or $2])
LYX_PYTHON_CHECK_VERSION([$PYTHON], LYX_PYTHON_CHECK_VERSION([$PYTHON],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
@ -35,7 +33,7 @@ AC_DEFUN([LYX_PATH_PYTHON],
else else
# Otherwise, try each interpreter until we find one that satisfies # Otherwise, try each interpreter until we find one that satisfies
# LYX_PYTHON_CHECK_VERSION. # LYX_PYTHON_CHECK_VERSION.
AC_CACHE_CHECK([for a Python interpreter with version >= py2_ver or py3_ver], AC_CACHE_CHECK([for a Python interpreter with version >= $1 or $2],
[am_cv_pathless_PYTHON],[ [am_cv_pathless_PYTHON],[
for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
test "$am_cv_pathless_PYTHON" = none && break test "$am_cv_pathless_PYTHON" = none && break
@ -55,9 +53,6 @@ AC_DEFUN([LYX_PATH_PYTHON],
fi fi
]) ])
m4_define(py2_ver_list, [patsubst(py2_ver,[\.],[,])])
m4_define(py3_ver_list, [patsubst(py3_ver,[\.],[,])])
# LYX_PYTHON_CHECK_VERSION(PROG, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) # LYX_PYTHON_CHECK_VERSION(PROG, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= py2_ver or py3_ver. # Run ACTION-IF-TRUE if the Python interpreter PROG has version >= py2_ver or py3_ver.
@ -65,5 +60,5 @@ m4_define(py3_ver_list, [patsubst(py3_ver,[\.],[,])])
AC_DEFUN([LYX_PYTHON_CHECK_VERSION], AC_DEFUN([LYX_PYTHON_CHECK_VERSION],
[prog="import sys [prog="import sys
version = sys.version_info@<:@:3@:>@ version = sys.version_info@<:@:3@:>@
sys.exit(not ((py2_ver_list) <= version < (3,0,0) or version >= (py3_ver_list)))" sys.exit(not ((py2_ver) <= version < (3,0,0) or version >= (py3_ver)))"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$2], [$3])]) AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$2], [$3])])

2
configure.ac
View File

@ -64,7 +64,7 @@ for file in config/install-sh ; do
done done
# Find a suitable python interpreter # Find a suitable python interpreter
LYX_PATH_PYTHON LYX_PATH_PYTHON23([2.7.0], [3.3.0])
# do the usual python setup stuff # do the usual python setup stuff
AM_PATH_PYTHON AM_PATH_PYTHON
AC_PROG_RANLIB AC_PROG_RANLIB