Update Simplified Chinese translation.

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e0fbb680c97b0d1eaebc8b9af38e00e438249051..e42539245238ae23410926743c302ae513dc4371 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [1])
-m4_define([empathy_micro_version], [1])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_micro_version], [2])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -41,8 +41,8 @@ GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.15.1
-TELEPATHY_LOGGER=0.2.0
+TELEPATHY_GLIB_REQUIRED=0.15.2
+TELEPATHY_LOGGER=0.2.10
 
 # Optional deps
 CLUTTER_GTK_REQUIRED=0.90.3
@@ -53,7 +53,7 @@ LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
 LIBCHAMPLAIN_REQUIRED=0.9
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
-WEBKIT_REQUIRED=1.3.2
+WEBKIT_REQUIRED=1.3.13
 GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
@@ -65,8 +65,11 @@ GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 
 # telepathy-yell
 prev_top_build_prefix=$ac_top_build_prefix
+prev_ac_configure_args=$ac_configure_args
+ac_configure_args="$ac_configure_args --disable-shared-library"
 AX_CONFIG_DIR([telepathy-yell])
 ac_top_build_prefix=$prev_top_build_prefix
+ac_configure_args=$prev_ac_configure_args
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -207,6 +210,38 @@ if test "x$with_call" = "xyes" -a "x$have_farstream" != "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_CALL, test "x$have_farstream" = "xyes")
 
+
+# -----------------------------------------------------------
+# Call support in tp-logger
+# -----------------------------------------------------------
+AC_ARG_WITH(call-logs,
+            AC_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
+            [build with call logs support]),,
+            [with_call_logs=auto])
+if test "x$with_call_logs" != "xno" ; then
+   SAVE_CFLAGS=$CFLAGS
+   SAVE_CPPFLAGS=$CPPFLAGS
+   CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
+   CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
+
+   AC_CHECK_HEADER(telepathy-logger/call-event.h,
+      have_call_logs="yes", have_call_logs="no")
+
+   CFLAGS=$SAVE_CFLAGS
+   CPPFLAGS=$SAVE_CPPFLAGS
+
+   if test "x$have_call_logs" = "xyes"; then
+      AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support])
+   fi
+else
+  have_call_logs=no
+fi
+
+if test "x$with_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
+   AC_MSG_ERROR([Call logs support requested but telepathy-logger wasn't
+                 built with --enable-call])
+fi
+
 # -----------------------------------------------------------
 # evolution-data-server (about-me)
 # -----------------------------------------------------------
@@ -409,6 +444,35 @@ AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes")
 AC_SUBST(GEOCLUE_CFLAGS)
 AC_SUBST(GEOCLUE_LIBS)
 
+# -----------------------------------------------------------
+# location checks: geocode-glib
+# -----------------------------------------------------------
+AC_ARG_ENABLE(geocode,
+              AS_HELP_STRING([--enable-geocode=@<:@no/yes/auto@:>@],
+                             [Enable geocode support]), ,
+                             enable_geocode=auto)
+
+if test "x$enable_geocode" != "xno"; then
+   PKG_CHECK_MODULES(GEOCODE,
+   [
+      geocode-glib
+   ], have_geocode="yes", have_geocode="no")
+
+   if test "x$have_geocode" = "xyes"; then
+      AC_DEFINE(HAVE_GEOCODE, 1, [Define if you have geocode])
+   fi
+else
+   have_geocode="no"
+fi
+
+if test "x$enable_geocode" = "xyes" -a "x$have_geocode" != "xyes"; then
+   AC_MSG_ERROR([Could not find geocode dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_GEOCODE, test "x$have_geocode" = "xyes")
+AC_SUBST(GEOCODE_CFLAGS)
+AC_SUBST(GEOCODE_LIBS)
+
 # -----------------------------------------------------------
 # meego widgets support
 # -----------------------------------------------------------
@@ -560,6 +624,7 @@ Configure summary:
        Spell checking (enchant)....:  ${have_enchant}
        Display maps (libchamplain).:  ${have_libchamplain}
        Location awareness (Geoclue):  ${have_geoclue}
+       Geocode support (Geoclue)...:  ${have_geocode}
        Adium themes (Webkit).......:  ${have_webkit}
        Meego widgets...............:  ${have_meego}
        Control center embedding....:  ${have_control_center_embedding}
@@ -573,4 +638,5 @@ Configure summary:
        Nautilus-sendto plugin......:  ${have_nst}
        Salut E-D-S support.........:  ${with_eds}
        Exp. Call channel handler...:  ${have_farstream}
+       Exp. Call log support.......:  ${have_call_logs}
 "