autoconf213: Fix build failure due to missing Makefile.am

We share autoconf.inc between autoconf 2.13 and 2.6x
and 2.13 does not have Makefile.am so we make it conditional

We define do_configure to just run configure

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index 7f22c2b..40d9413 100644 (file)
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -25,13 +25,18 @@ do_configure_prepend () {
                export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}"
                export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}"
        fi
-
-       sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' ${S}/Makefile.am
+       if [ -e ${S}/Makefile.am ]
+       then
+               sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' ${S}/Makefile.am
+       fi
 }
 
 do_configure_append() {
        # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl
-       sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/bin/*.in
+       if [ -e ${S}/bin ]
+       then
+               sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/bin/*.in
+       fi
 }
 
 PARALLEL_MAKE = ""

diff --git a/recipes/autoconf/autoconf213_2.13.bb b/recipes/autoconf/autoconf213_2.13.bb
index cd55073..089f5a5 100644 (file)
--- a/recipes/autoconf/autoconf213_2.13.bb
+++ b/recipes/autoconf/autoconf213_2.13.bb
@@ -3,7 +3,11 @@ LICENSE = "GPLv2+"
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz"
 EXTRA_OECONF = "--program-transform-name=s/\$/2.13/"
 EXTRA_OEMAKE = 'acdatadir="${datadir}/autoconf-${PV}" infodir="${datadir}/autoconf-${PV}/info"'
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 S = "${WORKDIR}/autoconf-${PV}"
 SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711"
 SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"
+
+do_configure (){
+       oe_runconf
+}