BIND 10 master, updated. 8e2ea0064bf2c96487a1aed89498c7c6b2410f1e Merge branch 'trac3243_2'

[BIND 10 source code commits]

The branch, master has been updated
       via  8e2ea0064bf2c96487a1aed89498c7c6b2410f1e (commit)
       via  e3ae30d0122bffa12ef180728b7bdae66ca60e37 (commit)
      from  ac194cf1e1c21f449bd2a378cb5a78ea1c8826ce (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 8e2ea0064bf2c96487a1aed89498c7c6b2410f1e
Merge: ac194cf e3ae30d
Author: Kean Johnston <kean at isc.org>
Date:   Thu Jan 9 08:23:33 2014 +0200

    Merge branch 'trac3243_2'

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

Summary of changes:
 configure.ac |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index f508400..5bfd318 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,13 +4,19 @@
 AC_PREREQ([2.59])
 AC_INIT(bind10, 20130529, bind10-dev at isc.org)
 AC_CONFIG_SRCDIR(README)
-# serial-tests is not available in automake version before 1.13. In
-# automake 1.13 and higher, AM_PROG_INSTALL is undefined, so we'll check
-# that and conditionally use serial-tests.
-AM_INIT_AUTOMAKE(
-	[foreign]
-	m4_ifndef([AM_PROG_INSTALL], [serial-tests])
-)
+
+# serial-tests is not available in automake version before 1.13, so
+# we'll check that and conditionally use serial-tests. This check is
+# adopted from code by Richard W.M. Jones:
+# https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html
+m4_define([serial_tests], [
+    m4_esyscmd([automake --version |
+                head -1 |
+                awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
+    ])
+])
+AM_INIT_AUTOMAKE(foreign serial_tests)
+
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])dnl be backward compatible
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4macros])