merge from master

[tools/sat_salome.git] / products / compil_scripts / omniORB.sh

diff --git a/products/compil_scripts/omniORB.sh b/products/compil_scripts/omniORB.sh
index a9d941fa786a0690ebad76c8a7858d78757d9aab..abd2a8e20f25ad6e3dd82af61f2c1ec2b597afde 100755 (executable)
--- a/products/compil_scripts/omniORB.sh
+++ b/products/compil_scripts/omniORB.sh
@@ -9,8 +9,8 @@ echo "##########################################################################
 PYTHON_HOME=$PYTHONHOME
 
 echo
-echo "*** configure --disable-ipv6"
-$SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --disable-ipv6 
+echo "*** configure --prefix=$PRODUCT_INSTALL --disable-ipv6"
+PYTHON=$PYTHONBIN $SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --disable-ipv6
 if [ $? -ne 0 ]
 then
     echo "ERROR on configure"
@@ -35,16 +35,17 @@ then
     exit 3
 fi
 
-if [[ $VERSION == "4.1.6" ]]
-then
+function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
+
+if version_ge $VERSION "4.1" ; then
     # fix headers
     echo
     echo "*** fix headers"
     cd $PRODUCT_INSTALL/bin
-    sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl
+    sed -e "s%#\!.*python[0-9]*%#\!/usr/bin/env python3%" omniidl > _omniidl
     mv -f _omniidl omniidl
     chmod a+x omniidl
-    sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py
+    sed -e "s%#\!.*python[0-9]*%#\!/usr/bin/env python3%" omniidlrun.py > _omniidlrun.py
     mv -f _omniidlrun.py omniidlrun.py
     chmod a+x omniidlrun.py
 fi