From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 28 Aug 2015 06:56:27 +0000 (+0000)
Subject: - Fix #697: Get PY_MAJOR_VERSION failure at configure for python
X-Git-Tag: release-1.5.5rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd7c7bb4b2d435a3bdf3c90776f5fc954af49b5;p=thirdparty%2Funbound.git

- 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 e2b1bdec4..6b0f52677 100755
--- 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 5ad39c7d5..3595707e7 100644
--- 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 fef399d86..7dd726913 100644
--- 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.