[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-73-g5108fe1

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  5108fe176d1a10c57ac703dd1acbedcb47d6c937 (commit)
      from  24a0140526c3bf5a2f71262d1c39798447fb3b53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/5108fe176d1a10c57ac703dd1acbedcb47d6c937

commit 5108fe176d1a10c57ac703dd1acbedcb47d6c937
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Sun Mar 2 16:18:11 2014 -0600

    Revert aclocal_cc.m4 commits that tweak VA_ARGS.
    
    The following commits are reverted.
    
    1. "Better checks for VA_ARGS."; commit
    de80ec8704071f3b9c810509fb8acee345865902.
    
    2. "Warning squash for clang."; commit
    ccf7f70c3252d4e38933de00dd2f4bb49a389a61.
    
    The clang warning this was originally trying to solve has been fixed
    by the newer versions of clang, AFAICT.
    
    Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>

diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4
index 2612e94..23172d9 100644
--- a/confdb/aclocal_cc.m4
+++ b/confdb/aclocal_cc.m4
@@ -1635,44 +1635,21 @@ AC_DEFUN([PAC_STRUCT_ALIGNMENT],[
 	   pac_cv_struct_alignment="eight"
 	fi
 ])
-
+dnl
 dnl PAC_C_MACRO_VA_ARGS
 dnl
 dnl will AC_DEFINE([HAVE_MACRO_VA_ARGS]) if the compiler supports C99 variable
 dnl length argument lists in macros (#define foo(...) bar(__VA_ARGS__))
 AC_DEFUN([PAC_C_MACRO_VA_ARGS],[
     AC_MSG_CHECKING([for variable argument list macro functionality])
-
-    # check if the program links correctly
-    rm -f pac_test1.log pac_test2.log
-
-    PAC_LINK_IFELSE_LOG([pac_test1.log],[AC_LANG_PROGRAM([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([
         #include <stdio.h>
         #define conftest_va_arg_macro(...) printf(__VA_ARGS__)
     ],
     [conftest_va_arg_macro("a test %d", 3);])],
-    prog_links=yes,prog_links=no)
-
-    PAC_LINK_IFELSE_LOG([pac_test2.log],[AC_LANG_PROGRAM([
-        #include <stdio.h>
-        #define conftest_va_arg_macro printf
-    ],
-    [conftest_va_arg_macro("a test %d", 3);])])
-
-    # If the program linked OK, make sure there were no warnings
-    if test "$prog_links" = "yes" -a "`diff pac_test1.log pac_test2.log`" = "" ; then
-       AC_DEFINE([HAVE_MACRO_VA_ARGS],[1],[Define if C99-style variable argument list macro functionality])
-       AC_MSG_RESULT([yes])
-    elif "`diff pac_test1.log pac_test2.log`" = "" ; then
-       AC_MSG_RESULT([no, compiler generates warnings])
-       echo "With VA_ARGS:"
-       cat pac_test1.log
-       echo "Without VA_ARGS:"
-       cat pac_test2.log
-    else
-       AC_MSG_RESULT([no])
-    fi
-    rm -f pac_test1.log pac_test2.log
+    [AC_DEFINE([HAVE_MACRO_VA_ARGS],[1],[Define if C99-style variable argument list macro functionality])
+     AC_MSG_RESULT([yes])],
+    [AC_MSG_RESULT([no])])
 ])dnl
 
 # Will AC_DEFINE([HAVE_BUILTIN_EXPECT]) if the compiler supports __builtin_expect.

-----------------------------------------------------------------------

Summary of changes:
 confdb/aclocal_cc.m4 |   33 +++++----------------------------
 1 files changed, 5 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
MPICH primary repository