Join modifications from branch OCC_development_for_3_2_0a2

[modules/smesh.git] / configure.in.base

diff --git a/configure.in.base b/configure.in.base
index 16b6b77fa798a9a63ee8293213b608c69337e4c3..d0105c7b04fe463b016f675ba88651a3e35d2471 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -148,6 +148,14 @@ echo
 
 CHECK_PYTHON
 
+echo
+echo ---------------------------------------------
+echo Testing qwt
+echo ---------------------------------------------
+echo
+
+CHECK_QWT 
+
 dnl echo
 dnl echo ---------------------------------------------
 dnl echo testing java
@@ -219,27 +227,27 @@ CHECK_QT
 
 echo
 echo ---------------------------------------------
-echo testing VTK
+echo testing MSG2QM
 echo ---------------------------------------------
 echo
 
-CHECK_VTK
+CHECK_MSG2QM
 
 echo
 echo ---------------------------------------------
-echo testing HDF5
+echo testing VTK
 echo ---------------------------------------------
 echo
 
-CHECK_HDF5
+CHECK_VTK
 
 echo
 echo ---------------------------------------------
-echo testing MED2
+echo testing HDF5
 echo ---------------------------------------------
 echo
 
-CHECK_MED2
+CHECK_HDF5
 
 echo
 echo ---------------------------------------------
@@ -257,6 +265,26 @@ echo
 
 CHECK_HTML_GENERATORS
 
+echo
+echo ---------------------------------------------
+echo Testing GUI
+echo ---------------------------------------------
+echo
+
+CHECK_SALOME_GUI
+
+echo
+echo ---------------------------------------------
+echo Testing full GUI
+echo ---------------------------------------------
+echo
+
+CHECK_CORBA_IN_GUI
+if test "x${CORBA_IN_GUI}" != "xyes"; then
+  echo "failed : For configure SMESH module necessary full GUI !"
+  exit
+fi
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel
@@ -288,7 +316,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok"
+variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok"
 
 for var in $variables
 do
@@ -359,7 +387,7 @@ do
   case "$local_bin" in
         *.in | *~)                    ;;
         ./bin/CVS | ./bin/salome)                    ;;
-        *) /usr/bin/install -C $i .; echo $local_bin ;;
+        *) /usr/bin/install $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR