X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.in.base;h=687d5d093b8c9e96437c4c4646b5e2365bb82fbf;hb=c936e5f8de0109e2ccf11625a5bb7766eea67881;hp=b34e79c1573e25085d30e6b0f5b3ea318c179720;hpb=3e94b9bf47f8fed7150e0c6cf142af04b8f48c4e;p=modules%2Fkernel.git diff --git a/configure.in.base b/configure.in.base index b34e79c15..687d5d093 100644 --- a/configure.in.base +++ b/configure.in.base @@ -14,7 +14,7 @@ # # Created from configure.in.base # - +AS_SHELL_SANITIZES AC_INIT(src) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST @@ -48,6 +48,10 @@ echo Build root directory : $ROOT_BUILDDIR echo echo +dnl Modification B. Secher portage sur osf +AC_CHECK_PROG(SHELL,sh) +AC_SUBST(SHELL) + if test -z "$AR"; then AC_CHECK_PROGS(AR,ar xar,:,$PATH) fi @@ -86,7 +90,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the dnl full-path to the binary instead. case "$INSTALL" in *install-sh*) - INSTALL='\${top_srcdir}'/salome_adm/unix/config_files/install-sh + INSTALL="${ROOT_SRCDIR}/salome_adm/unix/config_files/install-sh -c" ;; esac @@ -100,6 +104,8 @@ cc_ok=no dnl inutil car libtool dnl AC_PROG_CC AC_PROG_CXX +AC_CXX_WARNINGS +AC_CXX_TEMPLATE_OPTIONS AC_DEPEND_FLAG # AC_CC_WARNINGS([ansi]) cc_ok=yes @@ -107,15 +113,38 @@ cc_ok=yes dnl Library libdl : AC_CHECK_LIB(dl,dlopen) +dnl Library librt : for alpha/osf +AC_CHECK_LIB(rt,nanosleep) + dnl add library libm : AC_CHECK_LIB(m,ceil) -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 ! +AC_CXX_USE_STD_IOSTREAM +AC_CXX_HAVE_SSTREAM + +dnl +dnl --------------------------------------------- +dnl testing linker +dnl --------------------------------------------- dnl -AC_CXX_HAVE_SSTREAM +AC_LINKER_OPTIONS + +echo +echo --------------------------------------------- +echo testing threads +echo --------------------------------------------- +echo + +ENABLE_PTHREADS + +dnl +dnl --------------------------------------------- +dnl testing WITHIHM +dnl --------------------------------------------- +dnl + +CHECK_WITHIHM echo echo --------------------------------------------- @@ -127,11 +156,63 @@ CHECK_BOOST dnl dnl --------------------------------------------- -dnl testing MPICH +dnl testing MPI +dnl --------------------------------------------- +dnl + +CHECK_MPI + +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 + +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 -CHECK_MPICH +WITH_BATCH=no +test x$openpbs_ok = xyes || test x$lsf_ok = xyes && WITH_BATCH=yes +AC_SUBST(WITH_BATCH) + + echo echo --------------------------------------------- @@ -168,14 +249,6 @@ echo CHECK_SWIG -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - echo echo --------------------------------------------- echo testing omniORB @@ -205,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 --------------------------------------------- @@ -221,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 --------------------------------------------- @@ -292,12 +368,15 @@ 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 sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_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 - 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 @@ -362,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