summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-03-19 19:27:28 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-03-19 19:27:28 +0000
commit37ca3ab5974892ba7a4a87420a70bafa070db812 (patch)
treec255e50a9ec0e72402e379012411270313444d1e
parentd56a98ac7b81e416b7f9e43ae7dfcb7b6a573dd1 (diff)
Check for HAL support
-rw-r--r--acinclude.m46
-rw-r--r--configure.in1
-rw-r--r--network/Makefile.am4
3 files changed, 9 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index d8fafb3e..2eac9315 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -121,6 +121,12 @@ AC_DEFUN([AC_PATH_ALSA], [
AC_SUBST(ALSA_LIBS)
])
+AC_DEFUN([AC_PATH_HAL], [
+ PKG_CHECK_MODULES(HAL, hal >= 0.5.8, hal_found=yes, hal_found=no)
+ AC_SUBST(HAL_CFLAGS)
+ AC_SUBST(HAL_LIBS)
+])
+
AC_DEFUN([AC_PATH_USB], [
PKG_CHECK_MODULES(USB, libusb, usb_found=yes, usb_found=no)
AC_SUBST(USB_CFLAGS)
diff --git a/configure.in b/configure.in
index 1697b28c..1c65771d 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,7 @@ AC_PATH_GLIB
AC_PATH_DBUS
AC_PATH_OPENOBEX
AC_PATH_OPENSYNC
+AC_PATH_HAL
AC_PATH_USB
AC_PATH_EXPAT
AC_PATH_INOTIFY
diff --git a/network/Makefile.am b/network/Makefile.am
index aa3412b6..686fad9a 100644
--- a/network/Makefile.am
+++ b/network/Makefile.am
@@ -16,10 +16,10 @@ bluetoothd_service_network_SOURCES = main.c \
hal.h hal.c connection.h connection.c
LDADD = $(top_builddir)/common/libhelper.a \
- @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+ @GLIB_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @HAL_CFLAGS@ @GLIB_CFLAGS@
INCLUDES = -I$(top_srcdir)/common