4x & 5x: Error at Measures - Dimensions - Angle with edge selection

[modules/geom.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 68fdc88890fa6ef25578e3c581fd6539c80afb94..1550dc1df2b05edb49a1eb3686dc0a28848536e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,18 +9,14 @@
 #
 
 
-AC_INIT([Salome2 Project GEOM module], [4.0.0], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project GEOM module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-pax])
 
-PACKAGE=salome
-AC_SUBST(PACKAGE)
 
-VERSION=4.0.0
-XVERSION=0x040000
-AC_SUBST(VERSION)
+XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
 
 # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
@@ -218,29 +214,56 @@ corba=make_$ORB
 CORBA=adm_local/unix/$corba
 
 fi
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
 
-CHECK_OPENGL
+GEOM_WITH_GUI=yes
 
-echo
-echo ---------------------------------------------
-echo testing QT
-echo ---------------------------------------------
-echo
+AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${GEOM_WITH_GUI}" = "yes"])
 
-CHECK_QT
+if test "${GEOM_WITH_GUI}" = "yes"; then
+    echo
+    echo ---------------------------------------------
+    echo testing openGL
+    echo ---------------------------------------------
+    echo
 
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+    CHECK_OPENGL
 
-CHECK_VTK
+    echo
+    echo ---------------------------------------------
+    echo testing QT
+    echo ---------------------------------------------
+    echo
+
+    CHECK_QT
+
+    echo
+    echo ---------------------------------------------
+    echo testing VTK
+    echo ---------------------------------------------
+    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 GEOM module necessary full GUI !"
+      exit
+    fi
+fi
 
 echo
 echo ---------------------------------------------
@@ -276,40 +299,12 @@ CHECK_HTML_GENERATORS
 
 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 GEOM module necessary full GUI !"
-  exit
-fi
-
-echo
-echo ---------------------------------------------
-echo Testing SALOME KERNEL module
+echo Testing Kernel
 echo ---------------------------------------------
 echo
 
 CHECK_KERNEL
 
-echo
-echo ---------------------------------------------
-echo Testing SALOME GUI module
-echo ---------------------------------------------
-echo
-
-CHECK_SALOME_GUI
-
 echo
 echo ---------------------------------------------
 echo Summary
@@ -317,7 +312,13 @@ echo ---------------------------------------------
 echo
 
 echo Configure
+
+if test "${GEOM_WITH_GUI}" = "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 Kernel_ok SalomeGUI_ok"
+fi
+if test "${GEOM_WITH_GUI}" = "no"; then
+variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+fi
 
 for var in $variables
 do
@@ -337,20 +338,15 @@ else
    AC_SUBST(SETX) SETX="set -x"
 fi
 
-dnl copy shells and utilities contained in the bin directory
-dnl excluding .in files (treated in AC-OUTPUT below) and CVS
-dnl directory
-
-
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
-  chmod +x ./bin/*; \
-])
+#AC_OUTPUT_COMMANDS([ \
+#  chmod +x ./bin/*; \
+#])
 
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
@@ -367,9 +363,12 @@ AC_OUTPUT([ \
   ./doc/Makefile \
   ./doc/salome/Makefile \
   ./doc/salome/gui/Makefile \
+  ./doc/salome/gui/GEOM/Makefile \
+  ./doc/salome/gui/GEOM/doxyfile \
+  ./doc/salome/gui/GEOM/doxyfile_py \
+  ./doc/salome/gui/GEOM/doxyfile_tui \
   ./doc/salome/tui/Makefile \
-  ./doc/salome/tui/GEOM/doxyfile \
-  ./doc/salome/tui/GEOM/sources/static/tree.js \
+  ./doc/salome/tui/doxyfile \
   ./src/Makefile \
   ./src/ARCHIMEDE/Makefile \
   ./src/BREPExport/Makefile \
@@ -392,12 +391,12 @@ AC_OUTPUT([ \
   ./src/GEOM_I/Makefile \
   ./src/GEOM_I_Superv/Makefile \
   ./src/GEOM_SWIG/Makefile \
+  ./src/GEOM_SWIG_WITHIHM/Makefile \
   ./src/GenerationGUI/Makefile \
   ./src/GroupGUI/Makefile \
   ./src/IGESExport/Makefile \
   ./src/IGESImport/Makefile \
   ./src/MeasureGUI/Makefile \
-  ./src/NMTAlgo/Makefile \
   ./src/NMTDS/Makefile \
   ./src/NMTTools/Makefile \
   ./src/OBJECT/Makefile \