summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-01-10 18:00:45 +0900
committerSlávek Banko <slavek.banko@axis.cz>2023-01-10 14:59:45 +0100
commit7e4fd6fc5116d84e5dbc48a61fd566556d258cf8 (patch)
treefe99f8a1eb912a27812fa4d3ca2844e3a60f12c0
parenta7f75ac0ff587d5b8694a1b78557597161f8104c (diff)
downloadadmin-7e4fd6fc5116d84e5dbc48a61fd566556d258cf8.tar.gz
admin-7e4fd6fc5116d84e5dbc48a61fd566556d258cf8.zip
Update version detection for python 3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--acinclude.m4.in24
1 files changed, 7 insertions, 17 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index d5e9008..a311854 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -4463,7 +4463,7 @@ AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
if test -z "$1"; then
- version="1.5"
+ version="3.0"
else
version="$1"
fi
@@ -4551,22 +4551,12 @@ fi
AC_DEFUN([KDE_CHECK_PYTHON],
[
- KDE_CHECK_PYTHON_INTERN("2.7",
- [KDE_CHECK_PYTHON_INTERN("2.6",
- [KDE_CHECK_PYTHON_INTERN("2.5",
- [KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
- [KDE_CHECK_PYTHON_INTERN("2.1",
- [KDE_CHECK_PYTHON_INTERN("2.0",
- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
- ])
- ])
- ])
- ])
- ])
- ])
- ])
+ for PYTHON_VER_TEST in 3.{12,11,10,9,8,7,6,5,4,3,2,1,0}; do
+ KDE_CHECK_PYTHON_INTERN("$PYTHON_VER_TEST")
+ if test -n "$PYTHONLIB"; then
+ break
+ fi
+ done
])
AC_DEFUN([KDE_CHECK_STL],