Amélioration de la détection des dépendances (dépendances Runtime)

diff --git a/adm_local/unix/config_files/check_pal.m4 b/adm_local/unix/config_files/check_pal.m4
new file mode 100644 (file)
index 0000000..d4a2e8e
--- /dev/null
+++ b/adm_local/unix/config_files/check_pal.m4
@@ -0,0 +1,50 @@
+# Check availability of Salome's PAL binary distribution
+#
+# Author : Guillaume Boulant (CSSI - 03/08/2005)
+#
+
+AC_DEFUN([CHECK_PAL],[
+
+AC_CHECKING(for Pal)
+
+pal_ok=no
+
+AC_ARG_WITH(pal,
+           [  --with-pal=DIR               root directory path of PAL build or installation],
+           PAL_DIR="$withval",PAL_DIR="")
+
+if test "x$PAL_DIR" = "x" ; then
+
+# no --with-pal-dir option used
+
+   if test "x$PAL_ROOT_DIR" != "x" ; then
+
+    # PAL_ROOT_DIR environment variable defined
+      PAL_DIR=$PAL_ROOT_DIR
+
+   else
+      AC_MSG_WARN("PAL_ROOT_DIR is not defined")
+   fi
+fi
+
+if test -f ${PAL_DIR}/bin/salome/runAppli ; then
+   pal_ok=yes
+   AC_MSG_RESULT(Using Pal module distribution in ${PAL_DIR})
+
+   if test "x$PAL_ROOT_DIR" = "x" ; then
+      PAL_ROOT_DIR=${PAL_DIR}
+   fi
+   if test "x$PAL_SITE_DIR" = "x" ; then
+      PAL_SITE_DIR=${PAL_ROOT_DIR}
+   fi
+   AC_SUBST(PAL_ROOT_DIR)
+   AC_SUBST(PAL_SITE_DIR)
+
+else
+   AC_MSG_WARN("Cannot find compiled Pal module distribution")
+fi
+
+AC_MSG_RESULT(for Pal: $pal_ok)
+ 
+])dnl
+ 

diff --git a/adm_local/unix/config_files/check_visu.m4 b/adm_local/unix/config_files/check_visu.m4
new file mode 100644 (file)
index 0000000..e32bd85
--- /dev/null
+++ b/adm_local/unix/config_files/check_visu.m4
@@ -0,0 +1,58 @@
+# Check availability of Salome's VISU binary distribution
+#
+# Author : Jerome Roy (CEA, 2003)
+#
+
+AC_DEFUN([CHECK_VISU],[
+
+AC_CHECKING(for Visu)
+
+Visu_ok=no
+
+AC_ARG_WITH(visu,
+           [  --with-visu=DIR               root directory path of VISU build or installation],
+           VISU_DIR="$withval",VISU_DIR="")
+
+if test "x$VISU_DIR" = "x" ; then
+
+# no --with-visu-dir option used
+
+   if test "x$VISU_ROOT_DIR" != "x" ; then
+
+    # VISU_ROOT_DIR environment variable defined
+      VISU_DIR=$VISU_ROOT_DIR
+
+   else
+
+    # search Visu binaries in PATH variable
+      AC_PATH_PROG(TEMP, runSalome)
+      if test "x$TEMP" != "x" ; then
+         VISU_BIN_DIR=`dirname $TEMP`
+         VISU_DIR=`dirname $VISU_BIN_DIR`
+      fi
+      
+   fi
+# 
+fi
+
+if test -f ${VISU_DIR}/bin/salome/runSalome ; then
+   Visu_ok=yes
+   AC_MSG_RESULT(Using Visu module distribution in ${VISU_DIR})
+
+   if test "x$VISU_ROOT_DIR" = "x" ; then
+      VISU_ROOT_DIR=${VISU_DIR}
+   fi
+   if test "x$VISU_SITE_DIR" = "x" ; then
+      VISU_SITE_DIR=${VISU_ROOT_DIR}
+   fi
+   AC_SUBST(VISU_ROOT_DIR)
+   AC_SUBST(VISU_SITE_DIR)
+
+else
+   AC_MSG_WARN("Cannot find compiled Visu module distribution")
+fi
+
+AC_MSG_RESULT(for Visu: $Visu_ok)
+ 
+])dnl
+ 

diff --git a/configure.in.base b/configure.in.base
index 5474c93015d065d410873d5e92b728a6bb49002b..5c3c20c9630de708a17b9cf5936ce780bf52ba17 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -273,6 +273,22 @@ echo
 
 CHECK_KERNEL
 
+echo
+echo ---------------------------------------------
+echo Testing Visu
+echo ---------------------------------------------
+echo
+
+CHECK_VISU
+
+echo
+echo ---------------------------------------------
+echo Testing Pal
+echo ---------------------------------------------
+echo
+
+CHECK_PAL
+
 echo
 echo ---------------------------------------------
 echo Summary
@@ -292,6 +308,21 @@ echo
 echo "Default ORB   : $DEFAULT_ORB"
 echo
 
+echo
+echo ---------------------------------------------
+echo RunTime Dependencies
+echo ---------------------------------------------
+echo
+variables="Visu_ok pal_ok"
+
+for var in $variables
+do
+   printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
+   eval echo \$$var
+done
+
+
+
 dnl generals files which could be included in every makefile
 
 AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence