Porting to 64bit platform

diff --git a/salome_adm/unix/config_files/DEPRECATED/config.sub b/salome_adm/unix/config_files/DEPRECATED/config.sub
index c8e77851e69dd619632d512ff3cf4468f39b6d91..6218dd95462018692a0eb2e69118e22bf60bd89e 100755 (executable)
--- 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 37ff78d4f2484352371a3d9af704b70faf98752e..0298be6ee3d09a9ffc5cfead4d902c52a9ae3804 100644 (file)
--- 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 17b51498255756943f13b328bfe3555cce68584b..171986667d4d62929a2e2b6ad325ab1ea7b998c1 100644 (file)
--- 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 c71c8bea45f17c5e072606da9fc8ae9cf326cdee..558584d3bdae9297df00b3a877b624f9dff6ccdd 100644 (file)
--- 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);
 }