1
1

opal_search_libs.m4: remove redundant AC_MSG_CHECKING/RESULT

The AC_MSG_CHECKING/AC_MSG_RESULT in OPAL_SEARCH_LIBS_CORE were
generating recursive redundant output (i.e., AC_SEARCH_LIBS already
outputs "checking for library containing X... -lY".

Also add the "uppername" logic to OPAL_SEARCH_LIBS_COMPONENT so that
these two macros stay symmetrical.

Refs trac:4894.

This commit was SVN r32721.

The following Trac tickets were found above:
  Ticket 4894 --> https://svn.open-mpi.org/trac/ompi/ticket/4894
Этот коммит содержится в:
Jeff Squyres 2014-09-12 23:27:33 +00:00
родитель 7269dae2da
Коммит 2024d28a65

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

@ -28,7 +28,6 @@ AC_DEFUN([OPAL_SEARCH_LIBS_CORE],[
OPAL_VAR_SCOPE_PUSH([LIBS_save add uppername])
LIBS_save=$LIBS
AC_MSG_CHECKING([for $1 in lib $2])
AC_SEARCH_LIBS([$1], [$2],
[ # Found it! See if anything was added to LIBS
add=`printf '%s\n' "$LIBS" | sed -e "s/$LIBS_save$//"`
@ -37,10 +36,8 @@ AC_DEFUN([OPAL_SEARCH_LIBS_CORE],[
uppername=m4_toupper($1)
AC_DEFINE_UNQUOTED([OPAL_HAVE_$uppername], [1],
[whether $1 is found and available])
AC_MSG_RESULT([found...and set OPAL_HAVE_$uppername])
$3],
[AC_MSG_RESULT([not found])
$4], [$5])
[$4], [$5])
OPAL_VAR_SCOPE_POP
])dnl
@ -57,7 +54,7 @@ AC_DEFUN([OPAL_SEARCH_LIBS_COMPONENT],[
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])
OPAL_VAR_SCOPE_PUSH([LIBS_save add uppername])
LIBS_save=$LIBS
AC_SEARCH_LIBS([$2], [$3],
@ -65,6 +62,9 @@ AC_DEFUN([OPAL_SEARCH_LIBS_COMPONENT],[
add=`printf '%s\n' "$LIBS" | sed -e "s/$LIBS_save$//"`
AS_IF([test -n "$add"],
[OPAL_FLAGS_APPEND_UNIQ($1_LIBS, [$add])])
uppername=m4_toupper($1)
AC_DEFINE_UNQUOTED([OPAL_HAVE_$uppername], [1],
[whether $1 is found and available])
$4],
[$5], [$6])