Merge branch 'master' into mc5

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0a3455835727a4d8de647fd701d4512784369188..62e08f0a4160706634caaef9778a0af0645212e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 2.27.3, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 2.27.90, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -9,12 +9,12 @@ AC_COPYRIGHT([
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=25
-LIBEMPATHY_AGE=0
+LIBEMPATHY_CURRENT=28
+LIBEMPATHY_AGE=1
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=23
-LIBEMPATHY_GTK_AGE=0
+LIBEMPATHY_GTK_CURRENT=26
+LIBEMPATHY_GTK_AGE=1
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
@@ -30,15 +30,16 @@ GTK_REQUIRED=2.16.0
 GCONF_REQUIRED=1.2.0
 LIBPANELAPPLET_REQUIRED=2.10.0
 TELEPATHY_GLIB_REQUIRED=0.7.31
-MISSION_CONTROL_REQUIRED=4.61
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
 LIBCANBERRA_GTK_REQUIRED=0.4
-GEOCLUE_REQUIRED=0.11
-LIBCHAMPLAIN_REQUIRED=0.3.0
-LIBCHAMPLAIN_GTK_REQUIRED=0.3.0
+LIBCHAMPLAIN_REQUIRED=0.3.3
+LIBCHAMPLAIN_GTK_REQUIRED=0.3.3
 CLUTTER_GTK_REQUIRED=0.8.2
+GEOCLUE_REQUIRED=0.11
+WEBKIT_REQUIRED=1.1.7
+NETWORK_MANAGER_REQUIRED=0.7.0
 
 # Use --enable-maintainer-mode to disabled deprecated symbols
 GNOME_MAINTAINER_MODE_DEFINES
@@ -93,8 +94,9 @@ PKG_CHECK_MODULES(LIBEMPATHY,
    gio-unix-2.0 >= $GLIB_REQUIRED
    libxml-2.0
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    telepathy-farsight
+   farsight2-0.10
+   gstreamer-0.10
 ])
 
 PKG_CHECK_MODULES(LIBEMPATHYGTK,
@@ -107,8 +109,6 @@ PKG_CHECK_MODULES(LIBEMPATHYGTK,
    gtk+-2.0 >= $GTK_REQUIRED
    libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   telepathy-farsight
    farsight2-0.10
    gstreamer-0.10
    gstreamer-interfaces-0.10
@@ -119,16 +119,13 @@ PKG_CHECK_MODULES(EMPATHY,
    glib-2.0 >= $GLIB_REQUIRED
    gobject-2.0
    gio-2.0 >= $GLIB_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   x11
+   gdk-x11-2.0
    gtk+-2.0 >= $GTK_REQUIRED
-   libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
    libebook-1.2
+   dbus-glib-1
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    telepathy-farsight
    gstreamer-0.10
-   gstreamer-interfaces-0.10
 ])
 
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
@@ -155,6 +152,58 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
 
 AM_GLIB_GNU_GETTEXT
 
+# -----------------------------------------------------------
+# NM integration
+# -----------------------------------------------------------
+AC_ARG_ENABLE(network-manager,
+              AS_HELP_STRING([--enable-network-manager=@<:@no/yes/auto@:>@],
+                             [build with network-manager support]), ,
+                             enable_network_manager=auto)
+
+if test "x$enable_network_manager" != "xno"; then
+   PKG_CHECK_MODULES(NETWORK_MANAGER,
+   [
+      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+   ], have_nm="yes", have_nm="no")
+
+   if test "x$have_nm" = "xyes"; then
+      AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
+   fi
+else
+   have_nm=no
+fi
+
+if test "x$enable_network_manager" = "xyes" -a "x$have_nm" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find libnm-glib dependencies.])
+fi
+AM_CONDITIONAL(HAVE_NM, test "x$have_NM" = "xyes")
+
+# -----------------------------------------------------------
+# Webkit
+# -----------------------------------------------------------
+AC_ARG_ENABLE(webkit,
+              AS_HELP_STRING([--enable-webkit=@<:@no/yes/auto@:>@],
+                             [build with webkit support]), ,
+                             enable_webkit=auto)
+
+if test "x$enable_webkit" != "xno"; then
+   PKG_CHECK_MODULES(WEBKIT,
+   [
+      webkit-1.0 >= $WEBKIT_REQUIRED
+   ], have_webkit="yes", have_webkit="no")
+
+   if test "x$have_webkit" = "xyes"; then
+      AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk])
+   fi
+else
+   have_webkit=no
+fi
+
+if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find webkit dependencies.])
+fi
+AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes")
+
 # -----------------------------------------------------------
 # spellchecking checks: enchant and iso-codes
 # -----------------------------------------------------------
@@ -240,7 +289,7 @@ if test "x$enable_location" != "xno"; then
       AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue])
    fi
 else
-   have_geoclue=no
+   have_geoclue="no"
 fi
 
 if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then
@@ -266,7 +315,7 @@ if test "x$enable_megaphone" != "xno"; then
       glib-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+      telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    ], have_megaphone="yes", have_megaphone="no")
 else
    have_megaphone=no
@@ -293,7 +342,7 @@ if test "x$enable_nothere" != "xno"; then
       glib-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+      telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    ], have_nothere="yes", have_nothere="no")
 else
    have_nothere=no
@@ -344,7 +393,6 @@ if test "x$enable_python" != "xno"; then
       gobject-2.0
       gconf-2.0 >= $GCONF_REQUIRED
       libxml-2.0
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gstreamer-0.10
       gstreamer-interfaces-0.10
@@ -425,6 +473,8 @@ Configure summary:
        Spell checking (enchant)....:  ${have_enchant}
        Display maps (libchamplain).:  ${have_libchamplain}
        Location awareness (Geoclue):  ${have_geoclue}
+       Adium themes (Webkit).......:  ${have_webkit}
+       NetworkManager integration..:  ${have_nm}
 
     Extras:
        Documentation...............:  ${enable_gtk_doc}