BIND 10 trac2367_3, updated. 5829e2405653206e14a90acae967174f39d634c1 [2367] Require sqlite3 python module only when DNS components are enabled

[BIND 10 source code commits]

The branch, trac2367_3 has been updated
       via  5829e2405653206e14a90acae967174f39d634c1 (commit)
       via  aa3367fef3e2a1fdc2014c8b59c2e185461dc31a (commit)
      from  c3722f4556ae67562c97d8e2bd21fcaf4da02f6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5829e2405653206e14a90acae967174f39d634c1
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Feb 28 05:31:30 2014 +0530

    [2367] Require sqlite3 python module only when DNS components are enabled

commit aa3367fef3e2a1fdc2014c8b59c2e185461dc31a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Feb 28 05:26:47 2014 +0530

    [2367] Remove unnecessary CFLAGS

-----------------------------------------------------------------------

Summary of changes:
 m4macros/ax_python_sqlite3.m4 |    5 ++++-
 src/lib/cache/Makefile.am     |    1 -
 src/lib/nsas/Makefile.am      |    1 -
 src/lib/resolve/Makefile.am   |    1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/m4macros/ax_python_sqlite3.m4 b/m4macros/ax_python_sqlite3.m4
index f4076ba..af82852 100644
--- a/m4macros/ax_python_sqlite3.m4
+++ b/m4macros/ax_python_sqlite3.m4
@@ -11,7 +11,10 @@ if "$PYTHON" -c 'import sqlite3' 2>/dev/null ; then
     AC_MSG_RESULT(ok)
 else
     AC_MSG_RESULT(missing)
-    AC_MSG_ERROR([Missing sqlite3 python module.])
+
+    if test "x$want_dns" = "xyes" ; then
+        AC_MSG_ERROR([Missing sqlite3 python module that is required by DNS components.])
+    fi
 fi
 
 ])dnl AX_PYTHON_SQLITE3
diff --git a/src/lib/cache/Makefile.am b/src/lib/cache/Makefile.am
index 7a84dd6..d1ea25f 100644
--- a/src/lib/cache/Makefile.am
+++ b/src/lib/cache/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/nsas -I$(top_builddir)/src/lib/nsas
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/cache -I$(top_builddir)/src/lib/cache
-AM_CPPFLAGS += $(SQLITE_CFLAGS)
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 # Some versions of GCC warn about some versions of Boost regarding
diff --git a/src/lib/nsas/Makefile.am b/src/lib/nsas/Makefile.am
index d38cf1a..1f42d83 100644
--- a/src/lib/nsas/Makefile.am
+++ b/src/lib/nsas/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/nsas -I$(top_builddir)/src/lib/nsas
-AM_CPPFLAGS += $(SQLITE_CFLAGS)
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 # Some versions of GCC warn about some versions of Boost regarding missing
diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am
index 13e37e1..dde08f2 100644
--- a/src/lib/resolve/Makefile.am
+++ b/src/lib/resolve/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
 AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(SQLITE_CFLAGS)
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)