Fix help messages and docs about --with arguments

This commit was SVN r7183.

README

@@ -144,19 +144,19 @@ for a full list); a summary of the more important ones follows:
   Open MPI will place its executables in <directory>/bin, its header
   files in <directory>/include, its libraries in <directory>/lib, etc.
 
---with-btl-gm=<directory>
+--with-gm=<directory>
   Specify the directory where the GM libraries and header files are
   located.  This enables GM support in Open MPI.
 
---with-btl-mx=<directory>
+--with-mx=<directory>
   Specify the directory where the MX libraries and header files are
   located.  This enables MX support in Open MPI.
 
---with-btl-mvapi=<directory>
+--with-mvapi=<directory>
   Specify the directory where the mVAPI libraries and header files are
   located.  This enables mVAPI support in Open MPI.
 
---with-btl-openib=<directory>
+--with-openib=<directory>
   Specify the directory where the Open IB libraries and header files are
   located.  This enables mVAPI support in Open MPI.
 

config/ompi_check_mvapi.m4

@@ -23,10 +23,10 @@
 # support, otherwise executes action-if-not-found
 AC_DEFUN([OMPI_CHECK_MVAPI],[
     AC_ARG_WITH([mvapi],
-                [AC_HELP_STRING([--with-btl-mvapi=MVAPI_DIR],
+                [AC_HELP_STRING([--with-mvapi=MVAPI_DIR],
                                 [Additional directory to search for MVAPI installation])])
     AC_ARG_WITH([mvapi-libdir],
-       [AC_HELP_STRING([--with-btl-mvapi-libdir=IBLIBDIR],
+       [AC_HELP_STRING([--with-mvapi-libdir=IBLIBDIR],
 	       [directory where the IB library can be found, if it is not in MVAPI_DIR/lib or MVAPI_DIR/lib64])])
 
     AS_IF([test ! -z "$with_btl_mvapi" -a "$with_btl_mvapi" != "yes"],

config/ompi_check_openib.m4

@@ -23,10 +23,10 @@
 # support, otherwise executes action-if-not-found
 AC_DEFUN([OMPI_CHECK_OPENIB],[
     AC_ARG_WITH([openib],
-                [AC_HELP_STRING([--with-btl-openib=OPENIB_DIR],
+                [AC_HELP_STRING([--with-openib=OPENIB_DIR],
                                 [Additional directory to search for OPENIB installation])])
     AC_ARG_WITH([openib-libdir],
-       [AC_HELP_STRING([--with-btl-openib-libdir=IBLIBDIR],
+       [AC_HELP_STRING([--with-openib-libdir=IBLIBDIR],
                        [directory where the IB library can be found, if it is not in OPENIB_DIR/lib or OPENIB_DIR/lib64])])
 
     AS_IF([test ! -z "$with_btl_openib" -a "$with_btl_openib" != "yes"],