[polari/wip/fmuellner/tracker: 1/9] build: Replace custom check for gjs

[Florian Müllner <fmuellner src gnome org>]

commit b7e45191ed4cba34d86f4042e6e9be3cba5703c8
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Jul 27 23:29:04 2016 +0200

    build: Replace custom check for gjs
    
    autoconf-archive now ships a AX_PROG_GJS macro we can use.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769280

 configure.ac            |    7 +------
 src/Makefile.am         |    2 +-
 src/org.gnome.Polari.in |    2 +-
 src/polari-accounts.in  |    2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6996b4c..49ca983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,12 +40,7 @@ PKG_CHECK_MODULES(POLARI,
 
 AC_CHECK_FUNCS([strcasestr])
 
-AC_PATH_PROG([GJS_CONSOLE],[gjs-console],[no])
-
-if test "$GJS_CONSOLE" = "no"; then
-  AC_MSG_ERROR([gjs is required to build Polari])
-fi
-
+AX_PROG_GJS
 AC_PROG_LN_S
 
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
diff --git a/src/Makefile.am b/src/Makefile.am
index cd96bb6..1a71513 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
 do_subst = sed -e 's|@prefix[@]|$(prefix)|g' \
                -e 's|@libdir[@]|$(libdir)|g' \
-               -e 's|@GJS_CONSOLE[@]|$(GJS_CONSOLE)|g' \
+               -e 's|@GJS[@]|$(GJS)|g' \
                -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
                -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
                $(NULL)
diff --git a/src/org.gnome.Polari.in b/src/org.gnome.Polari.in
index f64d69a..71fd920 100644
--- a/src/org.gnome.Polari.in
+++ b/src/org.gnome.Polari.in
@@ -1,4 +1,4 @@
-#!@GJS_CONSOLE@
+#!@GJS@
 imports.package.start({ name: "@PACKAGE_NAME@",
                         version: "@PACKAGE_VERSION@",
                         prefix: "@prefix@",
diff --git a/src/polari-accounts.in b/src/polari-accounts.in
index 1289efb..ea5571e 100644
--- a/src/polari-accounts.in
+++ b/src/polari-accounts.in
@@ -1,4 +1,4 @@
-#!@GJS_CONSOLE@
+#!@GJS@
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;