64 bits platform porting

diff --git a/adm_local/unix/config_files/check_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4
index 2b64e644fdaf64c0b3b17cc995a2d90cb4fdf82a..34cbc06a266f8cb24a6cfded95d25eaaa58bc546 100755 (executable)
--- a/adm_local/unix/config_files/check_SIERPINSKY.m4
+++ b/adm_local/unix/config_files/check_SIERPINSKY.m4
@@ -34,14 +34,21 @@ if test "x$SIERPINSKY_DIR" = "x" ; then
 
 fi
 
-if test -f ${SIERPINSKY_DIR}/lib/salome/libSIERPINSKY.so  ; then
+if test -f ${SIERPINSKY_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libSIERPINSKY.so  ; then
   Sierpinsky_ok=yes
   AC_MSG_RESULT(Using SIERPINSKY module distribution in ${SIERPINSKY_DIR})
 
   if test "x$SIERPINSKY_ROOT_DIR" == "x" ; then
     SIERPINSKY_ROOT_DIR=${SIERPINSKY_DIR}
   fi
+  
+  SIERPINSKY_LDFLAGS=-L${SIERPINSKY_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+  SIERPINSKY_CXXFLAGS=-I${SIERPINSKY_ROOT_DIR}/include/salome
+
   AC_SUBST(SIERPINSKY_ROOT_DIR)
+  AC_SUBST(SIERPINSKY_LDFLAGS)
+  AC_SUBST(SIERPINSKY_CXXFLAGS)
+
 else
   AC_MSG_WARN("Cannot find compiled SIERPINSKY module distribution")
 fi

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 6e6bd288eda5098947db02120f14eaf4dc236136..a84dfbb7c5017aa73bb2fbccfed5d01daa09501f 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -17,8 +17,8 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 LIBS=@LIBS@
 LIBSFORBIN=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
-LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(KERNEL_ROOT_DIR)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(KERNEL_ROOT_DIR)/lib@LIB_LOCATION_SUFFIX@/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 LDFLAGSFORBIN+= -lstdc++
@@ -63,8 +63,8 @@ PYTHON_VERSION = @PYTHON_VERSION@
 # Changes from the SalomePro V1.2c
 #PYTHON_SITE = @PYTHON_SITE@
 #PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
-PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages
-PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome
+PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages
+PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome
 
 # QT
 
@@ -214,16 +214,34 @@ 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@
+
+GUI_ROOT_DIR=@GUI_ROOT_DIR@
+GUI_LDFLAGS=@GUI_LDFLAGS@
+GUI_CXXFLAGS=@GUI_CXXFLAGS@
+
+MED_ROOT_DIR=@MED_ROOT_DIR@
+MED_LDFLAGS=@MED_LDFLAGS@
+MED_CXXFLAGS=@MED_CXXFLAGS@
+
+RANDOMIZER_ROOT_DIR=@RANDOMIZER_ROOT_DIR@
+RANDOMIZER_CXXFLAGS=@RANDOMIZER_CXXFLAGS@
+RANDOMIZER_LDFLAGS=@RANDOMIZER_LDFLAGS@
+
 ## 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
 incmakedir=${prefix}/salome_adm/unix
 
 docdir=$(datadir)/doc

diff --git a/configure.in.base b/configure.in.base
index b9c31a31d2cf9a086745632af625e743555cc6ac..d3530f5dbedd384132bff4889a330c72b71898ab 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
@@ -243,6 +235,14 @@ echo
 
 CHECK_HDF5
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
 echo
 echo ---------------------------------------------
 echo testing MED2
@@ -373,7 +373,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 31e2cb31de29f26dcae07ae77bbe07fadd2f6c60..440eb3a782d9642042e31ae65bbfa14da0a57e23 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -30,7 +30,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 
 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)
 

diff --git a/src/Sierpinsky/Makefile.in b/src/Sierpinsky/Makefile.in
index bac9125c632c598ace3f8a59744c7a3a3c67e546..cf1c2c741ea73be6abda3b99156fab9cc0262be2 100644 (file)
--- a/src/Sierpinsky/Makefile.in
+++ b/src/Sierpinsky/Makefile.in
@@ -23,9 +23,9 @@ LIB_SRC = SIERPINSKY_Gen_i.cxx
 LIB_SERVER_IDL = Sierpinsky.idl MED.idl
 LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl SALOME_GenericObj.idl SALOME_Comm.idl
 
-CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(HDF5_INCLUDES) -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+CPPFLAGS += $(KERNEL_CXXFLAGS) $(HDF5_INCLUDES) $(MED_CXXFLAGS) $(BOOST_CPPFLAGS)
 
-LDFLAGS       += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper
-LDFLAGSFORBIN += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
+LDFLAGS       += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper
+LDFLAGSFORBIN += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
 
 @CONCLUDE@

diff --git a/src/SierpinskyGUI/Makefile.in b/src/SierpinskyGUI/Makefile.in
index cde2f8fdc693ebca55431f1b3fd8f27f5c1d572e..9cfa01678cfefcd0449afb1909759e6b09df2b3d 100644 (file)
--- a/src/SierpinskyGUI/Makefile.in
+++ b/src/SierpinskyGUI/Makefile.in
@@ -33,10 +33,10 @@ LIB_MOC = \
 LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl Sierpinsky.idl Randomizer.idl \
 SALOME_GenericObj.idl SALOMEDS_Attributes.idl SALOME_Comm.idl MED.idl VISU_Gen.idl
 
-CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS) $(BOOST_CPPFLAGS)
 
-CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
+CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS)
 
-LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome $(QT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lSalomeApp -lSIERPINSKYEngine -L${RANDOMIZER_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/include/salome -lSalomeLifeCycleCORBA
+LDFLAGS+= $(KERNEL_LDFLAGS) $(QT_LIBS) $(GUI_LDFLAGS) -lSalomeApp -lSIERPINSKYEngine $(RANDOMIZER_LDFLAGS) -lSalomeLifeCycleCORBA
 
 @CONCLUDE@