BIND 10 master, updated. 34a2c9541c16578175eb928b9ea3f3c7755965d3 [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  34a2c9541c16578175eb928b9ea3f3c7755965d3 (commit)
       via  73b258b1b4284e1017aedacee9ed75301be23e79 (commit)
      from  ae65cad3fbe923329f674694614e0af560c37018 (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 34a2c9541c16578175eb928b9ea3f3c7755965d3
Merge: 73b258b ae65cad
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Sep 27 11:01:32 2012 -0700

    [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 73b258b1b4284e1017aedacee9ed75301be23e79
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Sep 27 10:59:17 2012 -0700

    [master] make sure static.zone is generated for new AUTHORS or version string.
    
    previously, once this zone file was generated, incremental build
    (i.e., 'make' without 'make clean') may fail to update this file.
    that would result in unexpected answer from b10-auth for *.bind
    quieries, and would also cause unittest failures in auth/tests.
    
    okayed on jabber.

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

Summary of changes:
 src/lib/datasrc/Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index 862de8a..eccc147 100644
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -12,7 +12,9 @@ pkglibdir = $(libexecdir)/@PACKAGE@/backends
 datasrc_config.h: datasrc_config.h.pre
 	$(SED) -e "s|@@PKGLIBDIR@@|$(pkglibdir)|" datasrc_config.h.pre >$@
 
-static.zone: static.zone.pre
+# The top config.h defines "PACKAGE_STRING".  When it's changed we neeed to
+# regenerate this zone file.
+static.zone: static.zone.pre $(top_builddir)/config.h $(top_srcdir)/AUTHORS
 	$(SED) -e "s|@@VERSION_STRING@@|$(PACKAGE_STRING)|" $(srcdir)/static.zone.pre >$@
 	$(SED) -e 's/\(.*\)/AUTHORS.BIND.	0	CH	TXT	"\1"/' $(top_srcdir)/AUTHORS >>$@