diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-11-09 13:36:38 +0000 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-11-09 13:36:38 +0000 |
| commit | 53c5c0c34d33d67acad9ec50a0e7ed1247e40dbe (patch) | |
| tree | d55473304d60df34f503f6e5c1d5295ed5dbd6ae /classes/autotools.bbclass | |
| parent | 2f9a991fd522fb03ccba98244ef5bb3f620e5194 (diff) | |
| parent | c942cea699be2e07b4dfe9ced8b200756c80eb02 (diff) | |
Merge remote branch 'origin/org.openembedded.dev' into upstream
Diffstat (limited to 'classes/autotools.bbclass')
| -rw-r--r-- | classes/autotools.bbclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8236a27c76..45b269f4fd 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -1,5 +1,3 @@ -inherit base - # use autotools_stage_all for native packages AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" @@ -115,7 +113,7 @@ autotools_do_configure() { else CONFIGURE_AC=configure.ac fi - if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then + if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then : do nothing -- we still have an old unmodified configure.ac else @@ -123,12 +121,12 @@ autotools_do_configure() { echo "no" | glib-gettextize --force --copy fi fi - if grep "^[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then + mkdir -p m4 + if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then oenote Executing intltoolize --copy --force --automake intltoolize --copy --force --automake fi oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - mkdir -p m4 autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." cd $olddir fi |