[kbd] [PATCH 1/2] [loadkeys branch] fix up libtool warnings

[kbd] [PATCH 1/2] [loadkeys branch] fix up libtool warnings

[Mike Frysinger]

Use AM_PROG_AR with newer automake, and drop old libtool prog.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c89b042..15fa07d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,9 +23,10 @@ AC_PROG_SED
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
 AC_CANONICAL_HOST
 
+dnl older versions of automake didn't include this macro
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
 
 AM_GNU_GETTEXT_VERSION([0.14.1])
-- 
1.8.0.2

[kbd] [PATCH 2/2] [loadkeys branch] delete unused var

[Mike Frysinger]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 src/getkeycodes.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/getkeycodes.c b/src/getkeycodes.c
index 9bee144..9d6fad6 100644
--- a/src/getkeycodes.c
+++ b/src/getkeycodes.c
@@ -24,7 +24,6 @@ main(int argc, char **argv) {
 	int fd;
 	unsigned int sc, sc0;
 	struct kbkeycode a;
-	int old_kernel = 0;
 
 	set_progname(argv[0]);
 
@@ -43,7 +42,6 @@ main(int argc, char **argv) {
 	a.scancode = 0;
 	a.keycode = 0;
 	if (ioctl(fd, KDGETKEYCODE, &a)) {
-		old_kernel = 1;
 		sc0 = 89;
 	} else
 	for (sc0 = 1; sc0 <= 88; sc0++) {
-- 
1.8.0.2