Improve build system auto-selection process

[debhelper.git] / Debian / Debhelper / Buildsystem / autoconf.pm

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 7229fc718e866a61a992f5f6b6509dc68917da40..d7b0bed251b251adcba7fafcdc229706cbb58b96 100644 (file)
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -18,9 +18,9 @@ sub check_auto_buildable {
        my $this=shift;
        my ($step)=@_;
 
-       # Handle configure; the rest - next class
+       # Handle configure; the rest - next class (compat with 7.0.x code path)
        if ($step eq "configure") {
-               return -x $this->get_sourcepath("configure");
+               return 1 if -x $this->get_sourcepath("configure");
        }
        return 0;
 }
@@ -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("tail -v -n +0 config.log");
+               }
+               die $@;
+       }
 }
 
 1