Updates from ddm4

[awesomized/libmemcached] / m4 / ax_compiler_version.m4

diff --git a/m4/ax_compiler_version.m4 b/m4/ax_compiler_version.m4
index 7f6708d5dd8f2ad5007c28e1630e4a35d1aa41be..a277a9e7a7c12458da1782888a565f922a41c12a 100644 (file)
--- a/m4/ax_compiler_version.m4
+++ b/m4/ax_compiler_version.m4
@@ -1,36 +1,80 @@
-AC_DEFUN([AX_C_COMPILER_VERSION],[
-
-    dnl Print version of C compiler
-    AC_MSG_CHECKING("C Compiler version--$GCC")
-    AS_IF([test "$GCC" = "yes"],[
-      CC_VERSION=`$CC --version | sed 1q` ],[
-      test "$SUNCC" = "yes"],[
-      CC_VERSION=`$CC -V 2>&1 | sed 1q` ],[
-      test "$CLANG" = "yes"],[
-      CC_VERSION=`$CC --version 2>&1 | sed 1q` ],[
-      CC_VERSION=""
-      ])
-    AC_MSG_RESULT("$CC_VERSION")
-    AC_SUBST(CC_VERSION)
-    ])
+# ===========================================================================
+#      https://github.com/BrianAker/ddm4/
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_C_COMPILER_VERSION
+#   AX_CXX_COMPILER_VERSION
+#
+# DESCRIPTION
+#
+#   Capture version of C/C++ compiler
+#
+# LICENSE
+#
+#  Copyright (C) 2012 Brian Aker
+#  All rights reserved.
+#  
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are
+#  met:
+#  
+#      * Redistributions of source code must retain the above copyright
+#  notice, this list of conditions and the following disclaimer.
+#  
+#      * Redistributions in binary form must reproduce the above
+#  copyright notice, this list of conditions and the following disclaimer
+#  in the documentation and/or other materials provided with the
+#  distribution.
+#  
+#      * The names of its contributors may not be used to endorse or
+#  promote products derived from this software without specific prior
+#  written permission.
+#  
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#serial 3
 
+  AC_DEFUN([AX_C_COMPILER_VERSION],[
+      AC_REQUIRE([AX_COMPILER_VENDOR])
+      AC_MSG_CHECKING("C Compiler version")
 
-AC_DEFUN([AX_CXX_COMPILER_VERSION], [
+      AC_CHECK_DECL([__GNUC_PATCHLEVEL__],[GNUCC="yes"], [GNUCC="no"])
+      AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"],[SUNCC="no"])
+      AC_CHECK_DECL([__ICC], [INTELCC="yes"],[INTELCC="no"])
+      AC_CHECK_DECL([__clang__], [CLANG="yes"],[CLANG="no"])
 
-    dnl Check C version while at it
-    AC_REQUIRE([AX_C_COMPILER_VERSION])
+      ax_cc_version=unknown
+      AS_IF([test "$ax_cc_version" = "unknown"],[AS_IF([test "$SUNCC" = "yes"],[ax_cc_version=`$CC -V 2>&1 | sed 1q`])])
+      AS_IF([test "$ax_cc_version" = "unknown"],[AS_IF([test "$CLANG" = "yes"],[ax_cc_version=`$CC --version 2>&1 | sed 1q` ])])
+      AS_IF([test "$ax_cc_version" = "unknown"],[AS_IF([test "$INTELCC" = "yes"],[ax_cc_version=`$CC --version 2>&1 | sed 1q` ])])
+      AS_IF([test "$ax_cc_version" = "unknown"],[AS_IF([test "$GNUCC" = "yes"],[ax_cc_version=`$CC --version | sed 1q` ])])
 
-    dnl Print version of CXX compiler
-    AC_MSG_CHECKING("C++ Compiler version")
-    AS_IF([test "$GCC" = "yes"],[
-      CXX_VERSION=`$CXX --version | sed 1q` ],[
-      test "$SUNCC" = "yes"],[
-      CXX_VERSION=`$CXX -V 2>&1 | sed 1q` ],[
-      test "$CLANG" = "yes"],[
-      CXX_VERSION=`$CXX --version 2>&1 | sed 1q` ],[
-      CXX_VERSION=""
+      AC_MSG_RESULT(["$ax_cc_version"])
+      AC_SUBST([CC_VERSION],["$ax_cc_version"])
       ])
-    AC_MSG_RESULT("$CXX_VERSION")
-    AC_SUBST(CXX_VERSION)
-  ])
 
+  AC_DEFUN([AX_CXX_COMPILER_VERSION], [
+      AC_REQUIRE([AX_C_COMPILER_VERSION])
+      AC_MSG_CHECKING("C++ Compiler version")
+
+      ax_cxx_version=unknown
+      AS_IF([test "$ax_cxx_version" = "unknown"],[AS_IF([test "$GNUCC" = "yes"],[ax_cxx_version=`$CXX --version | sed 1q`])])
+      AS_IF([test "$ax_cxx_version" = "unknown"],[AS_IF([test "$SUNCC" = "yes"],[ax_cxx_version=`$CXX -V 2>&1 | sed 1q`])])
+      AS_IF([test "$ax_cxx_version" = "unknown"],[AS_IF([test "$CLANG" = "yes"],[ax_cxx_version=`$CXX --version 2>&1 | sed 1q`])])
+      AS_IF([test "$ax_cxx_version" = "unknown"],[AS_IF([test "$INTELCC" = "yes"],[ax_cc_version=`$CCX --version 2>&1 | sed 1q` ])])
+
+      AC_MSG_RESULT(["$ax_cxx_version"])
+      AC_SUBST([CXX_VERSION], ["$ax_cxx_version"])
+      ])