hal: Branch 'hal-0_5_8-branch'

[David Zeuthen]

 configure.in                  |   21 +++++++++++++++++++++
 hald/linux/addons/Makefile.am |    4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

New commits:
diff-tree f749f231157139bf6bbce564bd2f16926b0d3d9d (from fe3e9f7e678068e43e644c3b98bf979c0078634a)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Sep 19 14:03:52 2006 -0400

    don't build Macbook Pro utils on non-x86
    
    This could be the beginning of a bigger subsetting project where
    distributors can strip down the HAL they are building. Needs some
    thought but we needed this fix to make the build work on e.g. ppc.
    (cherry picked from acb5c5d6fcf99de778a7411f59bbaf61c9b3b77b commit)

diff --git a/configure.in b/configure.in
index 7a17d55..4525f24 100644
--- a/configure.in
+++ b/configure.in
@@ -247,6 +247,23 @@ AC_CHECK_HEADERS(pci/pci.h, [
 		USE_LIBPCI=no AM_CONDITIONAL(HAVE_LIBPCI,false)])], [
 	USE_LIBPCI=no AM_CONDITIONAL(HAVE_LIBPCI,false)])
 
+dnl see if we should build macbookpro utils
+AC_ARG_WITH(macbookpro,     [  --with-macbookpro       Whether to build Macbook Pro utils (auto)])
+BUILD_MACBOOKPRO=no
+if test "x$use_macbookpro" = "xyes" ; then
+   BUILD_MACBOOKPRO=yes
+elif test "x$use_macbookpro" = "x" ; then
+  if test "$HAVE_LIBPCI" != "false" ; then
+    case "${host}" in
+      i[[3456]]86-*-linux*)
+        BUILD_MACBOOKPRO=yes
+        ;;
+      *)
+        ;;
+      esac
+   fi
+fi
+AM_CONDITIONAL(BUILD_MACBOOKPRO, test x$BUILD_MACBOOKPRO = xyes)
 
 AC_ARG_WITH(backend, [  --with-backend=<name>   backend to use (linux/solaris/dummy)],
                       [
@@ -550,12 +567,16 @@ echo "
 
         use PolicyKit:              ${msg_polkit}
 
+        build Macbook Pro utils:    ${BUILD_MACBOOKPRO}
+
         Maintainer mode:            ${USE_MAINTAINER_MODE}
         Building verbose mode:      ${enable_verbose_mode}
         Building api docs:          ${enable_gtk_doc}
         Building docs:              ${enable_docbook_docs}
 "
 
+
+
 if test x$enable_verbose_mode = xyes; then
    echo "NOTE: building with verbose mode increases library size, may slightly "
    echo "      increase security risk, and decreases performance."
diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
index 83c2703..9765121 100644
--- a/hald/linux/addons/Makefile.am
+++ b/hald/linux/addons/Makefile.am
@@ -18,7 +18,7 @@ libexec_PROGRAMS  = 			\
 	hald-addon-storage		\
 	hald-addon-cpufreq
 
-if HAVE_LIBPCI
+if BUILD_MACBOOKPRO
 libexec_PROGRAMS += hald-addon-macbookpro-backlight
 endif
 if HAVE_LIBUSB
@@ -42,7 +42,7 @@ hald_addon_hid_ups_LDADD = $(top_builddi
 hald_addon_keyboard_SOURCES = addon-keyboard.c ../../logger.c ../../util_helper.c
 hald_addon_keyboard_LDADD = $(top_builddir)/libhal/libhal.la 
 
-if HAVE_LIBPCI
+if BUILD_MACBOOKPRO
 hald_addon_macbookpro_backlight_SOURCES = addon-macbookpro-backlight.c ../../logger.c
 hald_addon_macbookpro_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci @GLIB_LIBS@
 endif