[oe-commits] Richard Purdie : autotools.bbclass: Allow for leading whitespace in gettext and intltool searches (from Poky)

git version control git at git.openembedded.org
Mon Nov 9 22:16:05 UTC 2009


Module: openembedded.git
Branch: shr/merge
Commit: 6f481bcc549751aa1d7017de8c77a7606a74c468
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6f481bcc549751aa1d7017de8c77a7606a74c468

Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Fri Oct 30 02:42:06 2009 +0000

autotools.bbclass: Allow for leading whitespace in gettext and intltool searches (from Poky)

Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>

---

 classes/autotools.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index b4b1c6e..b7a9169 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -113,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
@@ -121,7 +121,7 @@ autotools_do_configure() {
 			    echo "no" | glib-gettextize --force --copy
 			  fi
 			fi
-			if grep "^[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
+			if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
 			  oenote Executing intltoolize --copy --force --automake
 			  intltoolize --copy --force --automake
 			fi





More information about the Openembedded-commits mailing list