hal: Branch 'master'

[Danny Kukawka]

 configure.in      |    5 +++++
 tools/Makefile.am |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 736082b1945dd835d43c7d767d857d4e8bd68389
Author: Holger Freyther <zecke at openmoko.org>
Date:   Mon Oct 27 13:04:02 2008 +0100

    allow to cross compile hal with host and target having different input.h
    
    Allow to cross compile hal with host and target having different input.h.
    
    When the Makefile is picking /usr/include/linux/input.h and libc kernel
    headers are newer than the one for target I will get a nice compile error
    that the new keynames are not known.
    
    The attached patch allows to inform hal where my input.h resides and allows
    to cross compile it.

diff --git a/configure.in b/configure.in
index 68f75f5..d4f8669 100644
--- a/configure.in
+++ b/configure.in
@@ -1021,6 +1021,11 @@ AC_ARG_WITH([linux-input-header],
 			   [Use an given Linux input.h rather than that installed on the system (<linux/input.h>)]))
 if test "x$with_linux_input_header" != "x"; then
 	AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>])
+	LINUX_INPUT_H=$with_linux_input_header
+	AC_SUBST(LINUX_INPUT_H)
+else
+	LINUX_INPUT_H=/usr/include/linux/input.h
+	AC_SUBST(LINUX_INPUT_H)
 fi
 
 dnl
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ae03edd..7d1cbab 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -79,7 +79,7 @@ endif
 if BUILD_KEYMAPS
 
 if HAVE_GPERF
-hal-setup-keymap-keys.txt: /usr/include/linux/input.h
+hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
 	awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
 
 hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt