1
1

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@c6d9bf906e
Этот коммит содержится в:
Jeff Squyres 2014-08-08 22:22:03 +00:00
родитель 1e02bb056f
Коммит a741406ad6

Просмотреть файл

@ -21,15 +21,17 @@ dnl
# calls OPAL_WRAPPER_FLAGS_ADD -- see big comment in # calls OPAL_WRAPPER_FLAGS_ADD -- see big comment in
# opal_setup_wrappers.m4 for an explanation of why this is bad). # opal_setup_wrappers.m4 for an explanation of why this is bad).
AC_DEFUN([OPAL_SEARCH_LIBS_CORE],[ 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 LIBS_save=$LIBS
AC_SEARCH_LIBS([$1], [$2], AC_SEARCH_LIBS([$1], [$2],
[ # Found it! See if anything was added to LIBS [ # Found it! See if anything was added to LIBS
add=`echo $LIBS | sed -e "s/$LIBS_save$//"` add=`printf '%s\n' "$LIBS" | sed -e "s/$LIBS_save$//"`
if test "x$add" != "x"; then AS_IF([test -n "$add"],
OPAL_WRAPPER_FLAGS_ADD([LIBS], [$add]) [OPAL_WRAPPER_FLAGS_ADD([LIBS], [$add])])
fi
$3], $3],
[$4], [$5]) [$4], [$5])
@ -45,15 +47,17 @@ AC_DEFUN([OPAL_SEARCH_LIBS_CORE],[
# variable (i.e., $prefix is usually "framework_component", such as # variable (i.e., $prefix is usually "framework_component", such as
# "fbtl_posix"). # "fbtl_posix").
AC_DEFUN([OPAL_SEARCH_LIBS_COMPONENT],[ 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 LIBS_save=$LIBS
AC_SEARCH_LIBS([$2], [$3], AC_SEARCH_LIBS([$2], [$3],
[ # Found it! See if anything was added to LIBS [ # Found it! See if anything was added to LIBS
add=`echo $LIBS | sed -e "s/$LIBS_save$//"` add=`printf '%s\n' "$LIBS" | sed -e "s/$LIBS_save$//"`
if test "x$add" != "x"; then AS_IF([test -n "$add"],
OPAL_FLAGS_APPEND_UNIQ($1_LIBS, [$add]) [OPAL_FLAGS_APPEND_UNIQ($1_LIBS, [$add])])
fi
$4], $4],
[$5], [$6]) [$5], [$6])