From: Michał Kępień <michal@isc.org>
Date: Tue, 28 Nov 2017 12:36:57 +0000 (+0100)
Subject: [master] Bail out of "./configure --with-atf" if "./configure" inside unit/atf-src... 
X-Git-Tag: v9.12.0rc1~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=376d5996a109f0cc21ef9fb9105d540854f92e16;p=thirdparty%2Fbind9.git

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

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 5719cbd943d..46e4bcdca57 100644
--- 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 0e251f67e96..17d156b6d44 100644
--- 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