[v9_11] Bail out of "./configure --with-atf" if "./configure" inside unit/atf-src...

4830.	[bug]		Failure to configure ATF when requested did not cause
			an error in top-level configure script. [RT #46655]

(cherry picked from commit 376d5996a109f0cc21ef9fb9105d540854f92e16)

diff --git a/CHANGES b/CHANGES
index 490a3f2e0b778c33ea7cdf6472b4248207354a3a..dd58150606f10388b94cf989d0bce2b4e4f8d888 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4830.  [bug]           Failure to configure ATF when requested did not cause
+                       an error in top-level configure script. [RT #46655]
+
 4829.  [bug]           isc_heap_delete did not zero the index value when
                        the heap was created with a callback to do that.
                        [RT #46709]

diff --git a/configure.in b/configure.in
index d2f76d79240251421df2566b751d4105a0711e90..3cfdb00a7afe915aa4c0a342540e9bfb9edaef79 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4862,7 +4862,7 @@ if test "yes" = "$atf"; then
                 *) srcdir="../../$srcdir";;
                 esac
                 ${SHELL} "${srcdir}${srcdir:+/unit/atf-src/}./configure" --enable-tools --disable-shared MISSING=: --prefix $atfdir;
-               ) ],
+               ) || AC_MSG_ERROR([Failed to configure ATF.]) ],
                [atfdir=`pwd`/unit/atf])
        AC_MSG_RESULT(building ATF from bind9/unit/atf-src)
 fi