*** empty log message ***

[tools/install.git] / config_files / GEOM.sh

diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index 68e0ed832f2ccff5b363f4c21ba69599e02a3620..bc35395aaf552428b93831a6632e6e59e23f8a6b 100755 (executable)
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.6"
+VERSION="4.0.0"
 
 check_version(){
 if [ -n "${GEOM_ROOT_DIR}" ]; then
@@ -24,12 +24,9 @@ if [ -n "${GEOM_ROOT_DIR}" ]; then
        fi
     fi
 elif [ -n "${GEOM_SRC_DIR}" ]; then
-    if [ -f ${GEOM_SRC_DIR}/configure.in.base ]; then
-       ver=`grep -E "^VERSION=" ${GEOM_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "${VERSION}" ]; then
-           return 0
-       fi
-    fi
+  check_salome_src_version GEOM_SRC_DIR $VERSION
+  if [ $? -eq 0 ] ; then return 0 ; fi
+  return 1
 fi
 return 1
 }
@@ -80,10 +77,8 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
-if [ $PROCEDURE == "install_source" ]; then
 # to generate environment scripts
-    try_preinstalled
-fi
+try_preinstalled
 }
 
 install_source_and_build()