Internal issue 0022865: Restructurization of Partition packages.

[modules/geom.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8849337c387421d0f8a65afdd6df5de29b8fdeea..929a9190b0e7e4d50507c224f08378c758903e46 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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.4.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -316,6 +316,19 @@ echo
 
 CHECK_CAS
 
+echo "OCC_VERSION_DEVELOPMENT = ${OCC_VERSION_DEVELOPMENT}"
+NMTDS_VAR=NMTDS
+NMTTools_VAR=NMTTools
+GEOMAlgo_VAR=GEOMAlgo
+if test "${OCC_VERSION_DEVELOPMENT}" == "1"; then
+  NMTDS_VAR=NMTDS_NEW
+  NMTTools_VAR=NMTTools_NEW
+  GEOMAlgo_VAR=GEOMAlgo_NEW
+fi
+AC_SUBST(NMTDS_VAR)
+AC_SUBST(NMTTools_VAR)
+AC_SUBST(GEOMAlgo_VAR)
+
 echo
 echo ---------------------------------------------
 echo Testing html generators
@@ -337,7 +350,10 @@ echo testing Opencv
 echo ---------------------------------------------
 echo
 CHECK_OPENCV
-AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV})
+if test "${opencv_ok}" = "yes"; then
+  AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV})
+fi
+
 
 echo
 echo ---------------------------------------------
@@ -442,9 +458,11 @@ AC_OUTPUT([ \
   src/EntityGUI/Makefile \
   src/GEOM/Makefile \
   src/GEOMAlgo/Makefile \
+  src/GEOMAlgo_NEW/Makefile \
   src/GEOMBase/Makefile \
   src/GEOMClient/Makefile \
   src/GEOMFiltersSelection/Makefile \
+  src/Material/Makefile \
   src/GEOMGUI/Makefile \
   src/GEOMImpl/Makefile \
   src/GEOMToolsGUI/Makefile \
@@ -460,7 +478,9 @@ AC_OUTPUT([ \
   src/IGESImport/Makefile \
   src/MeasureGUI/Makefile \
   src/NMTDS/Makefile \
+  src/NMTDS_NEW/Makefile \
   src/NMTTools/Makefile \
+  src/NMTTools_NEW/Makefile \
   src/OBJECT/Makefile \
   src/OCC2VTK/Makefile \
   src/OperationGUI/Makefile \