From: yfr <yfr@opencascade.com>
Date: Thu, 17 Jun 2004 09:32:57 +0000 (+0000)
Subject: DCQ : Merge with Ecole_ete_a6.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=06bd100c870bc0a43d33964abedba8a493242650;p=modules%2Fyacs.git

DCQ : Merge with Ecole_ete_a6.
---

diff --git a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4
index 5dd873fd2..7c87413dd 100644
--- a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4
+++ b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4
@@ -35,34 +35,17 @@ ac_cv_depend_flag,
  echo "conftest.o: conftest.c" > conftest.verif
  echo "int  main() { return 0; }" > conftest.c
 
-dnl Evolution portage sur CCRT/osf system
- case $host_os in
-   osf*)
-dnl sur CCRT/osf pas d'equivalent de l'option -MG de gcc avec compilo natif
-dnl on utilise donc gnu pour generer les dependances.
-     DEPCC=gcc
-     DEPCXX=g++
-     DEPCXXFLAGS="-Wno-deprecated -funsigned-char"
-     DIFFFLAGS="-w"
-     ;;
-   *)
-     DEPCC=${CC-cc}
-     DEPCXX=${CXX-c++}
-     DEPCXXFLAGS="\${CXXFLAGS}"
-     DIFFFLAGS="-b -B"
-     ;;
- esac
  C_DEPEND_FLAG=
  for ac_C_DEPEND_FLAG in -xM -MM -M ; do
 
     rm -f conftest.d conftest.err
-    ${DEPCC} ${ac_C_DEPEND_FLAG} -c conftest.c 1> conftest.d 2> conftest.err
+    ${CC-cc} ${ac_C_DEPEND_FLAG} -c conftest.c 1> conftest.d 2> conftest.err
     if test -f conftest.u ; then
        mv conftest.u conftest.d
     fi
 
     rm -f conftest
-    diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
+    diff -b -B conftest.d conftest.verif > conftest
     if test ! -s conftest ; then
        C_DEPEND_FLAG=${ac_C_DEPEND_FLAG}
        break
@@ -71,12 +54,12 @@ dnl on utilise donc gnu pour generer les dependances.
 
 dnl use gcc option -MG : asume unknown file will be construct later
  rm -f conftest.d conftest.err
- ${DEPCC} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err
+ ${CC-cc} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err
  if test -f conftest.u ; then
     mv conftest.u conftest.d
  fi
  rm -f conftest
- diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
+ diff -b -B conftest.d conftest.verif > conftest
  if test ! -s conftest ; then
     C_DEPEND_FLAG=${C_DEPEND_FLAG}" -MG"
  fi
@@ -87,7 +70,7 @@ dnl use gcc option -MG : asume unknown file will be construct later
     exit
  fi
 
- printf " C :  ${DEPCC} ${C_DEPEND_FLAG}"
+ echo -n " C : " ${C_DEPEND_FLAG}
 
  AC_LANG_CPLUSPLUS
  echo "conftest.o: conftest.cxx" > conftest.verif
@@ -97,13 +80,13 @@ dnl use gcc option -MG : asume unknown file will be construct later
  for ac_CXX_DEPEND_FLAG in -xM -MM -M ; do
 
     rm -f conftest.d conftest.err
-    ${DEPCXX} ${ac_CXX_DEPEND_FLAG} -c conftest.cxx 1> conftest.d 2> conftest.err
+    ${CXX-c++} ${ac_CXX_DEPEND_FLAG} -c conftest.cxx 1> conftest.d 2> conftest.err
     if test -f conftest.u ; then
        mv conftest.u conftest.d
     fi
 
     rm -f conftest
-    diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
+    diff -b -B conftest.d conftest.verif > conftest
     if test ! -s conftest ; then
        CXX_DEPEND_FLAG=${ac_CXX_DEPEND_FLAG}
        break
@@ -112,12 +95,12 @@ dnl use gcc option -MG : asume unknown file will be construct later
 
 dnl use g++ option -MG : asume unknown file will be construct later
  rm -f conftest.d conftest.err
- ${DEPCXX} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err
+ ${CXX-c++} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err
  if test -f conftest.u ; then
     mv conftest.u conftest.d
  fi
  rm -f conftest
- diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
+ diff -b -B conftest.d conftest.verif > conftest
  if test ! -s conftest ; then
     CXX_DEPEND_FLAG=${CXX_DEPEND_FLAG}" -MG"
  fi
@@ -129,12 +112,9 @@ dnl use g++ option -MG : asume unknown file will be construct later
     exit
  fi
 
- printf " C++ : ${DEPCXX} ${CXX_DEPEND_FLAG}"
+ echo -n " C++ : " ${CXX_DEPEND_FLAG}
  AC_LANG_RESTORE
 
- AC_SUBST(DEPCC)
- AC_SUBST(DEPCXX)
- AC_SUBST(DEPCXXFLAGS)
  AC_SUBST(C_DEPEND_FLAG)
  AC_SUBST(CXX_DEPEND_FLAG)
 ])
diff --git a/salome_adm/unix/config_files/check_Kernel.m4 b/salome_adm/unix/config_files/check_Kernel.m4
index ce2e458c9..85a53ce1b 100644
--- a/salome_adm/unix/config_files/check_Kernel.m4
+++ b/salome_adm/unix/config_files/check_Kernel.m4
@@ -10,7 +10,7 @@ AC_CHECKING(for Kernel)
 Kernel_ok=no
 
 AC_ARG_WITH(kernel,
-	    [  --with-kernel=DIR               root directory path of KERNEL installation ],
+	    [  --with-kernel=DIR               root directory path of KERNEL build or installation],
 	    KERNEL_DIR="$withval",KERNEL_DIR="")
 
 if test "x$KERNEL_DIR" == "x" ; then
@@ -51,7 +51,7 @@ if test -f ${KERNEL_DIR}/bin/salome/runSalome ; then
 else
    AC_MSG_WARN("Cannot find compiled Kernel module distribution")
 fi
-  
+
 AC_MSG_RESULT(for Kernel: $Kernel_ok)
  
 ])dnl
diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4
new file mode 100644
index 000000000..66efc5a13
--- /dev/null
+++ b/salome_adm/unix/config_files/check_boost.m4
@@ -0,0 +1,53 @@
+dnl  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+dnl 
+dnl  This library is free software; you can redistribute it and/or 
+dnl  modify it under the terms of the GNU Lesser General Public 
+dnl  License as published by the Free Software Foundation; either 
+dnl  version 2.1 of the License. 
+dnl 
+dnl  This library is distributed in the hope that it will be useful, 
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+dnl  Lesser General Public License for more details. 
+dnl 
+dnl  You should have received a copy of the GNU Lesser General Public 
+dnl  License along with this library; if not, write to the Free Software 
+dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+dnl 
+dnl  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+dnl
+dnl
+dnl
+AC_DEFUN([CHECK_BOOST],[
+
+AC_CHECKING(for BOOST Library)
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+AC_SUBST(BOOST_CPPFLAGS)
+BOOST_CPPFLAGS=""
+boost_ok=no
+
+if test -z ${BOOSTDIR}; then
+  AC_MSG_WARN(You must provide BOOSTDIR variable)
+else
+  AC_MSG_RESULT(\$BOOSTDIR = ${BOOSTDIR})
+  AC_CHECKING(for boost/shared_ptr.hpp header file)
+  dnl BOOST headers
+  CPPFLAGS_old="${CPPFLAGS}"
+  BOOST_CPPFLAGS="-ftemplate-depth-32 -I${BOOSTDIR}"
+  CPPFLAGS="${CPPFLAGS} ${BOOST_CPPFLAGS}"
+
+  AC_CHECK_HEADER(boost/shared_ptr.hpp,boost_ok=yes,boost_ok=no)
+
+  CPPFLAGS="${CPPFLAGS_old}"
+  boost_ok=yes
+fi
+
+AC_LANG_RESTORE
+
+])dnl
+
+
diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4
index fcf45bbf9..2b2048043 100644
--- a/salome_adm/unix/config_files/check_cas.m4
+++ b/salome_adm/unix/config_files/check_cas.m4
@@ -36,6 +36,7 @@ AC_SUBST(CAS_MODELER)
 AC_SUBST(CAS_OCAF)
 AC_SUBST(CAS_DATAEXCHANGE)
 AC_SUBST(CAS_LDFLAGS)
+
 AC_SUBST(CAS_LDPATH)
 
 CAS_CPPFLAGS=""
@@ -57,7 +58,7 @@ case $host_os in
    irix6.*)
       casdir=Linux
       ;;
-   osf*)
+   osf4.*)
       casdir=Linux
       ;;
    solaris2.*)
@@ -68,20 +69,6 @@ case $host_os in
       ;;
 esac
 
-AC_MSG_CHECKING(for OpenCascade directories)
-if test -d ${CASROOT}/${casdir}/lib; then
-  CAS_LDPATH="-L$CASROOT/$casdir/lib "
-  AC_MSG_RESULT(yes)
-else
-  if test -d ${CASROOT}/lib; then
-    CAS_LDPATH="-L$CASROOT/lib "
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-fi
-
-
 dnl were is OCC ?
 if test -z $CASROOT; then
   AC_MSG_WARN(You must provide CASROOT variable : see OCC installation manual)
@@ -99,33 +86,35 @@ fi
 
 if test "x$occ_ok" = "xyes"; then
 
-dnl test c++ compiler flag for unsigned character
-  for opt in -funsigned-char -unsigned ; do
-    AC_CXX_OPTION($opt,CXXFLAGS,flag=yes,flag=no)
-    if test "$flag" = "yes"; then
-      break
-    fi
-  done
-  
 dnl cascade headers
 
   CPPFLAGS_old="$CPPFLAGS"
-  CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc"
-  CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -I$CASROOT/inc -I$CASROOT -Wno-deprecated -DHAVE_WOK_CONFIG_H"
+  CXXFLAGS_old="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -funsigned-char"
 
   AC_CHECK_HEADER(Standard_Type.hxx,occ_ok=yes ,occ_ok=no)
 
+  CPPFLAGS="$CPPFLAGS_old"
+  CXXFLAGS="$CXXFLAGS_old"
 fi
 
 if test "x$occ_ok" = xyes ; then
 
+  CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -I$CASROOT/inc -I$CASROOT -DHAVE_WOK_CONFIG_H"
+  CAS_CXXFLAGS="-funsigned-char"
+
   AC_MSG_CHECKING(for OpenCascade libraries)
 
+  CPPFLAGS_old="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS -Wno-deprecated"
+  CXXFLAGS_old="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS $CAS_CXXFLAGS"
   LIBS_old="$LIBS"
-  LIBS="$LIBS $CAS_LDPATH -lTKernel"
-  
+  LIBS="$LIBS -L$CASROOT/$casdir/lib -lTKernel"
   AC_CACHE_VAL(salome_cv_lib_occ,[
     AC_TRY_LINK(
+using namespace std;
 #include <Standard_Type.hxx>
 ,   size_t size;
     const Standard_CString aName="toto";
@@ -135,36 +124,28 @@ if test "x$occ_ok" = xyes ; then
   ])
   occ_ok="$salome_cv_lib_occ"
 
+  CPPFLAGS="$CPPFLAGS_old"
+  CXXFLAGS="$CXXFLAGS_old"
+  LIBS="$LIBS_old"
 fi
-CPPFLAGS="$CPPFLAGS_old"
-LIBS="$LIBS_old"
 
 if test "x$occ_ok" = xno ; then
   AC_MSG_RESULT(no)
   AC_MSG_WARN(Opencascade libraries not found)
 else
   AC_MSG_RESULT(yes)
+  CAS_LDPATH="-L$CASROOT/$casdir/lib "
   CAS_KERNEL="$CAS_LDPATH -lTKernel -lTKMath"
-
-  # E.A. compatibility version 4 and 5.x  
-  CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKCAF -lFWOSPlugin -lTKPShape -lTKPCAF -lTKStdSchema -lTKShapeSchema -lPAppStdPlugin"
-  if test $OCC_VERSION_MAJOR -lt 5 ; then
-    CAS_OCAF="$CAS_OCAF -lTKPAppStd"
-  fi
-  CAS_OCAF="$CAS_OCAF -lTKCDF"
-  
+  CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKCAF -lFWOSPlugin -lTKPShape -lTKPCAF -lTKStdSchema -lTKShapeSchema -lPAppStdPlugin -lTKPAppStd -lTKCDF"
+dnl  CAS_VIEWER="-L$CASROOT/$casdir/lib -lTKOpenGl -lTKV3d -lTKV2d -lTKService"
   CAS_VIEWER="$CAS_LDPATH -lTKOpenGl -lTKV3d -lTKService"
+#  CAS_MODELER="-L$CASROOT/$casdir/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKFeat -lTKOffset"
   CAS_MODELER="$CAS_LDPATH -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKOffset"
-
-  # E.A. compatibility version 4 and 5.x  
-  CAS_DATAEXCHANGE="$CAS_LDPATH -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing"
-  if test $OCC_VERSION_MAJOR -lt 5 ; then
-    CAS_DATAEXCHANGE="$CAS_DATAEXCHANGE -lTKShHealingStd"
-  fi
-
-
+dnl  CAS_DATAEXCHANGE="-L$CASROOT/$casdir/lib -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd -lTKSTL -lTKVRML "
+  CAS_DATAEXCHANGE="$CAS_LDPATH -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd"
   CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE"  
-
+  
+  
 fi
 
 AC_LANG_RESTORE
diff --git a/salome_adm/unix/config_files/check_htmlgen.m4 b/salome_adm/unix/config_files/check_htmlgen.m4
index cb65ed3d0..026f80d07 100644
--- a/salome_adm/unix/config_files/check_htmlgen.m4
+++ b/salome_adm/unix/config_files/check_htmlgen.m4
@@ -14,7 +14,11 @@ AC_PATH_PROG(DOXYGEN,doxygen)
 if test "x$DOXYGEN" = "x"
 then
   doxygen_ok=no
+  AC_MSG_RESULT(no)
   AC_MSG_WARN(doxygen not found)
+else
+  dnl AC_SUBST(DOXYGEN)
+  AC_MSG_RESULT(yes)
 fi
 
 AC_CHECKING(for graphviz)
@@ -27,7 +31,10 @@ AC_PATH_PROG(DOT,dot)
 	
 if test "x$DOT" = "x" ; then
   graphviz_ok=no
+  AC_MSG_RESULT(no)
   AC_MSG_WARN(graphviz not found)
+else
+  AC_MSG_RESULT(yes)
 fi
 
 ])dnl
diff --git a/salome_adm/unix/config_files/check_mpich.m4 b/salome_adm/unix/config_files/check_mpich.m4
index c68a72757..cb4af5388 100644
--- a/salome_adm/unix/config_files/check_mpich.m4
+++ b/salome_adm/unix/config_files/check_mpich.m4
@@ -52,15 +52,13 @@ if test "$WITHMPICH" = yes; then
   if test "$WITHMPICH" = "yes";then
     LDFLAGS_old="$LDFLAGS"
     LDFLAGS="$MPICH_LIBS $LDFLAGS"
-    AC_CHECK_LIB(mpich,MPI_Init,WITHMPICH="yes",WITHMPICH="no")
+    AC_CHECK_LIB(mpich,MPI_Init,
+               AC_CHECK_LIB(pmpich, PMPI_Init,WITHMPICH="yes",WITHMPICH="no"),
+               WITHMPICH="no")
     LDFLAGS="$LDFLAGS_old"
   fi
 
-  if test "$WITHMPICH" = "yes";then
-    mpich_ok=yes
-    MPICH_LIBS="$MPICH_LIBS -lmpich"
-  fi
-
+  MPICH_LIBS="$MPICH_LIBS -lpmpich -lmpich"
 
 fi
 AC_SUBST(MPICH_INCLUDES)
diff --git a/salome_adm/unix/config_files/check_pthreads.m4 b/salome_adm/unix/config_files/check_pthreads.m4
index 983bfc200..0608c4a40 100644
--- a/salome_adm/unix/config_files/check_pthreads.m4
+++ b/salome_adm/unix/config_files/check_pthreads.m4
@@ -30,21 +30,22 @@ dnl@id $Id$
 dnl ----------------------------------------------------------------
 dnl CHECK_PTHREADS
 AC_DEFUN(CHECK_PTHREADS,[
-AC_CXX_OPTION(-pthread,CPPFLAGS,flag=yes,flag=no)
-
-if test $flag = no; then
-  AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-  AC_CHECK_HEADER(pthread.h,AC_DEFINE(HAVE_PTHREAD_H))
-  AC_CHECK_LIB(posix4,nanosleep, LIBS_PTHREADS="-lposix4",LIBS_PTHREADS="")
-  AC_CHECK_LIB(pthread,pthread_mutex_lock, 
-               LIBS_PTHREADS="-lpthread $LIBS_PTHREADS",LIBS_PTHREADS="")
-fi
-
-if test $flag = no && x$LIBS_PTHREADS = x; then
-  threads_ok=no
-else
-  threads_ok=yes
-fi
+AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
+AC_CHECK_HEADER(pthread.h,AC_DEFINE(HAVE_PTHREAD_H))
+AC_CHECK_LIB(posix4,nanosleep, LIBS_PTHREADS="-lposix4",LIBS_PTHREADS="")
+AC_CHECK_LIB(pthread,pthread_mutex_lock, 
+             LIBS_PTHREADS="-lpthread $LIBS_PTHREADS")
+AC_MSG_CHECKING([parameters for using pthreads])
+case $build_os in
+  freebsd*)
+    CFLAGS_PTHREADS="-pthread"
+    CXXFLAGS_PTHREADS="-pthread"
+    ;;
+  *)
+    ;;
+esac
+AC_MSG_RESULT(["flags: $CFLAGS_PTHREADS\;libs: $LIBS_PTHREADS"])
+threads_ok=yes
 ])dnl
 dnl
 dnl
diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4
index 55d70ebdd..753521cf9 100644
--- a/salome_adm/unix/config_files/check_qt.m4
+++ b/salome_adm/unix/config_files/check_qt.m4
@@ -80,6 +80,7 @@ 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"
@@ -91,10 +92,11 @@ then
 
   if  test "x$qt_ok" = "xno"
   then
-    AC_MSG_WARN(qt headers not found, or too old qt version, in $QTDIR/include)
-    AC_MSG_WARN(QTDIR environment variable may be wrong)
+    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
-    QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
+    AC_MSG_RESULT(yes)
+       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/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index 48a025918..feecb0dde 100644
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -28,17 +28,10 @@ else
            sip_vers=new ;;
          3.5*)
            sip_vers=new ;;
-         3.6*)
-           sip_vers=new ;;
-         3.7*)
-           sip_vers=new ;;
-         3.8*)
-           sip_vers=new ;;
-         3.9*)
-           sip_vers=new ;;
            *)
            sip_vers=no ;;
     esac
+
     sip_ok=no
 
     if test "x$sip_vers" = "xold"
@@ -51,11 +44,11 @@ else
 
     if test "x$sip_vers" = "xnew"
     then
-	sip_ok=yes
-	if test -d ${SIPDIR}/include/python${PYTHON_VERSION} ; then
+	if test -d ${SIPDIR}/include ; then
+	   sip_ok=yes
 	   SIP_ROOT="$SIPDIR"
-	   SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include/python${PYTHON_VERSION}"
-	   SIP_LIBS="-L${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages -lsip"
+	   SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include"
+	   SIP_LIBS="-L${SIPDIR}/lib -lsip"
 	else
 	   sip_ok=yes
 	   SIP_ROOT="$SIPDIR"
diff --git a/salome_adm/unix/config_files/check_vtk.m4 b/salome_adm/unix/config_files/check_vtk.m4
index 4b4b1454f..1b1a8d1a1 100644
--- a/salome_adm/unix/config_files/check_vtk.m4
+++ b/salome_adm/unix/config_files/check_vtk.m4
@@ -48,16 +48,10 @@ then
    AC_MSG_WARN(vtk needs OpenGL correct configuration, check configure output)
 fi
 
-if test "x$x_libraries" != "x"
-then
-   LXLIB="-L$x_libraries"
-else
-   LXLIB=""
-fi
 
 LOCAL_INCLUDES="$OGL_INCLUDES"
-LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS $LXLIB -lX11 -lXt"
-TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS $LXLIB -lX11 -lXt"
+LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS -L$x_libraries -lX11 -lXt"
+TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS -L$x_libraries -lX11 -lXt"
 
 if test -z $VTKHOME
 then 
@@ -70,7 +64,7 @@ fi
 
 dnl vtk headers
 CPPFLAGS_old="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
+CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES -Wno-deprecated"
 
 AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no")
 
@@ -88,7 +82,7 @@ AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no")
 #  LIBS="$LIBS $TRY_LINK_LIBS"
   LIBS="$LIBS $LOCAL_LIBS"
   CPPFLAGS_old="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $VTK_INCLUDES"
+  CPPFLAGS="$CPPFLAGS $VTK_INCLUDES -Wno-deprecated"
 
  dnl  VTKPY_MODULES="$VTKHOME/python"
 
diff --git a/salome_adm/unix/config_files/production.m4 b/salome_adm/unix/config_files/production.m4
index aa6da52d4..aa161181a 100644
--- a/salome_adm/unix/config_files/production.m4
+++ b/salome_adm/unix/config_files/production.m4
@@ -55,7 +55,7 @@ enable_production=AC_ENABLE_PRODUCTION_DEFAULT)dnl
 
 if test "X$enable_production" = "Xyes"; then
   CFLAGS="$CFLAGS -O"
-  CXXFLAGS="$CXXFLAGS -O "
+  CXXFLAGS="$CXXFLAGS -O -Wno-deprecated "
 fi
 ])
 
@@ -89,7 +89,7 @@ enable_debug=AC_ENABLE_DEBUG_DEFAULT)dnl
 
 if test "X$enable_debug" = "Xyes"; then
   CFLAGS="$CFLAGS -g -D_DEBUG_ "
-  CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ "
+  CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ -Wno-deprecated "
 fi
 ])
 
diff --git a/salome_adm/unix/config_files/python.m4 b/salome_adm/unix/config_files/python.m4
index b99b9d138..b86c21d35 100644
--- a/salome_adm/unix/config_files/python.m4
+++ b/salome_adm/unix/config_files/python.m4
@@ -126,8 +126,8 @@ fi])
  AC_MSG_CHECKING([if we need libdb])
  PY_NEEDOPENDB=`nm $PYTHON_LIBA | grep dbopen | grep U`
   if test "x$PY_NEEDOPENDB" != "x"; then
+     PYTHON_LIBS="$PYTHON_LIBS -ldb"
      AC_MSG_RESULT(yes)
-     AC_CHECK_LIB(db,dbopen,PYTHON_LIBS="$PYTHON_LIBS -ldb",db_ok=no)
   else
      AC_MSG_RESULT(no)
   fi
@@ -135,8 +135,8 @@ fi])
  AC_MSG_CHECKING([if we need libdl])
   PY_NEEDOPENDL=`nm $PYTHON_LIBA | grep dlopen | grep U`
   if test "x$PY_NEEDOPENDL" != "x"; then
+     PYTHON_LIBS="$PYTHON_LIBS -ldl"
      AC_MSG_RESULT(yes)
-     AC_CHECK_LIB(dl,dlopen,PYTHON_LIBS="$PYTHON_LIBS -ldl",dl_ok=no)
   else
      AC_MSG_RESULT(no)
   fi
@@ -144,8 +144,8 @@ fi])
  AC_MSG_CHECKING([if we need libutil])
   PY_NEEDOPENPTY=`nm $PYTHON_LIBA | grep openpty | grep U`
   if test "x$PY_NEEDOPENPTY" != "x"; then
+     PYTHON_LIBS="$PYTHON_LIBS -lutil"
      AC_MSG_RESULT(yes)
-     AC_CHECK_LIB(util,openpty,PYTHON_LIBS="$PYTHON_LIBS -lutil",openpty_ok=no)
   else
      AC_MSG_RESULT(no)
   fi
@@ -153,8 +153,8 @@ fi])
  AC_MSG_CHECKING([if we need tcltk])
   PY_NEEDTCLTK=`nm $PYTHON_LIBA | grep Tcl_Init | grep U`
   if test "x$PY_NEEDTCLTK" != "x"; then
+     PYTHON_LIBS="$PYTHON_LIBS -ltcl -ltk"
      AC_MSG_RESULT(yes)
-     AC_CHECK_LIB(tcl,Tcl_Init,PYTHON_LIBS="$PYTHON_LIBS -ltcl -ltk",tclinit_ok=no)
   else
      AC_MSG_RESULT(no)
   fi