quirks: add an option to enable/disable quirks

Change-Id: I75aef0d1b1f98b4e2491c9197d1cf8ad54c59341

diff --git a/meson.build b/meson.build
index 31cf8fe41e696ff6365587076ba6125d39b51cb5..48b9ec1b950c8d1c32094fe95efc8f7b475a80f4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -330,7 +330,7 @@ libinput_data_override_path = dir_overrides / 'local-overrides.quirks'
 config_h.set_quoted('LIBINPUT_QUIRKS_DIR', dir_data)
 config_h.set_quoted('LIBINPUT_QUIRKS_OVERRIDE_FILE', libinput_data_override_path)
 
-if get_option('install-quirks-data')
+if get_option('quirks-enable')
 quirks_data = [
        'quirks/10-generic-keyboard.quirks',
        'quirks/10-generic-lid.quirks',
@@ -361,6 +361,7 @@ quirks_data = [
        'quirks/50-system-system76.quirks',
        'quirks/50-system-toshiba.quirks',
 ]
+config_h.set10('ENABLE_QUIRKS', 1)
 else
 quirks_data = []
 endif

diff --git a/meson_options.txt b/meson_options.txt
index be3d31469c6eb5c8f051b465ad02db29d4f3e08b..5edee68fa43c0bc7d7c72622d36cda698f6fed79 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -42,7 +42,7 @@ option('udev-enable',
        type: 'boolean',
        value: true,
        description: 'Enable to build udev files [default=true]')
-option('install-quirks-data',
+option('quirks-enable',
        type: 'boolean',
        value: true,
        description: 'Install data files for quirks [default=true]')

diff --git a/packaging/libinput.spec b/packaging/libinput.spec
index 3b45995d3a0149c30659c13ff1fcdece96a8d5d1..e4968e5f20f068990e3a4f9057ed2b2ea4ca75a4 100644 (file)
--- a/packaging/libinput.spec
+++ b/packaging/libinput.spec
@@ -60,7 +60,7 @@ meson setup \
     -Dzshcompletiondir=no \
     -Dtools-enable=false \
     -Dudev-enable=false \
-    -Dinstall-quirks-data=false \
+    -Dquirks-enable=false \
     --prefix /usr \
     --libdir %{_libdir} \
     --bindir %{_bindir} \

diff --git a/src/libinput.c b/src/libinput.c
index 7606c99e0a3e228fcd256c52cc890b476711d75d..e6f552f6b85f0c07b9fea42410a53366ce188177 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -2184,6 +2184,7 @@ libinput_init_quirks(struct libinput *libinput)
        /* If we fail, we'll fail next time too */
        libinput->quirks_initialized = true;
 
+#ifdef ENABLE_QUIRKS
        data_path = getenv("LIBINPUT_QUIRKS_DIR");
        if (!data_path) {
                data_path = LIBINPUT_QUIRKS_DIR;
@@ -2209,6 +2210,7 @@ libinput_init_quirks(struct libinput *libinput)
        }
 
        libinput->quirks = quirks;
+#endif
 }
 
 static void