diff --git a/config/ompi_check_compiler_works.m4 b/config/ompi_check_compiler_works.m4
index 9dde457abc..b99230728c 100644
--- a/config/ompi_check_compiler_works.m4
+++ b/config/ompi_check_compiler_works.m4
@@ -5,6 +5,7 @@ dnl                         University Research and Technology
 dnl                         Corporation.  All rights reserved.
 dnl Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
 dnl                         reserved. 
+dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -37,7 +38,7 @@ AC_DEFUN([OMPI_CHECK_COMPILER_WORKS],
                            [AS_VAR_SET(lang_var, ["links (cross compiling)"])],
                            [AS_VAR_SET(lang_var, ["no"])])])
          AC_LANG_POP($1)])
-    AS_IF([test "AS_VAR_GET(lang_var)" = "no"],
+    AS_VAR_IF(lang_var, [no], 
           [cat <<EOF >&2
 **********************************************************************
 * It appears that your $1 compiler is unable to produce working
diff --git a/config/ompi_check_func_lib.m4 b/config/ompi_check_func_lib.m4
index 40e542eedc..0c76562735 100644
--- a/config/ompi_check_func_lib.m4
+++ b/config/ompi_check_func_lib.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -36,8 +37,8 @@ AC_DEFUN([OMPI_CHECK_FUNC_LIB],[
                  [AS_VAR_SET(ompi_var, "yes")],
                  [AS_VAR_SET(ompi_var, "not found")])
              LIBS="$LIBS_save"])])
-    AS_IF([test "AS_VAR_GET(ompi_var)" = "yes"],
-          [LIBS="$LIBS -l$2"])
+    AS_VAR_IF(ompi_var, [yes],
+              [LIBS="$LIBS -l$2"])
 
     # see if we actually have $1.  Use AC_CHECK_FUNCS so that it
     # does the glibc "not implemented" check.  Will use the current LIBS,
diff --git a/config/ompi_find_type.m4 b/config/ompi_find_type.m4
index 8368ac3839..3fefc84c45 100644
--- a/config/ompi_find_type.m4
+++ b/config/ompi_find_type.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -41,16 +42,12 @@ AC_DEFUN([OMPI_FIND_TYPE],[
                [AS_VAR_SET(type_var, "not found")],
                [AS_VAR_SET(type_var, "$oft_real_type")])])
 
-    AS_IF([test "AS_VAR_GET(type_var)" = "not found"],
+    AS_VAR_IF(type_var, ["not found"],
           [AC_MSG_WARN([*** Did not find corresponding C type])
            AS_IF([test "$oft_abort_on_fail" != "no"],
                  [AC_MSG_ERROR([Cannot continue])])])
 
-    if test "AS_VAR_GET(type_var)" = "not found" ; then
-        $5=
-    else
-        $5=AS_VAR_GET(type_var)
-    fi
+    AS_VAR_IF(type_var, ["not found"], [$5=], [AS_VAR_COPY([$5], [type_var])])
 
     unset oft_real_type oft_target_size
 
diff --git a/config/ompi_lang_link_with_c.m4 b/config/ompi_lang_link_with_c.m4
index 82918c8474..0b6cb3373b 100644
--- a/config/ompi_lang_link_with_c.m4
+++ b/config/ompi_lang_link_with_c.m4
@@ -2,6 +2,7 @@ dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
 dnl                         reserved. 
+dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -62,6 +63,6 @@ extern int testfunc(int);
      rm -f conftest_c.$ac_ext
      AC_LANG_POP(C)])
 
-  AS_IF([test "AS_VAR_GET([lang_var])" = "yes"], [$2], [$3])
+  AS_VAR_IF(lang_var, [yes], [$2], [$3])
   AS_VAR_POPDEF([lang_var])dnl
 ])
diff --git a/ompi/config/f77_check_real16_c_equiv.m4 b/ompi/config/f77_check_real16_c_equiv.m4
index 10fb9dabfc..992a43f08d 100644
--- a/ompi/config/f77_check_real16_c_equiv.m4
+++ b/ompi/config/f77_check_real16_c_equiv.m4
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2008-2010 Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -67,7 +67,7 @@ AC_DEFUN([OMPI_F77_CHECK_REAL16_C_EQUIV],[
         ])
     ])
 
-    ompi_real16_matches_c=AS_VAR_GET([real16_matches_c_var])
+    AS_VAR_COPY([ompi_real16_matches_c], [real16_matches_c_var])
     AS_VAR_POPDEF([real16_matches_c_var])
 
     AS_IF([test "$ompi_real16_matches_c" = "yes"],
diff --git a/ompi/config/f77_check_type.m4 b/ompi/config/f77_check_type.m4
index 87fd013ceb..b2c99e4121 100644
--- a/ompi/config/f77_check_type.m4
+++ b/ompi/config/f77_check_type.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -34,7 +35,7 @@ AC_DEFUN([OMPI_F77_CHECK_TYPE],[
              [AS_VAR_SET(type_var, "no")])
          AC_LANG_POP([Fortran 77])])
 
-    AS_IF([test "AS_VAR_GET(type_var)" = "yes"], [$2], [$3])
+    AS_VAR_IF(type_var, [yes], [$2], [$3])
     AS_VAR_POPDEF([type_var])dnl
 ])dnl
 
diff --git a/ompi/config/f77_get_alignment.m4 b/ompi/config/f77_get_alignment.m4
index aa3d318392..955714ab70 100644
--- a/ompi/config/f77_get_alignment.m4
+++ b/ompi/config/f77_get_alignment.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -90,7 +91,7 @@ EOF
                  AC_MSG_ERROR([Could not determine alignment of $1])])])
         rm -rf conftest*])
 
-    $2=AS_VAR_GET([type_var])
+    AS_VAR_COPY([$2], [type_var])
     AS_VAR_POPDEF([type_var])dnl
     OMPI_VAR_SCOPE_POP
 ])
diff --git a/ompi/config/f77_get_sizeof.m4 b/ompi/config/f77_get_sizeof.m4
index f52b0ab722..b5755c6a10 100644
--- a/ompi/config/f77_get_sizeof.m4
+++ b/ompi/config/f77_get_sizeof.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -80,6 +81,6 @@ EOF
         unset happy ompi_conftest_h
         rm -rf conftest*])
 
-    $2=AS_VAR_GET(type_var)
+    AS_VAR_COPY([$2], [type_var])
     AS_VAR_POPDEF([type_var])dnl
 ])dnl
diff --git a/ompi/config/f90_check_type.m4 b/ompi/config/f90_check_type.m4
index f85595ab30..52a91eb9ce 100644
--- a/ompi/config/f90_check_type.m4
+++ b/ompi/config/f90_check_type.m4
@@ -34,6 +34,6 @@ end]])],
              [AS_VAR_SET(type_var, "no")])
          AC_LANG_POP([Fortran])])
 
-    AS_IF([test "AS_VAR_GET(type_var)" = "yes"], [$2], [$3])
+    AS_VAR_IF(type_var, [yes], [$2], [$3])
     AS_VAR_POPDEF([type_var])dnl
 ])dnl
diff --git a/ompi/config/f90_find_module_include_flag.m4 b/ompi/config/f90_find_module_include_flag.m4
index fa6d02383a..6809954d6f 100644
--- a/ompi/config/f90_find_module_include_flag.m4
+++ b/ompi/config/f90_find_module_include_flag.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -71,7 +72,7 @@ EOF
             rm -rf conftest.$$
         ])
 
-        OMPI_FC_MODULE_FLAG=AS_VAR_GET(f90_inc_var)
+        AS_VAR_COPY([OMPI_FC_MODULE_FLAG], [f90_inc_var])
         if test "$OMPI_FC_MODULE_FLAG" = ""; then
         AC_MSG_WARN([*** Could not determine the f90 compiler flag to indicate where modules reside])
         AC_MSG_ERROR([*** Cannot continue])
diff --git a/ompi/config/f90_get_int_kind.m4 b/ompi/config/f90_get_int_kind.m4
index 2fd69b9d22..aa4fd45911 100644
--- a/ompi/config/f90_get_int_kind.m4
+++ b/ompi/config/f90_get_int_kind.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -54,7 +55,7 @@ EOF
         unset happy ompi_conftest_h
         rm -rf conftest*])
 
-        $3=AS_VAR_GET(type_var)
+        AS_VAR_COPY([$3], [type_var])
     else
         $3=0
     fi
diff --git a/ompi/config/f90_get_precision.m4 b/ompi/config/f90_get_precision.m4
index a75110ca51..682b772928 100644
--- a/ompi/config/f90_get_precision.m4
+++ b/ompi/config/f90_get_precision.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -55,6 +56,6 @@ EOF
         unset happy
         rm -rf conftest*])
 
-    $2=AS_VAR_GET([type_var])
+    AS_VAR_COPY([$2], [type_var])
     AS_VAR_POPDEF([type_var])dnl
 ])
diff --git a/ompi/config/f90_get_range.m4 b/ompi/config/f90_get_range.m4
index ef6169719b..90c76be791 100644
--- a/ompi/config/f90_get_range.m4
+++ b/ompi/config/f90_get_range.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -55,6 +56,6 @@ EOF
         unset happy
         rm -rf conftest*])
 
-    $2=AS_VAR_GET([type_var])
+    AS_VAR_COPY([$2], [type_var])
     AS_VAR_POPDEF([type_var])dnl
 ])
diff --git a/ompi/config/f90_get_sizeof.m4 b/ompi/config/f90_get_sizeof.m4
index 8a9d626157..8148056ab7 100644
--- a/ompi/config/f90_get_sizeof.m4
+++ b/ompi/config/f90_get_sizeof.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 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) 2010      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -80,6 +81,6 @@ EOF
         unset happy ompi_conftest_h
         rm -rf conftest*])
 
-    $2=AS_VAR_GET(type_var)
+    AS_VAR_COPY([$2], [type_var])
     AS_VAR_POPDEF([type_var])dnl
 ])dnl