build: add option to disable hwdb

[tomegun: fix Makefile-man.am, based on fix from Michael Biebl]

diff --git a/Makefile-man.am b/Makefile-man.am
index 45b8238adc247715a511b26edc69cbff3aa5d3ee..68e7483e70be8fb3b6ca0e20604174fca6fea0ae 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -14,7 +14,6 @@ MANPAGES += \
        man/file-hierarchy.7 \
        man/halt.8 \
        man/hostname.5 \
-       man/hwdb.7 \
        man/journalctl.1 \
        man/journald.conf.5 \
        man/kernel-command-line.7 \
@@ -73,7 +72,6 @@ MANPAGES += \
        man/systemd-halt.service.8 \
        man/systemd-hibernate-resume-generator.8 \
        man/systemd-hibernate-resume@.service.8 \
-       man/systemd-hwdb.8 \
        man/systemd-inhibit.1 \
        man/systemd-initctl.service.8 \
        man/systemd-journald.service.8 \
@@ -676,6 +674,12 @@ man/systemd-user.conf.html: man/systemd-system.conf.html
 man/user.conf.d.html: man/systemd-system.conf.html
        $(html-alias)
 
+if ENABLE_HWDB
+MANPAGES += \
+        man/hwdb.7 \
+        man/systemd-hwdb.8
+
+endif
 
 if ENABLE_BACKLIGHT
 MANPAGES += \

diff --git a/Makefile.am b/Makefile.am
index 86bcfdfd8bcdbee29ced7839eb1a4b738aa57603..baa1398a41b2772f1d99594f3b5d3a90addbdece 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3608,6 +3608,7 @@ udevadm_LDADD = \
        libudev-core.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_HWDB
 INSTALL_DIRS += \
        $(sysconfdir)/udev/hwdb.d
 
@@ -3656,6 +3657,7 @@ INSTALL_DATA_HOOKS += \
 
 hwdb-remove-hook:
        -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
 
 # ------------------------------------------------------------------------------
 TESTS += \

diff --git a/configure.ac b/configure.ac
index 90aa3ccf545ae9450d00229d04e97993db21343f..9296c25dbb1b044df2ff44b85f489f2aacd6f861 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1190,6 +1190,11 @@ AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >=
 AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
 AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
 
+# ------------------------------------------------------------------------------
+AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
+       enable_hwdb=$enableval, enable_hwdb=yes)
+AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
+
 # ------------------------------------------------------------------------------
 have_manpages=no
 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
@@ -1430,6 +1435,7 @@ AC_MSG_RESULT([
         dbus:                    ${have_dbus}
         nss-myhostname:          ${have_myhostname}
         gudev:                   ${enable_gudev}
+        hwdb:                    ${enable_hwdb}
         gintrospection:          ${enable_introspection}
         terminal:                ${have_terminal}
         kdbus:                   ${have_kdbus}