From 1d2f75ca8a1749cfe99cec3db1de36f2f0ae7e7e Mon Sep 17 00:00:00 2001
From: enk <enk@opencascade.com>
Date: Thu, 25 May 2006 13:27:15 +0000
Subject: [PATCH] Porting to 64bit platform

---
 salome_adm/unix/config_files/DEPRECATED/config.sub     |  2 +-
 salome_adm/unix/config_files/check_boost.m4            | 10 +++++++---
 src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx     |  6 +++---
 .../Test/SALOMETraceCollectorTest.cxx                  |  8 ++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/salome_adm/unix/config_files/DEPRECATED/config.sub b/salome_adm/unix/config_files/DEPRECATED/config.sub
index c8e77851e..6218dd954 100755
--- a/salome_adm/unix/config_files/DEPRECATED/config.sub
+++ b/salome_adm/unix/config_files/DEPRECATED/config.sub
@@ -209,7 +209,7 @@ case $basic_machine in
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | x86-* | x86_64-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
 	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
 	      | hppa2.0n-* | hppa64-* \
 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4
index 37ff78d4f..0298be6ee 100644
--- a/salome_adm/unix/config_files/check_boost.m4
+++ b/salome_adm/unix/config_files/check_boost.m4
@@ -38,6 +38,10 @@ AC_ARG_WITH(boost,
    [BOOSTDIR="$withval"
     AC_MSG_RESULT("select $withval as path to BOOST library")
    ])
+   
+if test "x${BOOSTDIR}" = "x" ; then
+  BOOSTDIR="/usr"
+fi
 
 AC_MSG_RESULT(\$BOOSTDIR = ${BOOSTDIR})
 
@@ -46,7 +50,7 @@ LIBS_old=$LIBS
 
 if test "x${BOOSTDIR}" != "x" ; then
   BOOST_CPPFLAGS="-I${BOOSTDIR}/include"
-  BOOST_LIBS="-L${BOOSTDIR}/lib"
+  BOOST_LIBS="-L${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}"
 fi
 
 boost_ok=no
@@ -83,12 +87,12 @@ if test "x${boost_headers_ok}" = "xyes" ; then
   AC_CHECKING(for BOOST binaries)
   boost_lib_dir_ok=yes
   if test "x${BOOSTDIR}" != "x" ; then
-    AC_CHECK_FILE(${BOOSTDIR}/lib/libboost_thread${BOOST_LIBSUFFIX}.so,
+    AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so,
                   boost_lib_dir_ok=yes,
                   boost_lib_dir_ok=no)
     if test "x${boost_lib_dir_ok}" = "xno" ; then
       BOOST_LIBSUFFIX=""
-      AC_CHECK_FILE(${BOOSTDIR}/lib/libboost_thread${BOOST_LIBSUFFIX}.so,
+      AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so,
                     boost_lib_dir_ok=yes,
                     boost_lib_dir_ok=no)
     fi
diff --git a/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx b/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx
index 17b514982..171986667 100644
--- a/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx
+++ b/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx
@@ -180,9 +180,9 @@ SALOMELocalTraceTest::testLoadBufferPoolFile()
 
 void *PrintHello(void *threadid)
 {
-  int id_thread = (int)threadid;
+  long id_thread = (long)threadid;
   for (int i=0; i<NUM_MESSAGES;i++)
-    MESSAGE("Hello World! This is a trace test : " << id_thread 
-	    << " - iter " << i);
+  MESSAGE("Hello World! This is a trace test : " << id_thread 
+        << " - iter " << i);
   pthread_exit(NULL);
 }
diff --git a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
index c71c8bea4..558584d3b 100644
--- a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
+++ b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
@@ -101,9 +101,9 @@ SALOMETraceCollectorTest::testLoadBufferPoolCORBA()
 
 void *PrintHello(void *threadid)
 {
-  int id_thread = (int)threadid;
-  for (int i=0; i<NUM_MESSAGES;i++)
-    MESSAGE("Hello World! This is a trace test : " << id_thread 
-	    << " - iter " << i);
+  long id_thread = (long)threadid;
+      for (int i=0; i<NUM_MESSAGES;i++)	
+	MESSAGE("Hello World! This is a trace test : " << id_thread 
+	        << " - iter " << i);
   pthread_exit(NULL);
 }
-- 
2.39.2