readline: 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: e531923c4c17becb2f1a8a89adfeff0a82961a4a)

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

1 files changed, 4 insertions, 3 deletions

diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 2c5ad002f7..0ce3b519e6 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -14,8 +14,7 @@ DEPENDS += "ncurses"
 SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \
            file://configure-fix.patch \
            file://config-dirent-symbols.patch \
-           file://norpath.patch \
-           file://acinclude.m4"
+           file://norpath.patch"
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
@@ -26,7 +25,9 @@ EXTRA_AUTORECONF += "--exclude=autoheader"
 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 () {