shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-25 06:03:40 +03:00
Code

build: add option to disable hwdb

Browse Source 
[tomegun: fix Makefile-man.am, based on fix from Michael Biebl]
This commit is contained in:
Umut Tezduyar Lindskog 2014-12-19 11:47:30 +01:00 committed by Tom Gundersen
parent 7a6f145746
commit fe659612e4
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile-man.am
View File

@ -14,7 +14,6 @@ MANPAGES += \
man/file-hierarchy.7 \ man/file-hierarchy.7 \
man/halt.8 \ man/halt.8 \
man/hostname.5 \ man/hostname.5 \
man/hwdb.7 \
man/journalctl.1 \ man/journalctl.1 \
man/journald.conf.5 \ man/journald.conf.5 \
man/kernel-command-line.7 \ man/kernel-command-line.7 \
@ -73,7 +72,6 @@ MANPAGES += \
man/systemd-halt.service.8 \ man/systemd-halt.service.8 \
man/systemd-hibernate-resume-generator.8 \ man/systemd-hibernate-resume-generator.8 \
man/systemd-hibernate-resume@.service.8 \ man/systemd-hibernate-resume@.service.8 \
man/systemd-hwdb.8 \
man/systemd-inhibit.1 \ man/systemd-inhibit.1 \
man/systemd-initctl.service.8 \ man/systemd-initctl.service.8 \
man/systemd-journald.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 man/user.conf.d.html: man/systemd-system.conf.html
$(html-alias) $(html-alias)
if ENABLE_HWDB
MANPAGES += \
man/hwdb.7 \
man/systemd-hwdb.8
endif
if ENABLE_BACKLIGHT if ENABLE_BACKLIGHT
MANPAGES += \ MANPAGES += \

2
Makefile.am
View File

@ -3608,6 +3608,7 @@ udevadm_LDADD = \
libudev-core.la libudev-core.la
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
if ENABLE_HWDB
INSTALL_DIRS += \ INSTALL_DIRS += \
$(sysconfdir)/udev/hwdb.d $(sysconfdir)/udev/hwdb.d
@ -3656,6 +3657,7 @@ INSTALL_DATA_HOOKS += \
hwdb-remove-hook: hwdb-remove-hook:
-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
endif
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
TESTS += \ TESTS += \

6
configure.ac
View File

@ -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"]) 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]) ]) 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 have_manpages=no
AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
@ -1430,6 +1435,7 @@ AC_MSG_RESULT([
dbus: ${have_dbus} dbus: ${have_dbus}
nss-myhostname: ${have_myhostname} nss-myhostname: ${have_myhostname}
gudev: ${enable_gudev} gudev: ${enable_gudev}
hwdb: ${enable_hwdb}
gintrospection: ${enable_introspection} gintrospection: ${enable_introspection}
terminal: ${have_terminal} terminal: ${have_terminal}
kdbus: ${have_kdbus} kdbus: ${have_kdbus}