Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 8ad34ae091162226fd4d1de7b1eb562d > files > 9

salome-5.1.3-7mdv2010.1.src.rpm

diff -p -up src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4.orig src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4
--- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4.orig	2010-03-17 19:22:06.391909264 -0300
+++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4	2010-03-17 19:24:01.170907976 -0300
@@ -43,8 +43,8 @@ CPPFLAGS_old="${CPPFLAGS}"
 LIBS_old=$LIBS
 
 if test "x${METISDIR}" != "x" ; then
-  METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib"
-  METIS_LIBS="-L${METISDIR} -lmetis"
+  METIS_CPPFLAGS="-DENABLE_METIS"
+  METIS_LIBS="-lmetis"
 fi
 
 metis_ok=no
@@ -57,7 +57,7 @@ CPPFLAGS="${CPPFLAGS_old} ${METIS_CPPFLA
 
 metis_include_dir_ok=yes
 if test "x${METISDIR}" != "x" ; then
-  AC_CHECK_FILE(${METISDIR}/Lib/metis.h,
+  AC_CHECK_FILE(${METISDIR}/include/metis.h,
                 metis_include_dir_ok=yes,
                 metis_include_dir_ok=no)
 fi
@@ -81,12 +81,12 @@ if test "x${metis_headers_ok}" = "xyes"
   AC_CHECKING(for METIS binaries)
   metis_lib_dir_ok=yes
   if test "x${METISDIR}" != "x" ; then
-    AC_CHECK_FILE(${METISDIR}/libmetis.a,
+    AC_CHECK_FILE(${METISDIR}/lib${LIB_LOCATION_SUFFIX}/libmetis.a,
                   metis_lib_dir_ok=yes,
                   metis_lib_dir_ok=no)
     if test "x${metis_lib_dir_ok}" = "xno" ; then
       METIS_LIBSUFFIX=""
-      AC_CHECK_FILE(${METISDIR}/libmetis.a,
+      AC_CHECK_FILE(${METISDIR}/lib${LIB_LOCATION_SUFFIX}/libmetis.a,
                     metis_lib_dir_ok=yes,
                     metis_lib_dir_ok=no)
     fi