From e45412f5db4c3f61f568d76cb9052f0848010928 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 9 Dec 2013 14:30:01 +0000 Subject: [PATCH] Addendum to r29847: actually remove the old OPAL_VAR_SCOPE_POP Refs trac:3694 This commit was SVN r29848. The following SVN revision numbers were found above: r29847 --> open-mpi/ompi@c1ce04ad2344b23b69e31ab03262c520d17634ed The following Trac tickets were found above: Ticket 3694 --> https://svn.open-mpi.org/trac/ompi/ticket/3694 --- config/ompi_check_libhcoll.m4 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/ompi_check_libhcoll.m4 b/config/ompi_check_libhcoll.m4 index bf2fdcf5dc..b63ae0e38b 100644 --- a/config/ompi_check_libhcoll.m4 +++ b/config/ompi_check_libhcoll.m4 @@ -1,7 +1,6 @@ # -*- shell-script -*- # # Copyright (c) 2011 Mellanox Technologies. All rights reserved. - # Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # @@ -16,8 +15,7 @@ # LDFLAGS, LIBS} as needed and runs action-if-found if there is # support, otherwise executes action-if-not-found AC_DEFUN([OMPI_CHECK_HCOLL],[ -OPAL_VAR_SCOPE_PUSH([ompi_check_hcoll_dir ompi_hcoll_libdir ompi_check_hcoll_incdir ompi_check_hcoll_libs ompi_check_hcoll_happy CPPFLAGS_save LDFLAGS_save LIBS_save]) - OPAL_VAR_SCOPE_PUSH([CPPFLAGS_save LDFLAGS_save LIBS_save]) + OPAL_VAR_SCOPE_PUSH([ompi_check_hcoll_dir ompi_hcoll_libdir ompi_check_hcoll_incdir ompi_check_hcoll_libs ompi_check_hcoll_happy CPPFLAGS_save LDFLAGS_save LIBS_save]) AC_ARG_WITH([hcoll], [AC_HELP_STRING([--with-hcoll(=DIR)], @@ -76,4 +74,3 @@ OPAL_VAR_SCOPE_PUSH([ompi_check_hcoll_dir ompi_hcoll_libdir ompi_check_hcoll_inc OPAL_VAR_SCOPE_POP ]) -