]> SALOME platform Git repositories - plugins/hybridplugin.git/commitdiff
Salome HOME
Additional fix for issue 0020692: Duplicate check_*.m4 between modules.
authorouv <ouv@opencascade.com>
Thu, 11 Feb 2010 16:43:14 +0000 (16:43 +0000)
committerouv <ouv@opencascade.com>
Thu, 11 Feb 2010 16:43:14 +0000 (16:43 +0000)
build_configure

index 9ed2b3811ef82e0a141afb855a578a3b571363d3..3a14c3ad6fe4b1ade56da812d7a0ba5113692d1d 100755 (executable)
@@ -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,