hal-info: Branch 'master'

[Danny Kukawka]

 configure.in                              |    7 +++++++
 fdi/information/10freedesktop/Makefile.am |    7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 27d8bdbe7eb0bc5c375b456fc480d6bb235c0dc4
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Nov 27 16:41:49 2008 +0100

    add new configure option --enable-video-default-quirks
    
    Add new configure option --enable-video-default-quirks to be able
    to prevent get 99-video-quirk-default.fdi installed which may cause
    trouble.

diff --git a/configure.in b/configure.in
index a140134..15cd105 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,12 @@ AC_ARG_ENABLE(video, [  --enable-video          include video suspend data],enab
 AM_CONDITIONAL(BUILD_VIDEO, test x$enable_video == xyes)
 
 dnl ---------------------------------------------------------------------------
+dnl - Should we ship the video suspend data
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(video_default_quirks, [  --enable-video-default-quirks         include video suspend data],enable_video_default_quirks=$enableval,enable_video_default_quirks=yes)
+AM_CONDITIONAL(BUILD_VIDEO_DEFAULT_QUIRKS, test x$enable_video_default_quirks == 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)
@@ -106,6 +112,7 @@ echo "
         sysconfdir:                                 ${sysconfdir}
         hardware recall data:                       ${enable_recall}
         video suspend data:                         ${enable_video}
+        video suspend default quirks:               ${enable_video_default_quirks}
         killswitch support for Dell wlan:           ${enable_killswitch_dell_wlan}
         killswitch support for Dell Bluetooth:      ${enable_killswitch_dell_bluetooth}
         killswitch support for Dell wwan:           ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index ae9067d..f96423e 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -66,8 +66,11 @@ dist_fdi_DATA +=				\
 		20-video-quirk-pm-samsung.fdi   \
 		20-video-quirk-pm-sony.fdi	\
 		20-video-quirk-pm-toshiba.fdi	\
-		21-video-quirk-nvidia.fdi	\
-		99-video-quirk-default.fdi
+		21-video-quirk-nvidia.fdi	
+
+if BUILD_VIDEO_DEFAULT_QUIRKS
+dist_fdi_DATA += 99-video-quirk-default.fdi
+endif
 endif
 
 if BUILD_KEYMAPS