*** empty log message ***

diff --git a/configure.in.base b/configure.in.base
index 880355a612a7b0eec58b94076457ce721598ce09..aac998f539b2ea8b58006dfc602418a7f95e9903 100644 (file)
--- 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/idl/MPIContainer.idl b/idl/MPIContainer.idl
deleted file mode 100644 (file)
index 6aab335..0000000
--- a/idl/MPIContainer.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
-//  File   : MPIContainer.idl
-
-#ifndef _SALOME_MPICONTAINER_IDL_
-#define _SALOME_MPICONTAINER_IDL_
-
-#include "SALOME_Component.idl"
-#include "MPIObject.idl"
-
-module Engines
-{
-  interface MPIContainer:Container,MPIObject
-  {
-  } ;
-} ;
-
-#endif
-

diff --git a/idl/MPIObject.idl b/idl/MPIObject.idl
deleted file mode 100644 (file)
index a480f51..0000000
--- a/idl/MPIObject.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
-//  File   : MPIObject.idl
-
-#ifndef _SALOME_MPIOBJECT_IDL_
-#define _SALOME_MPIOBJECT_IDL_
-
-module Engines
-{
-  typedef sequence<Object> IORTab;
-  interface MPIObject
-  {
-    attribute IORTab tior;
-  } ;
-} ;
-
-#endif

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 88685ce56138dec275466a6e29595de4b31430d8..8e44db9ac19f86d4e8dd233dc86ec277f67f6c49 100644 (file)
--- 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/ac_cxx_warnings.m4 b/salome_adm/unix/config_files/ac_cxx_warnings.m4
index 862f5e83c5144a290b67ed3e731fadd6f17ccc1f..b23ca3bd2a7767e62fb6df33633c2b21652be7a6 100644 (file)
--- a/salome_adm/unix/config_files/ac_cxx_warnings.m4
+++ b/salome_adm/unix/config_files/ac_cxx_warnings.m4
@@ -27,4 +27,8 @@ dnl @author Bernard Secher (CEA) - 04/12/2003
 dnl
 AC_DEFUN([AC_CXX_WARNINGS],[
   AC_CXX_OPTION(-Wno-deprecated,CXXFLAGS)
+  AC_CXX_OPTION(-Wparentheses,CXXFLAGS)
+  AC_CXX_OPTION(-Wreturn-type,CXXFLAGS)
+  AC_CXX_OPTION(-Wmissing-declarations,CXXFLAGS)
+  AC_CXX_OPTION(-Wunused,CXXFLAGS)
 ])

diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4
index 1cc692c5fd5bad4bd57f3c99f0f1d6066445a475..789167b4c1264a3d29860a04c96f3f492090f5bf 100644 (file)
--- 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)

diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4
index 753521cf9fe43f0bdfa5adb55c9fecdeb08d2aa0..b27de2779cb4cb176f9f0472407ec1e4f14fcc3a 100644 (file)
--- a/salome_adm/unix/config_files/check_qt.m4
+++ b/salome_adm/unix/config_files/check_qt.m4
@@ -80,8 +80,6 @@ QT_ROOT=$QTDIR
 
 if  test "x$qt_ok" = "xyes"
 then
-  AC_MSG_CHECKING(include of qt headers)
-
   CPPFLAGS_old=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
 
@@ -90,13 +88,15 @@ then
 
   CPPFLAGS=$CPPFLAGS_old
 
+  AC_MSG_CHECKING(include of qt headers)
+
   if  test "x$qt_ok" = "xno"
   then
     AC_MSG_RESULT(qt headers not found, or too old qt version, in $QTDIR/include)
     AC_MSG_RESULT(QTDIR environment variable may be wrong)
   else
     AC_MSG_RESULT(yes)
-       QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
+    QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
     QT_MT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
   fi
 fi

diff --git a/salome_adm/unix/config_files/production.m4 b/salome_adm/unix/config_files/production.m4
index 1cebe979e09be50fc9793d107fb83bbc9ffa28ac..e3da0539b890d86d2665320df4c629ff51083847 100644 (file)
--- a/salome_adm/unix/config_files/production.m4
+++ b/salome_adm/unix/config_files/production.m4
@@ -53,14 +53,6 @@ no) enable_production=no ;;
 esac],
 enable_production=AC_ENABLE_PRODUCTION_DEFAULT)dnl
 
-# portage alpha/OSF
-# CXXFLAGS="$CXXFLAGS -Wno-deprecated -Wparentheses -Wreturn-type -Wmissing-declarations -Wunused "
-echo $CXX
-AC_CXX_OPTION(-Wparentheses,CXXFLAGS)
-AC_CXX_OPTION(-Wreturn-type,CXXFLAGS)
-AC_CXX_OPTION(-Wmissing-declarations,CXXFLAGS)
-AC_CXX_OPTION(-Wunused,CXXFLAGS)
-
 # supprimer car ne marche qu'avec compilo gnu
 # CXXVERSION=`$CXX --version`
 # if test "X$CXXVERSION" != "X2.95.3"; then