From: caremoli <caremoli>
Date: Fri, 18 Jun 2010 12:14:47 +0000 (+0000)
Subject: CCAR:synchronize with V5_1_main head
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=55f4f655e1ad3f44ff14c9cae5cde324ef3b4c90;p=modules%2Fkernel.git

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 219e549ac..1da864219 100644
--- 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 49eb29380..654d45d8a 100644
--- 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 47a33b048..85b6e301f 100644
--- 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);
-}
-*/
 
 }