CCAR:synchronize with V5_1_main head

diff --git a/salome_adm/unix/config_files/check_vtk.m4 b/salome_adm/unix/config_files/check_vtk.m4
index 219e549ac3b4d473d4940f04a45cec9f27e62ceb..1da864219169067ac21330d43ca44ab299de53c4 100644 (file)
--- a/salome_adm/unix/config_files/check_vtk.m4
+++ b/salome_adm/unix/config_files/check_vtk.m4
@@ -87,7 +87,7 @@ then
    LXLIB=""
 fi
 
-LOCAL_INCLUDES="$OGL_INCLUDES"
+LOCAL_INCLUDES="$OGL_INCLUDES -DVTK_EXCLUDE_STRSTREAM_HEADERS"
 LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets $LXLIB -lX11 -lXt"
 TRY_LINK_LIBS="-lvtkCommon $LXLIB -lX11 -lXt"
 

diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am
index 49eb293803374393b1c95adbac332f49476fd457..654d45d8afd6c6f7cd635d7b94e55840cbf2c4d2 100644 (file)
--- a/src/SALOMEDS/Makefile.am
+++ b/src/SALOMEDS/Makefile.am
@@ -287,7 +287,6 @@ bin_PROGRAMS = SALOMEDS_Server SALOMEDS_Client
 SALOMEDS_Server_SOURCES  = SALOMEDS_Server.cxx
 SALOMEDS_Server_CPPFLAGS = $(COMMON_CPPFLAGS)
 SALOMEDS_Server_LDADD    = libSalomeDS.la \
-    $(top_builddir)/idl/libSalomeIDLKernel.la \
        ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
        $(CORBA_LIBS)
@@ -295,7 +294,6 @@ SALOMEDS_Server_LDADD    = libSalomeDS.la \
 SALOMEDS_Client_SOURCES  = SALOMEDS_Client.cxx
 SALOMEDS_Client_CPPFLAGS = $(COMMON_CPPFLAGS)
 SALOMEDS_Client_LDADD    = libSalomeDS.la \
-    $(top_builddir)/idl/libSalomeIDLKernel.la \
        ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
        $(CORBA_LIBS)

diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx
index 47a33b0485dca4422020d6532f4c9f7c682da4e6..85b6e301f2cd65d45f2304b5d2f75a2495eaa7dd 100644 (file)
--- a/src/SALOMEDS/SALOMEDS.cxx
+++ b/src/SALOMEDS/SALOMEDS.cxx
@@ -159,13 +159,5 @@ SALOMEDS_EXPORT
   return builder->GetBuilder();
 }
 
-/*
-SALOMEDS_EXPORT
-  SALOMEDSClient_Observer* ObserverFactory(SALOME::Observer_ptr theObserver)
-{
-  if(CORBA::is_nil(theObserver)) return NULL;
-  return new SALOMEDS_Observer(theObserver);
-}
-*/
 
 }