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

index 963a84233f2394224c7911210a994a6edc9e3a71..35c5d6959dde69fdc86c806e68842fb75dfc4589 100755 (executable)
@@ -84,11 +84,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,