From: vsr <vsr@opencascade.com>
Date: Thu, 17 Jun 2010 13:02:20 +0000 (+0000)
Subject: Fix compilation problem of the GEOM module in --without-gui mode
X-Git-Tag: translate_resources_09Jul10~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f2f21ff294ec035f6f8a8b7383642b576c5aed56;p=modules%2Fgeom.git

Fix compilation problem of the GEOM module in --without-gui mode
---

diff --git a/configure.ac b/configure.ac
index 78894f478..a97d65c0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,15 +274,15 @@ if test "${gui_ok}" = "yes"; then
     echo
 
     CHECK_QT
+fi
 
-    echo
-    echo ---------------------------------------------
-    echo testing VTK
-    echo ---------------------------------------------
-    echo
+echo
+echo ---------------------------------------------
+echo testing VTK
+echo ---------------------------------------------
+echo
 
-    CHECK_VTK
-fi
+CHECK_VTK
 
 echo
 echo ---------------------------------------------
@@ -335,9 +335,9 @@ echo Configure
 if test "${gui_ok}" = "yes"; then
   variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok"
 elif test "${SalomeGUI_need}" != "no"; then
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok"
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok"
 else
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
 fi
 
 for var in $variables
diff --git a/src/OCC2VTK/Makefile.am b/src/OCC2VTK/Makefile.am
index 0ad1ea823..9dcbaa4af 100644
--- a/src/OCC2VTK/Makefile.am
+++ b/src/OCC2VTK/Makefile.am
@@ -41,13 +41,11 @@ dist_libOCC2VTK_la_SOURCES =	\
 	GEOM_WireframeFace.cxx
 
 libOCC2VTK_la_CPPFLAGS =	\
-	$(QT_INCLUDES)		\
 	$(CAS_CPPFLAGS)		\
 	$(VTK_INCLUDES)		\
 	$(KERNEL_CXXFLAGS)
 
 libOCC2VTK_la_LDFLAGS  =	\
-	$(QT_MT_LIBS) \
 	$(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKService \
 	$(VTK_LIBS) \
 	$(KERNEL_LDFLAGS)  -lSALOMELocalTrace