1 files changed, 4 insertions, 7 deletions

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 44cb422584..1400b44999 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -88,14 +88,11 @@ oe_runconf () {
         cfgscript=`python -c "import os; print os.path.relpath(os.path.dirname('${CONFIGURE_SCRIPT}'), '.')"`/$cfgscript_name
         if [ -x "$cfgscript" ] ; then
                 bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
-                set +e
-                ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"
-                if [ "$?" != "0" ]; then
-                        echo "Configure failed. The contents of all config.log files follows to aid debugging"
-                        find ${B} -ignore_readdir_race -name config.log -print -exec cat {} \;
-                        die "oe_runconf failed"
+                if ! ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then
+                        bbnote "The following config.log files may provide further information."
+                        bbnote `find ${B} -ignore_readdir_race -type f -name config.log`
+                        bbfatal_log "configure failed"
                 fi
-                set -e
         else
                 bbfatal "no configure script found at $cfgscript"
         fi