Fixing a couple of items before releasing.

[awesomized/libmemcached] / m4 / pandora_check_compiler_version.m4

diff --git a/m4/pandora_check_compiler_version.m4 b/m4/pandora_check_compiler_version.m4
index f39174ed1435b621e6fcf2706e2890f31c89ec5c..f490ef27b06fe1b4ce6ccfb9a8dfd952d28806dd 100644 (file)
--- a/m4/pandora_check_compiler_version.m4
+++ b/m4/pandora_check_compiler_version.m4
@@ -6,32 +6,36 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([PANDORA_CHECK_C_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`
-  ],[AS_IF([test "$SUNCC" = "yes"],[
-      CC_VERSION=`$CC -V 2>&1 | sed 1q`
-    ],[
+    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)
     ])
-  ])
-  AC_MSG_RESULT("$CC_VERSION")
-  AC_SUBST(CC_VERSION)
-])
 
 
 AC_DEFUN([PANDORA_CHECK_CXX_VERSION], [
-  dnl Print version of CXX compiler
-  AC_MSG_CHECKING("C++ Compiler version")
-  AS_IF([test "$GCC" = "yes"],[
-    CXX_VERSION=`$CXX --version | sed 1q`
-  ],[AS_IF([test "$SUNCC" = "yes"],[
-      CXX_VERSION=`$CXX -V 2>&1 | sed 1q`
-    ],[
-    CXX_VERSION=""
-    ])
+
+    dnl Check C version while at it
+    AC_REQUIRE([PANDORA_CHECK_C_VERSION])
+
+    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("$CXX_VERSION")
+AC_SUBST(CXX_VERSION)
   ])
-  AC_MSG_RESULT("$CXX_VERSION")
-  AC_SUBST(CXX_VERSION)
-])