From 4fb270171d96e55c851e1493b18dfee1b3a4139e Mon Sep 17 00:00:00 2001 From: Allin Cottrell Date: Tue, 19 Jul 2011 21:16:22 +0200 Subject: [PATCH] configure: allow to disable mtd_probe --- Makefile.am | 25 ++++++++++++++----------- configure.ac | 8 ++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index d2e9b855..e20694f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -294,17 +294,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la libexec_PROGRAMS += extras/v4l_id/v4l_id dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules -# ------------------------------------------------------------------------------ -# mtd_probe - autoloads FTL module for mtd devices -# ------------------------------------------------------------------------------ -extras_mtd_probe_mtd_probe_SOURCES = \ - extras/mtd_probe/mtd_probe.c \ - extras/mtd_probe/mtd_probe.h \ - extras/mtd_probe/probe_smartmedia.c -extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) -dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules -libexec_PROGRAMS += extras/mtd_probe/mtd_probe - # ------------------------------------------------------------------------------ # accelerometer - updates device orientation # ------------------------------------------------------------------------------ @@ -334,6 +323,20 @@ dist_udevrules_DATA += \ extras/rule_generator/75-persistent-net-generator.rules endif +if ENABLE_MTD_PROBE +# ------------------------------------------------------------------------------ +# mtd_probe - autoloads FTL module for mtd devices +# ------------------------------------------------------------------------------ +extras_mtd_probe_mtd_probe_SOURCES = \ + extras/mtd_probe/mtd_probe.c \ + extras/mtd_probe/mtd_probe.h \ + extras/mtd_probe/probe_smartmedia.c +extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) +dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules +libexec_PROGRAMS += extras/mtd_probe/mtd_probe + +endif + if ENABLE_HWDB # ------------------------------------------------------------------------------ # usb/pci-db - read vendor/device string database diff --git a/configure.ac b/configure.ac index d1327ab5..fe968461 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,14 @@ AC_ARG_ENABLE([rule_generator], [], [enable_rule_generator=yes]) 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]) + # ------------------------------------------------------------------------------ # usb/pci-db - read vendor/device string database # ------------------------------------------------------------------------------ -- 2.39.5