From 288e13ba7cfed6ce0248bbcba0cf939456de2d81 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 13 Aug 2015 11:03:23 +0900 Subject: [PATCH] configury: fix --with-mxm * search mxm libs in both DIR/lib and DIR/lib64 * fix the description of the --with-mxm option --- config/ompi_check_mxm.m4 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config/ompi_check_mxm.m4 b/config/ompi_check_mxm.m4 index bde8c3b52e..c510fbeb6e 100644 --- a/config/ompi_check_mxm.m4 +++ b/config/ompi_check_mxm.m4 @@ -18,11 +18,11 @@ dnl AC_DEFUN([OMPI_CHECK_MXM],[ AC_ARG_WITH([mxm], [AC_HELP_STRING([--with-mxm(=DIR)], - [Build Mellanox Messaging support])]) - OPAL_CHECK_WITHDIR([mxm], [$with_mxm], [include/mxm/api/mxm_api.h]) + [Build Mellanox Messaging support, optionally adding + DIR/include and DIR/lib or DIR/lib64 to the search path for headers and libraries])]) AC_ARG_WITH([mxm-libdir], [AC_HELP_STRING([--with-mxm-libdir=DIR], - [Search for Mellanox Messaging libraries in DIR])]) + [Search for Mellanox MXM libraries in DIR])]) OPAL_CHECK_WITHDIR([mxm-libdir], [$with_mxm_libdir], [libmxm.*]) ompi_check_mxm_$1_save_CPPFLAGS="$CPPFLAGS" @@ -33,18 +33,15 @@ AC_DEFUN([OMPI_CHECK_MXM],[ [AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "yes"], [ ompi_check_mxm_dir="$with_mxm" - ompi_check_mxm_libdir="$with_mxm/lib" ]) AS_IF([test ! -z "$with_mxm_libdir" && test "$with_mxm_libdir" != "yes"], [ompi_check_mxm_libdir="$with_mxm_libdir"]) - AS_IF([test ! -z "$ompi_check_mxm_libdir"], [ompi_check_mxm_extra_libs="-L$ompi_check_mxm_libdir"],[]) - OPAL_CHECK_PACKAGE([$1], [mxm/api/mxm_api.h], [mxm], [mxm_cleanup], - [$ompi_check_mxm_extra_libs], + [], [$ompi_check_mxm_dir], [$ompi_check_mxm_libdir], [ompi_check_mxm_happy="yes"],