[gnome-documents] build: Get gjs executable from pkg-config

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

commit c97cbcc577889a7d72d4f331e738fb391a54d1a7
Author: Florian MÃllner <fmuellner gnome org>
Date:   Fri Nov 18 01:25:35 2011 +0100

    build: Get gjs executable from pkg-config
    
    Using /usr/bin/env to locate the executable is fine when having
    control over the environment (e.g. 'jhbuild run'), but makes it
    harder in cases like dbus activation. So instead pick the full
    executable path at build time.

 configure.ac           |    3 +++
 src/Makefile.am        |    3 ++-
 src/gnome-documents.in |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 32ba636..9565105 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,9 @@ AC_CACHE_SAVE
 GJS_JS_DIR=`$PKG_CONFIG --variable=datadir gjs-1.0`/gjs-1.0
 AC_SUBST(GJS_JS_DIR)
 
+GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
+AC_SUBST(GJS_CONSOLE)
+
 GLIB_GSETTINGS
 
 EVINCE_MIN_VERSION=3.3.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 5af578c..34b6a80 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,8 @@ do_subst = sed -e 's|@abs_top_srcdir[ ]|$(abs_top_srcdir)|g' \
                -e 's|@libdir[ ]|$(libdir)|g' \
                -e 's|@libexecdir[ ]|$(libexecdir)|g' \
                -e 's|@pkglibdir[ ]|$(pkglibdir)|g' \
-               -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g'
+               -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
+               -e 's|@GJS_CONSOLE[ ]|$(GJS_CONSOLE)|g'
 
 include $(INTROSPECTION_MAKEFILE)
 include Makefile-lib.am
diff --git a/src/gnome-documents.in b/src/gnome-documents.in
index 27c189d..728d2f7 100644
--- a/src/gnome-documents.in
+++ b/src/gnome-documents.in
@@ -12,4 +12,4 @@ else
     export GI_TYPELIB_PATH= libdir@/girepository-1.0:$GI_TYPELIB_PATH
 fi
 
-/usr/bin/env gjs -I @pkgdatadir@/js -c "const Main = imports.main; Main.start();"
+ GJS_CONSOLE@ -I @pkgdatadir@/js -c "const Main = imports.main; Main.start();"