diff --git a/README b/README index b36c0d98b3..62e770f9af 100644 --- a/README +++ b/README @@ -288,19 +288,39 @@ for a full list); a summary of the more commonly used ones follows: Specify the directory where the GM libraries and header files are located. This enables GM support in Open MPI. +--with-gm-libdir= + Look in directory for the GM libraries. By default, Open MPI will + look in /lib and /lib64, which covers + most cases. This option is only needed for special configurations. + --with-mx= Specify the directory where the MX libraries and header files are located. This enables MX support in Open MPI. +--with-mx-libdir= + Look in directory for the MX libraries. By default, Open MPI will + look in /lib and /lib64, which covers + most cases. This option is only needed for special configurations. + --with-mvapi= Specify the directory where the mVAPI libraries and header files are located. This enables mVAPI support in Open MPI. +--with-mvapi-libdir= + Look in directory for the MVAPI libraries. By default, Open MPI will + look in /lib and /lib64, which covers + most cases. This option is only needed for special configurations. + --with-openib= Specify the directory where the Open Fabrics (previously known as OpenIB) libraries and header files are located. This enables Open Fabrics support in Open MPI. +--with-openib-libdir= + Look in directory for the OPENIB libraries. By default, Open MPI will + look in /lib and /lib64, which covers + most cases. This option is only needed for special configurations. + --with-tm= Specify the directory where the TM libraries and header files are located. This enables PBS / Torque support in Open MPI. diff --git a/config/ompi_check_gm.m4 b/config/ompi_check_gm.m4 index face2ef88c..d7c9430467 100644 --- a/config/ompi_check_gm.m4 +++ b/config/ompi_check_gm.m4 @@ -126,8 +126,7 @@ AC_DEFUN([OMPI_CHECK_GM],[ [Build GM (Myrinet) support, searching for libraries in DIR])]) AC_ARG_WITH([gm-libdir], [AC_HELP_STRING([--with-gm-libdir=DIR], - [Search for GM (Myrinet) libraries in DIR/lib and DIR/lib64 - in addition to other search paths])]) + [Search for GM (Myrinet) libraries in DIR])]) AS_IF([test "$with_gm" != "no"], [AS_IF([test ! -z "$with_gm" -a "$with_gm" != "yes"], diff --git a/config/ompi_check_mvapi.m4 b/config/ompi_check_mvapi.m4 index e140149674..744b0f287a 100644 --- a/config/ompi_check_mvapi.m4 +++ b/config/ompi_check_mvapi.m4 @@ -29,8 +29,7 @@ AC_DEFUN([OMPI_CHECK_MVAPI],[ [Build MVAPI (InfiniBand) support, searching for libraries in DIR])]) AC_ARG_WITH([mvapi-libdir], [AC_HELP_STRING([--with-mvapi-libdir=DIR], - [Search for MVAPI (InfiniBand) libraries in DIR/lib and DIR/lib64 - in addition to other search paths])]) + [Search for MVAPI (InfiniBand) libraries in DIR])]) AS_IF([test ! -z "$with_mvapi" -a "$with_mvapi" != "yes"], [ompi_check_mvapi_dir="$with_mvapi"]) diff --git a/config/ompi_check_mx.m4 b/config/ompi_check_mx.m4 index 477f2b3ce5..6596a8b067 100644 --- a/config/ompi_check_mx.m4 +++ b/config/ompi_check_mx.m4 @@ -79,8 +79,7 @@ AC_DEFUN([OMPI_CHECK_MX],[ [Build MX (Myrinet Express) support, searching for libraries in DIR])]) AC_ARG_WITH([mx-libdir], [AC_HELP_STRING([--with-mx-libdir=DIR], - [Search for MX (Myrinet Express) libraries in DIR/lib and DIR/lib64 - in addition to other search paths])]) + [Search for MX (Myrinet Express) libraries in DIR])]) ompi_check_mx_$1_save_CPPFLAGS="$CPPFLAGS" ompi_check_mx_$1_save_LDFLAGS="$LDFLAGS" diff --git a/config/ompi_check_openib.m4 b/config/ompi_check_openib.m4 index baeb9d867f..3dd4d46278 100644 --- a/config/ompi_check_openib.m4 +++ b/config/ompi_check_openib.m4 @@ -30,8 +30,7 @@ AC_DEFUN([OMPI_CHECK_OPENIB],[ [Build OpenIB (InfiniBand) support, searching for libraries in DIR])]) AC_ARG_WITH([openib-libdir], [AC_HELP_STRING([--with-openib-libdir=DIR], - [Search for OpenIB (InfiniBand) libraries in DIR/lib and DIR/lib64 - in addition to other search paths])]) + [Search for OpenIB (InfiniBand) libraries in DIR])]) AS_IF([test ! -z "$with_openib" -a "$with_openib" != "yes"], [ompi_check_openib_dir="$with_openib"]) diff --git a/config/ompi_check_package.m4 b/config/ompi_check_package.m4 index 24ee12911f..6cc910536d 100644 --- a/config/ompi_check_package.m4 +++ b/config/ompi_check_package.m4 @@ -54,7 +54,7 @@ AC_DEFUN([_OMPI_CHECK_PACKAGE_HEADER], [ # _OMPI_CHECK_PACKAGE_LIB(prefix, library, function, extra-libraries, -# dir-prefix, libdir-prefix, +# dir-prefix, libdir, # [action-if-found], [action-if-not-found]]) # -------------------------------------------------------------------- AC_DEFUN([_OMPI_CHECK_PACKAGE_LIB], [ @@ -69,48 +69,57 @@ AC_DEFUN([_OMPI_CHECK_PACKAGE_LIB], [ unset ompi_Lib ompi_check_package_lib_happy="no" AS_IF([test "$6" != ""], - [ompi_check_package_libdir="$6"], - [ompi_check_package_libdir="$5"]) - - AS_IF([test "$ompi_check_package_libdir" = "" -o "$ompi_check_package_libdir" = "/usr" -o "$ompi_check_package_libdir" = "/usr/local"], - [ # try as is... - AC_VERBOSE([looking for library without search path]) + [ # libdir was specified - search only there + $1_LDFLAGS="$$1_LDFLAGS -L$6" + LDFLAGS="$LDFLAGS -L$6" AC_CHECK_LIB([$2], [$3], [ompi_check_package_lib_happy="yes"], [ompi_check_package_lib_happy="no"], [$4]) AS_IF([test "$ompi_check_package_lib_happy" = "no"], - [ # no go on the as is.. see what happens later... - LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" + [LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS" - unset ompi_Lib])]) + unset ompi_Lib])], + [ # libdir was not specified - go through search path + ompi_check_package_libdir="$5" + AS_IF([test "$ompi_check_package_libdir" = "" -o "$ompi_check_package_libdir" = "/usr" -o "$ompi_check_package_libdir" = "/usr/local"], + [ # try as is... + AC_VERBOSE([looking for library without search path]) + AC_CHECK_LIB([$2], [$3], + [ompi_check_package_lib_happy="yes"], + [ompi_check_package_lib_happy="no"], [$4]) + AS_IF([test "$ompi_check_package_lib_happy" = "no"], + [ # no go on the as is.. see what happens later... + LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" + $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS" + unset ompi_Lib])]) - AS_IF([test "$ompi_check_package_lib_happy" = "no"], - [AS_IF([test "$ompi_check_package_libdir" != ""], - [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib" - LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib" - AC_VERBOSE([looking for library in lib]) - AC_CHECK_LIB([$2], [$3], + AS_IF([test "$ompi_check_package_lib_happy" = "no"], + [AS_IF([test "$ompi_check_package_libdir" != ""], + [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib" + LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib" + AC_VERBOSE([looking for library in lib]) + AC_CHECK_LIB([$2], [$3], [ompi_check_package_lib_happy="yes"], [ompi_check_package_lib_happy="no"], [$4]) - AS_IF([test "$ompi_check_package_lib_happy" = "no"], - [ # no go on the as is.. see what happens later... - LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" - $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS" - unset ompi_Lib])])]) + AS_IF([test "$ompi_check_package_lib_happy" = "no"], + [ # no go on the as is.. see what happens later... + LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" + $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS" + unset ompi_Lib])])]) - AS_IF([test "$ompi_check_package_lib_happy" = "no"], - [AS_IF([test "$ompi_check_package_libdir" != ""], - [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib64" - LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib64" - AC_VERBOSE([looking for library in lib64]) - AC_CHECK_LIB([$2], [$3], + AS_IF([test "$ompi_check_package_lib_happy" = "no"], + [AS_IF([test "$ompi_check_package_libdir" != ""], + [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib64" + LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib64" + AC_VERBOSE([looking for library in lib64]) + AC_CHECK_LIB([$2], [$3], [ompi_check_package_lib_happy="yes"], [ompi_check_package_lib_happy="no"], [$4]) - AS_IF([test "$ompi_check_package_lib_happy" = "no"], - [ # no go on the as is.. see what happens later... - LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" - $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS" - unset ompi_Lib])])]) + AS_IF([test "$ompi_check_package_lib_happy" = "no"], + [ # no go on the as is.. see what happens later... + LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" + $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS" + unset ompi_Lib])])])]) AS_IF([test "$ompi_check_package_lib_happy" = "yes"], [$7], [$8]) @@ -119,8 +128,13 @@ AC_DEFUN([_OMPI_CHECK_PACKAGE_LIB], [ ]) -# OMPI_CHECK_PACKAGE(prefix, header, library, function, extra-libraries, -# dir-prefix, libdir-prefix, +# OMPI_CHECK_PACKAGE(prefix, +# header, +# library, +# function, +# extra-libraries, +# dir-prefix, +# libdir-prefix, # [action-if-found], [action-if-not-found] # ----------------------------------------------------------- # check for package defined by header and libs, and probably diff --git a/config/ompi_check_udapl.m4 b/config/ompi_check_udapl.m4 index 2420876338..4cb73a80e9 100644 --- a/config/ompi_check_udapl.m4 +++ b/config/ompi_check_udapl.m4 @@ -29,8 +29,7 @@ AC_DEFUN([OMPI_CHECK_UDAPL],[ [Build uDAPL support, searching for libraries in DIR])]) AC_ARG_WITH([udapl-libdir], [AC_HELP_STRING([--with-udapl-libdir=DIR], - [Search for uDAPL libraries in DIR/lib and DIR/lib64 - in addition to other search paths])]) + [Search for uDAPL libraries in DIR])]) AS_IF([test ! -z "$with_udapl" -a "$with_udapl" != "yes"], [ompi_check_udapl_dir="$with_udapl"])