Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/multipr.git] / adm_local / unix / make_commence.in

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index cd6bf5237e06179073640badc393c6212d22a0ed..2d3f80699deea594eaa1315bba9b015805d68675 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -39,6 +39,8 @@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
 # BOOST Library
 
 BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@
+BOOST_LIBS = @BOOST_LIBS@
 
 # JAVA
 
@@ -261,23 +263,26 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
 
 $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
-
-
-ACLOCAL_KERNEL = \
-ac_cxx_bool.m4                    check_corba.m4                       \
-ac_cxx_depend_flag.m4             check_hdf5.m4      enable_pthreads.m4        \
-ac_cxx_mutable.m4                 check_mico.m4      libtool.m4                \
-ac_cxx_namespaces.m4              check_omniorb.m4   pyembed.m4                \
-ac_cxx_partial_specialization.m4  python.m4                            \
-ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4      \
-ac_cc_warnings.m4                 check_swig.m4 
+       
+ACLOCAL_SRC = \
+check_corba.m4                  ac_cxx_depend_flag.m4           check_hdf5.m4     \
+enable_pthreads.m4              ac_cxx_namespaces.m4            check_omniorb.m4  \
+pyembed.m4                      python.m4                       check_cas.m4      \
+check_swig.m4
+
+ACLOCAL_SRC_DEPR = \
+ac_cxx_bool.m4                  ac_cxx_mutable.m4       ac_cxx_partial_specialization.m4 \
+check_mico.m4                   libtool.m4              ac_cxx_typename.m4               \
+check_pthreads.m4               ac_cc_warnings.m4
 
 ACLOCAL_GUI = \
-check_vtk.m4                      check_opengl.m4        check_qt.m4   \
+check_vtk.m4                      check_opengl.m4       check_qt.m4   \
 check_GUI.m4                      check_corba_in_GUI.m4
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+                          $(ACLOCAL_SRC_DEPR:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED/%) \
                           $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
        cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
-                                                                 -I @GUI_ROOT_DIR@/adm_local/unix/config_files \
-                                                                  -I @MED_ROOT_DIR@/adm_local/unix/config_files
+                                   -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED \
+                                   -I @GUI_ROOT_DIR@/adm_local/unix/config_files \
+                                   -I @MED_ROOT_DIR@/adm_local/unix/config_files