chiark / gitweb /
configure: allow to disable mtd_probe
authorAllin Cottrell <cottrell@wfu.edu>
Tue, 19 Jul 2011 19:16:22 +0000 (21:16 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Tue, 19 Jul 2011 19:16:22 +0000 (21:16 +0200)
Makefile.am
configure.ac

index d2e9b85..e20694f 100644 (file)
@@ -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
index d1327ab..fe96846 100644 (file)
@@ -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],