Merge remote-tracking branch 'pochu/upgrade-software'

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e235118abe87646a8026570af5b187988e6e60eb..9ca9f61e7d60b77990a10986ab9a5991b95a45e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number
 m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [1])
-m4_define([empathy_micro_version], [90])
+m4_define([empathy_minor_version], [2])
+m4_define([empathy_micro_version], [0])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -34,8 +34,8 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.6.0
-GLIB_REQUIRED=2.28.0
+FOLKS_REQUIRED=0.6.2
+GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=3.0.2
 GSTREAMER_REQUIRED=0.10.32
@@ -49,15 +49,13 @@ TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
 
 # Optional deps
+CLUTTER_REQUIRED=1.7.14
 CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
 ISO_CODES_REQUIRED=0.35
-LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
-LIBCHAMPLAIN_REQUIRED=0.9
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
-GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
@@ -218,7 +216,7 @@ if test "x$enable_call" != "xno" ; then
    [
       farsight2-0.10
       telepathy-farstream
-      clutter-1.0
+      clutter-1.0 >= $CLUTTER_REQUIRED
       clutter-gtk-1.0
       clutter-gst-1.0
    ], have_call="yes", have_call="no" )
@@ -441,8 +439,8 @@ if test "x$enable_map" != "xno"; then
    PKG_CHECK_MODULES(LIBCHAMPLAIN,
     [
        clutter-gtk-1.0
-       champlain-gtk-0.10
-       champlain-0.10
+       champlain-gtk-0.12
+       champlain-0.12
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
@@ -580,43 +578,33 @@ fi
 AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
 
 # -----------------------------------------------------------
-# new, single-window control center
+# goa-mc-plugin
 # -----------------------------------------------------------
-AC_ARG_ENABLE(control_center_embedding,
-              AS_HELP_STRING([--enable-control-center-embedding=@<:@no/yes/auto@:>@],
-                             [Enable support for single-window control center]),
-                             , enable_control_center_embedding=auto)
+AC_ARG_ENABLE(goa,
+              AS_HELP_STRING([--enable-goa=@<:@no/yes/auto@:>@],
+                             [build GOA MC plugin]), ,
+                             enable_goa=auto)
 
-if test "x$enable_control_center_embedding" != "xno"; then
-
-   PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED],
-        have_control_center_embedding="yes", have_control_center_embedding="no")
+if test "x$enable_goa" != "xno"; then
+   PKG_CHECK_MODULES(GOA,
+    [
+       mission-control-plugins
+       goa-1.0
+    ], have_goa="yes", have_goa="no")
 
-   if test "x$have_control_center_embedding" = "xyes"; then
-      AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
+   AC_MSG_CHECKING([Mission Control plugins dir])
+   MISSION_CONTROL_PLUGINS_DIR=`pkg-config --variable=plugindir mission-control-plugins`
 
-      AC_MSG_CHECKING([gnome-control-center extension dir])
-      CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
-      if test "x$CONTROL_CENTER_EXTENSIONDIR" = "x"; then
-          AC_MSG_ERROR([Could not determine extensiondir])
-      else
-          AC_MSG_RESULT([$CONTROL_CENTER_EXTENSIONDIR])
-      fi
-      AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
-   fi
+   AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
 else
-   have_control_center_embedding="no"
+   have_goa=no
 fi
 
-if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then
-   AC_MSG_ERROR([Could not find single-window control center dependencies:
-
-$CONTROL_CENTER_EMBEDDING_PKG_ERRORS])
+if test "x$enable_goa" = "xyes" -a "x$have_goa" != "xyes"; then
+   AC_MSG_ERROR([Could not find GOA dependencies.])
 fi
 
-AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
-AC_SUBST(CONTROL_CENTER_EMBEDDING_CFLAGS)
-AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
+AM_CONDITIONAL(HAVE_GOA, test "x$have_goa" = "xyes")
 
 # Optional dependency for avatar selection
 AC_ARG_WITH([cheese],
@@ -664,6 +652,7 @@ AC_CONFIG_FILES([
    libempathy-gtk/Makefile
    src/Makefile
    nautilus-sendto-plugin/Makefile
+   goa-mc-plugin/Makefile
    help/Makefile
    tests/Makefile
    tests/interactive/Makefile
@@ -685,9 +674,8 @@ Configure summary:
        Spell checking (enchant)....:  ${have_enchant}
        Display maps (libchamplain).:  ${have_libchamplain}
        Location awareness (Geoclue):  ${have_geoclue}
-       Geocode support (Geoclue)...:  ${have_geocode}
+       Geocode support (Geocode)...:  ${have_geocode}
        Meego widgets...............:  ${have_meego}
-       Control center embedding....:  ${have_control_center_embedding}
        Cheese webcam support ......:  ${have_cheese}
        Camera monitoring...........:  ${have_gudev}
 
@@ -697,6 +685,7 @@ Configure summary:
 
     Extras:
        Nautilus-sendto plugin......:  ${have_nst}
+       GOA MC plugin...............:  ${have_goa}
        Salut E-D-S support.........:  ${with_eds}
        Exp. Call channel handler...:  ${have_call}
        Exp. Call log support.......:  ${have_call_logs}