readline: improve aclocal.m4 handling

I don't know why I decided to copy aclocal.m4 to acinclude.m4 to avoid
autotools.bbclass deleting the upstream hand-maintained aclocal.m4, but
I did.

A neater fix is to exclude aclocal, which has the side-effect of not
deleting aclocal.m4 in do_configure.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 555bd0876f9a28883192a40f7af3b212b07bf8d7..06630dc455cbe1686bd2ae400ab3af0538b29873 100644 (file)
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -17,17 +17,13 @@ SRC_URI += "file://inputrc"
 
 inherit autotools texinfo
 
-EXTRA_AUTORECONF += "--exclude=autoheader"
+# Ensure we don't delete the shipped aclocal.m4 or config.h.in
+EXTRA_AUTORECONF += "--exclude=autoheader,aclocal"
+
 EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library"
 
 LEAD_SONAME = "libreadline.so"
 
-do_configure:prepend () {
-       if [ ! -e ${S}/acinclude.m4 ]; then
-               cat ${S}/aclocal.m4 > ${S}/acinclude.m4
-       fi
-}
-
 do_install:append () {
        # Make install doesn't properly install these
        oe_libinstall -so -C shlib libhistory ${D}${libdir}