From 02a843893e587bc0f1fd48a188aa7789adc8f633 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Fri, 26 Oct 2007 08:33:56 +0000 Subject: [PATCH] Update for Salome series 4x --- config_files/{CAS-6.2sp1.sh => CAS-6.2sp3.sh} | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) rename config_files/{CAS-6.2sp1.sh => CAS-6.2sp3.sh} (94%) diff --git a/config_files/CAS-6.2sp1.sh b/config_files/CAS-6.2sp3.sh similarity index 94% rename from config_files/CAS-6.2sp1.sh rename to config_files/CAS-6.2sp3.sh index 02ef0eb..d56fa6c 100755 --- a/config_files/CAS-6.2sp1.sh +++ b/config_files/CAS-6.2sp3.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : CAS-6.2sp1.sh +# File : CAS-6.2sp3.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -95,14 +95,30 @@ makedir ${PRODUCT_DIR} cd ${PRODUCT_DIR}_SRC # configure + echo " +++++++++++ configure" + +is_mandriva2007=0 + +if [ -e /etc/issue ] ; then + grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_mandriva2007=1 ; fi +fi + +if [ $is_mandriva2007 == 1 ] ; then +where_xmu_include=/usr/include/X11 +else +where_xmu_include=/usr/X11R6/include/X11 +fi + if test `uname -m` = "x86_64" ; then - flags="$flags --with-xmu-include=/usr/X11R6/include/X11" + flags="$flags --with-xmu-include=$where_xmu_include" flags="$flags --with-xmu-library=/usr/X11R6/lib64" else - flags="$flags --with-xmu-include=/usr/X11R6/include/X11" + flags="$flags --with-xmu-include=$where_xmu_include" flags="$flags --with-xmu-library=/usr/X11R6/lib" fi + flags="$flags LDFLAGS=-lpthread" glincdir="`where_gl_includes`" if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi @@ -242,7 +258,7 @@ export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; -export PRODUCT="CAS-6.2sp1" +export PRODUCT="CAS-6.2sp3" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh -- 2.39.2