Fix compilation problems

diff --git a/configure.ac b/configure.ac
index 1aef931f9844134942014863d1f8f2d3f2258753..4012acef246633096b4de03277c6b264abd84534 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -282,6 +282,15 @@ gui_ok=no
 
 WITHIHM="no"
 
+# This flags should be used to switch between the MEDMEM GUI (defined
+# in the MEDGUI package) and the MEDOP GUI (defined in the MEDOP
+# package). In any case the module factory function is provided by the
+# MEDOP GUI library (package MEDOP/gui) and this factory function
+# creates weither a MedGUI instance or a MEDOPModule instance,
+# depending on the value of this flags. The default is to use the new
+# MEDOP GUI.
+AM_CONDITIONAL(WITH_MEDMEMGUI,test "1" = "0")
+
 ###
 # Other tests should be performed only in --with-interp-kernel-only=no mode
 ###

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 109f76019e18fa81692b8e39267b53e34cb29d8f..60be0417ca98d8de98b0c8f4ebfca337e81c6359 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -54,7 +54,7 @@ lib_LTLIBRARIES = libSalomeIDLMED.la libSalomeIDLMEDTests.la
 
 # Sources built from idl files
 BASEIDL_SOURCES = \
-       MEDSK.cc MED_GenSK.cc Compo1PySK.cc \
+       MEDSK.cc \
        MEDCouplingCorbaServantSK.cc        \
        ParaMEDCouplingCorbaServantSK.cc
 
@@ -76,7 +76,7 @@ nodist_libSalomeIDLMED_la_SOURCES = $(IDL_SOURCES)
 
 # header files must be exported: other modules have to use this library
 nodist_salomeinclude_HEADERS =         \
-       MED.hh MED_Gen.hh Compo1Py.hh  \
+       MED.hh \
        MEDCouplingCorbaServant.hh     \
        MEDCouplingCorbaServantTest.hh \
        ParaMEDCouplingCorbaServant.hh

diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am
index 4e50f6efb623d0e6d78332f39ad9b5ffef7add82..0a10e7b1c6c595e2b91b574f5337667813ea0f47 100644 (file)
--- a/src/INTERP_KERNELTest/Makefile.am
+++ b/src/INTERP_KERNELTest/Makefile.am
@@ -86,8 +86,6 @@ if !MED_ENABLE_MICROMED
        MeshTestToolkit.txx                  \
        MultiElement2DTests.hxx              \
        MultiElementTetraTests.hxx           \
-       PointLocatorTest.hxx                 \
-       PointLocatorTest.cxx                 \
        SingleElementTetraTests.hxx
 
    libInterpKernelTest_la_CPPFLAGS +=            \