[oe-commits] Enrico Scholz : autotools.bbclass: swapped calls of intltoolize + autoreconf

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 1744622831ed26c34c3ae3e0707c48b72c2f4e9c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1744622831ed26c34c3ae3e0707c48b72c2f4e9c

Author: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Date:   Wed Apr 14 00:19:21 2010 +0000

autotools.bbclass: swapped calls of intltoolize + autoreconf

Because 'intltoolize' checks whether aclocal.m4 contains a recent copy
of 'intltool.m4' and it will fail when the found version is too old,
'aclocal' must be called before 'intltoolize'.

I built projects it with intltool-0.40.6-r3, autoconf-2.65-r9,
automake-1.11.1-r3 and gettext-0.17-r6 successfully with this change but
it will require probably tests with older versions.

This patch is a requirement for
http://patchwork.openembedded.org/patch/1858/ because 'autopoint' from
the 'aclocal' call will override 'intltool' files and build will fail
then.

Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Acked-by: Chris Larson <chris_larson at mentor.com>
Acked-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
Acked-by: Roman I Khimov <khimov at altell.ru>

---

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

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 31d3578..d47630e 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -129,12 +129,12 @@ autotools_do_configure() {
 			  fi
 			fi
 			mkdir -p m4
+			oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
+			autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
 			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
-			autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
 			cd $olddir
 		fi
 	;;