Support building without lvm2app

diff --git a/configure.ac b/configure.ac
index 9bf8e37..592c120 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -156,9 +156,14 @@ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
 AC_SUBST(DEVMAPPER_CFLAGS)
 AC_SUBST(DEVMAPPER_LIBS)
 
-PKG_CHECK_MODULES(LVM2APP, [lvm2app >= 2.1])
-AC_SUBST(LVM2APP_CFLAGS)
-AC_SUBST(LVM2APP_LIBS)
+PKG_CHECK_EXISTS(lvm2app >= 2.1, msg_lvm2app=yes, msg_lvm2app=no)
+if test "x$msg_lvm2app" = "xyes"; then
+  PKG_CHECK_MODULES(LVM2APP, [lvm2app >= 2.1])
+  AC_SUBST(LVM2APP_CFLAGS)
+  AC_SUBST(LVM2APP_LIBS)
+  AC_DEFINE(HAVE_LVM2APP, 1, [Define to 1 if lvm2app is available])
+fi
+AM_CONDITIONAL(LVM2APP_ENABLED, test x$msg_lvm2app = xyes)
 
 PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
 AC_SUBST(LIBATASMART_CFLAGS)
@@ -230,6 +235,8 @@ echo "
         cppflags:                   ${CPPFLAGS}
         xsltproc:                   ${XSLTPROC}
 
+        LVM2 support:               ${msg_lvm2app}
+
         Maintainer mode:            ${USE_MAINTAINER_MODE}
         Building api docs:          ${enable_gtk_doc}
         Building man pages:         ${enable_man_pages}

diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am
index a78d7d1..a4a546f 100644 (file)
--- a/src/probers/Makefile.am
+++ b/src/probers/Makefile.am
@@ -23,11 +23,14 @@ INCLUDES = \
 udevhelperdir = $(slashlibdir)/udev
 udevhelper_PROGRAMS =  udisks-part-id                  \
                        udisks-dm-export                \
-                       udisks-lvm-pv-export            \
                        udisks-probe-ata-smart          \
                        udisks-probe-sas-expander       \
                        $(NULL)
 
+if LVM2APP_ENABLED
+udevhelper_PROGRAMS += udisks-lvm-pv-export
+endif
+
 udisks_part_id_SOURCES = part-id.c
 udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
 udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la

diff --git a/src/probers/udisks-dm-export.c b/src/probers/udisks-dm-export.c
index b008d92..b950c32 100644 (file)
--- a/src/probers/udisks-dm-export.c
+++ b/src/probers/udisks-dm-export.c
@@ -8,8 +8,6 @@
 
 #include <libdevmapper.h>
 
-#include <lvm2app.h>
-
 static void
 usage (void)
 {