Gestion 32/64bits dans l'interfce C/F de Calcium.

[modules/kernel.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 740153160dc730c077e3f08520c8357ef9b4b8e7..993a66e5ec1f51735f46240e31ef0536787c713f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 # ================================================================
 #AC_PREREQ(2.59)
 #
-AC_INIT([Salome2 Project], [5.1.0], [paul.rascle@edf.fr], [SalomeKERNEL])
+AC_INIT([Salome2 Project], [5.1.1], [paul.rascle@edf.fr], [SalomeKERNEL])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -88,9 +88,10 @@ AM_CONDITIONAL(CORBA_GEN, test x$corba_gen = xtrue)
 
 # ---- option to build only launcher, resources manager and batch classes
 AC_ARG_WITH(onlylauncher,
-           --with-onlylauncher,
-           WITHONLYLAUNCHER="yes",WITHONLYLAUNCHER="no")
-AM_CONDITIONAL(WITHONLYLAUNCHER, test x$WITHONLYLAUNCHER = xyes)
+       [AC_HELP_STRING([--with-onlylauncher],[Build only launcher, resources manager and batch classes [default=no]])],
+       [],
+       [with_onlylauncher="no"])
+AM_CONDITIONAL(WITHONLYLAUNCHER, test x$with_onlylauncher = xyes)
 
 # ----------------------------------------------------------------------------
 
@@ -126,6 +127,7 @@ echo
 # production.m4
 AC_ENABLE_DEBUG(no)
 AC_ENABLE_PRODUCTION(no)
+AC_ENABLE_MPI_SEQ_CONTAINER(no)
 
 echo
 echo ---------------------------------------------
@@ -172,6 +174,14 @@ AC_CXX_HAVE_SSTREAM
 # Testing linker
 AC_LINKER_OPTIONS
 
+echo
+echo ---------------------------------------------
+echo testing Fortran INTEGER size for CALCIUM 
+echo ---------------------------------------------
+echo
+
+CHECK_CALCIUM
+
 echo
 echo ---------------------------------------------
 echo testing threads
@@ -206,7 +216,7 @@ echo
 
 CHECK_LIBXML
 
-if test x$WITHONLYLAUNCHER = xno; then
+if test x$with_onlylauncher = xno; then
 echo
 echo ---------------------------------------------
 echo testing HDF5
@@ -403,6 +413,9 @@ echo
 
 CHECK_HTML_GENERATORS
 
+# Additional conditional to avoid compilation of non-portable code
+AM_CONDITIONAL(WINDOWS, 0)
+
 echo
 echo ============================================================
 echo Summary
@@ -439,7 +452,7 @@ function check_fatal_error {
 
 # --------------------------------------
 
-if test x$WITHONLYLAUNCHER = xno; then
+if test x$with_onlylauncher = xno; then
   if test x$corba_gen = xtrue; then
     basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok libxml_ok"
   else
@@ -454,7 +467,7 @@ summary $basic_mandatory_products
 check_fatal_error $basic_mandatory_products
 echo
 
-if test x$WITHONLYLAUNCHER = xno; then
+if test x$with_onlylauncher = xno; then
   corba_mandatory_products="omniORB_ok omniORBpy_ok boost_ok"
   if test x$corba_gen = xtrue; then
     echo --- CORBA mandatory products - default configuration:
@@ -491,7 +504,7 @@ echo --- Html documentation products: only required for doc production
 summary $htmldoc_products
 echo
 
-if test x$WITHONLYLAUNCHER = xno; then
+if test x$with_onlylauncher = xno; then
 echo
 echo "Default ORB   : $DEFAULT_ORB"
 echo
@@ -537,10 +550,11 @@ AC_OUTPUT([ \
        ./doc/Makefile \
        ./doc/salome/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 \
+  ./doc/salome/tui/doxyfile \
+       ./doc/salome/gui/Makefile \
+  ./doc/salome/gui/doxyfile \
        ./idl/Makefile \
+       ./idl/Calcium_Ports.idl \
        ./resources/Makefile \
        ./resources/KERNELCatalog.xml \
        ./resources/CatalogResources.xml \
@@ -561,6 +575,9 @@ AC_OUTPUT([ \
        ./src/DSC/DSC_User/Datastream/Makefile \
        ./src/DSC/DSC_User/Datastream/Palm/Makefile \
        ./src/DSC/DSC_User/Datastream/Calcium/Makefile \
+        ./src/DSC/DSC_User/Datastream/Calcium/calcium_integer_port_uses.hxx \
+        ./src/DSC/DSC_User/Datastream/Calcium/CalciumProvidesPort.hxx \
+        ./src/DSC/DSC_User/Datastream/Calcium/CalciumFortranInt.h \
        ./src/DSC/ParallelDSC/Makefile \
        ./src/DSC/DSC_Python/Makefile \
        ./src/GenericObj/Makefile \