From bf2f07077fe4cf08ff0cb444168866e2dcf2d9b3 Mon Sep 17 00:00:00 2001 From: barate Date: Fri, 13 Sep 2013 07:31:02 +0000 Subject: [PATCH] Autotools: Add Boost include dirs to KERNEL includes. This is needed because an exported header in KERNEL depends on Boost shared pointers. --- salome_adm/unix/config_files/check_Kernel.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/salome_adm/unix/config_files/check_Kernel.m4 b/salome_adm/unix/config_files/check_Kernel.m4 index 428c9bdbc..eb9c31743 100644 --- a/salome_adm/unix/config_files/check_Kernel.m4 +++ b/salome_adm/unix/config_files/check_Kernel.m4 @@ -30,6 +30,13 @@ AC_REQUIRE([AC_LINKER_OPTIONS])dnl AC_CHECKING(for Kernel) +# We check for Boost here because an exported header in Kernel depends on Boost shared +# pointers +if test "x$boost_ok" = "x" +then + CHECK_BOOST +fi + Kernel_ok=no KERNEL_LDFLAGS="" @@ -73,7 +80,7 @@ if test -f ${KERNEL_DIR}/bin/salome/runSalome ; then AC_SUBST(KERNEL_SITE_DIR) KERNEL_LDFLAGS=-L${KERNEL_DIR}/lib${LIB_LOCATION_SUFFIX}/salome - KERNEL_CXXFLAGS=-I${KERNEL_DIR}/include/salome + KERNEL_CXXFLAGS="-I${KERNEL_DIR}/include/salome ${BOOST_CPPFLAGS}" AC_SUBST(KERNEL_LDFLAGS) AC_SUBST(KERNEL_CXXFLAGS) -- 2.39.2