X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=f0b2eb90705e557ce4dd51b16931f80ee869950e;hp=9773190904df5e62429a49866d8fb93df18a965f;hb=2a7fa12bcf9c0ee5a9ff506bc88af2194990dabc;hpb=d1efd59bfbb620fa7531726f6b473880a3c485a7

diff --git a/configure.ac b/configure.ac
index 97731909..f0b2eb90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@ 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], [5])
-m4_define([empathy_nano_version], [1])
+m4_define([empathy_minor_version], [3])
+m4_define([empathy_micro_version], [3])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -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.6
+GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=3.0.2
 GSTREAMER_REQUIRED=0.10.32
@@ -43,21 +43,21 @@ 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_FARSIGHT_REQUIRED=0.0.18
+TELEPATHY_GLIB_REQUIRED=0.17.3
 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
 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
+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,
@@ -66,6 +66,11 @@ GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
+# Disable GLib deprecation warnings for now; we don't want to bump the GLib dep
+# and make things harder for contributiors without good reason. We'll re-enable
+# those warnings later during the cycle (bgo #662662)
+AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
+
 # telepathy-yell
 prev_top_build_prefix=$ac_top_build_prefix
 prev_ac_configure_args=$ac_configure_args
@@ -152,10 +157,24 @@ AS_COMPILER_FLAG(-Wstrict-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wstrict-proto
 
 AC_SUBST(ERROR_CFLAGS)
 
+AC_ARG_ENABLE(gprof,
+            AS_HELP_STRING([--enable-gprof=@<:@no/yes@:>@],
+            [build with support for gprof]),,
+            [enable_gprof=no])
+if test "x$enable_gprof" != "xno" ; then
+    CFLAGS="$CFLAGS -pg"
+    LDFLAGS="$LDFLAGS -pg"
+fi
+
+AC_SUBST(LDFLAGS)
+
 # -----------------------------------------------------------
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
 
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
+
 PKG_CHECK_MODULES(EMPATHY,
 [
    dbus-glib-1
@@ -182,6 +201,7 @@ PKG_CHECK_MODULES(EMPATHY,
    libpulse
    libpulse-mainloop-glib
    webkitgtk-3.0 >= $WEBKIT_REQUIRED
+   libsoup-2.4
 ])
 
 PKG_CHECK_MODULES(YELL, [telepathy-yell])
@@ -192,6 +212,9 @@ PKG_CHECK_MODULES(EMPATHY_AV,
    telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
 ])
 
+AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
+   [Name of provider for accounts imported from GOA])
+
 # -----------------------------------------------------------
 # Call interface
 # -----------------------------------------------------------
@@ -203,8 +226,8 @@ if test "x$enable_call" != "xno" ; then
    PKG_CHECK_MODULES(EMPATHY_CALL,
    [
       farsight2-0.10
-      telepathy-farstream
-      clutter-1.0
+      telepathy-farstream >= 0.1.2
+      clutter-1.0 >= $CLUTTER_REQUIRED
       clutter-gtk-1.0
       clutter-gst-1.0
    ], have_call="yes", have_call="no" )
@@ -217,7 +240,9 @@ else
 fi
 
 if test "x$enable_call" = "xyes" -a "x$have_call" != "xyes"; then
-   AC_MSG_ERROR([Could not find Call handler dependencies.])
+   AC_MSG_ERROR([Could not find Call handler dependencies:
+
+$EMPATHY_CALL_PKG_ERRORS])
 fi
 AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
 
@@ -331,11 +356,15 @@ else
 fi
 
 if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find connman dependencies.])
+   AC_MSG_ERROR([Couldn't find connman dependencies:
+
+$CONNMAN_PKG_ERRORS])
 fi
 
 if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find libnm-glib dependencies.])
+   AC_MSG_ERROR([Couldn't find Network Manager dependencies:
+
+$NETWORK_MANAGER_PKG_ERRORS])
 fi
 
 AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes")
@@ -362,7 +391,9 @@ else
 fi
 
 if test "x$enable_gudev" = "xyes" -a "x$have_gudev" != "xyes"; then
-   AC_MSG_ERROR([Could not find gudev dependencies.])
+   AC_MSG_ERROR([Could not find gudev dependencies:
+
+$UDEV_PKG_ERRORS])
 fi
 AM_CONDITIONAL(HAVE_UDEV, test "x$have_gudev" = "xyes")
 
@@ -399,7 +430,9 @@ else
 fi
 
 if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then
-   AC_MSG_ERROR([Could not find spell dependencies.])
+   AC_MSG_ERROR([Could not find spell-checking dependencies:
+
+$ENCHANT_PKG_ERRORS])
 fi
 
 AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes")
@@ -417,8 +450,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 >= $CHAMPLAIN_REQUIRED
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
@@ -429,7 +462,9 @@ else
 fi
 
 if test "x$enable_map" = "xyes" -a "x$have_libchamplain" != "xyes"; then
-   AC_MSG_ERROR([Could not find map view dependencies.])
+   AC_MSG_ERROR([Could not find map view dependencies:
+
+$LIBCHAMPLAIN_PKG_ERRORS])
 fi
 
 AM_CONDITIONAL(HAVE_LIBCHAMPLAIN, test "x$have_libchamplain" = "xyes")
@@ -456,7 +491,9 @@ else
 fi
 
 if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then
-   AC_MSG_ERROR([Could not find location dependencies.])
+   AC_MSG_ERROR([Could not find location dependencies:
+
+$GEOCLUE_PKG_ERRORS])
 fi
 
 AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes")
@@ -485,7 +522,9 @@ else
 fi
 
 if test "x$enable_geocode" = "xyes" -a "x$have_geocode" != "xyes"; then
-   AC_MSG_ERROR([Could not find geocode dependencies.])
+   AC_MSG_ERROR([Could not find geocode dependencies:
+
+$GEOCODE_PKG_ERRORS])
 fi
 
 AM_CONDITIONAL(HAVE_GEOCODE, test "x$have_geocode" = "xyes")
@@ -515,7 +554,9 @@ else
 fi
 
 if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
-   AC_MSG_ERROR([Could not find meego dependencies.])
+   AC_MSG_ERROR([Could not find meego dependencies:
+
+$MEEGO_PKG_ERRORS])
 fi
 
 AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
@@ -540,47 +581,46 @@ else
 fi
 
 if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
-   AC_MSG_ERROR([Could not find nautilus-sendto dependencies.])
+   AC_MSG_ERROR([Could not find nautilus-sendto dependencies:
+
+$NST_PKG_ERRORS])
 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)
-
-if test "x$enable_control_center_embedding" != "xno"; then
+AC_ARG_ENABLE(goa,
+              AS_HELP_STRING([--enable-goa=@<:@no/yes/auto@:>@],
+                             [build GOA MC plugin]), ,
+                             enable_goa=auto)
 
-   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 >= $GOA_REQUIRED
+    ], 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_MSG_RESULT([$MISSION_CONTROL_PLUGINS_DIR])
+   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.])
+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)
+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
 AC_ARG_WITH([cheese],
@@ -594,7 +634,9 @@ if test x"$with_cheese" != x"no" ; then
      AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
    fi
    if test x${with_cheese} = xyes && test x${have_cheese} = xno; then
-     AC_MSG_ERROR([Cheese configured but not found])
+     AC_MSG_ERROR([Cheese configured but not found:
+
+$CHEESE_PKG_ERRORS])
    fi
 else
    have_cheese=no
@@ -626,6 +668,7 @@ AC_CONFIG_FILES([
    libempathy-gtk/Makefile
    src/Makefile
    nautilus-sendto-plugin/Makefile
+   goa-mc-plugin/Makefile
    help/Makefile
    tests/Makefile
    tests/interactive/Makefile
@@ -639,6 +682,7 @@ Configure summary:
 
 	Compiler....................:  ${CC}
 	Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
+	Linker Flags................:  ${LDFLAGS}
 	Prefix......................:  ${prefix}
 	Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
 
@@ -646,9 +690,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}
 
@@ -658,6 +701,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}