Fix two errors with r14552:

* Have _ompi_check_package_lib set LIBS, similar to how
    _ompi_check_package_include sets CPPFLAGS.  Fixes an
    issue discovered by Don
  * Need to restore flags after end of TM testing.

This commit was SVN r14602.

The following SVN revision numbers were found above:
  r14552 --> open-mpi/ompi@e63346a633

config/ompi_check_package.m4

@@ -122,7 +122,8 @@ AC_DEFUN([_OMPI_CHECK_PACKAGE_LIB], [
                           unset ompi_Lib])])])])
 
     AS_IF([test "$ompi_check_package_lib_happy" = "yes"],
-          [$7], [$8])
+          [$1_LIBS="-l$2 $4"
+           $7], [$8])
 
     AS_VAR_POPDEF([ompi_Lib])dnl
 ])
@@ -157,8 +158,7 @@ AC_DEFUN([OMPI_CHECK_PACKAGE],[
           [ompi_check_package_happy="no"])
 
     AS_IF([test "$ompi_check_package_happy" = "yes"],
-          [$8
-           $1_LIBS="-l$3 $5"],
+          [$8],
           [$1_CPPFLAGS="$ompi_check_package_$1_orig_CPPFLAGS"
            $1_LDFLAGS="$ompi_check_package_$1_orig_LDFLAGS"
            $1_LIBS="$ompi_check_package_$1_orig_LIBS"

config/ompi_check_tm.m4

@@ -131,6 +131,10 @@ AC_DEFUN([OMPI_CHECK_TM],[
                              [ompi_check_tm_found="yes"],
                              [ompi_check_tm_found="no"])])])])
 
+    CPPFLAGS="$ompi_check_package_$1_save_CPPFLAGS"
+    LDFLAGS="$ompi_check_package_$1_save_LDFLAGS"
+    LIBS="$ompi_check_package_$1_save_LIBS"
+
     # Did we find the right stuff?
     AS_IF([test "$ompi_check_tm_happy" = "yes" -a "$ompi_check_tm_found" = "yes"],
           [$2],