1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Sat, 29 Oct 2011 18:38:26 +0200
Subject: [PATCH] make devmapper dependency optional
This patch adds a configure option for devmapper.
When disabled, the helper program using it will not be built.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configure.ac | 11 ++++++++---
src/Makefile.am | 5 ++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index fc99275..751cea7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,9 +162,14 @@ if test "x$enable_libparted" = xyes; then
fi
AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
-PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
-AC_SUBST(DEVMAPPER_CFLAGS)
-AC_SUBST(DEVMAPPER_LIBS)
+AC_ARG_ENABLE(devmapper,[ --disable-devmapper],enable_devmapper=$enableval,enable_devmapper=yes)
+
+if test "x$enable_devmapper" = xyes; then
+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
+ AC_SUBST(DEVMAPPER_CFLAGS)
+ AC_SUBST(DEVMAPPER_LIBS)
+fi
+AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
AC_SUBST(LIBATASMART_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 51fa699..db15102 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,7 +154,7 @@ devkit_disks_helper_drive_poll_LDADD = $(GLIB_LIBS)
# TODO: move to udev
udevhelperdir = $(slashlibdir)/udev
-udevhelper_PROGRAMS = devkit-disks-dm-export devkit-disks-probe-ata-smart
+udevhelper_PROGRAMS = devkit-disks-probe-ata-smart
if LIBPARTED_ENABLED
udevhelper_PROGRAMS += devkit-disks-part-id
@@ -163,9 +163,12 @@ devkit_disks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
devkit_disks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) libpartutil.la
endif
+if DEVMAPPER_ENABLED
+udevhelper_PROGRAMS += devkit-disks-dm-export
devkit_disks_dm_export_SOURCES = devkit-disks-dm-export.c
devkit_disks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
devkit_disks_dm_export_LDADD = $(DEVMAPPER_LIBS)
+endif
devkit_disks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
devkit_disks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
|
