From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Nov 2009 02:10:45 +0000 (-0500)
Subject: autoconf: If configure fails, cat config.log. Intended to make it easier to debug... 
X-Git-Tag: 7.4.4~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bea62b42b26e8ec4868a7164be34227591da3310;p=debhelper.git

autoconf: If configure fails, cat config.log. Intended to make it easier to debug configure script failures on autobuilders. Closes: #556384
---

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 7229fc7..59b6c6b 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -49,7 +49,15 @@ sub configure {
 	}
 
 	$this->mkdir_builddir();
-	$this->doit_in_builddir($this->get_source_rel2builddir("configure"), @opts, @_);
+	eval {
+		$this->doit_in_builddir($this->get_source_rel2builddir("configure"), @opts, @_);
+	};
+	if ($@) {
+		if (-e $this->get_buildpath("config.log")) {
+			$this->doit_in_builddir("cat config.log");
+		}
+		die $@;
+	}
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 05b5b80..6b8ea91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ debhelper (7.4.4) UNRELEASED; urgency=low
   * Typo. Closes: #555659
   * cmake: Set CTEST_OUTPUT_ON_FAILURE when running test suite.
     Closes: #555807
+  * autoconf: If configure fails, cat config.log. Intended to make
+    it easier to debug configure script failures on autobuilders.
+    Closes: #556384
 
  -- Joey Hess <joeyh@debian.org>  Wed, 28 Oct 2009 18:10:45 -0400