summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllin Cottrell <cottrell@wfu.edu>2011-07-19 21:16:22 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-07-19 21:16:22 +0200
commit4fb270171d96e55c851e1493b18dfee1b3a4139e (patch)
tree338303b1bd88feb21122f9b5a20349b1fd42f34a
parentace6bfa72525089790b773ab0178e6d1a129357f (diff)
configure: allow to disable mtd_probe
-rw-r--r--Makefile.am25
-rw-r--r--configure.ac8
2 files changed, 22 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index d2e9b855fe..e20694f75f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -295,17 +295,6 @@ 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
# ------------------------------------------------------------------------------
extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
@@ -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 d1327ab5d2..fe9684611b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,14 @@ AC_ARG_ENABLE([rule_generator],
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
# ------------------------------------------------------------------------------
AC_ARG_ENABLE([hwdb],