Porting to 64bit platform

diff --git a/Makefile.in b/Makefile.in
index 685c2c85cd4db72168ac0ed28b8e5b8f124951b5..031ff116f3f31e21e7e62dce55fbc8b18f829e48 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,7 +30,6 @@ top_builddir=.
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:${KERNEL_ROOT_DIR}/idl/salome
 
-
 @COMMENCE@
 
 SUBDIRS = idl src doc adm_local
@@ -39,6 +38,7 @@ BIN_SCRIPT= \
 VERSION
 
 
+
 # copy header files in common directory
 ifeq ($(HAVE_SSTREAM),yes)
   include_list=include/salome/SALOMEconfig.h

diff --git a/adm_local/unix/config_files/check_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4
index 7700fb579ec054b2f44080dc6ddd9f9abad265b2..cea3c3866269844edc1383ef46d63791d11af8cb 100755 (executable)
--- a/adm_local/unix/config_files/check_VISU.m4
+++ b/adm_local/unix/config_files/check_VISU.m4
@@ -12,6 +12,10 @@ AC_CHECKING(for VISU)
 
 Visu_ok=no
 
+VISU_LDFLAGS=""
+VISU_CXXFLAGS=""
+
+
 AC_ARG_WITH(visu,
            [  --with-visu=DIR root directory path of VISU module installation ],
            VISU_DIR="$withval",VISU_DIR="")
@@ -32,6 +36,13 @@ if test -f ${VISU_DIR}/idl/salome/VISU_Gen.idl ; then
       VISU_ROOT_DIR=${VISU_DIR}
    fi
    AC_SUBST(VISU_ROOT_DIR)
+
+   VISU_LDFLAGS=-L${VISU_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+   VISU_CXXFLAGS=-I${VISU_DIR}/include/salome
+
+   AC_SUBST(VISU_LDFLAGS)
+   AC_SUBST(VISU_CXXFLAGS)
+
 else
    AC_MSG_WARN("Cannot find VISU module sources")
 fi

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index dc9755683b052a3bf48867522c60026e554e8b0b..ed0e9c451f62afb99956129ae6ec29dbab0c88f1 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -4,13 +4,14 @@ inc_builddir=$(top_builddir)/include/salome
 @SET_MAKE@
 SHELL=/bin/sh
 
+LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@
 # header missing
 
 HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 

diff --git a/configure.in.base b/configure.in.base
index 37aa59948c69f645061c7c49816a38011412985c..e7e69dd41edf217938191a2bb1343388f17c0e86 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -114,13 +114,7 @@ dnl
 AC_CXX_USE_STD_IOSTREAM
 AC_CXX_HAVE_SSTREAM
 
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
 
-CHECK_BOOST
 
 dnl
 dnl ---------------------------------------------
@@ -242,6 +236,14 @@ echo
 
 CHECK_HDF5
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
 echo
 echo ---------------------------------------------
 echo Testing OpenCascade

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 071fee71b906530c2c5ef46a369ee8db4a79f801..0e35bdacf817b85586f7c60460ed9f9bf67b7877 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -34,6 +34,8 @@ IDL_FILES = \
 
 PY_CLIENT_IDL = $(IDL_FILES)
 
+LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@
+
 # we copy all idl file in $(top_builddir)/idl
 inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
 
@@ -47,7 +49,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 
 lib: pyidl
 
-PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
+PYTHON_BUILD_SITE=$(top_builddir)/lib$(LIB_LOCATION_SUFFIX)/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
 
 pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
 

diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in
index 56481d8447825a13583913762f82de653fdc82e8..71e4bc8ecf2ed6b4d9dfb5d3c783a2efb605e9da 100644 (file)
--- a/src/CONVERTOR/Makefile.in
+++ b/src/CONVERTOR/Makefile.in
@@ -28,7 +28,7 @@ top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
-
+BOOST_LIBSUFFIX=@BOOST_LIBSUFFIX@
 
 @COMMENCE@
 

diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index 2ff5af6415634395fe2f64e1b48351eef23840b1..4242eaaa91e214ac6018b5ced409b73108387435 100644 (file)
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -28,7 +28,7 @@ top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
-
+BOOST_LIBSUFFIX=@BOOST_LIBSUFFIX@
 
 @COMMENCE@
 

diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index 7924835cd6e50e2833afe6158c3f7ebfa873ee59..a513b43da2d8c3b4d89e4a235776b80e4f545a48 100644 (file)
--- a/src/VISU_I/Makefile.in
+++ b/src/VISU_I/Makefile.in
@@ -11,7 +11,7 @@ top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
-
+BOOST_LIBSUFFIX=@BOOST_LIBSUFFIX@
 
 @COMMENCE@