hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 43dc4bbe5ff288bf690424beedc9a8b56b11f4cd
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Dec 18 16:29:36 2008 +0100

    add new configure option --enable-video-nvidia-quirks
    
    Add new configure option --enable-video-nvidia-quirks to be able
    to prevent get 21-video-quirk-nvidia.fdi installed which may cause
    trouble on systems which don't support this quirks.

diff --git a/configure.in b/configure.in
index 15cd105..f961e68 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,13 @@ 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)
+AC_ARG_ENABLE(video_default_quirks, [  --enable-video-nvidia-quirks         include NVIDIA video suspend data],enable_video_nvidia_quirks=$enableval,enable_video_nvidia_quirks=yes)
+AM_CONDITIONAL(BUILD_VIDEO_NVIDIA_QUIRKS, test x$enable_video_nvidia_quirks == xyes)
+
+dnl ---------------------------------------------------------------------------
+dnl - Should we ship the video suspend data
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(video_default_quirks, [  --enable-video-default-quirks         include default 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 ---------------------------------------------------------------------------
@@ -113,6 +119,7 @@ echo "
         hardware recall data:                       ${enable_recall}
         video suspend data:                         ${enable_video}
         video suspend default quirks:               ${enable_video_default_quirks}
+        video suspend default NVIDIA quirks:        ${enable_video_nvidia_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 f96423e..b82296b 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -65,8 +65,11 @@ dist_fdi_DATA +=				\
 		20-video-quirk-pm-misc.fdi	\
 		20-video-quirk-pm-samsung.fdi   \
 		20-video-quirk-pm-sony.fdi	\
-		20-video-quirk-pm-toshiba.fdi	\
-		21-video-quirk-nvidia.fdi	
+		20-video-quirk-pm-toshiba.fdi	
+
+if BUILD_VIDEO_NVIDIA_QUIRKS
+dist_fdi_DATA += 21-video-quirk-nvidia.fdi	
+endif
 
 if BUILD_VIDEO_DEFAULT_QUIRKS
 dist_fdi_DATA += 99-video-quirk-default.fdi