EDF 2281 : Add 2 primitives for hexa mesh

[modules/geom.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index af9313f9d757ab5ab05bffe9be8741f14a990eb0..a5d0afcd99653240ebbf7ef0d96cb6cd96a5d679 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project GEOM module], [6.3.1], [webmaster.salome@opencascade.com], [SalomeGEOM])
+AC_INIT([Salome2 Project GEOM module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -33,6 +33,8 @@ AM_INIT_AUTOMAKE([tar-pax -Wno-portability])
 
 XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
+VERSION_DEV=1
+AC_SUBST(VERSION_DEV)
 
 # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
 MODULE_NAME=geom
@@ -331,6 +333,17 @@ echo ---------------------------------------------
 echo
 CHECK_SPHINX
 
+echo
+echo ---------------------------------------------
+echo testing Opencv
+echo ---------------------------------------------
+echo
+CHECK_OPENCV
+if test "${opencv_ok}" = "yes"; then
+  AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV})
+fi
+
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel
@@ -345,24 +358,77 @@ echo Summary
 echo ---------------------------------------------
 echo
 
-echo Configure
-
-if test "${gui_ok}" = "yes"; then
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok gui_ok"
-elif test "${SalomeGUI_need}" != "no"; then
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok"
+if test "${SalomeGUI_need}" == "no"; then
+  echo "* Configuration options (without GUI):"
 else
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+  echo "* Configuration options:"
+fi
+echo
+
+obligatory_vars="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok"
+optional_vars="opencv_ok"
+gui_vars="OpenGL_ok qt_ok gui_ok"
+
+###
+# mandatory products
+###
+
+echo "--- Mandatory products:"
+
+missing_obligatory=no
+for var in $obligatory_vars
+do
+  eval toto=\$$var
+  if test x$toto == "x"; then toto="no" ; fi
+  if test x$toto == "xno"; then missing_obligatory=yes ; fi
+    printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
+    eval echo \$$var
+  #fi
+done
+if test x$missing_obligatory == "xyes"; then 
+  AC_MSG_ERROR([one or more obligatory product is missing])
 fi
 
-for var in $variables
+###
+# gui products
+###
+
+if test "${SalomeGUI_need}" == "yes"; then
+  # SALOME GUI is mandatory
+  if test "${gui_ok}" != "yes"; then
+    AC_MSG_ERROR([SALOME GUI is missing])
+  fi
+fi
+
+if test "${SalomeGUI_need}" != "no"; then
+  echo "--- GUI products (optional):"
+  
+  for var in $gui_vars
+  do
+    eval toto=\$$var
+    if test x$toto == "x"; then toto="no"; fi
+    printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
+    eval echo \$toto
+  done
+fi
+
+###
+# optional products
+###
+
+echo "--- Other products (optional):"
+
+for var in $optional_vars
 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
-echo "Default ORB   : $DEFAULT_ORB"
+echo "* Default ORB : $DEFAULT_ORB"
 echo
 
 dnl We don t need to say when we re entering directories if we re using
@@ -437,6 +503,7 @@ AC_OUTPUT([ \
   src/GEOMBase/Makefile \
   src/GEOMClient/Makefile \
   src/GEOMFiltersSelection/Makefile \
+  src/Material/Makefile \
   src/GEOMGUI/Makefile \
   src/GEOMImpl/Makefile \
   src/GEOMToolsGUI/Makefile \
@@ -463,10 +530,13 @@ AC_OUTPUT([ \
   src/STEPImport/Makefile \
   src/STLExport/Makefile \
   src/ShHealOper/Makefile \
+  src/ShapeRecognition/Makefile \
   src/TransformationGUI/Makefile \
   src/VTKExport/Makefile \
   resources/Makefile \
   resources/GEOMCatalog.xml \
+  resources/SalomeApp.xml \
+  resources/Plugin \
   idl/Makefile \
   Makefile \
 ])