classes: Sync various classes with OE for various bugfixes

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2407 311d38ba-8fff-0310-9ca6-ca027cbcb966

meta/classes/autotools.bbclass

@@ -16,10 +16,9 @@ def autotools_dep_prepend(d):
 	if not pn in ['libtool', 'libtool-native', 'libtool-cross']:
 		deps += 'libtool-native '
 		if not bb.data.inherits_class('native', d) \
-				and not bb.data.inherits_class('cross', d) \
-				and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1):
-			deps += 'libtool-cross '
-
+                        and not bb.data.inherits_class('cross', d) \
+                        and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1):
+                    deps += 'libtool-cross '
 
 	return deps + 'gnu-config-native '
 
@@ -124,14 +123,6 @@ autotools_do_configure() {
 			  oenote Executing intltoolize --copy --force --automake
 			  intltoolize --copy --force --automake
 			fi
-			#if grep "^GTK_DOC_CHECK" $CONFIGURE_AC >/dev/null; then
-			#  oenote Executing gtkdocize --copy
-			#  gtkdocize --copy
-			#fi
-			#if grep "^GNOME_DOC_INIT" $CONFIGURE_AC >/dev/null; then
-			#  oenote Executing gnome-doc-prepare --copy --force
-			#  gnome-doc-prepare --copy --force
-			#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."
@@ -148,6 +139,13 @@ autotools_do_configure() {
 
 autotools_do_install() {
 	oe_runmake 'DESTDIR=${D}' install
+
+        for i in `find ${D} -name "*.la"` ; do \
+            sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
+            sed -i -e s:${D}::g $i
+            sed -i -e 's:-I${WORKDIR}\S*: :g' $i
+            sed -i -e 's:-L${WORKDIR}\S*: :g' $i
+	done
 }
 
 STAGE_TEMP="${WORKDIR}/temp-staging"