diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:16:32 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:16:32 +0200 |
| commit | 9f49e9457547fc65aa6c0646910b291840eb22be (patch) | |
| tree | 35d9e4123edd62fb5c1c427abc2701b653bd5061 | |
| parent | f25b623eb0a6543630c876af7b87885a62edc1a6 (diff) | |
Remove loadkeys/setfont checks
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index cd9ed60a9d..1356ae2e32 100644 --- 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 2eef62fa32..c8cfff3dd0 100644 --- 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]), |