X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=8346bbd5e4930f32c34e6707669d0ddd25529f43;hp=25c8df8e63ee95dc010890930b07389735b040c6;hb=0fd5995a431de2efc2b097828dcf18306de1459b;hpb=e3598826ad6ede2f72fbee91c528e621f6dce926

diff --git a/configure.ac b/configure.ac
index 25c8df8e..8346bbd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [1])
+m4_define([empathy_minor_version], [3])
 m4_define([empathy_micro_version], [92])
 m4_define([empathy_nano_version], [0])
 
@@ -34,28 +34,42 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.6.2
-GLIB_REQUIRED=2.28.0
+FOLKS_REQUIRED=0.6.6
 GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=3.0.2
+
+GLIB_REQUIRED=2.30.0
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
+AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
+
+GTK_REQUIRED=3.3.6
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_4, [Prevent post 3.4 APIs])
+
+CLUTTER_REQUIRED=1.8.0
+AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
+AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_8, [Prevent post 1.8 APIs])
+
+CLUTTER_GTK_REQUIRED=0.90.3
+CLUTTER_GST_REQUIRED=1.5.2
+
 GSTREAMER_REQUIRED=0.10.32
 KEYRING_REQUIRED=2.26.0
 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.5
+TELEPATHY_FARSTREAM_REQUIRED=0.2.1
+TELEPATHY_GLIB_REQUIRED=0.17.5
 TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
+GOA_REQUIRED=3.3.0
 
 # Optional deps
-CLUTTER_REQUIRED=1.7.14
-CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
-GEOCLUE_REQUIRED=0.11
+GEOCLUE_REQUIRED=0.12
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
+CHAMPLAIN_REQUIRED=0.12.1
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
@@ -64,15 +78,6 @@ NETWORK_MANAGER_REQUIRED=0.7.0
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
-# 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])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -96,7 +101,6 @@ AC_PATH_XTRA
 LT_PREREQ([2.2])
 LT_INIT
 
-GNOME_DOC_INIT([0.17.3])
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 GLIB_GSETTINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
@@ -194,47 +198,38 @@ PKG_CHECK_MODULES(EMPATHY,
    libpulse
    libpulse-mainloop-glib
    webkitgtk-3.0 >= $WEBKIT_REQUIRED
+   libsoup-2.4
 ])
 
-PKG_CHECK_MODULES(YELL, [telepathy-yell])
-
-PKG_CHECK_MODULES(EMPATHY_AV,
+PKG_CHECK_MODULES(EMPATHY_CALL,
 [
-   farsight2-0.10
-   telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
+   farstream-0.1
+   telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
+   clutter-1.0 >= $CLUTTER_REQUIRED
+   clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
+   clutter-gst-1.0 >= $CLUTTER_GST_REQUIRED
 ])
 
+AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
+   [Name of provider for accounts imported from GOA])
+
 # -----------------------------------------------------------
-# Call interface
+# Build empathy-av?
 # -----------------------------------------------------------
-AC_ARG_ENABLE(call,
-            AS_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
-            [build with Call interface support]),,
-            [enable_call=auto])
-if test "x$enable_call" != "xno" ; then
-   PKG_CHECK_MODULES(EMPATHY_CALL,
+AC_ARG_ENABLE(empathy-av,
+            AS_HELP_STRING([--enable-empathy-av=@<:@no/yes@:>@],
+            [build empathy-av (legacy call UI)]),,
+            [enable_empathy_av=no])
+if test "x$enable_empathy_av" != "xno" ; then
+   PKG_CHECK_MODULES(EMPATHY_AV,
    [
-      farsight2-0.10
-      telepathy-farstream
-      clutter-1.0 >= $CLUTTER_REQUIRED
-      clutter-gtk-1.0
-      clutter-gst-1.0
-   ], have_call="yes", have_call="no" )
-
-   if test "x$have_call" = "xyes"; then
-      AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support])
-   fi
-else
-  have_call=no
-fi
-
-if test "x$enable_call" = "xyes" -a "x$have_call" != "xyes"; then
-   AC_MSG_ERROR([Could not find Call handler dependencies:
-
-$EMPATHY_CALL_PKG_ERRORS])
+      farstream-0.1
+      telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
+   ])
+   AC_DEFINE(HAVE_EMPATHY_AV, 1, [Define if you have StreamedMedia channel support])
+   have_empathy_av=yes
 fi
-AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
-
+AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes")
 
 # -----------------------------------------------------------
 # Call support in tp-logger
@@ -300,9 +295,6 @@ fi
 # -----------------------------------------------------------
 IT_PROG_INTLTOOL([0.40.0])
 
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-
 GETTEXT_PACKAGE=empathy
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
@@ -440,7 +432,7 @@ if test "x$enable_map" != "xno"; then
     [
        clutter-gtk-1.0
        champlain-gtk-0.12
-       champlain-0.12
+       champlain-0.12 >= $CHAMPLAIN_REQUIRED
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
@@ -589,12 +581,13 @@ if test "x$enable_goa" != "xno"; then
    PKG_CHECK_MODULES(GOA,
     [
        mission-control-plugins
-       goa-1.0
+       goa-1.0 >= $GOA_REQUIRED
     ], have_goa="yes", have_goa="no")
 
    AC_MSG_CHECKING([Mission Control plugins dir])
    MISSION_CONTROL_PLUGINS_DIR=`pkg-config --variable=plugindir mission-control-plugins`
 
+   AC_MSG_RESULT([$MISSION_CONTROL_PLUGINS_DIR])
    AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
 else
    have_goa=no
@@ -604,6 +597,10 @@ if test "x$enable_goa" = "xyes" -a "x$have_goa" != "xyes"; then
    AC_MSG_ERROR([Could not find GOA dependencies.])
 fi
 
+if test "x$have_goa" = "xyes"; then
+   AC_DEFINE(HAVE_GOA, 1, [Define to 1 to enable GNOME Online Accounts])
+fi
+
 AM_CONDITIONAL(HAVE_GOA, test "x$have_goa" = "xyes")
 
 # Optional dependency for avatar selection
@@ -627,6 +624,8 @@ else
 fi
 AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
+# Help documentation
+YELP_HELP_INIT
 
 # -----------------------------------------------------------
 # Coding style checks
@@ -687,6 +686,6 @@ Configure summary:
 	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}
+	empathy-av (legacy).........:  ${enable_empathy_av}
 "