Salome HOME
Changing version to 5.1.2
[modules/smesh.git] / configure.ac
index 4aeb847b623b8f813306f0394b9a0c58af862e34..912e8c20af8314b3f212c3c03e12785d42026b19 100644 (file)
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project SMESH module], [5.1.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
+AC_INIT([Salome2 Project SMESH module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeSMESH])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wno-portability])
 
 XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
@@ -212,10 +212,6 @@ echo
 
 ENABLE_PTHREADS
 
-SMESH_WITH_GUI=yes
-
-AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${SMESH_WITH_GUI}" = "yes"])
-
 if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then
     echo
     echo ---------------------------------------------
@@ -255,8 +251,34 @@ dnl CHECK_MICO
 
 fi
 
+echo
+echo ---------------------------------------------
+echo Testing GUI
+echo ---------------------------------------------
+echo
+
+CHECK_GUI_MODULE
 
-if test "${SMESH_WITH_GUI}" = "yes"; then
+gui_ok=no
+if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then 
+  gui_ok=yes
+fi
+
+AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${gui_ok}" = "yes"])
+
+if test "${SalomeGUI_need}" == "yes"; then
+  if test "${FullGUI_ok}" != "yes"; then
+    AC_MSG_WARN(For configure SMESH module necessary full GUI!)
+  fi
+elif test "${SalomeGUI_need}" == "auto"; then
+  if test "${FullGUI_ok}" != "yes"; then
+    AC_MSG_WARN(Full GUI not found. Build will be done without GUI!)
+  fi
+elif test "${SalomeGUI_need}" == "no"; then
+  echo Build without GUI option has been chosen
+fi
+
+if test "${gui_ok}" = "yes"; then
     echo
     echo ---------------------------------------------
     echo testing openGL
@@ -280,26 +302,6 @@ if test "${SMESH_WITH_GUI}" = "yes"; then
     echo
 
     CHECK_VTK
-
-    echo
-    echo ---------------------------------------------
-    echo Testing GUI
-    echo ---------------------------------------------
-    echo
-
-    CHECK_SALOME_GUI
-
-    echo
-    echo ---------------------------------------------
-    echo Testing full GUI
-    echo ---------------------------------------------
-    echo
-
-    CHECK_CORBA_IN_GUI
-    if test "x${CORBA_IN_GUI}" != "xyes"; then
-      echo "failed : For configure SMESH module necessary full GUI !"
-      exit
-    fi
 fi
 
 echo
@@ -326,7 +328,7 @@ echo
 
 CHECK_CAS
 
-if test "${SMESH_WITH_GUI}" = "yes"; then
+if test "${gui_ok}" = "yes"; then
 
 echo
 echo ---------------------------------------------
@@ -379,12 +381,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 SalomeGUI_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"
+if test "${gui_ok}" = "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 gui_ok"
+elif test "${SalomeGUI_need}" != "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 gui_ok"
+else
+  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
@@ -430,44 +433,45 @@ echo
 # autoscan, the Makefile list is generated in the output file configure.scan.
 # This could be helpfull to update de configuration.
 AC_OUTPUT([ \
-  ./salome_adm/unix/SALOMEconfig.h \
-  ./adm_local/Makefile \
-  ./adm_local/unix/Makefile \
-  ./adm_local/unix/config_files/Makefile \
-  ./bin/VERSION \
-  ./bin/Makefile \
-  ./SMESH_version.h \
-  ./doc/Makefile \
-  ./doc/salome/Makefile \
-  ./doc/salome/gui/Makefile \
-  ./doc/salome/gui/SMESH/Makefile \
-  ./doc/salome/gui/SMESH/doxyfile \
-  ./doc/salome/gui/SMESH/doxyfile_py \
-  ./doc/salome/tui/Makefile \
-  ./doc/salome/tui/doxyfile \
-  ./src/Makefile \
-  ./src/Controls/Makefile \
-  ./src/Driver/Makefile \
-  ./src/DriverDAT/Makefile \
-  ./src/DriverMED/Makefile \
-  ./src/DriverSTL/Makefile \
-  ./src/DriverUNV/Makefile \
-  ./src/MEFISTO2/Makefile \
-  ./src/OBJECT/Makefile \
-  ./src/SMDS/Makefile \
-  ./src/SMESH/Makefile \
-  ./src/SMESHClient/Makefile \
-  ./src/SMESHDS/Makefile \
-  ./src/SMESHFiltersSelection/Makefile \
-  ./src/SMESHGUI/Makefile \
-  ./src/SMESH_I/Makefile \
-  ./src/SMESH_SWIG/Makefile \
-  ./src/SMESH_SWIG_WITHIHM/Makefile \
-  ./src/StdMeshers/Makefile \
-  ./src/StdMeshersGUI/Makefile \
-  ./src/StdMeshers_I/Makefile \
-  ./resources/Makefile \
-  ./resources/SMESHCatalog.xml \
-  ./idl/Makefile \
+  salome_adm/unix/SALOMEconfig.h \
+  adm_local/Makefile \
+  adm_local/cmake_files/Makefile \
+  adm_local/unix/Makefile \
+  adm_local/unix/config_files/Makefile \
+  bin/VERSION \
+  bin/Makefile \
+  SMESH_version.h \
+  doc/Makefile \
+  doc/salome/Makefile \
+  doc/salome/gui/Makefile \
+  doc/salome/gui/SMESH/Makefile \
+  doc/salome/gui/SMESH/doxyfile \
+  doc/salome/gui/SMESH/doxyfile_py \
+  doc/salome/tui/Makefile \
+  doc/salome/tui/doxyfile \
+  src/Makefile \
+  src/Controls/Makefile \
+  src/Driver/Makefile \
+  src/DriverDAT/Makefile \
+  src/DriverMED/Makefile \
+  src/DriverSTL/Makefile \
+  src/DriverUNV/Makefile \
+  src/MEFISTO2/Makefile \
+  src/OBJECT/Makefile \
+  src/SMDS/Makefile \
+  src/SMESH/Makefile \
+  src/SMESHClient/Makefile \
+  src/SMESHDS/Makefile \
+  src/SMESHFiltersSelection/Makefile \
+  src/SMESHGUI/Makefile \
+  src/SMESH_I/Makefile \
+  src/SMESH_SWIG/Makefile \
+  src/SMESH_SWIG_WITHIHM/Makefile \
+  src/StdMeshers/Makefile \
+  src/StdMeshersGUI/Makefile \
+  src/StdMeshers_I/Makefile \
+  resources/Makefile \
+  resources/SMESHCatalog.xml \
+  idl/Makefile \
   Makefile
 ])