meson: Don't make the man pages build depend on the documentation option

Include all meson build files under docs/ and check with get_option() there.

.gitlab-ci/test-msys2-meson.sh

@@ -39,7 +39,10 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 ccache --zero-stats
 ccache --show-stats
 
-meson _build
+meson \
+    -Dman-pages=true \
+    _build
+
 ninja -C _build
 
 ccache --show-stats

docs/reference/gdk/meson.build

@@ -154,9 +154,11 @@ if wayland_enabled
   src_dir += [ gdkwayland_inc ]
 endif
 
-configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+if get_option('documentation')
 
-gnome.gtkdoc('gdk3',
+    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+    gnome.gtkdoc('gdk3',
                  mode: 'none',
                  main_xml: 'gdk-docs.sgml',
                  src_dir: src_dir,
@@ -175,3 +177,4 @@ gnome.gtkdoc('gdk3',
                  ],
                  html_assets: images,
                  install: true)
+endif

docs/reference/gtk/meson.build

@@ -439,8 +439,6 @@ expand_content_files = [
   'tree_widget.sgml',
 ]
 
-configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
-
 types_conf = configuration_data()
 if os_win32
   types_conf.set('DISABLE_ON_W32', '%')
@@ -454,7 +452,11 @@ else
   types_conf.set('DISABLE_ON_QUARTZ', '')
 endif
 
-gnome.gtkdoc('gtk3',
+if get_option('documentation')
+
+    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+    gnome.gtkdoc('gtk3',
                  mode: 'none',
                  main_xml: 'gtk-docs.sgml',
                  src_dir: [
@@ -486,6 +488,7 @@ gnome.gtkdoc('gtk3',
                  expand_content_files: expand_content_files,
                  html_assets: images,
                  install: true)
+endif
 
 xsltproc = find_program('xsltproc', required: false)
 if get_option('man-pages') and not xsltproc.found()

docs/reference/libgail-util/meson.build

@@ -1,6 +1,7 @@
-configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+if get_option('documentation')
+    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
-gnome.gtkdoc('gail-libgail-util3',
+    gnome.gtkdoc('gail-libgail-util3',
                  mode: 'none',
                  main_xml: 'gail-libgail-util-docs.sgml',
                  src_dir: libgailutilinc,
@@ -17,3 +18,4 @@ gnome.gtkdoc('gail-libgail-util3',
                    '--extra-dir=../gtk',
                  ],
                  install: true)
+endif

docs/reference/meson.build

@@ -1,19 +1,21 @@
-glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+if get_option('documentation')
-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+    glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+    glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 
-cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix')
+    cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix')
-cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
+    cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
 
-gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix')
+    gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix')
-gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
+    gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
 
-docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
+    docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
 
-version_conf = configuration_data()
+    version_conf = configuration_data()
-version_conf.set('GTK_VERSION', meson.project_version())
+    version_conf.set('GTK_VERSION', meson.project_version())
 
-src_dir_conf = configuration_data()
+    src_dir_conf = configuration_data()
-src_dir_conf.set('SRC_DIR', meson.source_root())
+    src_dir_conf.set('SRC_DIR', meson.source_root())
+endif
 
 subdir('gdk')
 subdir('gtk')

docs/tools/meson.build

@@ -1,4 +1,4 @@
-if x11_enabled
+if x11_enabled and get_option('documentation')
   doc_shooter_sources = [
     'shadow.c',
     'shooter.c',

meson.build

@@ -877,10 +877,8 @@ endif
 
 subdir('po')
 subdir('po-properties')
-if get_option('documentation')
+subdir('docs/tools')
-  subdir('docs/tools')
+subdir('docs/reference')
-  subdir('docs/reference')
-endif
 
 install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
 
@@ -903,6 +901,7 @@ summary = [
   '    Colord support: @0@'.format(get_option('colord')),
   '     Introspection: @0@'.format(get_option('introspection')),
   '     Documentation: @0@'.format(get_option('documentation')),
+  '         Man pages: @0@'.format(get_option('man-pages')),
   '       Build tests: @0@'.format(get_option('build-tests')),
   '             Demos: @0@'.format(get_option('demos')),
   '          Examples: @0@'.format(get_option('build-examples')),