Add configure switches for nbtk (off by default).

diff --git a/configure.ac b/configure.ac
index 79fc93f8990ac66c0a458f8315c287ebca89e6d2..4df19bd120d8423431b2a3c728c709c1bf0aca4a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,33 @@ AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes")
 AC_SUBST(GEOCLUE_CFLAGS)
 AC_SUBST(GEOCLUE_LIBS)
 
+# -----------------------------------------------------------
+# moblin widgets support
+# -----------------------------------------------------------
+AC_ARG_ENABLE(moblin,
+              AS_HELP_STRING([--enable-moblin=@<:no/yes@:>@],
+                             [Enable moblin widgets]), ,
+                             enable_moblin=no)
+
+if test "x$enable_moblin" != "xno"; then
+    PKG_CHECK_MODULES(MOBLIN,
+    [nbtk-gtk-1.2], have_nbtk="yes", have_nbtk="no")
+
+    if test "x$have_nbtk" = "xyes"; then
+       AC_DEFINE(HAVE_NBTK, 1, [Define if you have nbtk])
+    fi
+else
+   have_nbtk="no"
+fi
+
+if test "x$enable_moblin" = "xyes" -a "x$have_nbtk" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find moblin dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_NBTK, test "x$have_nbtk" = "xyes")
+AC_SUBST(MOBLIN_CFLAGS)
+AC_SUBST(MOBLIN_LIBS)
+
 # -----------------------------------------------------------
 # Megaphone
 # -----------------------------------------------------------
@@ -524,6 +551,7 @@ Configure summary:
        Display maps (libchamplain).:  ${have_libchamplain}
        Location awareness (Geoclue):  ${have_geoclue}
        Adium themes (Webkit).......:  ${have_webkit}
+       Moblin widgets (Nbtk).......:  ${have_nbtk}
 
     Connectivity:
        NetworkManager integration..:  ${have_nm}

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index fb7e431cd6db1f1a93a636516378d1684d42258e..25e3dc9d9eb58d0a9949f384e824dec57e0e64a4 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS =                                           \
        $(ENCHANT_CFLAGS)                               \
        $(LIBCHAMPLAIN_CFLAGS)                          \
        $(GEOCLUE_CFLAGS)                               \
+       $(MOBLIN_CFLAGS)                                \
        $(WEBKIT_CFLAGS)                                \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)
@@ -78,6 +79,7 @@ libempathy_gtk_la_LIBADD =                    \
        $(ENCHANT_LIBS)                         \
        $(LIBCHAMPLAIN_LIBS)                    \
        $(GEOCLUE_LIBS)                         \
+       $(MOBLIN_LIBS)                          \
        $(WEBKIT_LIBS)                          \
        $(top_builddir)/libempathy/libempathy.la