[empathy/gnome-2-28: 3/18] Add configure switches for nbtk (off by default).
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-28: 3/18] Add configure switches for nbtk (off by default).
- Date: Fri, 2 Oct 2009 16:36:49 +0000 (UTC)
commit ee7554e574161eaeda14be53ce70abe7be23bb77
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sun Sep 27 20:17:50 2009 +0200
Add configure switches for nbtk (off by default).
configure.ac | 28 ++++++++++++++++++++++++++++
libempathy-gtk/Makefile.am | 2 ++
2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 443b2ba..008d917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,33 @@ 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
# -----------------------------------------------------------
AC_ARG_ENABLE(megaphone,
@@ -499,6 +526,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 fb7e431..25e3dc9 100644
--- 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]