[Telepathy-commits] [telepathy-qt4/master] Correctly check for C++ compiler flags in AS_COMPILER_FLAG

[Olli Salli]

---
 configure.ac           |    1 +
 m4/as-compiler-flag.m4 |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9236bbe..d61097f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ m4_define([tp_qt4_version],
 
 AC_INIT([Telepathy-Qt4], [tp_qt4_version],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy])
+AC_LANG([C++])
 
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/m4/as-compiler-flag.m4 b/m4/as-compiler-flag.m4
index 27d43d5..c98dc67 100644
--- a/m4/as-compiler-flag.m4
+++ b/m4/as-compiler-flag.m4
@@ -1,6 +1,7 @@
 dnl as-compiler-flag.m4 0.1.0
 
-dnl autostars m4 macro for detection of compiler flags
+dnl autostars m4 macro for detection of compiler flags, ported to C++ by
+dnl Olli Salli <olli.salli at collabora.co.uk>
 
 dnl David Schleef <ds at schleef.org>
 
@@ -13,7 +14,8 @@ dnl and ACTION-IF-NOT-ACCEPTED otherwise.
 
 AC_DEFUN([AS_COMPILER_FLAG],
 [
-  AC_MSG_CHECKING([to see if compiler understands $1])
+  AC_LANG_ASSERT([C++])
+  AC_MSG_CHECKING([to see if the C++ compiler understands $1])
 
   save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS $1"
-- 
1.5.6.5