From fadc3ad01a30b2062e6feff9b0751a2be4e29d49 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 13 Apr 2015 19:51:01 -0700 Subject: [PATCH] hwloc/external/configure.m4: no need to unset Instead, use a safe environment variable name (that is SCOPE_PUSHed and SCOPE_POPed). --- opal/mca/hwloc/external/configure.m4 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/opal/mca/hwloc/external/configure.m4 b/opal/mca/hwloc/external/configure.m4 index f25c2cefb7..07868e8d4e 100644 --- a/opal/mca/hwloc/external/configure.m4 +++ b/opal/mca/hwloc/external/configure.m4 @@ -1,6 +1,6 @@ # -*- shell-script -*- # -# Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2014 Research Organization for Information Science # and Technology (RIST). All rights reserved. # @@ -169,8 +169,8 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[ AC_MSG_CHECKING([if external hwloc version is 1.8 or greater]) AS_IF([test "$opal_hwloc_dir" != ""], - [CFLAGS_save=$CFLAGS - CFLAGS="-I$opal_hwloc_dir/include $CFLAGS_save"]) + [opal_hwloc_external_CFLAGS_save=$CFLAGS + CFLAGS="-I$opal_hwloc_dir/include $opal_hwloc_external_CFLAGS_save"]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include ]], [[ @@ -182,8 +182,7 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[ [AC_MSG_RESULT([no]) AC_MSG_ERROR([Cannot continue])]) AS_IF([test "$opal_hwloc_dir" != ""], - [CFLAGS=$CFLAGS_save - unset CFLAGS_save]) + [CFLAGS=$opal_hwloc_external_CFLAGS_save]) $1], [$2])