From: vsr <vsr@opencascade.com>
Date: Wed, 15 Apr 2009 13:35:33 +0000 (+0000)
Subject: Improve make procedure (add aclocal flags)
X-Git-Tag: V4_1_5rc1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=216f6f1ad805779647b3ab67f1a6c463dab9ce78;p=modules%2Fsmesh.git

Improve make procedure (add aclocal flags)
---

diff --git a/Makefile.am b/Makefile.am
index 2af4f6dc2..417939b53 100644
--- 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 d135d9e8d..6eeefd6fd 100755
--- 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