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 #697: Get PY_MAJOR_VERSION failure at configure for python

Browse source 
2.4 to 2.6.


git-svn-id: file:///svn/unbound/trunk@3480 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2015-08-28 06:56:27 +00:00
parent 14b1de6166
commit 5dd7c7bb4b
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -16101,7 +16101,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
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
PY_MAJOR_VERSION="`$PYTHON -c "import sys; print(sys.version_info.major)"`" PY_MAJOR_VERSION="`$PYTHON -c \"import sys; print(sys.version_info[0])\"`"
# Have Python # Have Python

2
configure.ac
View file

@ -475,7 +475,7 @@ if test x_$ub_test_python != x_no; then
AC_ERROR([Python version >= 2.4.0 is required]) AC_ERROR([Python version >= 2.4.0 is required])
fi fi
PY_MAJOR_VERSION="`$PYTHON -c "import sys; print(sys.version_info.major)"`" [PY_MAJOR_VERSION="`$PYTHON -c \"import sys; print(sys.version_info[0])\"`"]
AC_SUBST(PY_MAJOR_VERSION) AC_SUBST(PY_MAJOR_VERSION)
# Have Python # Have Python
AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.]) AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])

4
doc/Changelog
View file

@ -1,3 +1,7 @@
28 August 2015: Wouter
- Fix #697: Get PY_MAJOR_VERSION failure at configure for python
2.4 to 2.6.
24 August 2015: Wouter 24 August 2015: Wouter
- Fix deadlock for local data add and zone add when unbound-control - Fix deadlock for local data add and zone add when unbound-control
list_local_data printout is interrupted. list_local_data printout is interrupted.