Improve make procedure (add aclocal flags)

diff --git a/Makefile.am b/Makefile.am
index b95b1399532d90ec63fd38093c30653dd1a10b6d..13377c16bfaa76667edb2ec5071ebf5e050a505c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,21 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if NETGENPLUGIN_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 !NETGENPLUGIN_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
 
 DIST_SUBDIRS = idl adm_local resources src bin 

diff --git a/build_configure b/build_configure
index 4e3b7e46b9d1d970410a688fee194251be5cdf28..0e97239819aad8226ee560057ae2b8875b4827e7 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -131,8 +131,8 @@ echo "====================================================== aclocal"
 
 if test ${NETGENPLUGIN_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