From 15b4f8cd97a494979ddb871e3e1134ac11de825a Mon Sep 17 00:00:00 2001 From: Ankit Date: Wed, 15 Jul 2015 20:42:03 +0530 Subject: [PATCH] Add Avahi dependency Avahi will be required by GClueNMEASource, which will be added in the coming patches. Avahi will help GClueNMEASource to automatically discover nmea-tcp services on the local network. https://bugs.freedesktop.org/show_bug.cgi?id=90974 --- configure.ac | 9 +++++++++ src/Makefile.am | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac index 2d1086e..388d899 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,7 @@ JSON_GLIB_MIN_VERSION=0.14 GEOIP_MIN_VERSION=1.5.1 LIBMM_GLIB_MIN_VERSION=1.0 LIBSOUP_MIN_VERSION=2.42 +AVAHI_MIN_VERSION=0.6.10 AC_CHECK_LIB([m],[sin]) @@ -56,6 +57,8 @@ PKG_CHECK_MODULES(GEOCLUE, [ gio-unix-2.0 >= $GLIB_MIN_VERSION json-glib-1.0 >= $JSON_GLIB_MIN_VERSION libsoup-2.4 >= $LIBSOUP_MIN_VERSION + avahi-client >= $AVAHI_MIN_VERSION + avahi-glib >= $AVAHI_MIN_VERSION ]) # 3G source @@ -105,6 +108,12 @@ if test "$require_modemmanager" = "yes"; then PKG_CHECK_MODULES(ModemManager, mm-glib >= $LIBMM_GLIB_MIN_VERSION) fi +# Check for avahi-client +PKG_CHECK_MODULES(AvahiClient, avahi-client >= $AVAHI_MIN_VERSION) + +# Check for avahi-glib +PKG_CHECK_MODULES(AvahiGlib, avahi-glib >= $AVAHI_MIN_VERSION) + # Demo agent AC_ARG_ENABLE(demo-agent, AS_HELP_STRING([--enable-demo-agent=yes|no], diff --git a/src/Makefile.am b/src/Makefile.am index b3f22dc..0b79cc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,6 +66,8 @@ noinst_LTLIBRARIES = libgeoclue.la AM_CPPFLAGS = $(GEOCLUE_CFLAGS) \ $(ModemManager_CFLAGS) \ + $(AvahiClient_CFLAGS) \ + $(AvahiGlib_CFLAGS) \ $(WARN_CFLAGS) \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -DG_LOG_DOMAIN=\""Geoclue"\" \ @@ -129,6 +131,8 @@ endif libgeoclue_la_LIBADD = \ $(GEOCLUE_LIBS) \ $(ModemManager_LIBS) \ + $(AvahiClient_LIBS) \ + $(AvahiGlib_LIBS) \ $(LIBS) \ $(NULL) -- 2.1.0