From: ouv <ouv@opencascade.com>
Date: Thu, 11 Feb 2010 16:43:14 +0000 (+0000)
Subject: Additional fix for issue 0020692: Duplicate check_*.m4 between modules.
X-Git-Tag: V5_1_4a1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c645dce8e31f57873bbcd532d72f3022abdb5b84;p=plugins%2Fhybridplugin.git

Additional fix for issue 0020692: Duplicate check_*.m4 between modules.
---

diff --git a/build_configure b/build_configure
index 9ed2b38..3a14c3a 100755
--- a/build_configure
+++ b/build_configure
@@ -79,11 +79,20 @@ ABS_CONF_DIR=`pwd`
 #   autom4te.cache (directory)
 echo "======================================================= aclocal"
 
-aclocal -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 || exit 1
+if test -d "${GUI_ROOT_DIR}"; 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 ${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
+else
+  aclocal -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 || exit 1
+fi
 
 # ____________________________________________________________________
 # libtoolize creates some configuration files (ltmain.sh,