1 files changed, 10 insertions, 4 deletions

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 4e4ef986bf..883eb06e26 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -108,10 +108,16 @@ CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate"
 
 autotools_preconfigure() {
         if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then
-                if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${S}" != "${B}" ]; then
-                        echo "Previously configured separate build directory detected, cleaning ${B}"
-                        rm -rf ${B}
-                        mkdir ${B}
+                if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then
+                        if [ "${S}" != "${B}" ]; then
+                                echo "Previously configured separate build directory detected, cleaning ${B}"
+                                rm -rf ${B}
+                                mkdir ${B}
+                        else
+                                # At least remove the .la files since automake won't automatically
+                                # regenerate them even if CFLAGS/LDFLAGS are different
+                                cd ${S}; find ${S} -name \*.la -delete
+                        fi
                 fi
         fi
 }