Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/kernel.git] / salome_adm / unix / config_files / check_boost.m4

diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4
index 0298be6ee3d09a9ffc5cfead4d902c52a9ae3804..27ae50c73a5957782cf31374728a75e662277970 100644 (file)
--- a/salome_adm/unix/config_files/check_boost.m4
+++ b/salome_adm/unix/config_files/check_boost.m4
@@ -53,6 +53,11 @@ if test "x${BOOSTDIR}" != "x" ; then
   BOOST_LIBS="-L${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}"
 fi
 
+if test "x${BOOSTDIR}" = "x/usr" ; then
+  BOOST_CPPFLAGS=""
+  BOOST_LIBS=""
+fi
+
 boost_ok=no
 boost_headers_ok=no
 boost_binaries_ok=no
@@ -68,6 +73,14 @@ if test "x${BOOSTDIR}" != "x" ; then
                 boost_include_dir_ok=no)
 fi
 
+BOOST_PROGRAM_OPTIONS_LIB=no
+if test "x${boost_include_dir_ok}" = "xyes" ; then
+  AC_CHECK_FILE(${BOOSTDIR}/include/boost/program_options.hpp,
+                BOOST_PROGRAM_OPTIONS_LIB=yes,
+                BOOST_PROGRAM_OPTIONS_LIB=no)
+fi
+AC_MSG_RESULT(for boost program_options tool: $BOOST_PROGRAM_OPTIONS_LIB)
+
 if test "x${boost_include_dir_ok}" = "xyes" ; then
   AC_TRY_COMPILE([#include <boost/shared_ptr.hpp>],
                  [boost::shared_ptr<int>(new int)],
@@ -137,6 +150,7 @@ AC_MSG_RESULT(for boost: $boost_ok)
 AC_SUBST(BOOST_CPPFLAGS)
 AC_SUBST(BOOST_LIBSUFFIX)
 AC_SUBST(BOOST_LIBS)
+AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
 
 AC_LANG_RESTORE