X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=configure.in.base;h=d0105c7b04fe463b016f675ba88651a3e35d2471;hp=f2e7919b0a04d144fbd055840747a56cca86501f;hb=d9a6e9d9f3e844703bbeb5cd6806bed6c2e9b615;hpb=faa1c8f2bc27c5244a34fe03584826de59cb17b3

diff --git a/configure.in.base b/configure.in.base
index f2e7919b0..d0105c7b0 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -113,6 +113,14 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -140,6 +148,14 @@ echo
 
 CHECK_PYTHON
 
+echo
+echo ---------------------------------------------
+echo Testing qwt
+echo ---------------------------------------------
+echo
+
+CHECK_QWT 
+
 dnl echo
 dnl echo ---------------------------------------------
 dnl echo testing java
@@ -211,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 ---------------------------------------------
@@ -251,35 +267,47 @@ CHECK_HTML_GENERATORS
 
 echo
 echo ---------------------------------------------
-echo Testing Kernel
+echo Testing GUI
 echo ---------------------------------------------
 echo
 
-CHECK_KERNEL
+CHECK_SALOME_GUI
 
 echo
 echo ---------------------------------------------
-echo Testing Geom
+echo Testing full GUI
 echo ---------------------------------------------
 echo
 
-CHECK_GEOM
+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 Med
+echo Testing Kernel
 echo ---------------------------------------------
 echo
 
-CHECK_MED
+CHECK_KERNEL
 
 echo
 echo ---------------------------------------------
-echo Testing Netgen
+echo Testing Geom
 echo ---------------------------------------------
 echo
 
-CHECK_NETGEN
+CHECK_GEOM
+
+echo
+echo ---------------------------------------------
+echo Testing Med
+echo ---------------------------------------------
+echo
+
+CHECK_MED
 
 echo
 echo ---------------------------------------------
@@ -288,7 +316,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_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 Netgen_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
@@ -303,7 +331,7 @@ echo
 dnl generals files which could be included in every makefile
 
 AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude
+AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude
 AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
 
 dnl les dependences
@@ -318,7 +346,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep
@@ -351,14 +379,15 @@ dnl copy shells and utilities contained in the bin directory
 dnl excluding .in files (treated in AC-OUTPUT below) and CVS 
 dnl directory
 
-cd bin
+mkdir -p bin/salome
+cd bin/salome
 for i in $ROOT_SRCDIR/bin/*
 do
   local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
   case "$local_bin" in
         *.in | *~)                    ;;
-        ./bin/CVS)                    ;;
-        *) ln -fs $i; echo $local_bin ;;
+        ./bin/CVS | ./bin/salome)                    ;;
+        *) /usr/bin/install $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR