]> git.0d.be Git - empathy.git/commitdiff
Build fix
authorDavyd Madeley <davyd@madeley.id.au>
Thu, 22 Jan 2009 05:04:10 +0000 (16:04 +1100)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Wed, 27 May 2009 16:52:05 +0000 (12:52 -0400)
configure.ac
src/Makefile.am

index 0f03dc02c4ab3e402ab4e3ab0ff54999991ad634..b7660937993b0acad6cc27e8d5aea00803bc5c03 100644 (file)
@@ -252,6 +252,8 @@ if test "x$enable_map" = "xyes" -a "x$have_geoclue" != "xyes"; then
 fi
 
 AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes")
+AC_SUBST(GEOCLUE_CFLAGS)
+AC_SUBST(GEOCLUE_LIBS)
 
 # -----------------------------------------------------------
 # Megaphone
index a70e7e2de5df68ed8b27bc7f19d51fb132055bec..ef6311f29f39c82e71af4a2b6de49d4ca164a093 100644 (file)
@@ -4,9 +4,10 @@ AM_CPPFLAGS =                                          \
        -I$(top_srcdir)                                 \
        $(EMPATHY_CFLAGS)                               \
        $(LIBNOTIFY_CFLAGS)                             \
+       $(GEOCLUE_CFLAGS)                               \
        $(LIBCHAMPLAIN_CFLAGS)                          \
-       $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)
+       $(WARN_CFLAGS)
 
 LDADD =                                                                \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
@@ -14,7 +15,8 @@ LDADD =                                                               \
        $(top_builddir)/extensions/libemp-extensions.la         \
        $(LIBNOTIFY_LIBS)                                       \
        $(EMPATHY_LIBS)                                         \
-       $(LIBCHAMPLAIN_LIBS)
+       $(LIBCHAMPLAIN_LIBS)                                    \
+       $(GEOCLUE_LIBS)
 
 bin_PROGRAMS =                 \
        empathy                 \