[telepathy-stream-engine/master] Add libhal dependency

Olivier Crête olivier.crete at collabora.co.uk
Wed Dec 16 12:37:23 PST 2009


---
 configure.ac           |    4 ++++
 src/Makefile.am        |    2 ++
 src/tp-stream-engine.c |    5 ++++-
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 08cb0d2..38d2f6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,10 @@ PKG_CHECK_MODULES(GST_VIDEO, [gstreamer-video-0.10 >= 0.10.18],[],
 AC_SUBST(GST_VIDEO_CFLAGS)
 AC_SUBST(GST_VIDEO_LIBS)
 
+dnl Check for hal
+PKG_CHECK_MODULES(HAL, [hal])
+AC_SUBST(HAL_CFLAGS)
+AC_SUBST(HAL_LIBS)
 
 dnl libx11
 PKG_CHECK_MODULES(X11, [x11 gtk+-2.0])
diff --git a/src/Makefile.am b/src/Makefile.am
index 73c3128..e92061d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ AM_CFLAGS = \
 	$(ERROR_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
+	$(HAL_CFLAGS) \
 	$(X11_CFLAGS) \
 	$(GST_CFLAGS) \
 	$(GST_VIDEO_CFLAGS) \
@@ -41,6 +42,7 @@ AM_CFLAGS = \
 AM_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
+	$(HAL_LIBS) \
 	$(X11_LIBS) \
 	$(GST_LIBS) \
 	$(GST_VIDEO_LIBS) \
diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c
index 0106ac9..0b65393 100644
--- a/src/tp-stream-engine.c
+++ b/src/tp-stream-engine.c
@@ -22,13 +22,16 @@
 #include "config.h"
 #endif
 
-#include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
 #include <netinet/ip.h>
 
+#include <dbus/dbus-glib.h>
+
+#include <libhal.h>
+
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/errors.h>
 #include <telepathy-glib/interfaces.h>
-- 
1.5.6.5




More information about the telepathy-commits mailing list