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
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++
# 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
# 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
AC_CXX_HAVE_SSTREAM
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
-
-CHECK_BOOST
-
dnl
dnl ---------------------------------------------
dnl testing MPICH
CHECK_HDF5
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
echo
echo ---------------------------------------------
echo testing MED2
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
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)
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@
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@