X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Funix%2Fconfig_files%2Fcheck_Med.m4;h=5e057354bda6f8052f040247170285be9e4c9b4b;hb=29bbc406c6a2a0cfea1b13d7dd6dbe58173f362c;hp=7619099a73ab71c86ef290465d4917cc6e7567c8;hpb=97e267c35d896c3c401989a4a165087c3bebd708;p=modules%2Fmed.git

diff --git a/adm_local/unix/config_files/check_Med.m4 b/adm_local/unix/config_files/check_Med.m4
index 7619099a7..5e057354b 100644
--- a/adm_local/unix/config_files/check_Med.m4
+++ b/adm_local/unix/config_files/check_Med.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@ dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public
 dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
+dnl version 2.1 of the License, or (at your option) any later version.
 dnl
 dnl This library is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,74 +20,66 @@ dnl
 dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 dnl
 
-# Check availability of Med binary distribution
+# Check availability of Fields binary distribution
 #
 # Author : Nicolas REJNERI (OPEN CASCADE, 2003)
 #
 
-AC_DEFUN([CHECK_MED],[
+AC_DEFUN([CHECK_FIELDS],[
 AC_REQUIRE([AC_LINKER_OPTIONS])dnl
 AC_REQUIRE([CHECK_MED3])
 
-AC_CHECKING(for Med)
+AC_CHECKING(for Fields)
 
-Med_ok=no
+Fields_ok=no
 
-MED_LDFLAGS=""
-MED_CXXFLAGS=""
+FIELDS_LDFLAGS=""
+FIELDS_CXXFLAGS=""
 
-AC_ARG_WITH(med,
-	    [  --with-med=DIR root directory path of MED installation ],
-	    MED_DIR="$withval",MED_DIR="")
-
-if test "x${MED_DIR}" == "x" ; then
-  AC_MSG_RESULT(for \${MED_ROOT_DIR}: ${MED_ROOT_DIR})
-# no --with-med-dir option used
-   if test "x${MED_ROOT_DIR}" != "x" ; then
-
-    # MED_ROOT_DIR environment variable defined
-      MED_DIR=${MED_ROOT_DIR}
+AC_ARG_WITH(fields,
+	    [  --with-fields=DIR root directory path of Fields installation ],
+	    FIELDS_DIR="$withval",FIELDS_DIR="")
 
+if test "x${FIELDS_DIR}" == "x" ; then
+   AC_MSG_RESULT(for \${FIELDS_ROOT_DIR}: ${FIELDS_ROOT_DIR})
+   # --with-fields option is not used
+   if test "x${FIELDS_ROOT_DIR}" != "x" ; then
+      # FIELDS_ROOT_DIR environment variable defined
+      FIELDS_DIR=${FIELDS_ROOT_DIR}
    fi
-
 fi
 
-MED_ENABLE_MULTIPR=no
-
-if test -f ${MED_DIR}/idl/salome/MED.idl ; then
-   AC_MSG_RESULT(Using Med module distribution in ${MED_DIR})
-   Med_ok=yes
+if test -f ${FIELDS_DIR}/idl/salome/MEDCouplingCorbaServant.idl ; then
+   AC_MSG_RESULT(Using Fields module distribution in ${FIELDS_DIR})
+   Fields_ok=yes
 
-   if test "x$MED_ROOT_DIR" == "x" ; then
-      MED_ROOT_DIR=${MED_DIR}
+   if test "x$FIELDS_ROOT_DIR" == "x" ; then
+      FIELDS_ROOT_DIR=${FIELDS_DIR}
    fi
 
-   AC_SUBST(MED_ROOT_DIR)
+   AC_SUBST(FIELDS_ROOT_DIR)
 
-   MED_LDFLAGS=-L${MED_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   MED_CXXFLAGS=-I${MED_DIR}/include/salome
+   FIELDS_LDFLAGS=-L${FIELDS_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+   FIELDS_CXXFLAGS=-I${FIELDS_DIR}/include/salome
 
-   AC_SUBST(MED_LDFLAGS)
-   AC_SUBST(MED_CXXFLAGS)
+   AC_SUBST(FIELDS_LDFLAGS)
+   AC_SUBST(FIELDS_CXXFLAGS)
 
-   # MULTIPR
-   AC_CHECK_FILE(${MED_DIR}/include/salome/MULTIPR_Obj.hxx,
-                 ENABLE_MULTIPR=yes,
-                 ENABLE_MULTIPR=no)
-   AC_SUBST(ENABLE_MULTIPR)
-   MULTIPR_CPPFLAGS=""
-   MULTIPR_LIBS=""
-   if test "x${ENABLE_MULTIPR}" = "xyes" ; then
-      MULTIPR_CPPFLAGS="-DENABLE_MULTIPR"
-      MULTIPR_LIBS="-lMULTIPR_API"
-   fi
-   AC_SUBST(MULTIPR_CPPFLAGS)
-   AC_SUBST(MULTIPR_LIBS)
 else
-   AC_MSG_WARN("Cannot find Med module sources")
+   AC_MSG_WARN("Cannot find Fields module sources")
 fi
 
-AC_MSG_RESULT(for Med: $Med_ok)
-AC_MSG_RESULT(for MULTIPR Med package: $ENABLE_MULTIPR)
+AC_MSG_RESULT(for Fields: $Fields_ok)
+
+dnl Backward compatibility
+MED_ROOT_DIR=${FIELDS_ROOT_DIR}
+MED_CXXFLAGS=${FIELDS_CXXFLAGS}
+MED_LDFLAGS=${FIELDS_LDFLAGS}
+AC_SUBST(MED_ROOT_DIR)
+AC_SUBST(MED_CXXFLAGS)
+AC_SUBST(MED_LDFLAGS)
 
 ])dnl
+
+dnl Backward compatibility
+AC_DEFUN([CHECK_MED],[CHECK_FIELDS])