Remove loadkeys/setfont checks

diff --git a/Makefile.am b/Makefile.am
index cd9ed60a9db8c898e4932b3f4ed5e3d5685d0707..1356ae2e322e7b3d3e806ebf78e089ead12e54c3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,7 +158,6 @@ AM_CPPFLAGS = \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-       -DELOGIND_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DELOGIND_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \

diff --git a/configure.ac b/configure.ac
index 2eef62fa32067681b10213fc8464ab687da477c7..c8cfff3dd0fb32acd225043398561a27814bae71 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -525,24 +525,6 @@ fi
 AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])
 
 # ------------------------------------------------------------------------------
-AC_ARG_WITH(kbd-loadkeys,
-        AS_HELP_STRING([--with-kbd-loadkeys=PATH],
-                [Path to loadkeys]),
-        [KBD_LOADKEYS="$withval"],
-        [KBD_LOADKEYS="/usr/bin/loadkeys"])
-
-AC_ARG_WITH(kbd-setfont,
-        AS_HELP_STRING([--with-kbd-setfont=PATH],
-                [Path to setfont]),
-        [KBD_SETFONT="$withval"],
-        [KBD_SETFONT="/usr/bin/setfont"])
-
-AC_DEFINE_UNQUOTED(KBD_LOADKEYS, ["$KBD_LOADKEYS"], [Path of loadkeys])
-AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont])
-
-AC_SUBST(KBD_LOADKEYS)
-AC_SUBST(KBD_SETFONT)
-
 AC_ARG_WITH(telinit,
         AS_HELP_STRING([--with-telinit=PATH],
                 [Path to telinit]),