Fix compilation pb.

[modules/kernel.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3347624821dda4f2ce9ebf877f885061df5bf9d6..6254567d5dfa71f8d8e1557da4b409db5e6a76b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [4.0.0], [paul.rascle@edf.fr], [salome])
+AC_INIT([Salome2 Project], [4.1.0], [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, ...
@@ -18,8 +18,8 @@ AM_INIT_AUTOMAKE([tar-pax])
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=4.0.0
-XVERSION=0x040000
+VERSION=4.1.0
+XVERSION=0x040100
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
@@ -186,14 +186,6 @@ echo
 
 CHECK_HDF5
 
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
-
-CHECK_CAS
-
 # ----------------------------------------------------------------------------
 # --- test corba
 
@@ -244,20 +236,20 @@ AC_SUBST_FILE(CORBA)
 
 echo
 echo ---------------------------------------------
-echo Testing QT
+echo BOOST Library
 echo ---------------------------------------------
 echo
-# Qt must be kept because kernel makes use of qxml and some other
-# non-graphical stuff.
-CHECK_QT
+
+CHECK_BOOST
 
 echo
 echo ---------------------------------------------
-echo BOOST Library
+echo Testing libxml2
 echo ---------------------------------------------
 echo
 
-CHECK_BOOST
+CHECK_LIBXML
+
 
 fi 
 # --- end test corba
@@ -424,9 +416,9 @@ function check_fatal_error {
 # --------------------------------------
 
 if test x$corba_gen = xtrue; then
-  basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok occ_ok"
+  basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok"
 else
-  basic_mandatory_products="cc_ok threads_ok hdf5_ok occ_ok"
+  basic_mandatory_products="cc_ok threads_ok hdf5_ok"
 fi
 
 echo --- General mandatory products - Light configuration:
@@ -434,7 +426,7 @@ summary $basic_mandatory_products
 check_fatal_error $basic_mandatory_products
 echo
 
-corba_mandatory_products="omniORB_ok qt_ok boost_ok"
+corba_mandatory_products="omniORB_ok boost_ok"
 if test x$corba_gen = xtrue; then
   echo --- CORBA mandatory products - default configuration:
   summary $corba_mandatory_products
@@ -553,11 +545,11 @@ AC_OUTPUT([ \
        ./src/Basics/Test/Makefile \
        ./src/Batch/Makefile \
        ./src/Batch_SWIG/Makefile \
-       ./src/CASCatch/Makefile \
        ./src/Communication/Makefile \
        ./src/Communication_SWIG/Makefile \
        ./src/Container/Makefile \
        ./src/ParallelContainer/Makefile \
+       ./src/DF/Makefile \
        ./src/DSC/Makefile \
        ./src/DSC/DSC_Basic/Makefile \
        ./src/DSC/DSC_User/Makefile \
@@ -570,6 +562,7 @@ AC_OUTPUT([ \
        ./src/GenericObj/Makefile \
        ./src/HDFPersist/Makefile \
        ./src/KERNEL_PY/Makefile \
+       ./src/Launcher/Makefile \
        ./src/LifeCycleCORBA/Makefile \
        ./src/LifeCycleCORBA/Test/Makefile \
        ./src/LifeCycleCORBA_SWIG/Makefile \