hal: Branch 'master'

[Richard Hughes]

 configure.in                              |    6 ++++++
 fdi/information/10freedesktop/Makefile.am |    5 +++++
 2 files changed, 11 insertions(+)

New commits:
diff-tree c8b6c3084c79fe0853befa2795e1738fb11fa5c2 (from ba588f11f380a32a318fb9c9718d81fe5dd071a2)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jun 5 16:48:19 2007 +0100

    add keymap capabilities into hal-info
    
    Add keymapping data into hal-info so we can remap scancode->keycodes
    at boot time, fixing many multimedia keyboards.

diff --git a/configure.in b/configure.in
index 452dabd..1c3fbc9 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,12 @@ dnl ------------------------------------
 AC_ARG_ENABLE(video, [  --enable-video          include video suspend data],enable_video=$enableval,enable_video=yes)
 AM_CONDITIONAL(BUILD_VIDEO, test x$enable_video == xyes)
 
+dnl ---------------------------------------------------------------------------
+dnl - Should we ship the keymap data (makes random vendor keys work)
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(keymaps, [  --enable-keymaps        include key mapping data],enable_keymaps=$enableval,enable_keymaps=yes)
+AM_CONDITIONAL(BUILD_KEYMAPS, test x$enable_keymaps == xyes)
+
 AC_OUTPUT([
 Makefile
 fdi/Makefile
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 594606c..cb604dd 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -37,6 +37,11 @@ dist_fdi_DATA +=				\
 		20-video-quirk-pm-toshiba.fdi
 endif
 
+if BUILD_KEYMAPS
+dist_fdi_DATA +=				\
+		30-keymap-lenovo.fdi
+endif
+
 check:
 	for f in $(dist_fdi_DATA); do \
             echo -n "Validate XML in $$f : "; \