From 31f12579ff7ede6b1a0af36f0a4f9caadb1e4a9a Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Thu, 24 Aug 2017 02:16:19 +0800
Subject: [PATCH] Add back options for HAVE_SYNAPTICS and HAVE_THUNDERBOLT

These were casualties in the move to meson that caused dell coldplug
prepare to fail.
---
 meson.build         | 9 +++++++++
 meson_options.txt   | 1 +
 plugins/meson.build | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/meson.build b/meson.build
index 27e8323ef..372438be5 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/meson_options.txt b/meson_options.txt
index e7fc34d8a..04bba4bed 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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')
diff --git a/plugins/meson.build b/plugins/meson.build
index e6f4c4bd9..3dcd9f717 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -23,6 +23,9 @@ endif
 
 if get_option('enable-dell')
 subdir('dell')
+endif
+
+if get_option('enable-synaptics')
 subdir('synapticsmst')
 endif