[master] 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]

diff --git a/CHANGES b/CHANGES
index 5719cbd943df7a3ae5eb1edda0afc021ea04a2a4..46e4bcdca578429d4a364f07baee1f74bd452169 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 0e251f67e966b9731ddfa0f9fbd6b9eadd8b8754..17d156b6d447817061e6180dce4741e43bfd58b7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4821,7 +4821,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