[gdk-pixbuf] build: Remove "with" from Meson build options

[Bastien Nocera <hadess src gnome org>]

commit 4ea4a3f9989a57fca57958c85cba1fca60216767
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Nov 29 18:09:55 2017 +0100

    build: Remove "with" from Meson build options
    
    As per https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting
    
    https://bugzilla.gnome.org/show_bug.cgi?id=790995

 docs/reference/gdk-pixbuf/meson.build |    4 ++--
 gdk-pixbuf/meson.build                |    2 +-
 meson_options.txt                     |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/docs/reference/gdk-pixbuf/meson.build b/docs/reference/gdk-pixbuf/meson.build
index fcfcb0d..88e737d 100644
--- a/docs/reference/gdk-pixbuf/meson.build
+++ b/docs/reference/gdk-pixbuf/meson.build
@@ -20,7 +20,7 @@ private_headers = [
   'test-images.h',
 ]
 
-if get_option('with_docs')
+if get_option('docs')
   # This should not be needed, but gnome.gtkdoc() does not copy the
   # .types file into the builddir, if one is found
   configure_file(input: 'gdk-pixbuf.types',
@@ -59,7 +59,7 @@ if get_option('with_docs')
 endif
 
 xsltproc = find_program('xsltproc', required: false)
-if get_option('with_man') and xsltproc.found()
+if get_option('man') and xsltproc.found()
   xlstproc_flags = [
     '--nonet',
     '--stringparam', 'man.output.quietly', '1',
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index a02177c..5ab6f94 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -242,7 +242,7 @@ loaders_cache = custom_target('loaders.cache',
                               build_by_default: true)
 loaders_dep = declare_dependency(sources: [ loaders_cache ])
 
-build_gir = get_option('with_gir') and not meson.is_cross_build()
+build_gir = get_option('gir') and not meson.is_cross_build()
 if build_gir
   gir_args = [
     '--quiet',
diff --git a/meson_options.txt b/meson_options.txt
index a197b74..a5aa93b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -22,15 +22,15 @@ option('builtin_loaders',
        description: 'Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build 
all buildable loaders into gdk-pixbuf',
        type: 'string',
        value: 'none')
-option('with_docs',
+option('docs',
        description: 'Whether to generate the API reference (requires GTK-Doc)',
        type: 'boolean',
        value: false)
-option('with_gir',
+option('gir',
        description: 'Whether to generate the API introspection data (requires GObject-Introspection)',
        type: 'boolean',
        value: true)
-option('with_man',
+option('man',
        description: 'Whether to generate man pages (requires xlstproc)',
        type: 'boolean',
        value: true)