merge from branch BR_For40_DSC tag mergeto_BR_Dev_For_4_0_16apr07

[modules/kernel.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 139252b95b4021e67df55fe3e504f67202f70bc1..61a80e169b85c64f90ae2b31f8121b824d913993 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,24 +5,28 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [3.2.0], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project], [3.2.2], [paul.rascle@edf.fr], [salome])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-pax])
 #AC_CONFIG_HEADER([config.h])
 
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.0
-XVERSION=0x030200
+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 ---------------------------------------------
 echo Initialize source and build root directories
@@ -261,7 +265,7 @@ fi
 
 echo
 echo ============================================================
-echo testing optionnal products
+echo testing parallel products
 echo ============================================================
 echo
 
@@ -273,6 +277,48 @@ echo
 
 CHECK_MPI
 
+echo
+echo ---------------------------------------------
+echo checking if PaCO++ is requested by user
+echo ---------------------------------------------
+echo
+
+CHECK_PACO
+
+echo
+echo ------------------------------------------------------------
+echo checking if parallel kernel extensions are requested by user
+echo ------------------------------------------------------------
+echo
+
+AC_MSG_CHECKING(whether to enable parallel kernel extension)
+AC_ARG_ENABLE(parallel_extension, 
+             AC_HELP_STRING([--enable-parallel_extension], [parallel kernel extension = [no/yes] (default is no)]),
+             parallel_extension_ok=$enableval,                
+             parallel_extension_ok=no)
+if test "x$parallel_extension_ok" = "xyes"
+then
+  if test "x$PaCO_ok" = "xno"
+  then
+    parallel_extension_ok=no
+  fi
+fi
+
+if test "x$parallel_extension_ok" = "xyes"
+then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
+AM_CONDITIONAL([WITH_PACO_PARALLEL], [test "x$parallel_extension_ok" = "xyes"])
+
+echo
+echo ============================================================
+echo testing optionnal products
+echo ============================================================
+echo
+
 echo
 echo ---------------------------------------------
 echo Testing Batch
@@ -405,13 +451,10 @@ else
 fi
 echo
 
-if test x$MPIREQUESTED = xyes; then
-  requested_products="mpi_ok"
-  echo --- products requested by user
-  summary $requested_products
-  check_fatal_error $requested_products
-  echo
-fi
+parallel_products="mpi_ok PaCO_ok parallel_extension_ok"
+echo --- Kernel parallel extensions:
+summary $parallel_products
+echo
 
 optional_products="cppunit_ok openpbs_ok lsf_ok"
 echo --- Optional products:
@@ -490,16 +533,15 @@ AC_OUTPUT([ \
        ./salome_adm/Makefile \
        ./salome_adm/unix/Makefile \
        ./salome_adm/unix/config_files/Makefile \
-       ./Makefile \
+       Makefile \
        ./bin/Makefile \
        ./bin/VERSION \
        ./bin/runIDLparser \
        ./doc/Makefile \
        ./doc/salome/Makefile \
-       ./doc/salome/DevelopersGuide/DevelopersGuide.tex \
-       ./doc/salome/DevelopersGuide/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 \
@@ -515,6 +557,15 @@ AC_OUTPUT([ \
        ./src/Communication/Makefile \
        ./src/Communication_SWIG/Makefile \
        ./src/Container/Makefile \
+       ./src/ParallelContainer/Makefile \
+       ./src/DSC/Makefile \
+       ./src/DSC/DSC_Basic/Makefile \
+       ./src/DSC/DSC_User/Makefile \
+       ./src/DSC/DSC_User/Basic/Makefile \
+       ./src/DSC/DSC_User/Datastream/Makefile \
+       ./src/DSC/DSC_User/Datastream/Palm/Makefile \
+       ./src/DSC/DSC_User/Datastream/Calcium/Makefile \
+       ./src/DSC/ParallelDSC/Makefile \
        ./src/GenericObj/Makefile \
        ./src/HDFPersist/Makefile \
        ./src/KERNEL_PY/Makefile \