[gnome-shell/wip/fmuellner/meson: 1/9] build: Drop check for gjs-console



commit 3178fc343bceec49f1733e079e5b099f819a578c
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu May 25 01:32:28 2017 +0200

    build: Drop check for gjs-console
    
    Nowadays all javascript code is run via small C-wrappers ...
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783206

 configure.ac    |    3 ---
 src/Makefile.am |    3 +--
 2 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 07e77ea..d8b073b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,9 +159,6 @@ AC_SUBST(MUTTER_GIR_DIR)
 MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir $LIBMUTTER`
 AC_SUBST(MUTTER_TYPELIB_DIR)
 
-GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
-AC_SUBST(GJS_CONSOLE)
-
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index fa33712..fb2390e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,8 +42,7 @@ generated_script_substitutions = \
            -e "s|@pkgdatadir[@]|$(pkgdatadir)|g" \
            -e "s|@PYTHON[@]|$(PYTHON)|g" \
            -e "s|@VERSION[@]|$(VERSION)|g" \
-           -e "s|@sysconfdir[@]|$(sysconfdir)|g" \
-           -e "s|@GJS_CONSOLE[@]|$(GJS_CONSOLE)|g"
+           -e "s|@sysconfdir[@]|$(sysconfdir)|g"
 
 gnome-shell-extension-tool: gnome-shell-extension-tool.in Makefile
        $(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]