From cbf8c632dc09b62b69c85dbf31e20c1561ea30bc Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Wed, 8 Mar 2017 07:57:06 +0000 Subject: [PATCH] - swig version 2.0.1 required. git-svn-id: file:///svn/unbound/trunk@4037 be551aaa-1e26-0410-a405-d3ace91eadb9 --- configure | 10 +++++----- configure.ac | 2 +- doc/Changelog | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure b/configure index a9d47ce9d..563db6d0a 100755 --- a/configure +++ b/configure @@ -16909,7 +16909,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find 'swig' program. You should look at http://www.swig.org" >&5 $as_echo "$as_me: WARNING: cannot find 'swig' program. You should look at http://www.swig.org" >&2;} SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false' - elif test -n "2.0.0" ; then + elif test -n "2.0.1" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWIG version" >&5 $as_echo_n "checking for SWIG version... " >&6; } swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'` @@ -16917,7 +16917,7 @@ $as_echo_n "checking for SWIG version... " >&6; } $as_echo "$swig_version" >&6; } if test -n "$swig_version" ; then # Calculate the required version number components - required=2.0.0 + required=2.0.1 required_major=`echo $required | sed 's/[^0-9].*//'` if test -z "$required_major" ; then required_major=0 @@ -16962,9 +16962,9 @@ $as_echo "$swig_version" >&6; } badversion=1 fi if test $badversion -eq 1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 2.0.0 is required. You have $swig_version. You should look at http://www.swig.org" >&5 -$as_echo "$as_me: WARNING: SWIG version >= 2.0.0 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} - SWIG='echo "Error: SWIG version >= 2.0.0 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 2.0.1 is required. You have $swig_version. You should look at http://www.swig.org" >&5 +$as_echo "$as_me: WARNING: SWIG version >= 2.0.1 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} + SWIG='echo "Error: SWIG version >= 2.0.1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' else { $as_echo "$as_me:${as_lineno-$LINENO}: SWIG executable is '$SWIG'" >&5 $as_echo "$as_me: SWIG executable is '$SWIG'" >&6;} diff --git a/configure.ac b/configure.ac index f5d72c5a9..b8e01d7ec 100644 --- a/configure.ac +++ b/configure.ac @@ -551,7 +551,7 @@ if test x_$ub_test_python != x_no; then # Check for SWIG ub_have_swig=no - AC_PROG_SWIG(2.0.0) + AC_PROG_SWIG(2.0.1) AC_MSG_CHECKING(SWIG) if test ! -x "$SWIG"; then AC_ERROR([failed to find swig tool, install it, or do not build Python module and PyUnbound]) diff --git a/doc/Changelog b/doc/Changelog index 7f64b26f2..239d93850 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,6 @@ 8 March 2017: Wouter - make depend for build dependencies. + - swig version 2.0.1 required. 7 March 2017: Wouter - Fix #1230: swig version 2.0.0 is required for pythonmod, with