From 055caab5ee1c61a713d0d11ef10ae11c75c6f3cf Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 3 Sep 2004 12:13:30 +0000 Subject: [PATCH] *** empty log message *** --- configure.in.base | 16 ++++++++-------- salome_adm/unix/make_commence.in | 6 ++++++ src/Communication/Makefile.in | 3 ++- src/Container/Makefile.in | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/configure.in.base b/configure.in.base index 516bcbffc..5186e98a8 100644 --- a/configure.in.base +++ b/configure.in.base @@ -125,6 +125,14 @@ echo CHECK_BOOST +echo +echo --------------------------------------------- +echo testing threads +echo --------------------------------------------- +echo + +ENABLE_PTHREADS + dnl dnl --------------------------------------------- dnl testing MPICH @@ -184,14 +192,6 @@ echo CHECK_SWIG -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - echo echo --------------------------------------------- echo testing omniORB diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index 72033bdcd..0ab4e98eb 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -116,11 +116,17 @@ CAS_VIEWER=@CAS_VIEWER@ CAS_MODELER=@CAS_MODELER@ CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ CAS_LDPATH=@CAS_LDPATH@ + # MPICH MPICH_INCLUDES=@MPICH_INCLUDES@ MPICH_LIBS=@MPICH_LIBS@ +# LAM + +LAM_INCLUDES=@LAM_INCLUDES@ +LAM_LIBS=@LAM_LIBS@ + # Swig C++ Python SWIG = @SWIG@ diff --git a/src/Communication/Makefile.in b/src/Communication/Makefile.in index 9d2a9be3e..81e5c4336 100644 --- a/src/Communication/Makefile.in +++ b/src/Communication/Makefile.in @@ -12,7 +12,8 @@ EXPORT_PYSCRIPTS = EXPORT_HEADERS = \ ReceiverFactory.hxx \ SenderFactory.hxx \ - + SALOMEMultiComm.hxx \ + MultiCommException.hxx # Libraries targets LIB = libSalomeCommunication.la diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in index 87f372867..5b9b44d7f 100644 --- a/src/Container/Makefile.in +++ b/src/Container/Makefile.in @@ -51,10 +51,10 @@ BIN = SALOME_Container BIN_SRC = BIN_SERVER_IDL = SALOME_Component.idl -CPPFLAGS+= $(PYTHON_INCLUDES) +CPPFLAGS+= $(PYTHON_INCLUDES) $(LAM_INCLUDES) LDFLAGS+= -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSALOMELocalTrace -LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) +LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) $(LAM_LIBS) @CONCLUDE@ -- 2.39.2