- Fix #697: Get PY_MAJOR_VERSION failure at configure for python

  2.4 to 2.6.

git-svn-id: file:///svn/unbound/trunk@3480 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index e2b1bdec44ead2b0c6f147d4759dd419742ceaa5..6b0f526770d648ad4ef6ec0cef09524eeef8c41f 100755 (executable)
--- a/configure
+++ b/configure
@@ -16101,7 +16101,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                as_fn_error $? "Python version >= 2.4.0 is required" "$LINENO" 5
        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
 

diff --git a/configure.ac b/configure.ac
index 5ad39c7d5531783f0ebad186045894a9ce11ae12..3595707e733bfb10429023fa8a8fe91ee9a2fa21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -475,7 +475,7 @@ if test x_$ub_test_python != x_no; then
                AC_ERROR([Python version >= 2.4.0 is required])
        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)
       # Have Python
       AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])

diff --git a/doc/Changelog b/doc/Changelog
index fef399d8675f0cc02edf60ec7d185326c4b17c95..7dd7269137fb69353f9a422869be99f84f48877e 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -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
        - Fix deadlock for local data add and zone add when unbound-control
          list_local_data printout is interrupted.