diff options
| author | Anthony G. Basile <anthony.g.basile@gmail.com> | 2016-12-21 14:27:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 14:27:43 -0500 |
| commit | 29f9e04a96752fc15a210b2f8f7d92081c582d4a (patch) | |
| tree | 22e055982df0a677e0aae1e152f4ab795615ad3b | |
| parent | 823db6f44cf8123ffb4fb18efd1ccfb1f927eb0c (diff) | |
| parent | 2edc3cf8799eecae9cc476611f1259923314f6f8 (diff) | |
Merge pull request #137 from 10ne1/dev/aratiu/upstream-disable-mtd_probe
configure.ac: add option to disable mtd_probe
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | rules/Makefile.am | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
3 files changed, 18 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ff90fe4889..52865a8157 100644 --- a/configure.ac +++ b/configure.ac @@ -284,6 +284,14 @@ fi AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = xyes]) # ------------------------------------------------------------------------------ +# mtd_probe - autoloads FTL module for mtd devices +# ------------------------------------------------------------------------------ +AC_ARG_ENABLE([mtd_probe], + AS_HELP_STRING([--disable-mtd_probe], [disable MTD support]), + [], [enable_mtd_probe=yes]) +AM_CONDITIONAL([ENABLE_MTD_PROBE], [test "x$enable_mtd_probe" = xyes]) + +# ------------------------------------------------------------------------------ AC_CONFIG_FILES([Makefile hwdb/Makefile diff --git a/rules/Makefile.am b/rules/Makefile.am index a403710ed0..e0b17d2ca5 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -16,7 +16,6 @@ dist_udevrules_DATA = \ 70-mouse.rules \ 70-touchpad.rules \ 75-net-description.rules \ - 75-probe_mtd.rules \ 78-sound-card.rules if !ENABLE_RULE_GENERATOR @@ -34,5 +33,10 @@ dist_udevrules_DATA += \ 80-drivers.rules endif +if ENABLE_MTD_PROBE +dist_udevrules_DATA += \ + 75-probe_mtd.rules +endif + install-data-local: $(MKDIR_P) $(DESTDIR)$(udevconfdir)/rules.d diff --git a/src/Makefile.am b/src/Makefile.am index f0ddd0125e..fc052a83e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,10 @@ SUBDIRS += \ ata_id \ cdrom_id \ collect \ - mtd_probe \ scsi_id \ v4l_id + +if ENABLE_MTD_PROBE +SUBDIRS += \ + mtd_probe +endif |