-# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# Modified by : Marc Tajchman (CEA)
# Modified by : Mikhail PONIKAROV (OCN)
#
-AC_INIT([Salome2 Project MED module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeMED])
+AC_INIT([Salome2 Project MED module], [7.2.0], [webmaster.salome@opencascade.com], [SalomeMED])
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
AC_SUBST(XVERSION)
-VERSION_DEV=1
+VERSION_DEV=0
AC_SUBST(VERSION_DEV)
# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
echo ---------------------------------------------
echo
+CHECK_SPHINX
CHECK_HTML_GENERATORS
###
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
###
if test "x$ENABLE_SPLITTER" = "xyes"; then
+ scotch_ok=no
+ metis_ok=no
+ parmetis_ok=no
+ libxml_ok=no
+
echo
echo ---------------------------------------------
echo testing ParMETIS
echo ---------------------------------------------
echo
- parmetis_ok=no
CHECK_PARMETIS dnl parmetis_ok is set to yes by CHECK_PARMETIS
+ if test "x$parmetis_ok" != "xyes"; then
+ CHECK_PARMETISV4
+ fi
+
echo
echo ---------------------------------------------
echo testing METIS
echo ---------------------------------------------
echo
- metis_ok=no
CHECK_METIS dnl metis_ok is set to yes by CHECK_METIS
echo
echo ---------------------------------------------
echo testing SCOTCH
echo ---------------------------------------------
- scotch_ok=no
CHECK_SCOTCH
dnl scotch_ok is set to yes by CHECK_SCOTCH
echo ---------------------------------------------
echo testing LIBXML2
echo ---------------------------------------------
- libxml_ok=no
CHECK_LIBXML
dnl libxml_ok is set to yes by CHECK_LIBXML
else
# --with-interp-kernel-only=no mode
obligatory_vars="$obligatory_vars python_ok boost_ok swig_ok hdf5_ok med3_ok $splitter_obligatory_vars"
+ optional_vars="$optional_vars $splitter_optional_vars $renumber_optional_vars"
fi
fi
],[])
AC_OUTPUT([ \
- adm_local_without_kernel/unix/SALOMEconfig.h \
+ adm_local_without_kernel/SALOMEconfig.h \
Makefile \
MED_version.h \
adm_local/unix/config_files/Makefile \
src/MEDWrapper/Base/Makefile \
src/MEDWrapper/Factory/Makefile \
src/MEDWrapper/V2_2/Makefile \
- src/MEDMEM/Doxyfile_med_devel \
- src/MEDMEM/Doxyfile_med_user \
- src/MEDMEM/Makefile \
- src/MEDMEM_SWIG/Makefile \
- src/MEDMEMBinTest/Makefile \
- src/MEDMEMCppTest/Makefile \
src/INTERP_KERNEL/Makefile \
src/INTERP_KERNELTest/Makefile \
src/MEDCoupling/Makefile \
src/MEDCalculator/Makefile \
src/MEDCalculator/Swig/Makefile \
src/MEDCalculator/Test/Makefile \
- src/MEDSPLITTER/Makefile \
- src/MEDSPLITTER/Test/Makefile \
- src/MEDSPLITTER_Swig/Makefile \
src/MEDPartitioner/Makefile \
src/MEDPartitioner/Test/Makefile \
src/RENUMBER/Makefile \
src/ParaMEDLoader/Makefile \
src/ParaMEDMEMTest/Makefile \
src/ParaMEDMEM_Swig/Makefile \
- src/MEDMEM_I/Makefile \
- src/MED/Makefile \
- src/MedCorba_Swig/Makefile \
- src/MED_SWIG/Makefile \
- src/MedClient/Makefile \
- src/MedClient/src/Makefile \
- src/MedClient/test/Makefile \
- src/MedClient/test/environ/Makefile \
- src/MedClient/test/environ/runContainer \
- src/MedClient/test/environ/runEnvironTests \
- src/MedClient/test/environ/runTestMedCorba \
- src/MedClient/test/environ/stopContainer \
- src/MedClient/test/environ/csh/init1 \
- src/MedClient/test/environ/csh/init2 \
- src/MedClient/test/environ/csh/init3 \
- src/MedClient/test/environ/csh/Makefile \
- src/MedClient/test/environ/csh/runContainer \
- src/MedClient/test/environ/csh/runEnvironTests \
- src/MedClient/test/environ/csh/stopContainer \
- src/MedClient/test/test1/Makefile \
- src/MedClient/test/test2/Makefile \
src/MEDGUI/Makefile \
+ src/MEDOP/Makefile \
+ src/MEDOP/cmp/Makefile \
+ src/MEDOP/tui/Makefile \
+ src/MEDOP/tui/xmedpy/Makefile \
+ src/MEDOP/res/Makefile \
+ src/MEDOP/res/testfiles/Makefile \
+ src/MEDOP/gui/dialogs/Makefile \
+ src/MEDOP/gui/Makefile \
+ src/MEDOP/exe/Makefile \
+ src/MEDOP/exe/appligen/Makefile \
+ src/MEDOP/exe/appligen/config_appli_model.xml \
+ src/MEDOP/exe/appligen/appligen.sh \
+ src/MEDOP/exe/image2med/Makefile \
+ src/MEDOP/doc/Makefile \
+ src/MEDOP/doc/sphinx/conf.py \
+ src/MEDOP/doc/sphinx/Makefile \
doc/Makefile \
- doc/MEDMEM/Makefile \
- doc/MEDMEM/MEDMEM_Content.tex \
- doc/MEDMEM/MEDMEM_UML_light.png \
- doc/MEDMEM/MEDMEM_UML.png \
- doc/MEDMEM/MEDMEM_UsersGuide.tex \
doc/salome/Makefile \
doc/salome/tui/Makefile \
doc/salome/tui/doxyfile \