X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=137a371bd7c8e5d21331a140efe59d1ee303764f;hb=51b7f08bdb9757517575bf964ce4c89785e2b2f1;hp=00a4a387b3690bb5118b6729e407835332fb7232;hpb=d69bd878538cdb24652e64925fdab2565994a6be;p=modules%2Fmed.git

diff --git a/configure.ac b/configure.ac
index 00a4a387b..137a371bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# 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
@@ -23,7 +23,7 @@
 # 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.1.0], [webmaster.salome@opencascade.com], [SalomeMED])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -270,6 +270,7 @@ echo testing html generators
 echo ---------------------------------------------
 echo
 
+CHECK_SPHINX
 CHECK_HTML_GENERATORS
 
 ###
@@ -281,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
 ###
@@ -323,27 +333,33 @@ if test "$with_interp_kernel_only" != "yes" ; then
     
     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    
         
@@ -351,7 +367,6 @@ if test "$with_interp_kernel_only" != "yes" ; then
         echo --------------------------------------------- 
         echo testing LIBXML2
         echo ---------------------------------------------
-        libxml_ok=no 
         CHECK_LIBXML 
         dnl libxml_ok is set to yes by CHECK_LIBXML         
         
@@ -564,6 +579,7 @@ else
     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
 
@@ -663,7 +679,7 @@ sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs
 ],[])
 
 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 \
@@ -740,6 +756,22 @@ AC_OUTPUT([ \
         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 \