Improve make procedure (add aclocal flags)

diff --git a/Makefile.am b/Makefile.am
index e8f22190a76078c7f6b8c36f21f014c44b59877b..5f6e04899502a78194d9cb840571d575a6f65cce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,20 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if GHS3DPLUGIN_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 \
+                    -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+else !GHS3DPLUGIN_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 \
+                    -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+endif
 
 SUBDIRS = idl adm_local resources src bin 
 

diff --git a/build_configure b/build_configure
index 574aa92137d731bd747f9c6d7c28348ee64d2126..5fb84d9a83d552a0f92d0530d28c4f3094d84377 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -124,8 +124,8 @@ echo "====================================================== aclocal"
 
 if test ${GHS3DPLUGIN_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 \
           -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1