From a382332eed10d3348231803c47a4c599d24c5e3a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 4 Jan 2013 23:19:02 +0100
Subject: [PATCH] build-sys: make path of loadkeys/setfont configurable in
 configure

---
 Makefile.am  | 41 -----------------------------------------
 configure.ac | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9132ccdfc..b11dfb95e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,47 +167,6 @@ AM_CPPFLAGS = \
 AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
-# ------------------------------------------------------------------------------
-if TARGET_GENTOO
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_ARCH
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_FRUGALWARE
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MANDRIVA
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\"
-else
-if TARGET_ANGSTROM
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MAGEIA
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\"
-else
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\"
-endif
-endif
-endif
-endif
-endif
-endif
-
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
 	systemctl \
diff --git a/configure.ac b/configure.ac
index a39dd6a33..2f457fc8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,6 +626,25 @@ AC_DEFINE_UNQUOTED(RC_LOCAL_SCRIPT_PATH_STOP, ["$RC_LOCAL_SCRIPT_PATH_STOP"], [P
 AC_SUBST(RC_LOCAL_SCRIPT_PATH_START)
 AC_SUBST(RC_LOCAL_SCRIPT_PATH_STOP)
 
+# ------------------------------------------------------------------------------
+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(firmware-path,
        AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
-- 
2.30.2