BIND 10 trac1909, updated. 8d6493eb98994ac01c4305d12a148d78d048b681 [1909] EXTRA_DIST the m4 files

[BIND 10 source code commits]

The branch, trac1909 has been updated
       via  8d6493eb98994ac01c4305d12a148d78d048b681 (commit)
       via  f182b85e7ab01bae5c9c7a181a2b9db7977a9948 (commit)
      from  fa72716d183569839306fa8bde1d7ec451ce8919 (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 8d6493eb98994ac01c4305d12a148d78d048b681
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu May 2 08:29:43 2013 +0530

    [1909] EXTRA_DIST the m4 files
    
    ... in case someone wants to autoreconf from a tarball.

commit f182b85e7ab01bae5c9c7a181a2b9db7977a9948
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu May 2 08:27:55 2013 +0530

    [1909] Remove redundant AC_SUBSTs

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

Summary of changes:
 Makefile.am                       |    2 +-
 configure.ac                      |    1 +
 m4macros/Makefile.am              |    2 ++
 m4macros/ax_sqlite3_for_bind10.m4 |    3 ---
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 m4macros/Makefile.am

-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 8e01f4a..6ef95bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4macros -I examples/m4 ${ACLOCAL_FLAGS}
 # ^^^^^^^^ This has to be the first line and cannot come later in this
 # Makefile.am due to some bork in some versions of autotools.
 
-SUBDIRS = compatcheck doc . src tests
+SUBDIRS = compatcheck doc . src tests m4macros
 USE_LCOV=@USE_LCOV@
 LCOV=@LCOV@
 GENHTML=@GENHTML@
diff --git a/configure.ac b/configure.ac
index 8e1a0d8..3e62279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1325,6 +1325,7 @@ AC_CONFIG_FILES([Makefile
                  tests/tools/perfdhcp/Makefile
                  tests/tools/perfdhcp/tests/Makefile
                  tests/tools/perfdhcp/tests/testdata/Makefile
+                 m4macros/Makefile
                  dns++.pc
                ])
 AC_OUTPUT([doc/version.ent
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
new file mode 100644
index 0000000..eeae7f9
--- /dev/null
+++ b/m4macros/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST  = ax_boost_for_bind10.m4
+EXTRA_DIST += ax_sqlite3_for_bind10.m4
diff --git a/m4macros/ax_sqlite3_for_bind10.m4 b/m4macros/ax_sqlite3_for_bind10.m4
index e558c35..4eb7f94 100644
--- a/m4macros/ax_sqlite3_for_bind10.m4
+++ b/m4macros/ax_sqlite3_for_bind10.m4
@@ -16,9 +16,6 @@ PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.3.9,
     have_sqlite="yes",
     have_sqlite="no (sqlite3 not detected)")
 
-AC_SUBST(SQLITE_CFLAGS)
-AC_SUBST(SQLITE_LIBS)
-
 # Check for sqlite3 program
 AC_PATH_PROG(SQLITE3_PROGRAM, sqlite3, no)
 AM_CONDITIONAL(HAVE_SQLITE3_PROGRAM, test "x$SQLITE3_PROGRAM" != "xno")