diff --git a/meson.build b/meson.build index 5ef06bac77..caf04fd128 100644 --- a/meson.build +++ b/meson.build @@ -2244,7 +2244,6 @@ final_message = [ ''' Print: @0@'''.format(have_print), ''' Javascript plug-ins: @0@'''.format(have_javascript), ''' Vala plug-ins: @0@'''.format(have_vala), -''' TWAIN (Win32): @0@'''.format(platform_windows), ''' WMF: @0@'''.format(wmf.found()), ''' X11 Mouse Cursor: @0@'''.format(xmc.found()), ''' XPM: @0@'''.format(libxpm.found()), @@ -2259,6 +2258,7 @@ final_message = [ '''Unmaintained Plug-Ins (discouraged except for developers):''', ''' Help Browser: @0@'''.format(get_option('webkit-unmaintained')), ''' Webpage: @0@'''.format(get_option('webkit-unmaintained')), +''' TWAIN (Win32): @0@'''.format(get_option('twain-unmaintained')), '', '''Optional Modules:''', ''' ALSA (MIDI Input): @0@'''.format(alsa.found()), diff --git a/meson_options.txt b/meson_options.txt index d995b83eaf..c88d94c3bf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -51,6 +51,7 @@ option('openexr', type: 'feature', value: 'auto', description: 'Openex option('openmp', type: 'feature', value: 'auto', description: 'OpenMP support') option('print', type: 'boolean', value: true, description: 'Print support') option('webkit-unmaintained',type: 'boolean', value: false, description: 'Help browser and webpage plugins (unmaintained)') +option('twain-unmaintained',type: 'boolean', value: false, description: '32-bit TWAIN plugin for scanning (unmaintained)') option('webp', type: 'feature', value: 'auto', description: 'Webp support') option('wmf', type: 'feature', value: 'auto', description: 'Wmf support') option('xcursor', type: 'feature', value: 'auto', description: 'Xcursor support') diff --git a/plug-ins/meson.build b/plug-ins/meson.build index 9c2595e12b..2754bb9d6a 100644 --- a/plug-ins/meson.build +++ b/plug-ins/meson.build @@ -63,7 +63,7 @@ if get_option('webkit-unmaintained') } endif -if platform_windows and host_cpu_family == 'x86' +if platform_windows and host_cpu_family == 'x86' and get_option('twain-unmaintained') complex_plugins_list += { 'name': 'twain', }