From a741406ad6f20e98ffe37e98fb1705cf5364707c Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 8 Aug 2014 22:22:03 +0000
Subject: [PATCH] opal_search_libs.m4: improvements from Dave Goodell's review

Unfortunately, I didn't see Dave's review until CMR #4841 went in.
Oops.

This commit is a handful of minor m4 improvements to that original
r32447 commit.  It can go to v1.8.3, just to minimize drift between
trunk and v1.8.

Reviewed by Dave Goodell.

cmr=v1.8.3:reviewer=ompi-rm1.8

This commit was SVN r32477.

The following SVN revision numbers were found above:
  r32447 --> open-mpi/ompi@c6d9bf906ebf94ab5157a5f72808f9b5b0b19df1
---
 config/opal_search_libs.m4 | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/config/opal_search_libs.m4 b/config/opal_search_libs.m4
index b3de449636..1caba6fe4d 100644
--- a/config/opal_search_libs.m4
+++ b/config/opal_search_libs.m4
@@ -21,15 +21,17 @@ dnl
 # calls OPAL_WRAPPER_FLAGS_ADD -- see big comment in
 # opal_setup_wrappers.m4 for an explanation of why this is bad).
 AC_DEFUN([OPAL_SEARCH_LIBS_CORE],[
-    OPAL_VAR_SCOPE_PUSH(LIBS_save add)
+    m4_ifdef([mca_component_configure_active],
+        [m4_fatal([*** OPAL_SEARCH_LIBS_CORE cannot be called from a component configure.m4])])
+
+    OPAL_VAR_SCOPE_PUSH([LIBS_save add])
     LIBS_save=$LIBS
 
     AC_SEARCH_LIBS([$1], [$2],
         [ # Found it!  See if anything was added to LIBS
-         add=`echo $LIBS | sed -e "s/$LIBS_save$//"`
-         if test "x$add" != "x"; then
-             OPAL_WRAPPER_FLAGS_ADD([LIBS], [$add])
-         fi
+         add=`printf '%s\n' "$LIBS" | sed -e "s/$LIBS_save$//"`
+         AS_IF([test -n "$add"],
+             [OPAL_WRAPPER_FLAGS_ADD([LIBS], [$add])])
          $3],
         [$4], [$5])
 
@@ -45,15 +47,17 @@ AC_DEFUN([OPAL_SEARCH_LIBS_CORE],[
 # variable (i.e., $prefix is usually "framework_component", such as
 # "fbtl_posix").
 AC_DEFUN([OPAL_SEARCH_LIBS_COMPONENT],[
-    OPAL_VAR_SCOPE_PUSH(LIBS_save add)
+    m4_ifndef([mca_component_configure_active],
+        [m4_fatal([*** OPAL_SEARCH_LIBS_COMPONENT can only be called from a component configure.m4])])
+
+    OPAL_VAR_SCOPE_PUSH([LIBS_save add])
     LIBS_save=$LIBS
 
     AC_SEARCH_LIBS([$2], [$3],
         [ # Found it!  See if anything was added to LIBS
-         add=`echo $LIBS | sed -e "s/$LIBS_save$//"`
-         if test "x$add" != "x"; then
-             OPAL_FLAGS_APPEND_UNIQ($1_LIBS, [$add])
-         fi
+         add=`printf '%s\n' "$LIBS" | sed -e "s/$LIBS_save$//"`
+         AS_IF([test -n "$add"],
+             [OPAL_FLAGS_APPEND_UNIQ($1_LIBS, [$add])])
          $4],
         [$5], [$6])