64 bits platform porting

diff --git a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4
index 1d36f9ce17601abdacda3d5e41b42e751f46968a..ffd162834a1c0c70886df9b7fee7459c3d2313b6 100755 (executable)
--- a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4
+++ b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4
@@ -5,6 +5,9 @@
 
 AC_DEFUN([CHECK_GHS3DPLUGIN],[
 
+GHS3DPLUGIN_LDFLAGS=""
+GHS3DPLUGIN_CXXFLAGS=""
+
 AC_CHECKING(for GHS3dPlugin)
 
 GHS3dPlugin_ok=no
@@ -41,7 +44,11 @@ if test -f ${GHS3DPLUGIN_DIR}/lib/salome/libGHS3DEngine.so  ; then
   if test "x$GHS3DPLUGIN_ROOT_DIR" == "x" ; then
     GHS3DPLUGIN_ROOT_DIR=${GHS3DPLUGIN_DIR}
   fi
+  GHS3DPLUGIN_CXXFLAGS+=-I${GHS3DPLUGIN_ROOT_DIR}/include/salome
+  GHS3DPLUGIN_LDFLAGS+=-L${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
   AC_SUBST(GHS3DPLUGIN_ROOT_DIR)
+  AC_SUBST(GHS3DPLUGIN_LDFLAGS)
+  AC_SUBST(GHS3DPLUGIN_CXXFLAGS)
 else
   AC_MSG_WARN("Cannot find compiled GHS3DPLUGIN module distribution")
 fi

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 1f111d0a4b1a52bd2ce697f51ef9d2ce4e439ec7..79373ac5cb364e882b6b5acb9d08e532b79dd4fb 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 
@@ -172,7 +172,7 @@ SALOME_INCLUDES = \
 CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS)
 CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES)
 
-LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib/salome -L${SMESH_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj
+LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine $(KERNEL_LDFLAGS) $(SMESH_LDFLAGS) $(GEOM_LDFLAGS) -lSalomeGenericObj
 
 # add corba libs when link salome application ! 
 #LDFLAGS+= $(CORBA_LIBS)
@@ -198,16 +198,29 @@ INSTALL_DATA=@INSTALL_DATA@
 # create a symbolic link (or a copie ?)
 LN_S=@LN_S@
 
+KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@
+KERNEL_SITE_DIR=@KERNEL_SITE_DIR@
+KERNEL_LDFLAGS=@KERNEL_LDFLAGS@
+KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
+
+GEOM_ROOT_DIR=@GEOM_ROOT_DIR@
+GEOM_LDFLAGS=@GEOM_LDFLAGS@
+GEOM_CXXFLAGS=@GEOM_CXXFLAGS@
+
+SMESH_ROOT_DIR=@SMESH_ROOT_DIR@
+SMESH_LDFLAGS=@SMESH_LDFLAGS@
+SMESH_CXXFLAGS=@SMESH_CXXFLAGS@
+
 ## Installation points
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@/salome
-libdir=@libdir@/salome
+libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome
 # warning : if user give this path in configure we could have salome/salome :-(
 includedir=@includedir@/salome
 datadir=@datadir@/salome
 idldir=$(prefix)/idl/salome
-sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
+sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
 
 docdir=${prefix}/doc/salome
 

diff --git a/configure.in.base b/configure.in.base
index be7f7ccf0fd0b9688a0521df387d6a18a378bf7d..4ffaf295cfdece312b1a2e8bc7873e8d000ff97b 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -115,14 +115,6 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
-
-CHECK_BOOST
-
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -241,6 +233,14 @@ echo Testing OpenCascade
 echo ---------------------------------------------
 echo
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
 CHECK_CAS
 
 echo
@@ -357,7 +357,7 @@ fi
 
 # make other build directories
 for rep in \
-       salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources #idl
+       salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources #idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 0325f6d89130bcb92ebaf6cfd86891c3a9031fb2..dc63e8df3d76bd35acf43f73d454d2cb642c14d4 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -31,6 +31,7 @@ VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome :${SMESH_ROOT_
 
 IDL_FILES = GHS3DPlugin_Algorithm.idl
 
+LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@
 
 # copy all idl file in $(top_builddir)/idl
 inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
@@ -45,7 +46,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 # python wrap
 lib: pyidl
 
-PYTHON_BUILD_SITE=$(top_builddir)/lib/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)