From: André Ribes <andre.ribes@edf.fr>
Date: Fri, 17 Dec 2010 14:17:46 +0000 (+0100)
Subject: Ajout test du module Eficas
X-Git-Tag: V6_4_0rc3~107
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ba136bccf3668da6633185da4f568df32be836cb;p=modules%2Fadao.git

Ajout test du module Eficas
---

diff --git a/adm_local/check_module_eficas.m4 b/adm_local/check_module_eficas.m4
new file mode 100644
index 0000000..7b4bbad
--- /dev/null
+++ b/adm_local/check_module_eficas.m4
@@ -0,0 +1,32 @@
+AC_DEFUN([CHECK_MODULE_EFICAS],[
+
+AC_CHECKING(for Module Eficas)
+
+module_eficas_ok=no
+
+AC_ARG_WITH(module-eficas,
+            [  --with-module-eficas=DIR               root directory path of Module Eficas installation],
+               MODULE_EFICAS_DIR=$withval,MODULE_EFICAS_DIR="")
+
+if test "x$MODULE_EFICAS_DIR" = "x" ; then
+
+  # no --with-module-eficas option used
+
+  if test "x$EFICAS_ROOT_DIR" != "x" ; then
+
+  #EFICAS_ROOT_DIR environment variable defined
+  MODULE_EFICAS_DIR=$EFICAS_ROOT_DIR
+
+  else
+    AC_MSG_WARN("EFICAS_ROOT_DIR is not defined")
+  fi
+fi
+
+if test "x$MODULE_EFICAS_DIR" != "x" ; then
+  module_eficas_ok=yes
+fi
+
+AC_MSG_RESULT(for Module Eficas: $module_eficas_ok)
+
+])dnl
+
diff --git a/configure.ac b/configure.ac
index 5b235e5..b6bd102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_PROG_CXX
 CHECK_KERNEL
 CHECK_OMNIORB
 CHECK_EFICAS
+CHECK_MODULE_EFICAS
 CHECK_SCIPY
 CHECK_SPHINX
 
@@ -57,6 +58,7 @@ echo "  OmniOrb (CORBA) ........ : $omniORB_ok"
 echo "  OmniOrbpy (CORBA) ...... : $omniORBpy_ok"
 echo "  SALOME KERNEL .......... : $Kernel_ok"
 echo "  Eficas ................. : $eficas_ok"
+echo "  Module Eficas .......... : $module_eficas_ok"
 echo
 echo "Optional products:"
 echo "  Sphinx (for doc)........ : $threads_ok"
@@ -92,6 +94,10 @@ if test "x$eficas_ok" = "xno"; then
   AC_MSG_WARN([Eficas is required for SALOME Module part])
   salome_module_ok=no
 fi
+if test "x$module_eficas_ok" = "xno"; then
+  AC_MSG_WARN([Module Eficas is required for SALOME Module part])
+  salome_module_ok=no
+fi
 
 AM_CONDITIONAL(SALOME_MODULE, test x$salome_module_ok = xyes)