X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=f6ee7f2a0c6004b96acaf6d992aa4d96a3730837;hb=37875bfc03723328aa8b54af942d1338445b1356;hp=7fe63445cf8a2e5aa2fbe0c6db2e19d4d5ddfbc5;hpb=836c34a4e2dd99f1f302a2c3ae93a51cd182368f;p=modules%2Fkernel.git

diff --git a/configure.ac b/configure.ac
index 7fe63445c..f6ee7f2a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [3.1.0], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project], [3.2.2], [gboulant@CS], [salome])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -18,9 +18,14 @@ AM_INIT_AUTOMAKE
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.1.0
+VERSION=3.2.2
+XVERSION=0x030202
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=kernel
+AC_SUBST(MODULE_NAME)
 
 echo
 echo ---------------------------------------------
@@ -305,6 +310,17 @@ dnl localbatch_ok is set to yes by CHECK_LOCAL
 
 WITH_BATCH=no
 test x$openpbs_ok = xyes || test x$lsf_ok = xyes || test x$localbatch_ok = xyes && WITH_BATCH=yes
+
+AC_ARG_ENABLE(batch,
+  [AC_HELP_STRING([--enable-batch],[Batch [default=yes]])],
+  [case "${enableval}" in
+     yes) test x$openpbs_ok = xyes || test x$lsf_ok = xyes || test x$localbatch_ok = xyes && WITH_BATCH=yes;;
+     no)  WITH_BATCH=no ;;
+     *) AC_MSG_ERROR(bad value ${enableval} for --enable-batch) ;;
+  esac],[test x$openpbs_ok = xyes || test x$lsf_ok = xyes || test x$localbatch_ok = xyes && WITH_BATCH=yes])
+
+echo Batch mode = $WITH_BATCH
+
 AC_SUBST(WITH_BATCH)
 AM_CONDITIONAL(WITH_BATCH, [test x"$WITH_BATCH" = xyes])
 
@@ -365,7 +381,12 @@ function check_fatal_error {
 
 # --------------------------------------
 
-basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok occ_ok"
+if test x$corba_gen = xtrue; then
+  basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok occ_ok"
+else
+  basic_mandatory_products="cc_ok threads_ok hdf5_ok occ_ok"
+fi
+
 echo --- General mandatory products - Light configuration:
 summary $basic_mandatory_products
 check_fatal_error $basic_mandatory_products
@@ -378,6 +399,13 @@ if test x$corba_gen = xtrue; then
   check_fatal_error $corba_mandatory_products
 else
   echo --- CORBA products not required - option --disable-corba-gen
+  if test x"$WITH_BATCH" = xyes; then
+    echo --- BATCH mode mandatory products - default configuration:
+    summary "python_ok"
+    check_fatal_error "python_ok"
+  else 
+    echo --- Python not required - option --enable-batch=no
+  fi
 fi
 echo
 
@@ -461,21 +489,26 @@ AC_OUTPUT_COMMANDS([ \
 # 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 \
+	./KERNEL_version.h \
+	./salome_adm/unix/SALOMEconfig.ref \
 	./salome_adm/Makefile \
 	./salome_adm/unix/Makefile \
 	./salome_adm/unix/config_files/Makefile \
 	./Makefile \
 	./bin/Makefile \
+	./bin/VERSION \
 	./bin/runIDLparser \
 	./doc/Makefile \
 	./doc/salome/Makefile \
-	./doc/salome/DevelopersGuide/DevelopersGuide.tex \
-	./doc/salome/DevelopersGuide/Makefile \
-	./doc/salome/gui/Makefile \
 	./doc/salome/tui/Makefile \
+	./doc/salome/tui/INPUT/doxyuser:./doc/salome/tui/KERNEL/doxyuser.in \
+	./doc/salome/tui/INPUT/doxydev:./doc/salome/tui/KERNEL/doxydev.in \
+	./doc/salome/tui/INPUT/sources/static/tree.js:./doc/salome/tui/KERNEL/sources/static/tree.js.in \
 	./idl/Makefile \
 	./resources/Makefile \
+	./resources/KERNELCatalog.xml \
+	./resources/CatalogResources.xml \
+	./resources/DEPRECATED/Plugin \
 	./src/Makefile \
 	./src/Basics/Makefile \
 	./src/Basics/Test/Makefile \
@@ -485,13 +518,16 @@ AC_OUTPUT([ \
 	./src/Communication/Makefile \
 	./src/Communication_SWIG/Makefile \
 	./src/Container/Makefile \
-	./src/DataTypeCatalog/Makefile \
+	./src/DSC/Makefile \
+	./src/DSC/DSC_Basic/Makefile \
+	./src/DSC/DSC_User/Makefile \
 	./src/GenericObj/Makefile \
 	./src/HDFPersist/Makefile \
 	./src/KERNEL_PY/Makefile \
 	./src/LifeCycleCORBA/Makefile \
 	./src/LifeCycleCORBA/Test/Makefile \
 	./src/LifeCycleCORBA_SWIG/Makefile \
+	./src/LifeCycleCORBA_SWIG/Test/Makefile \
 	./src/Logger/Makefile \
 	./src/Logger/Test/Makefile \
 	./src/ModuleCatalog/Makefile \
@@ -504,7 +540,6 @@ AC_OUTPUT([ \
 	./src/NOTIFICATION_SWIG/Makefile \
 	./src/Registry/Makefile \
 	./src/ResourcesManager/Makefile \
-	./src/RessourcesCatalog/Makefile \
 	./src/SALOMEDS/Makefile \
 	./src/SALOMEDS/Test/Makefile \
 	./src/SALOMEDSClient/Makefile \