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

diff --git a/configure.ac b/configure.ac
index 78894f4785bc2c8e169190dc5351ce5e2a8ca47a..a97d65c0b2851dd38b5c59e27c03261aba62e8cf 100644 (file)
--- 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 0ad1ea823321509330eb8dfdf8fe082d65441ff7..9dcbaa4af3a830af81e868ea8ec948e7b10020e6 100644 (file)
--- 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