From: enk <enk@opencascade.com>
Date: Thu, 25 May 2006 13:32:37 +0000 (+0000)
Subject: Porting to 64bit platform
X-Git-Tag: V3_2_0rc~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8ab6867c228d5b34ef36ba329838c6019a3402e5;p=modules%2Fvisu.git

Porting to 64bit platform
---

diff --git a/Makefile.in b/Makefile.in
index 685c2c85..031ff116 100644
--- 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 7700fb57..cea3c386 100755
--- 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 dc975568..ed0e9c45 100644
--- 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 37aa5994..e7e69dd4 100644
--- 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 071fee71..0e35bdac 100644
--- 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 56481d84..71e4bc8e 100644
--- 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 2ff5af64..4242eaaa 100644
--- 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 7924835c..a513b43d 100644
--- 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@