Add back options for HAVE_SYNAPTICS and HAVE_THUNDERBOLT

These were casualties in the move to meson that caused dell coldplug
prepare to fail.
This commit is contained in:
Mario Limonciello 2017-08-24 02:16:19 +08:00
parent 6cbc7a6623
commit 31f12579ff
3 changed files with 13 additions and 0 deletions

View File

@ -189,8 +189,17 @@ if get_option('enable-dell')
conf.set('HAVE_DELL', '1')
endif
if get_option('enable-synaptics')
if get_option('enable-dell')
conf.set('HAVE_SYNAPTICS', '1')
else
error('compiling --enable-synaptics requires --enable-dell')
endif
endif
if get_option('enable-thunderbolt')
umockdev = dependency('umockdev-1.0', required: false)
conf.set('HAVE_THUNDERBOLT', '1')
endif
if get_option('enable-systemd')

View File

@ -10,6 +10,7 @@ option('enable-uefi-labels', type : 'boolean', value : true, description : 'enab
option('enable-dell', type : 'boolean', value : true, description : 'enable Dell-specific support')
option('enable-amt', type : 'boolean', value : true, description : 'enable Intel AMT support')
option('enable-thunderbolt', type : 'boolean', value : true, description : 'enable Thunderbolt support')
option('enable-synaptics', type: 'boolean', value: true, description : 'enable Synaptics MST hub support')
option('enable-systemd', type : 'boolean', value : true, description : 'enable systemd support')
option('enable-consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
option('enable-dummy', type : 'boolean', value : false, description : 'enable the dummy device')

View File

@ -23,6 +23,9 @@ endif
if get_option('enable-dell')
subdir('dell')
endif
if get_option('enable-synaptics')
subdir('synapticsmst')
endif