summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac20
-rw-r--r--hwdb/Makefile.am6
-rw-r--r--rules/Makefile.am6
-rw-r--r--src/udev/Makefile.am4
-rw-r--r--src/udev/udev-builtin.c2
-rw-r--r--src/udev/udev.h4
6 files changed, 8 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac
index 5ddf386c19..31f076ad1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,28 +227,18 @@ AC_CHECK_DECL([unshare],
# ------------------------------------------------------------------------------
AC_ARG_ENABLE([gudev],
- AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
- [], [enable_gudev=yes])
+ AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
+ [], [enable_gudev=yes])
AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0]) ])
AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([keymap],
- AS_HELP_STRING([--disable-keymap], [disable keymap fixup support @<:@default=enabled@:>@]),
- [], [enable_keymap=yes])
-
-if test "x$enable_keymap" = "xyes"; then
- AC_PATH_TOOL(GPERF, gperf)
- if test -z "$GPERF" ; then
- AC_MSG_ERROR([*** gperf not found])
- fi
- AC_DEFINE([ENABLE_KEYMAP], [1], [Define if we are enabling rule generator])
+AC_PATH_TOOL(GPERF, gperf)
+if test -z "$GPERF" ; then
+ AC_MSG_ERROR([*** gperf not found])
fi
-AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
-
# ------------------------------------------------------------------------------
-
GTK_DOC_CHECK([1.18],[--flavour no-tmpl])
AM_CONDITIONAL([ENABLE_GTK_DOC],[test "x$enable_gtk_doc" = "xyes"])
diff --git a/hwdb/Makefile.am b/hwdb/Makefile.am
index 192fa7e132..6ecff09c09 100644
--- a/hwdb/Makefile.am
+++ b/hwdb/Makefile.am
@@ -10,10 +10,6 @@ dist_udevhwdb_DATA = \
20-sdio-vendor-model.hwdb \
20-usb-classes.hwdb \
20-usb-vendor-model.hwdb \
+ 60-keyboard.hwdb \
70-mouse.hwdb \
70-touchpad.hwdb
-
-if ENABLE_KEYMAP
-dist_udevhwdb_DATA += \
- 60-keyboard.hwdb
-endif
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 15a3a903f4..336021ece4 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -5,6 +5,7 @@ dist_udevrules_DATA = \
50-udev-default.rules \
60-cdrom_id.rules \
60-drm.rules \
+ 60-keyboard.rules \
60-persistent-alsa.rules \
60-persistent-input.rules \
60-persistent-serial.rules \
@@ -31,10 +32,5 @@ dist_udevrules_DATA += \
80-drivers.rules
endif
-if ENABLE_KEYMAP
-dist_udevrules_DATA += \
- 60-keyboard.rules
-endif
-
install-data-local:
$(MKDIR_P) $(DESTDIR)$(udevconfdir)/rules.d
diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am
index 4a47f63063..b6583f0070 100644
--- a/src/udev/Makefile.am
+++ b/src/udev/Makefile.am
@@ -100,7 +100,7 @@ EXTRA_DIST = \
CLEANFILES = \
udev.pc
-if ENABLE_KEYMAP
+
AM_CPPFLAGS += \
-I $(top_builddir)/src/udev
@@ -133,8 +133,6 @@ CLEANFILES += \
keyboard-keys.txt \
$(BUILT_SOURCES)
-endif
-
# install udevadm symlink in sbindir
install-exec-hook:
if test "$(bindir)" != "$(sbindir)"; then \
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 40dfeb6f30..82f644896c 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -36,9 +36,7 @@ static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
-#ifdef ENABLE_KEYMAP
[UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
-#endif
#ifdef HAVE_KMOD
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
#endif
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 13bb1dc82a..198cb2c137 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -151,9 +151,7 @@ enum udev_builtin_cmd {
UDEV_BUILTIN_BTRFS,
UDEV_BUILTIN_HWDB,
UDEV_BUILTIN_INPUT_ID,
-#ifdef ENABLE_KEYMAP
UDEV_BUILTIN_KEYBOARD,
-#endif
#ifdef HAVE_KMOD
UDEV_BUILTIN_KMOD,
#endif
@@ -177,9 +175,7 @@ extern const struct udev_builtin udev_builtin_blkid;
extern const struct udev_builtin udev_builtin_btrfs;
extern const struct udev_builtin udev_builtin_hwdb;
extern const struct udev_builtin udev_builtin_input_id;
-#ifdef ENABLE_KEYMAP
extern const struct udev_builtin udev_builtin_keyboard;
-#endif
#ifdef HAVE_KMOD
extern const struct udev_builtin udev_builtin_kmod;
#endif