diff -p -up src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4.orig src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4 --- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4.orig 2010-03-17 20:49:10.961911120 -0300 +++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4 2010-03-17 20:52:05.708908854 -0300 @@ -43,8 +43,8 @@ CPPFLAGS_old="${CPPFLAGS}" LIBS_old=$LIBS if test "x${SCOTCHDIR}" != "x" ; then - SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}" - SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr" + SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch" + SCOTCH_LIBS="-L${SCOTCHDIR}/lib${LIB_LOCATION_SUFFIX}/scotch -lscotch -lscotcherr" fi scotch_ok=no @@ -57,14 +57,14 @@ CPPFLAGS="${CPPFLAGS_old} ${SCOTCH_CPPFL scotch_include_dir_ok=yes if test "x${SCOTCHDIR}" != "x" ; then - AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h, + AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h, scotch_include_dir_ok=yes, scotch_include_dir_ok=no) fi if test "x${scotch_include_dir_ok}" = "xyes" ; then AC_TRY_COMPILE([#include <stdio.h> - #include <bin/scotch.h>], + #include <scotch/scotch.h>], [SCOTCH_Graph* graph; SCOTCH_graphInit(graph)], scotch_headers_ok=yes, @@ -83,12 +83,12 @@ if test "x${scotch_headers_ok}" = "xyes" AC_CHECKING(for SCOTCH binaries) scotch_lib_dir_ok=yes if test "x${SCOTCHDIR}" != "x" ; then - AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a, + AC_CHECK_FILE(${SCOTCHDIR}/lib${LIB_LOCATION_SUFFIX}/scotch/libscotch.a, scotch_lib_dir_ok=yes, scotch_lib_dir_ok=no) if test "x${scotch_lib_dir_ok}" = "xno" ; then SCOTCH_LIBSUFFIX="" - AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a, + AC_CHECK_FILE(${SCOTCHDIR}/lib${LIB_LOCATION_SUFFIX}/scotch/libscotch.a, scotch_lib_dir_ok=yes, scotch_lib_dir_ok=no) fi @@ -96,7 +96,7 @@ if test "x${scotch_headers_ok}" = "xyes" if test "x${scotch_lib_dir_ok}" = "xyes" ; then LIBS="${LIBS_old} ${SCOTCH_LIBS}" AC_TRY_LINK([#include <stdio.h> - #include <bin/scotch.h>], + #include <scotch/scotch.h>], [SCOTCH_Graph* graph; SCOTCH_graphInit(graph)], scotch_binaries_ok=yes, @@ -105,7 +105,7 @@ if test "x${scotch_headers_ok}" = "xyes" SCOTCH_LIBSUFFIX="" LIBS="${LIBS_old} ${SCOTCH_LIBS} " AC_TRY_LINK([#include <stdio.h> - #include <bin/scotch.h>], + #include <scotch/scotch.h>], [SCOTCH_Graph* graph; SCOTCH_graphInit(graph)], scotch_binaries_ok=yes, diff -p -up src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx.orig src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx --- src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx.orig 2010-04-28 19:42:14.000000000 +0000 +++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2010-04-28 19:45:21.000000000 +0000 @@ -19,7 +19,7 @@ #include <cstdio> extern "C" { #define restrict -#include "bin/scotch.h" +#include "scotch/scotch.h" } #include "MEDSPLITTER_Graph.hxx" #include "MEDSPLITTER_SCOTCHGraph.hxx" --- src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Utils.cxx.orig 2010-04-28 18:41:38.105059569 -0300 +++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Utils.cxx 2010-04-28 18:42:07.409193088 -0300 @@ -82,15 +82,15 @@ string multipr::getFilenameWithoutPath(const char* pFilename) { - char* res = strrchr(pFilename, '/'); + char* res = strrchr((char *)pFilename, '/'); if (res == NULL) { - return pFilename; + return (string)pFilename; } else { char* name = res + 1; - return name; + return (string)name; } }