From 1c5ea01f2736ba49f23a2fec6bb64fe6d19b2409 Mon Sep 17 00:00:00 2001
From: ageay <ageay>
Date: Fri, 26 Nov 2004 12:20:30 +0000
Subject: [PATCH] Porting on CCRT

---
 build_configure                              | 19 +++++++++++++++----
 salome_adm/unix/config_files/check_Kernel.m4 |  6 +++---
 salome_adm/unix/config_files/check_med2.m4   | 19 +++++++++++++++++--
 salome_adm/unix/envScript.in                 |  4 +++-
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/build_configure b/build_configure
index 8ce1d16ed..d3294fb59 100755
--- a/build_configure
+++ b/build_configure
@@ -28,8 +28,11 @@ CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
 
 find_in()
 {
-  local i
-  local f=$2
+#CCRT
+  #local i
+  i=0
+  #local f=$2
+  f=$2
 
 # if the first argument is not a directory, returns
 
@@ -79,9 +82,13 @@ ABS_CONF_DIR=`pwd`
 # Common part of the configure.in file
 #
 chmod u+w configure.in.base
-if ! \cp -f configure.in.base configure.in_tmp1 
+#CCRT
+#if ! \cp -f configure.in.base configure.in_tmp1
+if \cp -f configure.in.base configure.in_tmp1
 then
 	echo
+else
+	echo
 	echo "error : can't create files in" ${CONF_DIR}
 	echo "aborting ..."
         chmod u-w configure.in.base 
@@ -149,9 +156,13 @@ then
 	fi
 else
 	echo -n "Updating 'configure.in' file ... "
-	if ! \cp configure.in configure.in_old >& /dev/null
+#CCRT
+#	if ! \cp configure.in configure.in_old >& /dev/null
+	if \cp configure.in configure.in_old >& /dev/null
 	then
 		echo
+        else
+		echo
 		echo
 		echo "Can't backup previous configure.in"
 		echo -n "Continue (you will not be able to revert) - (Y/N) ? "
diff --git a/salome_adm/unix/config_files/check_Kernel.m4 b/salome_adm/unix/config_files/check_Kernel.m4
index 85a53ce1b..fc07131da 100644
--- a/salome_adm/unix/config_files/check_Kernel.m4
+++ b/salome_adm/unix/config_files/check_Kernel.m4
@@ -13,7 +13,7 @@ AC_ARG_WITH(kernel,
 	    [  --with-kernel=DIR               root directory path of KERNEL build or installation],
 	    KERNEL_DIR="$withval",KERNEL_DIR="")
 
-if test "x$KERNEL_DIR" == "x" ; then
+if test "x$KERNEL_DIR" = "x" ; then
 
 # no --with-kernel-dir option used
 
@@ -39,10 +39,10 @@ if test -f ${KERNEL_DIR}/bin/salome/runSalome ; then
    Kernel_ok=yes
    AC_MSG_RESULT(Using Kernel module distribution in ${KERNEL_DIR})
 
-   if test "x$KERNEL_ROOT_DIR" == "x" ; then
+   if test "x$KERNEL_ROOT_DIR" = "x" ; then
       KERNEL_ROOT_DIR=${KERNEL_DIR}
    fi
-   if test "x$KERNEL_SITE_DIR" == "x" ; then
+   if test "x$KERNEL_SITE_DIR" = "x" ; then
       KERNEL_SITE_DIR=${KERNEL_ROOT_DIR}
    fi
    AC_SUBST(KERNEL_ROOT_DIR)
diff --git a/salome_adm/unix/config_files/check_med2.m4 b/salome_adm/unix/config_files/check_med2.m4
index 68345204c..6e8192b44 100644
--- a/salome_adm/unix/config_files/check_med2.m4
+++ b/salome_adm/unix/config_files/check_med2.m4
@@ -58,7 +58,15 @@ dnl check med2 header
 
 CPPFLAGS_old="$CPPFLAGS"
 dnl we must test system : linux = -DPCLINUX
-CPPFLAGS="$CPPFLAGS -DPCLINUX $LOCAL_INCLUDES"
+dnl we must test system : Alpha-OSF = -DOSF1
+case $host_os in
+   linux*)
+      CPPFLAGS="$CPPFLAGS -DPCLINUX $LOCAL_INCLUDES"
+      ;;
+   osf*)
+      CPPFLAGS="$CPPFLAGS -DOSF1 $LOCAL_INCLUDES"
+      ;;
+esac
 AC_CHECK_HEADER(med.h,med2_ok=yes ,med2_ok=no)
 CPPFLAGS="$CPPFLAGS_old"
 
@@ -76,7 +84,14 @@ fi
 
 if  test "x$med2_ok" = "xyes"
 then
-  MED2_INCLUDES="-DPCLINUX $LOCAL_INCLUDES"
+case $host_os in
+   linux*)
+        MED2_INCLUDES="-DPCLINUX $LOCAL_INCLUDES"
+      ;;
+   osf*)
+      MED2_INCLUDES="-DOSF1 $LOCAL_INCLUDES"
+      ;;
+esac
   MED2_LIBS="$LOCAL_LIBS"
   MED2_MT_LIBS="$LOCAL_LIBS"
 fi
diff --git a/salome_adm/unix/envScript.in b/salome_adm/unix/envScript.in
index 6fe41a56f..eaa69845d 100644
--- a/salome_adm/unix/envScript.in
+++ b/salome_adm/unix/envScript.in
@@ -17,4 +17,6 @@ export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/lib:${LD_LIBRARY_PATH}
 PYVTK_PATH=@VTKPY_MODULES@
 export PYTHONPATH=${PYTHONPATH}:${SALOME_HOME_DIR}/idl:${SALOME_HOME_DIR}/bin:${SALOME_HOME_DIR}/lib:${PYVTK_PATH}:${EXEC_DIR}
 
-export MICORC=/dev/null
+MICORC=/dev/null
+export MICORC
+
-- 
2.39.2