[gjs/wip/xulrunner-2-rebase2: 1/9] Bump required glib to 2.18

[Colin Walters <walters src gnome org>]

commit 9cfe6782067af1cf0389bf394dadc89987f88c9a
Author: Colin Walters <walters verbum org>
Date:   Thu Oct 21 11:09:05 2010 -0400

    Bump required glib to 2.18
    
    The verison of g-i we require itself needs 2.24.  Now, I'm not
    actually going to claim we work with 2.18, but doing this allows me to
    drop the glib stuff from compat.h at least.

 configure.ac |    2 +-
 gjs/compat.h |    8 --------
 2 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3db7e68..98fe77a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ fi
 AM_CONDITIONAL([ENABLE_COVERAGE], [test x$enable_coverage = xyes])
 
 # Checks for libraries.
-m4_define(gobject_required_version, 2.16.0)
+m4_define(gobject_required_version, 2.18.0)
 
 # Look for Spidermonkey. If js-config exists, use that;
 # otherwise we try some pkgconfig files from various distributions.
diff --git a/gjs/compat.h b/gjs/compat.h
index c634b06..3976064 100644
--- a/gjs/compat.h
+++ b/gjs/compat.h
@@ -24,18 +24,10 @@
 #ifndef __GJS_COMPAT_H__
 #define __GJS_COMPAT_H__
 
-#include <glib.h>
-
 G_BEGIN_DECLS
 
 #include "config.h"
 
-#if !GLIB_CHECK_VERSION(2, 18, 0)
-
-#define g_set_error_literal(error, domain, code, message) g_set_error(error, domain, code, "%s", message)
-#define g_dpgettext2(domain, ctx, msgid) dgettext(domain, msgid)
-
-#endif
 
 /* See https://bugzilla.gnome.org/show_bug.cgi?id=622896 */
 #ifndef HAVE_MOZJS_2