From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 8 Jun 2009 14:53:27 +0000 (+0000)
Subject: fail python if no swig
X-Git-Tag: release-1.3.1~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6099d5f55c17d84aebc15fdd355a4cbe9877e14;p=thirdparty%2Funbound.git

fail python if no swig

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

diff --git a/configure b/configure
index d6e4eceb7..19f5d3630 100755
--- a/configure
+++ b/configure
@@ -23055,12 +23055,9 @@ echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
       { echo "$as_me:$LINENO: checking SWIG" >&5
 echo $ECHO_N "checking SWIG... $ECHO_C" >&6; }
       if test ! -x "$SWIG"; then
-         { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-         swig=""
-
-         ub_with_pyunbound=no
-         ub_with_pythonmod=no
+         { { echo "$as_me:$LINENO: error: failed to find swig tool, install it, or do not build Python module and PyUnbound" >&5
+echo "$as_me: error: failed to find swig tool, install it, or do not build Python module and PyUnbound" >&2;}
+   { (exit 1); exit 1; }; }
       else
 
 cat >>confdefs.h <<\_ACEOF
diff --git a/configure.ac b/configure.ac
index 8ad0cf5ba..dd08993fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,10 +313,7 @@ if test x_$ub_test_python != x_no; then
       AC_PROG_SWIG
       AC_MSG_CHECKING(SWIG)
       if test ! -x "$SWIG"; then
-         AC_MSG_RESULT(failed, won't build Python module and PyUnbound)
-         AC_SUBST(swig, "")
-         ub_with_pyunbound=no
-         ub_with_pythonmod=no
+         AC_ERROR([failed to find swig tool, install it, or do not build Python module and PyUnbound])
       else
          AC_DEFINE(HAVE_SWIG, 1, [Define if you have Swig libraries and header files.])
          AC_SUBST(swig, "$SWIG")
diff --git a/doc/Changelog b/doc/Changelog
index 8d5bc559e..5a7167aa8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
 	- iana portlist updated.
 	- fix lint from complaining on ldns/sha.h.
 	- help compiler figure out aliasing in priv_rrset_bad() routine.
+	- fail to configure with python if swig is not found.
 
 3 June 2009: Wouter
 	- fixup bad free() when wrongly encoded DSA signature is seen.