btl/sm: fix a typo in the error message
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
Merge branch 'master' of github.com:rhc54/ompi-trunk