[gjs: 2/2] Merge branch 'readline' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 8113a0e762f707661674032be3df894fed5a9673
Merge: 9979ed8a a806dbd9
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Jul 20 01:15:33 2018 +0000

    Merge branch 'readline' into 'master'
    
    Create a '--disable-readline' option and use it
    
    See merge request GNOME/gjs!196

 .gitlab-ci.yml | 19 +++++++++++++++----
 configure.ac   | 47 +++++++++++++++++++++++++++++------------------
 2 files changed, 44 insertions(+), 22 deletions(-)
---
diff --cc .gitlab-ci.yml
index d681f8b8,d1b44863..80d2c16f
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -158,9 -152,8 +158,9 @@@ with_logging
    variables:
      TASK_ID: "fedora-x86_64-clang-default-logging-check"
      CC: clang
-     BUILD_OPTS: CPPFLAGS='-DGJS_VERBOSE_ENABLE_PROPS=1 -DGJS_VERBOSE_ENABLE_MARSHAL=1 
-DGJS_VERBOSE_ENABLE_LIFECYCLE=1 -DGJS_VERBOSE_ENABLE_GI_USAGE=1 -DGJS_VERBOSE_ENABLE_CLOSURE=1 
-DGJS_VERBOSE_ENABLE_GSIGNAL=1'
+     BUILD_OPTS: "--disable-readline CPPFLAGS='-DGJS_VERBOSE_ENABLE_PROPS=1 -DGJS_VERBOSE_ENABLE_MARSHAL=1 
-DGJS_VERBOSE_ENABLE_LIFECYCLE=1 -DGJS_VERBOSE_ENABLE_GI_USAGE=1 -DGJS_VERBOSE_ENABLE_CLOSURE=1 
-DGJS_VERBOSE_ENABLE_GSIGNAL=1'"
      TEST: "check"
 +    SCRIPTCHECK: "yes"
    except:
      - schedules