[gjs] build: Build with mozjs31

[Philip Chimento <pchimento src gnome org>]

commit bce2da5c7bacca228724210802785c083fe3f580
Author: Philip Chimento <philip endlessm com>
Date:   Thu Sep 1 18:41:45 2016 -0700

    build: Build with mozjs31
    
    Requires updating our includes, and also we can get rid of the
    jsfriendapi.h include altogether.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=751252

 configure.ac        |    2 +-
 gjs/jsapi-util.h    |    1 +
 gjs/jsapi-wrapper.h |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8c041f5..ce572cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ m4_define(glib_required_version, 2.50.0)
 GOBJECT_INTROSPECTION_REQUIRE([1.41.4])
 
 GOBJECT_REQUIREMENT="gobject-2.0 >= glib_required_version"
-common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-24"
+common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-31"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 gjs_cairo_packages="cairo cairo-gobject $common_packages"
 gjs_gdbus_packages="$GOBJECT_REQUIREMENT gio-2.0"
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index 2d699cd..50980b0 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 
 #include <glib-object.h>
+#include <mozilla/Maybe.h>
 
 #include "jsapi-wrapper.h"
 #include "gjs/runtime.h"
diff --git a/gjs/jsapi-wrapper.h b/gjs/jsapi-wrapper.h
index 3627c25..f4f57e2 100644
--- a/gjs/jsapi-wrapper.h
+++ b/gjs/jsapi-wrapper.h
@@ -35,6 +35,6 @@
 #pragma GCC system_header
 #endif
 #include <jsapi.h>
-#include <jsdbgapi.h> // Needed by some bits
+#include <js/OldDebugAPI.h>  /* Needed by some bits */
 
 #endif  /* GJS_JSAPI_WRAPPER_H */