opal_config_subdir[_args].m4: use OPAL_VAR_SCOPE_PUSH/POP

config/opal_config_subdir.m4

@@ -22,6 +22,8 @@ dnl $HEADER$
 dnl
 
 AC_DEFUN([OPAL_CONFIG_SUBDIR],[
+OPAL_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp])
+
 #
 # Invoke configure in a specific subdirectory.
 #
@@ -123,6 +125,7 @@ if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
     export CXXFLAGS CXXCPPFLAGS
     export FCFLAGS
     export LDFLAGS LIBS
+
     sub_configure="$SHELL '$subdir_srcdir/configure'"
     AC_MSG_NOTICE([running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking])
     eval "$sub_configure $subdir_args \
@@ -146,5 +149,4 @@ fi
 # Clean up
 #
 
-unset subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file
-unset subdir_args subdir_dots total_dir dir_part temp])dnl
+OPAL_VAR_SCOPE_POP])dnl

config/opal_config_subdir_args.m4

@@ -11,6 +11,7 @@ dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2014      Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -19,6 +20,7 @@ dnl $HEADER$
 dnl
 
 AC_DEFUN([OPAL_CONFIG_SUBDIR_ARGS],[
+OPAL_VAR_SCOPE_PUSH([subdirs_str subdirs_skip subdirs_args subdirs_arg])
 #
 # Invoke configure in subdirectories.
 #
@@ -75,4 +77,4 @@ eval "$subdirs_str"
 # Clean up
 #
 
-unset subdirs_str subdirs_skip subdirs_args subdirs_arg])dnl
+OPAL_VAR_SCOPE_POP])dnl