PR: mergefrom_BR_CCRT_11Nov04

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

diff --git a/configure.in.base b/configure.in.base
index 99e1272e1e65a22a8786dcd4dbc4173d5b785c82..880355a612a7b0eec58b94076457ce721598ce09 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -49,7 +49,7 @@ echo
 echo
 
 dnl Modification B. Secher portage sur osf
-AC_CHECK_PROG(SHELL,sh,,)
+AC_CHECK_PROG(SHELL,sh)
 AC_SUBST(SHELL)
 
 if test -z "$AR"; then
@@ -107,7 +107,7 @@ AC_PROG_CXX
 AC_CXX_WARNINGS
 AC_CXX_TEMPLATE_OPTIONS
 AC_DEPEND_FLAG
-#AC_CC_WARNINGS([ansi])
+# AC_CC_WARNINGS([ansi])
 cc_ok=yes
 
 dnl Library libdl :
@@ -119,18 +119,7 @@ AC_CHECK_LIB(rt,nanosleep)
 dnl add library libm :
 AC_CHECK_LIB(m,ceil)
 
-dnl 
-dnl Check if we use std iostream by default or if we must add
-dnl a compiler directive for that
-dnl
-
 AC_CXX_USE_STD_IOSTREAM
-
-dnl 
-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_HAVE_SSTREAM
 
 dnl
@@ -141,14 +130,53 @@ dnl
 
 AC_LINKER_OPTIONS
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
+echo
+echo ---------------------------------------------
+echo testing threads
+echo ---------------------------------------------
+echo
+
+ENABLE_PTHREADS
+
 dnl
 dnl ---------------------------------------------
-dnl testing MPICH
+dnl testing MPI
 dnl ---------------------------------------------
 dnl
 
 CHECK_MPI
-CHECK_MPICH
+
+dnl
+dnl ---------------------------------------------
+dnl testing sockets
+dnl ---------------------------------------------
+dnl
+
+CHECK_SOCKETS
+
+dnl
+dnl ---------------------------------------------
+dnl testing OpenPBS
+dnl ---------------------------------------------
+dnl
+
+echo
+echo ---------------------------------------------
+echo testing OpenPBS
+echo ---------------------------------------------
+echo
+
+openpbs_ok=no
+CHECK_OPENPBS
+dnl openpbs_ok is set to yes by CHECK_OPENPBS
 
 echo
 echo ---------------------------------------------
@@ -185,14 +213,6 @@ echo
 
 CHECK_SWIG
 
-echo
-echo ---------------------------------------------
-echo testing threads
-echo ---------------------------------------------
-echo
-
-ENABLE_PTHREADS
-
 echo
 echo ---------------------------------------------
 echo testing omniORB
@@ -309,14 +329,15 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok mpi_ok mpich_ok lex_yacc_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"
-
-AC_SUBST(pyqt_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"
  
 for var in $variables
 do
-   printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
-   eval echo \$$var
+   eval toto=\$$var
+   if test x$toto != "x"; then
+     printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
+     eval echo \$$var
+   fi
 done
 
 echo
@@ -341,7 +362,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
@@ -374,14 +395,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 $ROOT_BUILDDIR/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 ;;
+        *.in | *~) ;;
+        ./bin/CVS | ./bin/salome)                    ;;
+        *) /usr/bin/install -c $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR
@@ -406,7 +428,8 @@ echo ---------------------------------------------
 echo
 
 AC_OUTPUT_COMMANDS([ \
-       chmod +x ./bin/* \
+       chmod +x ./bin/*; \
+       chmod +x ./bin/salome/* \
 ])
 
 ## do not delete this line