From 37f2a5b95696643df2a796f74d31e7371057106e Mon Sep 17 00:00:00 2001
From: maintenance team <salome-mnt@opencascade.com>
Date: Mon, 29 Oct 2007 15:06:39 +0000
Subject: [PATCH] Update for salome 4X

---
 config_files/omniORB-4.0.6.sh                 | 200 ----------------
 config_files/omniORB-4.0.7.sh                 | 225 ------------------
 .../{omniORB-4.0.5.sh => omniORB-4.1.0.sh}    |  38 ++-
 3 files changed, 28 insertions(+), 435 deletions(-)
 delete mode 100755 config_files/omniORB-4.0.6.sh
 delete mode 100755 config_files/omniORB-4.0.7.sh
 rename config_files/{omniORB-4.0.5.sh => omniORB-4.1.0.sh} (83%)

diff --git a/config_files/omniORB-4.0.6.sh b/config_files/omniORB-4.0.6.sh
deleted file mode 100755
index 57c05bd..0000000
--- a/config_files/omniORB-4.0.6.sh
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : omniORB-4.0.6.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version()
-{
-if [ -z "${OMNIORBDIR}" ]; then
-   #echo "OMNIORBDIR doesn't set"
-   return 1
-fi
-python_version="`python -c 'import sys; print sys.version[:3]'`"
-check_lib_version libomniORB4.so.0.6 ${OMNIORBDIR}/lib
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version _omnipymodule.so.2.6 ${OMNIORBDIR}/lib/python${python_version}/site-packages
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version libCOSNotify4.so.0.1 ${OMNIORBDIR}/lib
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version notifd ${OMNIORBDIR}/bin
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-return 0
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export OMNIORBDIR=\${INSTALL_ROOT}/${PRODUCT}
-export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
-export PYTHONPATH=\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export PATH=\$OMNIORBDIR/bin:\$PATH
-export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
-##
-EOF
-if [ $PROCEDURE != "try_preinstalled" ] && [ -w ${PRODUCT_DIR} ] ; then
-    cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
-InitRef = NameService=corbaname::`hostname`:2810
-EOF
-fi
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_DIR}_SRC && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_DIR}_SRC)
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_DIR}_SRC ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-makedir ${PRODUCT_DIR}_SRC
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}_SRC
-check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.6.tar.gz -C ${PRODUCT_DIR}_SRC
-check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${PRODUCT_DIR}_SRC
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-makedir ${PRODUCT_DIR}
-# install omniORB
-cd ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC
-mkdir build
-cd build
-
-check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG \
-    ../configure --prefix=${PRODUCT_DIR}
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE_OMNIORB.LOG make
-check_job ${PRODUCT_DIR}/INSTALL_OMNIORB.LOG make install
-
-# install omniORBpy
-cd ${PRODUCT_DIR}_SRC/omniORBpy-2.6_SRC
-mkdir build
-cd build
-
-check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORBPY.LOG \
-    ../configure --prefix=${PRODUCT_DIR}
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG make
-check_job ${PRODUCT_DIR}/INSTALL_OMNIORBPY.LOG make install
-
-# install omniNotify
-cd ${PRODUCT_DIR}_SRC/omniNotify_SRC
-mkdir build
-cd build
-
-check_job ${PRODUCT_DIR}/CONFIGURE_OMNINOTIFY.LOG \
-    ../configure --prefix=${PRODUCT_DIR}
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG make
-check_job ${PRODUCT_DIR}/INSTALL_OMNINOTIFY.LOG make install
-
-cd ${PRODUCT_DIR}/bin
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl
-mv -f _omniidl omniidl
-chmod a+x omniidl
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py
-mv -f _omniidlrun.py omniidlrun.py
-chmod a+x omniidlrun.py
-
-#du -sk ${PRODUCT_DIR}_SRC > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR}
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
-
-ln -sf ${PRODUCT_DIR} ${INSTALL_ROOT}/omni
-
-cd ${PRODUCT_DIR}/bin
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl
-mv -f _omniidl omniidl
-chmod a+x omniidl
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py
-mv -f _omniidlrun.py omniidlrun.py
-chmod a+x omniidlrun.py
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-export PRODUCT="omniORB-4.0.6"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/omniORB-4.0.7.sh b/config_files/omniORB-4.0.7.sh
deleted file mode 100755
index d4aac1c..0000000
--- a/config_files/omniORB-4.0.7.sh
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : omniORB-4.0.7.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version()
-{
-if [ -z "${OMNIORBDIR}" ]; then
-   #echo "OMNIORBDIR doesn't set"
-   return 1
-fi
-python_version="`python -c 'import sys; print sys.version[:3]'`"
-check_lib_version libomniORB4.so.0.6 ${OMNIORBDIR}/lib
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version _omnipymodule.so.2.6 ${OMNIORBDIR}/lib/python${python_version}/site-packages
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version libCOSNotify4.so.0.1 ${OMNIORBDIR}/lib
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version notifd ${OMNIORBDIR}/bin
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-return 0
-}
-
-print_env_bin()
-{
-
-if test `uname -m` = "x86_64" ; then
-export OMNI_LIB_PREFIX="64"
-fi
-
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export OMNIORBDIR=\${INSTALL_ROOT}/${PRODUCT}
-export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
-export PYTHONPATH=\${OMNIORBDIR}/lib${OMNI_LIB_PREFIX}:\${OMNIORBDIR}/lib${OMNI_LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export PATH=\$OMNIORBDIR/bin:\$PATH
-export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
-##
-EOF
-if [ $PROCEDURE != "try_preinstalled" ] && [ -w ${PRODUCT_DIR} ] ; then
-    cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
-InitRef = NameService=corbaname::`hostname`:2810
-EOF
-fi
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_DIR}_SRC && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_DIR}_SRC)
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_DIR}_SRC ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-makedir ${PRODUCT_DIR}_SRC
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}_SRC
-check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.7.tar.gz -C ${PRODUCT_DIR}_SRC
-check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${PRODUCT_DIR}_SRC
-
-# apply patches for 64-bit platforms
-if test `uname -m` = "x86_64" ; then
-    if [ -f patches/omniORB-4.0.7-lib64.patch ] ; then
-	cp patches/omniORB-4.0.7-lib64.patch ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC
-	( cd ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC ; patch -p1 < omniORB-4.0.7-lib64.patch )
-    fi
-    if [ -f patches/omniORBpy-2.7-lib64.patch ] ; then
-	cp patches/omniORBpy-2.7-lib64.patch ${PRODUCT_DIR}_SRC/omniORBpy-2.7_SRC
-	( cd ${PRODUCT_DIR}_SRC/omniORBpy-2.7_SRC ; patch -p1 < omniORBpy-2.7-lib64.patch )
-    fi
-    if [ -f patches/omniNotify-2.1-lib64.patch ] ; then
-	cp patches/omniNotify-2.1-lib64.patch ${PRODUCT_DIR}_SRC/omniNotify-2.1_SRC
-	( cd ${PRODUCT_DIR}_SRC/omniNotify-2.1_SRC ; patch -p1 < omniNotify-2.1-lib64.patch )
-    fi
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-makedir ${PRODUCT_DIR}
-# install omniORB
-cd ${PRODUCT_DIR}_SRC/omniORB-4.0.7_SRC
-mkdir build
-cd build
-
-check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG \
-    ../configure --prefix=${PRODUCT_DIR}
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE_OMNIORB.LOG make
-check_job ${PRODUCT_DIR}/INSTALL_OMNIORB.LOG make install
-
-if test `uname -m` = "x86_64" ; then
-cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python2.4 .
-fi
-
-# install omniORBpy
-cd ${PRODUCT_DIR}_SRC/omniORBpy-2.7_SRC
-mkdir build
-cd build
-
-check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORBPY.LOG \
-    ../configure --prefix=${PRODUCT_DIR}
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG make
-check_job ${PRODUCT_DIR}/INSTALL_OMNIORBPY.LOG make install
-
-# install omniNotify
-cd ${PRODUCT_DIR}_SRC/omniNotify-2.1_SRC
-
-mkdir build
-cd build
-
-check_job ${PRODUCT_DIR}/CONFIGURE_OMNINOTIFY.LOG \
-    ../configure --prefix=${PRODUCT_DIR}
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG make
-check_job ${PRODUCT_DIR}/INSTALL_OMNINOTIFY.LOG make install
-
-cd ${PRODUCT_DIR}/bin
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl
-mv -f _omniidl omniidl
-chmod a+x omniidl
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py
-mv -f _omniidlrun.py omniidlrun.py
-chmod a+x omniidlrun.py
-
-#du -sk ${PRODUCT_DIR}_SRC > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR}
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
-
-ln -sf ${PRODUCT_DIR} ${INSTALL_ROOT}/omni
-
-cd ${PRODUCT_DIR}/bin
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl
-mv -f _omniidl omniidl
-chmod a+x omniidl
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py
-mv -f _omniidlrun.py omniidlrun.py
-chmod a+x omniidlrun.py
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-export PRODUCT="omniORB-4.0.7"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.1.0.sh
similarity index 83%
rename from config_files/omniORB-4.0.5.sh
rename to config_files/omniORB-4.1.0.sh
index 82a98a1..23d1705 100755
--- a/config_files/omniORB-4.0.5.sh
+++ b/config_files/omniORB-4.1.0.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : omniORB-4.0.5.sh
+#  File      : omniORB-4.1.0.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
@@ -19,11 +19,11 @@ if [ -z "${OMNIORBDIR}" ]; then
    return 1
 fi
 python_version="`python -c 'import sys; print sys.version[:3]'`"
-check_lib_version libomniORB4.so.0.5 ${OMNIORBDIR}/lib
+check_lib_version libomniORB4.so.1.0 ${OMNIORBDIR}/lib
 if [ "$?" -ne "0" ]; then
    return 1
 fi
-check_lib_version _omnipymodule.so.2.4 ${OMNIORBDIR}/lib/python${python_version}/site-packages
+check_lib_version _omnipymodule.so.3.0 ${OMNIORBDIR}/lib/python${python_version}/site-packages
 if [ "$?" -ne "0" ]; then
    return 1
 fi
@@ -40,11 +40,16 @@ return 0
 
 print_env_bin()
 {
+
+if test `uname -m` = "x86_64" ; then
+export OMNI_LIB_PREFIX="64"
+fi
+
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export OMNIORBDIR=\${INSTALL_ROOT}/${PRODUCT}
 export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
-export PYTHONPATH=\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PYTHONPATH=\${OMNIORBDIR}/lib${OMNI_LIB_PREFIX}:\${OMNIORBDIR}/lib${OMNI_LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 export PATH=\$OMNIORBDIR/bin:\$PATH
 export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
 ##
@@ -83,7 +88,7 @@ source ${INSTALL_WORK}/$SHRC
 makedir ${PRODUCT_DIR}_SRC
 # unpack
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}_SRC
-check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.5.tar.gz -C ${PRODUCT_DIR}_SRC
+check_jb tar xfz ${SOURCE_DIR}/omniORBpy-3.0.tar.gz -C ${PRODUCT_DIR}_SRC
 check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${PRODUCT_DIR}_SRC
 
 # to generate environment scripts
@@ -98,12 +103,20 @@ install_source
 # build sources
 makedir ${PRODUCT_DIR}
 # install omniORB
-cd ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC
+cd ${PRODUCT_DIR}_SRC/omniORB-4.1.0_SRC
 mkdir build
 cd build
 
-check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG \
-    ../configure --prefix=${PRODUCT_DIR}
+if [ -e /etc/redhat-release ] ; then
+    grep -e "Red Hat" /etc/redhat-release > /dev/null
+    if [ $? == 0 ] ; then is_redhat=1 ; fi
+fi
+
+if [ "X$is_redhat" == "X1" ] ; then
+    check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR} --disable-ipv6
+else
+    check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR}
+fi
 
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <<EOF
@@ -112,8 +125,12 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE_OMNIORB.LOG make
 check_job ${PRODUCT_DIR}/INSTALL_OMNIORB.LOG make install
 
+if test `uname -m` = "x86_64" ; then
+cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python2.4 .
+fi
+
 # install omniORBpy
-cd ${PRODUCT_DIR}_SRC/omniORBpy-2.5_SRC
+cd ${PRODUCT_DIR}_SRC/omniORBpy-3.0_SRC
 mkdir build
 cd build
 
@@ -129,6 +146,7 @@ check_job ${PRODUCT_DIR}/INSTALL_OMNIORBPY.LOG make install
 
 # install omniNotify
 cd ${PRODUCT_DIR}_SRC/omniNotify-2.1_SRC
+
 mkdir build
 cd build
 
@@ -192,7 +210,7 @@ export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
-export PRODUCT="omniORB-4.0.5"
+export PRODUCT="omniORB-4.1.0"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
-- 
2.39.2