hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
diff-tree d6daf8fb1b5005e06062236f0795cfa76a5ce1d8 (from parents)
Merge: e172b224c8de6016121b4768c8f214048223dfd7 5052a31363655207771767fed4793566b774b585
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 26 22:51:49 2007 +0200

    Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal

diff-tree e172b224c8de6016121b4768c8f214048223dfd7 (from 81dccee799c57a6507321459cb08244db37a8e8d)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 26 22:51:22 2007 +0200

    fix for new pciutils which need to link against zlib
    
    Fixed build Macbook/Macbook Pro backlight addons which use libpci.
    Actual versions of libpci need to link against zlib. Added -lz where
    needed and check in configure if zlib available.

diff --git a/configure.in b/configure.in
index e046f48..bfa8206 100644
--- a/configure.in
+++ b/configure.in
@@ -344,22 +344,14 @@ AC_ARG_WITH([libpci],
   [],
   [with_libpci=yes])
 
-AS_IF([test "x$with_libpci" != xno],
-  [dnl Check for libpci
-   AC_CHECK_HEADERS([pci/pci.h], [
-     AC_CHECK_LIB(pci, pci_init, [
-       USE_LIBPCI=yes; AM_CONDITIONAL(HAVE_LIBPCI, true)], [
-       USE_LIBPCI=no; AM_CONDITIONAL(HAVE_LIBPCI, false)])], [
-     USE_LIBPCI=no; AM_CONDITIONAL(HAVE_LIBPCI, false)])
-  ], [
-    USE_LIBPCI=no; AM_CONDITIONAL(HAVE_LIBPCI, false)
-  ])
-
-AC_ARG_WITH(backend, [  --with-backend=<name>   backend to use (linux/solaris/freebsd/dummy)],
-                      [
-                      backend=$withval
-                      ]
-                      )
+USE_LIBPCI="no"
+if test "x$with_libpci" != xno ; then
+  dnl check for libpci
+  AC_CHECK_HEADERS([pci/pci.h], [AC_CHECK_LIB([pci], [pci_init], [USE_LIBPCI="yes"], , [-lz ]) ])
+fi 
+AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
+
+AC_ARG_WITH(backend, [  --with-backend=<name>   backend to use (linux/solaris/freebsd/dummy)], [ backend=$withval ])
 if ! test -z "$with_backend" ; then
     HALD_BACKEND="$with_backend"
 else
diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
index 5d98709..ffd4ea1 100644
--- a/hald/linux/addons/Makefile.am
+++ b/hald/linux/addons/Makefile.am
@@ -35,13 +35,13 @@ endif
 if BUILD_MACBOOKPRO
 libexec_PROGRAMS += hald-addon-macbookpro-backlight
 hald_addon_macbookpro_backlight_SOURCES = addon-macbookpro-backlight.c ../../logger.c
-hald_addon_macbookpro_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci @GLIB_LIBS@
+hald_addon_macbookpro_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci -lz @GLIB_LIBS@
 endif
 
 if BUILD_MACBOOK
 libexec_PROGRAMS += hald-addon-macbook-backlight
 hald_addon_macbook_backlight_SOURCES = addon-macbook-backlight.c ../../logger.c ../../util_helper.c
-hald_addon_macbook_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci @GLIB_LIBS@
+hald_addon_macbook_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci -lz @GLIB_LIBS@
 endif
 
 if BUILD_CPUFREQ