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 d6e4eceb7d60ec3f7d165e2053c7ee349a418cb6..19f5d36307c66301a331bf6503539c6b00ea1f26 100755 (executable)
--- 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 8ad0cf5ba54e529cd8fc6cf848ec9afbe342740f..dd08993fd932ab60ba8376dff03bcda683e91ba9 100644 (file)
--- 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 8d5bc559e78322eac85a6909c0ad34e408c88239..5a7167aa8d06906956a8756a353f607b891b8a1a 100644 (file)
--- 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.