- Fix #1239: configure fails to find python distutils if python

  prints warning.

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

diff --git a/acx_python.m4 b/acx_python.m4
index 4e83d7764bcd9b0f367412460b2b61429cc6a3ef..2940971f1a4e500072d352f95a009a7e86e536d4 100644 (file)
--- a/acx_python.m4
+++ b/acx_python.m4
@@ -22,8 +22,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
         # Check if you have distutils, else fail
         #
         AC_MSG_CHECKING([for the distutils Python package])
-        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-        if test -z "$ac_distutils_result"; then
+        if ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`; then
                 AC_MSG_RESULT([yes])
         else
                 AC_MSG_RESULT([no])

diff --git a/configure b/configure
index 5450d166d5d01fb96fc1e812c05c01db5287edfe..a3283e1eddb40c08041f381f4c76046d696b85aa 100755 (executable)
--- a/configure
+++ b/configure
@@ -16732,8 +16732,7 @@ fi
         #
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
 $as_echo_n "checking for the distutils Python package... " >&6; }
-        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-        if test -z "$ac_distutils_result"; then
+        if ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
         else

diff --git a/doc/Changelog b/doc/Changelog
index fa4899420f5165e95ff436c1098add0db5460af9..0ac5dcdb6bbaa4de2e09c534779b91d3cca23181 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+23 March 2017: Wouter
+       - Fix #1239: configure fails to find python distutils if python
+         prints warning.
+
 22 March 2017: Wouter
        - Fix #1238: segmentation fault when adding through the remote
          interface a per-view local zone to a view with no previous