X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=63eca7ec2128e5be8427033d338a0b710db85b6b;hb=b88ec5abd8c049cb9f6b77508ece7e661c90f395;hp=47099046087538341eb3141e09d17a7e025ab268;hpb=0600c4b484dfa65efb046502dfffe6b61389c2b3;p=modules%2Fsmesh.git diff --git a/configure.ac b/configure.ac index 470990460..63eca7ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ # -AC_INIT([Salome2 Project SMESH module], [4.0.0], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project SMESH module], [4.1.1], [webmaster.salome@opencascade.com], [salome]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -194,6 +194,12 @@ echo ENABLE_PTHREADS +SMESH_WITH_GUI=yes + +AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${SMESH_WITH_GUI}" = "yes"]) + +if test "${SMESH_WITH_GUI}" = "yes"; then + echo echo --------------------------------------------- echo testing msg2qm @@ -202,6 +208,8 @@ echo CHECK_MSG2QM +fi + if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then echo echo --------------------------------------------- @@ -242,10 +250,6 @@ dnl CHECK_MICO fi -SMESH_WITH_GUI=yes - -AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${SMESH_WITH_GUI}" = "yes"]) - if test "${SMESH_WITH_GUI}" = "yes"; then echo echo --------------------------------------------- @@ -316,6 +320,8 @@ echo CHECK_CAS +if test "${SMESH_WITH_GUI}" = "yes"; then + echo echo --------------------------------------------- echo Testing qwt @@ -324,6 +330,8 @@ echo CHECK_QWT +fi + echo echo --------------------------------------------- echo Testing html generators @@ -365,7 +373,13 @@ echo --------------------------------------------- echo echo Configure +if test "${SMESH_WITH_GUI}" = "yes"; then variables="cc_ok fortran_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 qwt_ok Kernel_ok Geom_ok Med_ok" +fi + +if test "${SMESH_WITH_GUI}" = "no"; then +variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok" +fi for var in $variables do