From dd5db724c8b9f5866ce828d6040e1cf013ab12ff Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 5 Dec 2005 16:07:32 +0000 Subject: [PATCH] This commit was generated by cvs2git to create tag 'TG-D5-38-2003_D2005-20-12'. Sprout from master 2005-12-05 16:07:30 UTC smh 'Copyrights update' Cherrypick from IMPORT 2003-07-09 16:13:48 UTC nri 'sources v1.2': idl/SALOME_Registry.idl idl/TestNotif.idl resources/CatalogDataType.xml resources/CatalogModulePersonnel.xml_skel resources/Tools_en.xml resources/Tools_fr.xml resources/back.xpm resources/cascade.png resources/channel.cfg resources/close.png resources/config resources/copy.png resources/default.png resources/dl_delete.png resources/dl_insert.png resources/dl_movedown.png resources/dl_moveup.png resources/forward.xpm resources/help.png resources/home.xpm resources/new.png resources/open.png resources/paste.png resources/plot2d_dump.png resources/plot2d_fitall.png resources/plot2d_fitarea.png resources/plot2d_legend.png resources/plot2d_linear.png resources/plot2d_linear_y.png resources/plot2d_lines.png resources/plot2d_log.png resources/plot2d_log_y.png resources/plot2d_pan.png resources/plot2d_points.png resources/plot2d_settings.png resources/plot2d_splines.png resources/plot2d_zoom.png resources/print.png resources/redo.png resources/reset.png resources/salomeCommonModel.spml resources/save.png resources/select1.png resources/tile.png resources/uc_add.png resources/uc_clear.png resources/uc_current.png resources/uc_del.png resources/uc_new.png resources/undo.png resources/view_back.png resources/view_bottom.png resources/view_camera_dump.png resources/view_fitall.png resources/view_fitarea.png resources/view_front.png resources/view_glpan.png resources/view_left.png resources/view_pan.png resources/view_reset.png resources/view_right.png resources/view_rotate.png resources/view_top.png resources/view_triedre.png resources/view_zoom.png salome_adm/unix/Doxyfile salome_adm/unix/F77config.h.in salome_adm/unix/config_files/ac_cc_warnings.m4 salome_adm/unix/config_files/check_Salome.m4 salome_adm/unix/config_files/check_corba.m4 salome_adm/unix/config_files/check_f77.m4 salome_adm/unix/config_files/check_java.m4 salome_adm/unix/config_files/check_swig.m4 salome_adm/unix/config_files/config.guess salome_adm/unix/config_files/config.sub salome_adm/unix/config_files/ltconfig salome_adm/unix/config_files/ltmain.sh salome_adm/unix/config_files/missing salome_adm/unix/sstream.in src/HDFPersist/HDFOI.hxx src/HDFPersist/HDFattrClose.c src/HDFPersist/HDFattrGetSize.c src/HDFPersist/HDFattrGetType.c src/HDFPersist/HDFattrOpen.c src/HDFPersist/HDFattribute.hxx src/HDFPersist/HDFdatasetClose.c src/HDFPersist/HDFdatasetGetDim.c src/HDFPersist/HDFdatasetGetSize.c src/HDFPersist/HDFdatasetGetnDim.c src/HDFPersist/HDFdatasetOpen.c src/HDFPersist/HDFerrorModeLock.c src/HDFPersist/HDFexplorer.hxx src/HDFPersist/HDFfileClose.c src/HDFPersist/HDFfileCreate.c src/HDFPersist/HDFfileMount.c src/HDFPersist/HDFfileOpen.c src/HDFPersist/HDFfileUmount.c src/HDFPersist/HDFgroupClose.c src/HDFPersist/HDFgroupCreate.c src/HDFPersist/HDFgroupOpen.c src/HDFPersist/HDFnObjects.c src/HDFPersist/HDFobjectIdentify.c src/HDFPersist/HDFobjectType.c src/HDFPersist/test1.c src/HDFPersist/test2.c src/ModuleGenerator/tests/Truc2Component.idl src/ModuleGenerator/tests/TrucComponent.idl src/ModuleGenerator/tests/test1.sh src/ModuleGenerator/tests/test1b.sh src/ModuleGenerator/tests/test2.sh src/ModuleGenerator/tests/test3.sh src/ModuleGenerator/tests/test4.sh src/ModuleGenerator/tests/test5.sh src/NOTIFICATION_SWIG/NOTIFICATION.i src/Notification/CosNotifyShorthands.h src/SALOMEDS/Handle_SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx src/SALOMEDS/Handle_SALOMEDS_TableOfStringAttribute.hxx src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapOfIntegerString.hxx src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx src/SALOMEDS/SALOMEDS_DataMapOfIntegerString.hxx src/SALOMEDS/SALOMEDS_IORAttribute.jxx src/SALOMEDS/SALOMEDS_OCAFApplication.jxx src/SALOMEDS/SALOMEDS_PersRefAttribute.jxx src/SALOMEDS/SALOMEDS_TableOfStringAttribute.hxx src/SALOMEDS/SALOMEDS_TableOfStringAttribute.ixx src/SALOMEDS/SALOMEDS_TableOfStringAttribute.jxx src/Utils/SalomeString.hxx Cherrypick from BR2-D5-38-2003 2005-10-19 13:26:27 UTC apo 'To merge with HEAD version': salome_adm/unix/config_files/check_boost.m4 salome_adm/unix/make_commence.in --- salome_adm/unix/config_files/check_boost.m4 | 22 +++++++++++++++++++-- salome_adm/unix/make_commence.in | 4 +--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4 index 215ce8cf5..c77edba5d 100644 --- a/salome_adm/unix/config_files/check_boost.m4 +++ b/salome_adm/unix/config_files/check_boost.m4 @@ -28,6 +28,10 @@ AC_LANG_CPLUSPLUS AC_SUBST(BOOST_CPPFLAGS) BOOST_CPPFLAGS="" + +AC_SUBST(BOOST_LIBS) +BOOST_LIBS="" + boost_ok=no if test -z ${BOOSTDIR}; then @@ -37,17 +41,31 @@ if test -z ${BOOSTDIR}; then fi else AC_MSG_RESULT(\$BOOSTDIR = ${BOOSTDIR}) - AC_CHECKING(for boost/shared_ptr.hpp header file) + dnl BOOST headers + AC_CHECKING(for boost/shared_ptr.hpp header file) CPPFLAGS_old="${CPPFLAGS}" - BOOST_CPPFLAGS="-I${BOOSTDIR}" + BOOST_CPPFLAGS="-I${BOOSTDIR}/include" CPPFLAGS="${CPPFLAGS} ${BOOST_CPPFLAGS}" AC_CHECK_HEADER(boost/shared_ptr.hpp,boost_ok=yes,boost_ok=no) CPPFLAGS="${CPPFLAGS_old}" + + if test "x${boost_ok}" = "xyes" ; then + AC_MSG_RESULT(\$BOOST_CPPFLAGS = ${BOOST_CPPFLAGS}) + dnl BOOST libs + AC_CHECKING(for libboost_thread-mt.so library file) + AC_CHECK_FILE(${BOOSTDIR}/lib/libboost_thread-mt.so,boost_ok=yes,boost_ok=no) + if test "x${boost_ok}" = "xyes" ; then + BOOST_LIBS="-L${BOOSTDIR}/lib" + AC_MSG_RESULT(\$BOOST_LIBS = ${BOOST_LIBS}) + fi + fi fi +AC_MSG_RESULT(for boost: $boost_ok) + AC_LANG_RESTORE ])dnl diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index acd9fc70a..68f186cdf 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -42,6 +42,7 @@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ # BOOST Library BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LIBS = @BOOST_LIBS@ # OpenPBS @@ -134,10 +135,7 @@ OCC_CXXFLAGS=@CAS_CXXFLAGS@ #OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ #OCC_LIBS=@CAS_LDFLAGS@ CAS_KERNEL=@CAS_KERNEL@ -CAS_MATH=@CAS_MATH@ CAS_OCAF=@CAS_OCAF@ -CAS_OCAFVIS=@CAS_OCAFVIS@ -CAS_TKTopAlgo=@CAS_TKTopAlgo@ CAS_VIEWER=@CAS_VIEWER@ CAS_MODELER=@CAS_MODELER@ CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ -- 2.39.2