Add OECORE_ACLOCAL_OPTS to env setup scripts for autotool project using correct libto...

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 09ecd7ca47a9cb4138bdee5fc2bd4627b8604197..33013192076ccaac9af9a05c498ae814b4ce1da8 100644 (file)
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -28,6 +28,7 @@ toolchain_create_sdk_env_script () {
        echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
        echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
+       echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script
        echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 }
 
@@ -59,6 +60,7 @@ toolchain_create_tree_env_script () {
        echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
        echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
        echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
+       echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
 }
 
 # This function creates an environment-setup-script for use by the ADT installer
@@ -89,6 +91,7 @@ toolchain_create_sdk_env_script_for_installer () {
        echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
        echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
+        echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script
        echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
        echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
 }