Adding key of configuration : -dlopen-opengl

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

diff --git a/config_files/MED.sh b/config_files/MED.sh
index 90cec12a113db3a77d9cc820a54255f22e18c289..88f4ebaf31f12b1e49b8445ded95496b84512f66 100755 (executable)
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.6"
+VERSION="4.1.0"
 
 check_version(){
 if [ -n "${MED_ROOT_DIR}" ]; then
@@ -24,12 +24,9 @@ if [ -n "${MED_ROOT_DIR}" ]; then
        fi
     fi
 elif [ -n "${MED_SRC_DIR}" ]; then
-    if [ -f ${MED_SRC_DIR}/configure.in.base ]; then
-       ver=`grep -E "^VERSION=" ${MED_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "${VERSION}" ]; then
-           return 0
-       fi
-    fi
+  check_salome_src_version MED_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}/MEDsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
-if [ $PROCEDURE == "install_source" ]; then
 # to generate environment scripts
-    try_preinstalled
-fi
+try_preinstalled
 }
 
 install_source_and_build()
@@ -123,7 +118,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 if [ $MED_WITH_GUI == "FALSE" ] ; then
-    check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+    check_jb tar xfz ${SOURCE_DIR}/MEDWOGUIbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 else
     check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 fi
@@ -147,7 +142,7 @@ export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
-if [ $# == 9 ] ; then MED_WITH_GUI="FALSE" ; else MED_WITH_GUI="TRUE" ; fi
+if [ $# == 10 ] ; then MED_WITH_GUI="FALSE" ; else MED_WITH_GUI="TRUE" ; fi
 export PRODUCT="MED_${VERSION}"
 export PRODUCT_SRC="MED_SRC_${VERSION}"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}