Revert r15900; the variable was already named correctly. This fixes

static builds for OMPI components that required extra LIBS or LDFLAGS
(e.g., the openib BTL).

Fixes trac:1155.

This commit was SVN r16314.

The following SVN revision numbers were found above:
  r15900 --> open-mpi/ompi@50941ec389

The following Trac tickets were found above:
  Ticket 1155 --> https://svn.open-mpi.org/trac/ompi/ticket/1155

config/ompi_setup_wrappers.m4

@@ -187,8 +187,8 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
     #
     # OMPI
     #
-    OMPI_UNIQ([OMPI_WRAPPER_EXTRA_LDFLAGS])
-    OMPI_UNIQ([OMPI_WRAPPER_EXTRA_LIBS])
+    OMPI_UNIQ([ompi_WRAPPER_EXTRA_LDFLAGS])
+    OMPI_UNIQ([ompi_WRAPPER_EXTRA_LIBS])
 
     AC_MSG_CHECKING([for OMPI CPPFLAGS])
     OMPI_WRAPPER_EXTRA_CPPFLAGS="$ORTE_WRAPPER_EXTRA_CPPFLAGS"
@@ -216,12 +216,12 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
     AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FCFLAGS])
 
     AC_MSG_CHECKING([for OMPI LDFLAGS])
-    OMPI_WRAPPER_EXTRA_LDFLAGS="$OMPI_WRAPPER_EXTRA_LDFLAGS $ORTE_WRAPPER_EXTRA_LDFLAGS"
+    OMPI_WRAPPER_EXTRA_LDFLAGS="$ompi_WRAPPER_EXTRA_LDFLAGS $ORTE_WRAPPER_EXTRA_LDFLAGS"
     AC_SUBST([OMPI_WRAPPER_EXTRA_LDFLAGS])
     AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LDFLAGS])
 
     AC_MSG_CHECKING([for OMPI LIBS])
-    OMPI_WRAPPER_EXTRA_LIBS="$OMPI_WRAPPER_EXTRA_LIBS $ORTE_WRAPPER_EXTRA_LIBS"
+    OMPI_WRAPPER_EXTRA_LIBS="$ompi_WRAPPER_EXTRA_LIBS $ORTE_WRAPPER_EXTRA_LIBS"
     AC_SUBST([OMPI_WRAPPER_EXTRA_LIBS])
     AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LIBS])