From: jfa <jfa@opencascade.com>
Date: Mon, 2 Jul 2007 05:51:33 +0000 (+0000)
Subject: Join correction from BR_Dev_For_4_0, necessary for successfull compilation.
X-Git-Tag: T_MULTIPR_INDUS_Dump_python~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d48f784608cc6f5f428cda8ec559959ac90b8a18;p=modules%2Fmultipr.git

Join correction from BR_Dev_For_4_0, necessary for successfull compilation.
---

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index cd6bf52..9003b37 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -261,23 +261,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