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

index 6c5331b6a8d6557f96e9e7cb9933ada97be448a6..b8ae5440a975d809e19a23edd97cc0c4875e08a3 100755 (executable)
@@ -77,10 +77,19 @@ 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 || 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 || 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 || exit 1
+fi
+
 
 # ____________________________________________________________________
 # libtoolize creates some configuration files (ltmain.sh,