From ca6257883d6af3e1c32e46c59d26804598b76d8c Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 15 Apr 2009 13:33:51 +0000
Subject: [PATCH] Improve make procedure (add aclocal flags)

---
 Makefile.am     | 9 +++++++++
 build_configure | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 34a6eae32..ace7bd22e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,15 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if GEOM_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
+else !GEOM_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/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 d8b893183..cc474f8a0 100755
--- a/build_configure
+++ b/build_configure
@@ -104,8 +104,8 @@ echo "====================================================== aclocal"
 
 if test ${GEOM_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 || exit 1
+          -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+          -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
 else
   aclocal -I adm_local/unix/config_files \
           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1