[gnome-builder: 21/139] build: update and remove various meson options

[Christian Hergert <chergert src gnome org>]

commit 0ab099cb16093e67ce3a53b8fbb0fa5b0a0ae7a0
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 15:10:54 2019 -0800

    build: update and remove various meson options

 doc/sdk/meson.build | 4 ++++
 meson_options.txt   | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/doc/sdk/meson.build b/doc/sdk/meson.build
index 1f3327679..5953184bc 100644
--- a/doc/sdk/meson.build
+++ b/doc/sdk/meson.build
@@ -1,3 +1,5 @@
+if get_option('docs')
+
 subdir('xml')
 
 private_headers = ['config.h']
@@ -53,3 +55,5 @@ gnome.gtkdoc('libide',
        ],
             install: true)
 
+
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 0db9d5cec..b6b9ae390 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -11,10 +11,7 @@ option('with_channel',
 )
 
 option('help', type: 'boolean', value: false)
-option('with_editorconfig', type: 'boolean')
-option('with_webkit', type: 'boolean')
-option('with_vapi', type: 'boolean')
-option('with_docs', type: 'boolean', value: false)
+option('docs', type: 'boolean', value: false)
 
 option('network_tests', type: 'boolean', value: true, description: 'Allow networking in unit-tests')