diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-01-07 12:27:41 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-01-07 12:27:41 +0000 |
| commit | 7a3b8612300282d33d4c11bbec4c7aea411a4490 (patch) | |
| tree | 2fa2b1d4046714d4044cba3dec12015bf159af92 | |
| parent | 89b457f3f474f68397e496bb00dc1acbde92c5a2 (diff) | |
| download | gdk-pixbuf-7a3b8612300282d33d4c11bbec4c7aea411a4490.tar.gz | |
Remove unused x11 configuration option
Now that gdk-pixbuf-xlib has been moved out of tree into its own
repository, we can drop the `x11` build configuration option.
| -rw-r--r-- | README.msvc | 2 | ||||
| -rw-r--r-- | docs/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | meson_options.txt | 4 |
4 files changed, 1 insertions, 10 deletions
diff --git a/README.msvc b/README.msvc index b39551a57..dbac333a2 100644 --- a/README.msvc +++ b/README.msvc @@ -34,7 +34,7 @@ part of the dependency's build process. Set the PATH, LIB, INCLUDE and PKG_CONFIG_PATH environmental variables as
needed. Run the following in a Visual Studio command prompt:
-python $(PATH_TO_meson.py)\meson.py $(GDK_PIXBUF_SRCDIR) --builldtype=$(BUILD_CONFIG) --prefix=$(PREFIX) -Dman=false -Dx11=false $(OTHER_OPTIONS)
+python $(PATH_TO_meson.py)\meson.py $(GDK_PIXBUF_SRCDIR) --buildtype=$(BUILD_CONFIG) --prefix=$(PREFIX) -Dman=false $(OTHER_OPTIONS)
For $(OTHER_OPTIONS), the following may be of interest, besides the png,
jpeg, japer and tiff options. Prefix each option with -D:
diff --git a/docs/meson.build b/docs/meson.build index 0311e01d2..4615bfaad 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -32,10 +32,6 @@ private_headers = [ 'lzw.h', ] -if not get_option('x11') - private_headers += 'contrib' -endif - if get_option('docs') gnome.gtkdoc('gdk-pixbuf', main_xml: 'gdk-pixbuf.xml', diff --git a/meson.build b/meson.build index 0c725d8ae..6aebaed1d 100644 --- a/meson.build +++ b/meson.build @@ -447,7 +447,6 @@ summary = [ ' documentation: @0@'.format(get_option('docs')), ' man pages: @0@'.format(get_option('man')), ' introspection: @0@'.format(get_option('gir')), - ' x11: @0@'.format(get_option('x11')), ' installed tests: @0@'.format(get_option('installed_tests')), ' relocatable: @0@'.format(get_option('relocatable')), '', diff --git a/meson_options.txt b/meson_options.txt index a7c33a869..1add5a86b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,10 +14,6 @@ option('jasper', description: 'Enable JPEG2000 loader (requires libjasper)', type: 'boolean', value: false) -option('x11', - description: 'Enable X11 support (requires libX11)', - type: 'boolean', - value: true) 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', |