From: san <san@opencascade.com>
Date: Mon, 15 Dec 2008 14:08:03 +0000 (+0000)
Subject: Do not use libvtkhdf5.so in ParaView
X-Git-Tag: V2008a~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=845f9cb9b80b238b03c291a662763b7714eef05a;p=modules%2Fparavis.git

Do not use libvtkhdf5.so in ParaView
---

diff --git a/adm_local/unix/config_files/check_ParaView.m4 b/adm_local/unix/config_files/check_ParaView.m4
index 5c311f88..773ff418 100644
--- a/adm_local/unix/config_files/check_ParaView.m4
+++ b/adm_local/unix/config_files/check_ParaView.m4
@@ -70,6 +70,10 @@ if test "x$qt_ok" != "xyes" ; then
    AC_MSG_WARN(ParaView needs Qt correct configuration, check configure output)
 fi
 
+if test "x$hdf5_ok" != "xyes" ; then
+   AC_MSG_WARN(ParaView needs correct HDF5 configuration, check configure output)
+fi
+
 AC_PATH_X
 if test "x$x_libraries" != "x"
 then
@@ -89,7 +93,7 @@ then
 fi
 
 LOCAL_INCLUDES="$OGL_INCLUDES"
-LOCAL_LIBS="-lvtksys -lvtkzlib -lvtkpng -lvtkjpeg -lvtktiff -lvtkexpat -lvtksqlite -lvtkmetaio -lvtkverdict -lvtkNetCDF -lvtkDICOMParser -lvtkfreetype -lvtkftgl -lvtkexoIIc -lvtkhdf5 -lvtklibxml2 -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets -lvtkClientServer -lvtkCommonCS -lvtkFilteringCS -lvtkIOCS -lvtkImagingCS -lvtkGraphicsCS -lvtkGenericFiltering -lvtkGenericFilteringCS -lvtkRenderingCS -lvtkHybridCS -lvtkParallelCS -lvtkPVCommandOptions -lKWCommon -lvtkInfovis -lvtkInfovisCS -lvtkPVServerCommon -lvtkPVServerCommonCS -lvtkCommonPythonD -lvtkFilteringPythonD -lvtkIOPythonD -lXdmf -lvtkXdmf -lvtkXdmfCS -lvtkWidgetsCS -lvtkVolumeRendering -lvtkVolumeRenderingCS -lvtkPVFilters -lvtkPVFiltersCS -lvtkViews -lvtkPVServerManagerPythonD -lvtkPVServerCommonPythonD -lvtkPVPythonInterpretor -lvtkPVServerManager -lQVTK -lpqWidgets -lQtTesting -lQtChart -lpqCore -lQtPython -lpqComponents $LXLIB -lX11 -lXt"
+LOCAL_LIBS="-lvtksys -lvtkzlib -lvtkpng -lvtkjpeg -lvtktiff -lvtkexpat -lvtksqlite -lvtkmetaio -lvtkverdict -lvtkNetCDF -lvtkDICOMParser -lvtkfreetype -lvtkftgl -lvtkexoIIc -lvtklibxml2 -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets -lvtkClientServer -lvtkCommonCS -lvtkFilteringCS -lvtkIOCS -lvtkImagingCS -lvtkGraphicsCS -lvtkGenericFiltering -lvtkGenericFilteringCS -lvtkRenderingCS -lvtkHybridCS -lvtkParallelCS -lvtkPVCommandOptions -lKWCommon -lvtkInfovis -lvtkInfovisCS -lvtkPVServerCommon -lvtkPVServerCommonCS -lvtkCommonPythonD -lvtkFilteringPythonD -lvtkIOPythonD -lXdmf -lvtkXdmf -lvtkXdmfCS -lvtkWidgetsCS -lvtkVolumeRendering -lvtkVolumeRenderingCS -lvtkPVFilters -lvtkPVFiltersCS -lvtkViews -lvtkPVServerManagerPythonD -lvtkPVServerCommonPythonD -lvtkPVPythonInterpretor -lvtkPVServerManager -lQVTK -lpqWidgets -lQtTesting -lQtChart -lpqCore -lQtPython -lpqComponents $LXLIB -lX11 -lXt"
 
 dnl VTK install dir
 if test -z $with_paraview ; then
diff --git a/configure.ac b/configure.ac
index 705cda68..70ff7606 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,19 +219,19 @@ CHECK_QT
 
 echo
 echo ---------------------------------------------
-echo testing ParaView
+echo testing HDF5
 echo ---------------------------------------------
 echo
 
-CHECK_PARAVIEW
+CHECK_HDF5
 
 echo
 echo ---------------------------------------------
-echo testing HDF5
+echo testing ParaView
 echo ---------------------------------------------
 echo
 
-CHECK_HDF5
+CHECK_PARAVIEW
 
 echo
 echo ---------------------------------------------
@@ -272,7 +272,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok paraview_ok hdf5_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok"
+variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok hdf5_ok paraview_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok"
 
 for var in $variables
 do