Applying patch from Erwan Adam (customization of check files)

diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4
index 789167b4c1264a3d29860a04c96f3f492090f5bf..ed3a09302886034679a531ed34b4a27f6b7bc1c3 100644 (file)
--- a/salome_adm/unix/config_files/check_boost.m4
+++ b/salome_adm/unix/config_files/check_boost.m4
@@ -32,6 +32,11 @@ boost_ok=no
 
 if test -z ${BOOSTDIR}; then
   AC_MSG_WARN(You must provide BOOSTDIR variable)
+  dnl E.A. : If BOOSTDIR is not defined, trying in system
+  AC_CHECK_HEADER(boost/shared_ptr.hpp,boost_ok=yes,boost_ok=no)
+  if test boost_ok = no ; then
+    AC_MSG_WARN(You must provide BOOSTDIR variable)
+  fi
 else
   AC_MSG_RESULT(\$BOOSTDIR = ${BOOSTDIR})
   AC_CHECKING(for boost/shared_ptr.hpp header file)

diff --git a/salome_adm/unix/config_files/check_med2.m4 b/salome_adm/unix/config_files/check_med2.m4
index 07d100bfa1a4edb51e562df0b1d1afefef0c1eb7..c1388819536f265d1dae9692b78fe4aca4584035 100644 (file)
--- a/salome_adm/unix/config_files/check_med2.m4
+++ b/salome_adm/unix/config_files/check_med2.m4
@@ -51,7 +51,15 @@ dnl check, if there is MED library
 if test -z $MED2HOME
 then
    AC_MSG_WARN(undefined MED2HOME variable which specify med2 installation directory)
-else
+   AC_PATH_PROG(MDUMP, mdump)
+   if test "xMDUMP" != "x" ; then
+      MED2HOME=$MDUMP
+      MED2HOME=`echo ${MED2HOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+      MED2HOME=`echo ${MED2HOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+   fi
+fi
+if test ! -z $MED2HOME
+then
    LOCAL_INCLUDES="$HDF5_INCLUDES -I$MED2HOME/include"
    if test "x$MED2HOME" = "x/usr"
    then

diff --git a/salome_adm/unix/config_files/check_qwt.m4 b/salome_adm/unix/config_files/check_qwt.m4
index 9cdc0a9d3de6e822c3ed433149258d01d51b8868..760cc7dac0f336b70f161c11f93f1c60cff6b0e1 100644 (file)
--- a/salome_adm/unix/config_files/check_qwt.m4
+++ b/salome_adm/unix/config_files/check_qwt.m4
@@ -47,6 +47,9 @@ if test -z $QWTHOME; then
   if test "x$exits_ok" = "xyes"; then
      if test -z $QWT_INCLUDES; then
         QWT_INCLUDES=$QWTHOME"/include/qwt"
+       if test ! -d $QWTHOME"/include/qwt" ; then
+          QWT_INCLUDES=$QWTHOME"/include"
+       fi
      fi
   fi
 else

diff --git a/salome_adm/unix/config_files/check_vtk.m4 b/salome_adm/unix/config_files/check_vtk.m4
index 3f46f41baf661db443a36c97099f5d71650bee0b..b37edf89ef10518ae5df46fd0176a9f48e0543fe 100644 (file)
--- a/salome_adm/unix/config_files/check_vtk.m4
+++ b/salome_adm/unix/config_files/check_vtk.m4
@@ -67,9 +67,21 @@ TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS $LXLIB -lX11 -lXt"
 if test -z $VTKHOME
 then 
    AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
-else
+   if test -f /usr/include/vtk/vtkPlane.h ; then
+      AC_MSG_RESULT(trying /usr)
+      VTKHOME="/usr"
+   fi
+fi
+
+if test ! -z $VTKHOME
+then
    LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"
    LOCAL_LIBS="-L$VTKHOME/lib/vtk $LOCAL_LIBS"
+   dnl E.A. : On mandrake 10.2 with vtk4.4, the libvtk*Python.so
+   dnl E.A. : are separated ...
+   if test -d $VTKHOME/lib/vtk/python ; then
+      LOCAL_LIBS="-L$VTKHOME/lib/vtk/python $LOCAL_LIBS"
+   fi
    TRY_LINK_LIBS="-L$VTKHOME/lib/vtk $TRY_LINK_LIBS"
 fi