changeset 795:9eadfcabb570

Make it build with xulrunner 27
author Jiri Vanek <jvanek@redhat.com>
date Fri, 21 Feb 2014 15:48:43 +0100
parents 1d4c7bc579d8
children c4a622149b5c
files ChangeLog acinclude.m4 configure.ac
diffstat 3 files changed, 27 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 19 15:38:50 2014 +0100
+++ b/ChangeLog	Fri Feb 21 15:48:43 2014 +0100
@@ -1,3 +1,8 @@
+2014-02-21  Jiri Vanek  <jvanek@redhat.com>
+
+	* acinclude.m4:	Added (IT_CHECK_XULRUNNER_API_VERSION_C11) macro
+	* configure.ac: added call of IT_CHECK_XULRUNNER_API_VERSION_C11
+
 2014-02-19  Michal Vyskocil  <mvyskocil@suse.com>
 
 	Put link flags to the end of gcc command line to prevent link failures
--- a/acinclude.m4	Wed Feb 19 15:38:50 2014 +0100
+++ b/acinclude.m4	Fri Feb 21 15:48:43 2014 +0100
@@ -515,6 +515,27 @@
   AC_LANG_POP(C++)
 ])
 
+AC_DEFUN_ONCE([IT_CHECK_XULRUNNER_REQUIRES_C11],
+[
+  AC_MSG_CHECKING([for xulrunner enforcing C++11 standard])
+  AC_LANG_PUSH(C++)
+  CXXFLAGS_BACKUP="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS"" ""$MOZILLA_CFLAGS"
+  AC_COMPILE_IFELSE([
+    #include <npapi.h>
+    #include <npruntime.h>]
+    [void setnpptr (NPVariant *result)
+    {VOID_TO_NPVARIANT(*result);}
+    ],[
+    AC_MSG_RESULT(no)
+    CXXFLAGS="$CXXFLAGS_BACKUP"
+    ],[
+    AC_MSG_RESULT(yes)
+    CXXFLAGS="$CXXFLAGS_BACKUP -std=c++11"
+  ])
+  AC_LANG_POP(C++)
+])
+
 AC_DEFUN([IT_CHECK_WITH_GCJ],
 [
   AC_MSG_CHECKING([whether to compile ecj natively])
--- a/configure.ac	Wed Feb 19 15:38:50 2014 +0100
+++ b/configure.ac	Fri Feb 21 15:48:43 2014 +0100
@@ -83,6 +83,7 @@
 IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
 IT_CHECK_GLIB_VERSION
 IT_CHECK_XULRUNNER_API_VERSION
+IT_CHECK_XULRUNNER_REQUIRES_C11
 
 #
 # Find optional depedencies