From c8a1afe6d981566482c51c8c58133d38b17af87c Mon Sep 17 00:00:00 2001 From: secher Date: Tue, 16 Nov 2004 08:19:28 +0000 Subject: [PATCH] portage boost sur alpha/osf --- configure.in.base | 12 ++++++------ .../unix/config_files/ac_cxx_use_std_iostream.m4 | 2 +- salome_adm/unix/config_files/check_boost.m4 | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.in.base b/configure.in.base index 880355a61..aac998f53 100644 --- a/configure.in.base +++ b/configure.in.base @@ -132,19 +132,19 @@ AC_LINKER_OPTIONS echo echo --------------------------------------------- -echo BOOST Library +echo testing threads echo --------------------------------------------- echo -CHECK_BOOST +ENABLE_PTHREADS echo echo --------------------------------------------- -echo testing threads +echo BOOST Library echo --------------------------------------------- echo -ENABLE_PTHREADS +CHECK_BOOST dnl dnl --------------------------------------------- @@ -402,8 +402,8 @@ do local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` case "$local_bin" in *.in | *~) ;; - ./bin/CVS | ./bin/salome) ;; - *) /usr/bin/install -c $i .; echo $local_bin ;; + ./bin/CVS | ./bin/salome) ;; + *) $INSTALL $i .; echo $local_bin ;; esac done cd $ROOT_BUILDDIR diff --git a/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 b/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 index 88685ce56..8e44db9ac 100644 --- a/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 +++ b/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 @@ -38,7 +38,7 @@ EOF fUSE_STD_IOSTREAM=no for ac_CXX_USE_STD_IOSTREAM in "" -D__USE_STD_IOSTREAM ; do if $CXX ${ac_CXX_USE_STD_IOSTREAM} conftest.cxx > /dev/null 2>&1; then - CXXFLAGS="$CXXFLAGS ${ac_CXX_USE_STD_IOSTREAM}" + CPPFLAGS="$CPPFLAGS ${ac_CXX_USE_STD_IOSTREAM}" if test x${ac_CXX_USE_STD_IOSTREAM} = x; then AC_MSG_RESULT(yes) else diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4 index 1cc692c5f..789167b4c 100644 --- a/salome_adm/unix/config_files/check_boost.m4 +++ b/salome_adm/unix/config_files/check_boost.m4 @@ -37,7 +37,7 @@ else AC_CHECKING(for boost/shared_ptr.hpp header file) dnl BOOST headers CPPFLAGS_old="${CPPFLAGS}" - BOOST_CPPFLAGS="-ftemplate-depth-32 -I${BOOSTDIR}" + BOOST_CPPFLAGS="-I${BOOSTDIR}" CPPFLAGS="${CPPFLAGS} ${BOOST_CPPFLAGS}" AC_CHECK_HEADER(boost/shared_ptr.hpp,boost_ok=yes,boost_ok=no) -- 2.39.2