From 18167dd114aa4d6b5c7074bedad02f0b7f7952fc Mon Sep 17 00:00:00 2001 From: nri Date: Mon, 26 May 2003 14:38:56 +0000 Subject: [PATCH] NRI : Add MED check local. --- adm_local/unix/config_files/check_Med.m4 | 54 ++++++++++++++++++++++++ build_configure | 2 +- configure.in.base | 10 ++++- 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 adm_local/unix/config_files/check_Med.m4 diff --git a/adm_local/unix/config_files/check_Med.m4 b/adm_local/unix/config_files/check_Med.m4 new file mode 100644 index 00000000..839a3d7b --- /dev/null +++ b/adm_local/unix/config_files/check_Med.m4 @@ -0,0 +1,54 @@ +# Check availability of Med binary distribution +# +# Author : Nicolas REJNERI (OPEN CASCADE, 2003) +# + +AC_DEFUN([CHECK_MED],[ + +AC_CHECKING(for Med) + +Med_ok=no + +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 + +# 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 + + else + + # search Med binaries in PATH variable + AC_PATH_PROG(TEMP, libMEDMEM_Swig.py) + if test "x$TEMP" != "x" ; then + MED_BIN_DIR=`dirname $TEMP` + MED_DIR=`dirname $MED_BIN_DIR` + fi + + fi +# +fi + +if test -f ${MED_DIR}/bin/salome/libMEDMEM_Swig.py ; then + Med_ok=yes + AC_MSG_RESULT(Using Med module distribution in ${MED_DIR}) + + if test "x$MED_ROOT_DIR" == "x" ; then + MED_ROOT_DIR=${MED_DIR} + fi + AC_SUBST(MED_ROOT_DIR) + +else + AC_MSG_WARN("Cannot find compiled Med module distribution") +fi + +AC_MSG_RESULT(for Med: $Med_ok) + +])dnl + diff --git a/build_configure b/build_configure index 4edf6f44..a4cc2dd0 100755 --- a/build_configure +++ b/build_configure @@ -193,7 +193,7 @@ else echo -n "Creating 'configure' script ... " fi -aclocal --acdir=${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files if autoconf then echo "done" diff --git a/configure.in.base b/configure.in.base index 87a8cf6b..25ab7b4c 100644 --- a/configure.in.base +++ b/configure.in.base @@ -265,6 +265,14 @@ echo CHECK_KERNEL +echo +echo --------------------------------------------- +echo Testing Med +echo --------------------------------------------- +echo + +CHECK_MED + echo echo --------------------------------------------- echo Summary @@ -272,7 +280,7 @@ echo --------------------------------------------- echo echo Configure -variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok" +variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok Med_ok" for var in $variables do -- 2.39.2