Scope "result" variable in options

bwbarrett · bwbarrett · commit fe482ad73ae4 · 2022-01-24T16:37:51.000Z
result is commonly used as a scoped variable throughout OMPI's
configure.  This doesn't currently cause failures, because
the assembly checks unconditionally unset result (after using
it for its own things).  But to clean up the assembly macros,
we must clean up this usage.

Signed-off-by: Brian Barrett &lt;bbarrett@amazon.com&gt;
diff --git a/config/opal_configure_options.m4 b/config/opal_configure_options.m4
@@ -420,6 +420,7 @@ AM_CONDITIONAL([OPAL_WANT_SCRIPT_WRAPPER_COMPILERS], [test "$enable_script_wrapp
 #
 # Support per-user config files?
 #
+OPAL_VAR_SCOPE_PUSH([result])
 AC_ARG_ENABLE([per-user-config-files],
    [AS_HELP_STRING([--enable-per-user-config-files],
       [Disable per-user configuration files, to save disk accesses during job start-up.  This is likely desirable for large jobs.  Note that this can also be achieved by environment variables at run-time.  (default: enabled)])])
@@ -430,6 +431,7 @@ else
 fi
 AC_DEFINE_UNQUOTED([OPAL_WANT_HOME_CONFIG_FILES], [$result],
      [Enable per-user config files])
+OPAL_VAR_SCOPE_POP
 
 #
 # Do we want to enable IPv6 support?

Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,7 @@ AM_CONDITIONAL([OPAL_WANT_SCRIPT_WRAPPER_COMPILERS], [test "$enable_script_wrapp`
`420`	`420`	`#`
`421`	`421`	`# Support per-user config files?`
`422`	`422`	`#`
	`423`	`+OPAL_VAR_SCOPE_PUSH([result])`
`423`	`424`	`AC_ARG_ENABLE([per-user-config-files],`
`424`	`425`	`[AS_HELP_STRING([--enable-per-user-config-files],`
`425`	`426`	`[Disable per-user configuration files, to save disk accesses during job start-up. This is likely desirable for large jobs. Note that this can also be achieved by environment variables at run-time. (default: enabled)])])`
`@@ -430,6 +431,7 @@ else`
`430`	`431`	`fi`
`431`	`432`	`AC_DEFINE_UNQUOTED([OPAL_WANT_HOME_CONFIG_FILES], [$result],`
`432`	`433`	`[Enable per-user config files])`
	`434`	`+OPAL_VAR_SCOPE_POP`
`433`	`435`
`434`	`436`	`#`
`435`	`437`	`# Do we want to enable IPv6 support?`