* Fix for bug #152. Make --with-FOO-libdir=DIR only check DIR, and not the

DIR/lib and DIR/lib64, which really never made sense.

This commit was SVN r10535.

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=<directory>
+  Look in directory for the GM libraries.  By default, Open MPI will
+  look in <gm directory>/lib and <gm directory>/lib64, which covers
+  most cases.  This option is only needed for special configurations.
+
 --with-mx=<directory>
   Specify the directory where the MX libraries and header files are
   located.  This enables MX support in Open MPI.
 
+--with-mx-libdir=<directory>
+  Look in directory for the MX libraries.  By default, Open MPI will
+  look in <mx directory>/lib and <mx directory>/lib64, which covers
+  most cases.  This option is only needed for special configurations.
+
 --with-mvapi=<directory>
   Specify the directory where the mVAPI libraries and header files are
   located.  This enables mVAPI support in Open MPI.
 
+--with-mvapi-libdir=<directory>
+  Look in directory for the MVAPI libraries.  By default, Open MPI will
+  look in <mvapi directory>/lib and <mvapi directory>/lib64, which covers
+  most cases.  This option is only needed for special configurations.
+
 --with-openib=<directory>
   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=<directory>
+  Look in directory for the OPENIB libraries.  By default, Open MPI will
+  look in <openib directory>/lib and <openib directory>/lib64, which covers
+  most cases.  This option is only needed for special configurations.
+
 --with-tm=<directory>
   Specify the directory where the TM libraries and header files are
   located.  This enables PBS / Torque support in Open MPI.

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 
+             [Search for GM (Myrinet) libraries in DIR])])
-               in addition to other search paths])])
 
     AS_IF([test "$with_gm" != "no"],
           [AS_IF([test ! -z "$with_gm" -a "$with_gm" != "yes"],

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 
+             [Search for MVAPI (InfiniBand) libraries in DIR])])
-               in addition to other search paths])])
 
     AS_IF([test ! -z "$with_mvapi" -a "$with_mvapi" != "yes"],
           [ompi_check_mvapi_dir="$with_mvapi"])

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 
+             [Search for MX (Myrinet Express) libraries in DIR])])
-               in addition to other search paths])])
 
     ompi_check_mx_$1_save_CPPFLAGS="$CPPFLAGS"
     ompi_check_mx_$1_save_LDFLAGS="$LDFLAGS"

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 
+             [Search for OpenIB (InfiniBand) libraries in DIR])])
-               in addition to other search paths])])
 
     AS_IF([test ! -z "$with_openib" -a "$with_openib" != "yes"],
           [ompi_check_openib_dir="$with_openib"])

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"],
+          [ # libdir was specified - search only there
-          [ompi_check_package_libdir="$5"])
+           $1_LDFLAGS="$$1_LDFLAGS -L$6"
-
+           LDFLAGS="$LDFLAGS -L$6"
-    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"
-                  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_lib_happy" = "no"],
-          [AS_IF([test "$ompi_check_package_libdir" != ""],
+               [AS_IF([test "$ompi_check_package_libdir" != ""],
-                 [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib"
+                    [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib"
-                  LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib"
+                     LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib"
-                  AC_VERBOSE([looking for library in lib])
+                     AC_VERBOSE([looking for library in lib])
-                  AC_CHECK_LIB([$2], [$3], 
+                     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"],
+                     AS_IF([test "$ompi_check_package_lib_happy" = "no"],
-                        [ # no go on the as is..  see what happens later...
+                         [ # 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"
+                          $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS"
-                         unset ompi_Lib])])])
+                          unset ompi_Lib])])])
 
-    AS_IF([test "$ompi_check_package_lib_happy" = "no"],
+           AS_IF([test "$ompi_check_package_lib_happy" = "no"],
-          [AS_IF([test "$ompi_check_package_libdir" != ""],
+               [AS_IF([test "$ompi_check_package_libdir" != ""],
-                 [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib64"
+                    [$1_LDFLAGS="$$1_LDFLAGS -L$ompi_check_package_libdir/lib64"
-                  LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib64"
+                     LDFLAGS="$LDFLAGS -L$ompi_check_package_libdir/lib64"
-                  AC_VERBOSE([looking for library in lib64])
+                     AC_VERBOSE([looking for library in lib64])
-                  AC_CHECK_LIB([$2], [$3], 
+                     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"],
+                     AS_IF([test "$ompi_check_package_lib_happy" = "no"],
-                        [ # no go on the as is..  see what happens later...
+                         [ # 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"
+                          $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS"
-                         unset ompi_Lib])])])
+                          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, 
+# OMPI_CHECK_PACKAGE(prefix, 
-#                    dir-prefix, libdir-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

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 
+             [Search for uDAPL libraries in DIR])])
-               in addition to other search paths])])
 
     AS_IF([test ! -z "$with_udapl" -a "$with_udapl" != "yes"],
           [ompi_check_udapl_dir="$with_udapl"])