Improve make procedure (add aclocal flags)

diff --git a/Makefile.am b/Makefile.am
index 2af4f6dc257af766f66f028a730a66e9ba7730b7..417939b53e433a09e0c349647dc6cccb7676d7e3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,19 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if SMESH_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files                      \
+                    -I ${GUI_ROOT_DIR}/adm_local/unix/config_files      \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files  \
+                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files      \
+                    -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files
+else !SMESH_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files                      \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files  \
+                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files      \
+                    -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files
+endif
+
 SUBDIRS = idl adm_local resources src doc bin
 
 DIST_SUBDIRS = idl adm_local resources src doc bin 

diff --git a/build_configure b/build_configure
index d135d9e8d027bbddfd5b19fdb2d9c99431a1d9eb..6eeefd6fd7fd4cbe30568df130ecc59667f56638 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -123,8 +123,8 @@ echo "====================================================== aclocal"
 
 if test ${SMESH_WITH_GUI} = yes; then
   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 ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
          -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
          -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files || exit 1
 else