X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=configure.in.base;h=71cdbb9d6774fec54afaabe2233466475522aec4;hp=b04a48cfd6012d6e3e1e155011dbfbd84fc3a7a7;hb=482a58db1be716040955d1f187d32e01e6001ba2;hpb=b5c3be7eba28cb6dc3a2b9255b6fcfb3c5d5c58d diff --git a/configure.in.base b/configure.in.base index b04a48cfd..71cdbb9d6 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,13 +148,13 @@ echo CHECK_PYTHON -echo -echo --------------------------------------------- -echo testing java -echo --------------------------------------------- -echo +dnl echo +dnl echo --------------------------------------------- +dnl echo testing java +dnl echo --------------------------------------------- +dnl echo -CHECK_JAVA +dnl CHECK_JAVA echo echo --------------------------------------------- @@ -172,13 +180,13 @@ echo CHECK_OMNIORB -echo -echo --------------------------------------------- -echo testing mico -echo --------------------------------------------- -echo +dnl echo +dnl echo --------------------------------------------- +dnl echo testing mico +dnl echo --------------------------------------------- +dnl echo -CHECK_MICO +dnl CHECK_MICO echo echo --------------------------------------------- @@ -191,7 +199,7 @@ CHECK_CORBA AC_SUBST_FILE(CORBA) corba=make_$ORB -CORBA=salome_adm/unix/$corba +CORBA=adm_local/unix/$corba echo echo --------------------------------------------- @@ -211,27 +219,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 --------------------------------------------- @@ -265,6 +273,14 @@ echo CHECK_GEOM +echo +echo --------------------------------------------- +echo Testing Med +echo --------------------------------------------- +echo + +CHECK_MED + echo echo --------------------------------------------- echo Summary @@ -272,7 +288,7 @@ echo --------------------------------------------- echo echo Configure -variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_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 Kernel_ok Geom_ok Med_ok" for var in $variables do @@ -286,8 +302,8 @@ echo dnl generals files which could be included in every makefile -AC_SUBST_FILE(COMMENCE) COMMENCE=salome_adm/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module dnl les dependences @@ -302,7 +318,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 @@ -335,14 +351,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