Join modifications from BR_Dev_For_4_0.

diff --git a/build_configure b/build_configure
index b1db1b3e019fb33880fd854621f9ce2222974867..d3790d2ee924e6ae1010f7890e38a001064692c2 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -244,6 +244,7 @@ else
 fi
 
 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 \
                                        -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \

diff --git a/configure.in.base b/configure.in.base
index 16bce0b36b4a895f6cfe4b59e68e006b5ce210cd..018a31113c86dbbcd5b18bdd806cf43e9148fc48 100755 (executable)
--- 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