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

index 8eb1500fd32f672a7a8eae800a1763b4d0e3d05b..8803fbedf7cfdb7c20a2535b34d65498a2399562 100755 (executable)
@@ -62,8 +62,14 @@ 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 || 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 || exit 1
+else
+  aclocal -I adm_local/unix/config_files \
+          -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
+fi
 
 # ____________________________________________________________________
 # libtoolize creates some configuration files (ltmain.sh,