From 34e8e9e28587498c7907b01ea5623253a5ced9ef Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 24 Apr 2011 18:38:48 -0700 Subject: autotools.bbclass: Copy gettext files only if --disable-nls is not set (From OE-Core rev: 040d4dea9637a4723cbb2a74975130d3b86e569a) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/autotools.bbclass | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'meta/classes/autotools.bbclass') diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 7ebf833603..cbd2e9666e 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -127,17 +127,18 @@ autotools_do_configure() { else CONFIGURE_AC=configure.ac fi - 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 - oenote Executing glib-gettextize --force --copy - echo "no" | glib-gettextize --force --copy + if ! echo ${EXTRA_OECONF} | grep -q "\-\-disable-nls"; 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 + oenote Executing glib-gettextize --force --copy + echo "no" | glib-gettextize --force --copy + fi + else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then + cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/ fi - else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then - cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/ fi - fi mkdir -p m4 if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then -- cgit v1.2.3-54-g00ecf