Join modifications from branch OCC_development_for_3_2_0a2

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

diff --git a/configure.in.base b/configure.in.base
index 0c666c610193db3b1b2a044616c4ef2a2d91e185..e4b35d6ec2f1c6c1f3b53f82b09ac53f2c3ee38a 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -111,8 +111,17 @@ dnl Well we use sstream which is not in gcc pre-2.95.3
 dnl We must test if it exists. If not, add it in include !
 dnl
 
+AC_CXX_USE_STD_IOSTREAM
 AC_CXX_HAVE_SSTREAM
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -211,27 +220,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 +266,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 VISU module necessary full GUI !"
+  exit
+fi
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel
@@ -280,7 +309,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 qwt_ok doxygen_ok graphviz_ok Kernel_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 qwt_ok doxygen_ok graphviz_ok Kernel_ok Med_ok"
 
 for var in $variables
 do
@@ -310,7 +339,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
@@ -343,14 +372,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