Avoid unnecessary callbacks

We don't need to call for heavyweight tests until after the lightweight
tests pass.

Author: roystgnr

acsm_cxx_compiler_standard.m4

@@ -106,7 +106,7 @@ dnl still "count" as earlier standards too.
     AS_IF([test 2017 -gt "$acsm_CXX_STD_MIN"],
           [AX_CXX_COMPILE_STDCXX([17],[$3],[optional])],
           [AX_CXX_COMPILE_STDCXX([17],[$3],[mandatory])])
-    AS_IF([test $acsm_found_cxx -eq 0],
+    AS_IF([test "$HAVE_CXX17" = "1" -a $acsm_found_cxx -eq 0],
            [ACSM_TEST_CXX_ALL])
     AS_IF([test "$HAVE_CXX17" = "1" -a "x$have_cxx_all"=xyes],
           [
@@ -123,7 +123,7 @@ dnl still "count" as earlier standards too.
     AS_IF([test 2014 -gt "$acsm_CXX_STD_MIN"],
           [AX_CXX_COMPILE_STDCXX([14],[$3],[optional])],
           [AX_CXX_COMPILE_STDCXX([14],[$3],[mandatory])])
-    AS_IF([test $acsm_found_cxx -eq 0],
+    AS_IF([test "$HAVE_CXX14" = "1" -a $acsm_found_cxx -eq 0],
            [ACSM_TEST_CXX_ALL])
     AS_IF([test "$HAVE_CXX14" = "1" -a "x$have_cxx_all"=xyes],
           [
@@ -140,7 +140,7 @@ dnl still "count" as earlier standards too.
     AS_IF([test 2011 -gt "$acsm_CXX_STD_MIN"],
           [AX_CXX_COMPILE_STDCXX([11],[$3],[optional])],
           [AX_CXX_COMPILE_STDCXX([11],[$3],[mandatory])])
-    AS_IF([test $acsm_found_cxx -eq 0],
+    AS_IF([test "$HAVE_CXX11" = "1" -a $acsm_found_cxx -eq 0],
            [ACSM_TEST_CXX_ALL])
     AS_IF([test "$HAVE_CXX11" = "1" -a "x$have_cxx_all"=xyes],
           [