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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: make libparted dependency optional
This patch adds a configure option for libparted.
When disabled, the helper programs using it will not be built.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configure.ac | 11 ++++++++---
src/helpers/Makefile.am | 13 +++++++++----
src/probers/Makefile.am | 6 +++++-
3 files changed, 22 insertions(+), 8 deletions(-)
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -164,9 +164,14 @@ PKG_CHECK_MODULES(POLKIT_BACKEND_1, [pol
AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
AC_SUBST(POLKIT_BACKEND_1_LIBS)
-PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
-AC_SUBST(LIBPARTED_CFLAGS)
-AC_SUBST(LIBPARTED_LIBS)
+AC_ARG_ENABLE(libparted,[ --disable-libparted],enable_libparted=$enableval,enable_libparted=yes)
+
+if test "x$enable_libparted" = xyes; then
+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
+ AC_SUBST(LIBPARTED_CFLAGS)
+ AC_SUBST(LIBPARTED_LIBS)
+fi
+AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
AC_SUBST(DEVMAPPER_CFLAGS)
Index: b/src/helpers/Makefile.am
===================================================================
--- a/src/helpers/Makefile.am
+++ b/src/helpers/Makefile.am
@@ -19,10 +19,6 @@ INCLUDES = \
libexec_PROGRAMS = \
udisks-helper-mkfs \
- udisks-helper-delete-partition \
- udisks-helper-create-partition \
- udisks-helper-modify-partition \
- udisks-helper-create-partition-table \
udisks-helper-change-filesystem-label \
udisks-helper-linux-md-remove-component \
udisks-helper-fstab-mounter \
@@ -37,7 +33,16 @@ if SGUTILS2_ENABLED
libexec_PROGRAMS += udisks-helper-drive-detach
endif
+if LIBPARTED_ENABLED
+libexec_PROGRAMS += \
+ udisks-helper-delete-partition \
+ udisks-helper-create-partition \
+ udisks-helper-modify-partition \
+ udisks-helper-create-partition-table \
+ $(NULL)
+
noinst_LTLIBRARIES = libpartutil.la
+endif
libpartutil_la_SOURCES = partutil.h partutil.c
libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
Index: b/src/probers/Makefile.am
===================================================================
--- a/src/probers/Makefile.am
+++ b/src/probers/Makefile.am
@@ -21,12 +21,16 @@ INCLUDES = \
#
udevhelperdir = $(slashlibdir)/udev
-udevhelper_PROGRAMS = udisks-part-id \
+udevhelper_PROGRAMS = \
udisks-dm-export \
udisks-probe-ata-smart \
udisks-probe-sas-expander \
$(NULL)
+if LIBPARTED_ENABLED
+udevhelper_PROGRAMS += udisks-part-id
+endif
+
if HAVE_LVM2
udevhelper_PROGRAMS += udisks-lvm-pv-export
endif
|
