readline-5.2: use upstream's aclocal.m4 as acinclude.m4

Instead of shipping a fork of the upstream aclocal.m4, simply rename it to
acinclude.m4 at configure time.  We don't need the fork now that autoheader is
excluded.

(From OE-Core rev: 7b98575797c2e8822e6a26d95cb7e727d6efef4b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/meta/recipes-core/readline/readline_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb
index 05ab26f053..6a37849dbf 100644
--- a/meta/recipes-core/readline/readline_5.2.bb
+++ b/meta/recipes-core/readline/readline_5.2.bb
@@ -28,7 +28,6 @@ SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \
            ${GNU_MIRROR}/readline/readline-5.2-patches/readline52-013;name=patch13;apply=yes;striplevel=0 \
            ${GNU_MIRROR}/readline/readline-5.2-patches/readline52-014;name=patch14;apply=yes;striplevel=0 \
            file://configure-fix.patch \
-           file://acinclude.m4 \
            file://fix-redundant-rpath.patch"
 
 SRC_URI[archive.md5sum] = "e39331f32ad14009b9ff49cc10c5e751"
@@ -70,7 +69,9 @@ inherit autotools
 LEAD_SONAME = "libreadline.so"
 
 do_configure_prepend () {
-        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+        if [ ! -e ${S}/acinclude.m4 ]; then
+                cat ${S}/aclocal.m4 > ${S}/acinclude.m4
+        fi
 }
 
 do_install_append () {