upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix python version detection in configure.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2023-01-09 15:10:00 +01:00
parent 4517dcd439
commit 0fed35a4b7
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure vendored
View file

@ -17734,7 +17734,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# #
if test ! -z "$PYTHON_VERSION"; then if test ! -z "$PYTHON_VERSION"; then
if test `$PYTHON -c "print('$PYTHON_VERSION' >= '2.4.0')"` = "False"; then badversion="no"
if test "$PYTHON_VERSION_MAJOR" -lt 2; then
badversion="yes"
fi
if test "$PYTHON_VERSION_MAJOR" -eq 2 -a "$PYTHON_VERSION_MINOR" -lt 4; then
badversion="yes"
fi
if test "$badversion" = "yes"; then
as_fn_error $? "Python version >= 2.4.0 is required" "$LINENO" 5 as_fn_error $? "Python version >= 2.4.0 is required" "$LINENO" 5
fi fi

9
configure.ac
View file

@ -734,7 +734,14 @@ if test x_$ub_test_python != x_no; then
ac_save_LIBS="$LIBS" dnl otherwise AC_PYTHON_DEVEL thrashes $LIBS ac_save_LIBS="$LIBS" dnl otherwise AC_PYTHON_DEVEL thrashes $LIBS
AC_PYTHON_DEVEL AC_PYTHON_DEVEL
if test ! -z "$PYTHON_VERSION"; then if test ! -z "$PYTHON_VERSION"; then
if test `$PYTHON -c "print('$PYTHON_VERSION' >= '2.4.0')"` = "False"; then badversion="no"
if test "$PYTHON_VERSION_MAJOR" -lt 2; then
badversion="yes"
fi
if test "$PYTHON_VERSION_MAJOR" -eq 2 -a "$PYTHON_VERSION_MINOR" -lt 4; then
badversion="yes"
fi
if test "$badversion" = "yes"; then
AC_MSG_ERROR([Python version >= 2.4.0 is required]) AC_MSG_ERROR([Python version >= 2.4.0 is required])
fi fi

1
doc/Changelog
View file

@ -1,5 +1,6 @@
9 January 2023: Wouter 9 January 2023: Wouter
- Fix python module install path detection. - Fix python module install path detection.
- Fix python version detection in configure.
6 January 2023: Wouter 6 January 2023: Wouter
- Fix #823: Response change to NODATA for some ANY queries since - Fix #823: Response change to NODATA for some ANY queries since