Fixed bugs on:

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

diff --git a/configure.in.base b/configure.in.base
index 880355a612a7b0eec58b94076457ce721598ce09..687d5d093b8c9e96437c4c4646b5e2365bb82fbf 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -132,19 +132,27 @@ AC_LINKER_OPTIONS
 
 echo
 echo ---------------------------------------------
-echo BOOST Library
+echo testing threads
 echo ---------------------------------------------
 echo
 
-CHECK_BOOST
+ENABLE_PTHREADS
+
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
 
 echo
 echo ---------------------------------------------
-echo testing threads
+echo BOOST Library
 echo ---------------------------------------------
 echo
 
-ENABLE_PTHREADS
+CHECK_BOOST
 
 dnl
 dnl ---------------------------------------------
@@ -178,6 +186,34 @@ openpbs_ok=no
 CHECK_OPENPBS
 dnl openpbs_ok is set to yes by CHECK_OPENPBS
 
+dnl
+dnl ---------------------------------------------
+dnl testing LSF
+dnl ---------------------------------------------
+dnl
+
+echo
+echo ---------------------------------------------
+echo testing LSF
+echo ---------------------------------------------
+echo
+
+lsf_ok=no
+CHECK_LSF
+dnl lsf_ok is set to yes by CHECK_LSF
+
+dnl
+dnl ---------------------------------------------
+dnl testing Batch
+dnl ---------------------------------------------
+dnl
+
+WITH_BATCH=no
+test x$openpbs_ok = xyes || test x$lsf_ok = xyes && WITH_BATCH=yes
+AC_SUBST(WITH_BATCH)
+
+
+
 echo
 echo ---------------------------------------------
 echo testing LEX \& YACC
@@ -242,13 +278,6 @@ AC_SUBST_FILE(CORBA)
 corba=make_$ORB
 CORBA=salome_adm/unix/$corba
 
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
-
-CHECK_OPENGL
 
 echo
 echo ---------------------------------------------
@@ -258,61 +287,71 @@ echo
 
 CHECK_QT
 
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+if test "X$WITHIHM" = "Xyes"; then
+       echo
+       echo ---------------------------------------------
+       echo Testing sip
+       echo ---------------------------------------------
+       echo
 
-CHECK_VTK
+       CHECK_SIP
 
-echo
-echo ---------------------------------------------
-echo testing HDF5
-echo ---------------------------------------------
-echo
+       echo
+       echo ---------------------------------------------
+       echo testing openGL
+       echo ---------------------------------------------
+       echo
 
-CHECK_HDF5
+       CHECK_OPENGL
 
-echo
-echo ---------------------------------------------
-echo testing MED2
-echo ---------------------------------------------
-echo
+       echo
+       echo ---------------------------------------------
+       echo testing VTK
+       echo ---------------------------------------------
+       echo
 
-CHECK_MED2
+       CHECK_VTK
 
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
+       echo
+       echo ---------------------------------------------
+       echo Testing pyqt
+       echo ---------------------------------------------
+       echo
 
-CHECK_CAS
+       CHECK_PYQT
+
+       echo
+       echo ---------------------------------------------
+       echo Testing qwt
+       echo ---------------------------------------------
+       echo
+
+       CHECK_QWT
+fi
 
 echo
 echo ---------------------------------------------
-echo Testing sip
+echo testing HDF5
 echo ---------------------------------------------
 echo
 
-CHECK_SIP
+CHECK_HDF5
 
 echo
 echo ---------------------------------------------
-echo Testing pyqt
+echo testing MED2
 echo ---------------------------------------------
 echo
 
-CHECK_PYQT
+CHECK_MED2
 
 echo
 echo ---------------------------------------------
-echo Testing qwt
+echo Testing OpenCascade
 echo ---------------------------------------------
 echo
 
-CHECK_QWT
+CHECK_CAS
 
 echo
 echo ---------------------------------------------
@@ -329,7 +368,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok boost_ok lex_yacc_ok mpi_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok openpbs_ok"
+variables="cc_ok boost_ok lex_yacc_ok mpi_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok openpbs_ok lsf_ok"
  
 for var in $variables
 do
@@ -402,8 +441,8 @@ do
   local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
   case "$local_bin" in
         *.in | *~) ;;
-        ./bin/CVS | ./bin/salome)                    ;;
-        *) /usr/bin/install -c $i .; echo $local_bin ;;
+        ./bin/CVS | ./bin/salome) ;;
+        *) $INSTALL $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR