Removed copying of configure files

Removed copying of pythonbe file

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index e3d27df07f5f6966eb201244775e848a415dadfc..f93a0a4bba7d71e02801ea61ac8f176d2e633a5a 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -295,19 +295,23 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
 
 
 ACLOCAL_SRC = \
-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      check_qt.m4 
+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                  check_qt.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_GUI.m4                     check_corba_in_GUI.m4
 
 $(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 @KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED \
                                                                   -I @GUI_ROOT_DIR@/adm_local/unix/config_files

diff --git a/build_configure b/build_configure
index 212e7d8b0e292dc8c6a5431bd7bcdc906ee73d48..952ce5b6ed6a93ec835098343737f97b6ee889bb 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -220,9 +220,12 @@ else
        echo -n "Creating 'configure' script ...  "
 fi
 
-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
+aclocal -I adm_local/unix/config_files \
+        -I ${KERNEL_ROOT_DIR}/salome_adm/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
+       
 if autoconf
 then
        echo "done"

diff --git a/configure.in.base b/configure.in.base
index bffa2f4af53e4b536d74f138d23529485bca2106..a516d94ffda12cdf725eb4bc99142a96432acc62 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -16,7 +16,7 @@
 #
 
 AC_INIT(src)
-AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED)
 AC_CANONICAL_HOST
 
 PACKAGE=salome