X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=8346bbd5e4930f32c34e6707669d0ddd25529f43;hp=d8de67f2c30462213373972f899d19ea8a219ccd;hb=0fd5995a431de2efc2b097828dcf18306de1459b;hpb=96174dd10b0fd5f43656d582d5ecb2b4877641a8 diff --git a/configure.ac b/configure.ac index d8de67f2..8346bbd5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ 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_micro_version], [5]) +m4_define([empathy_minor_version], [3]) +m4_define([empathy_micro_version], [92]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' @@ -34,30 +34,42 @@ AC_COPYRIGHT([ # Minimal version required # Hardp deps -FOLKS_REQUIRED=0.6.0 -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.3 +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_GTK_REQUIRED=0.90.3 ENCHANT_REQUIRED=1.2.0 -GEOCLUE_REQUIRED=0.11 +GEOCLUE_REQUIRED=0.12 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 -WEBKIT_REQUIRED=1.3.13 -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,15 +78,6 @@ GNOME_CONTROL_CENTER_REQUIRED=2.31.4 #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]) @@ -98,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` @@ -152,10 +154,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 @@ -181,45 +197,39 @@ PKG_CHECK_MODULES(EMPATHY, gcr-3 >= $GCR_REQUIRED 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-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.]) + 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 @@ -231,14 +241,17 @@ AC_ARG_ENABLE(call-logs, if test "x$enable_call_logs" != "xno" ; then SAVE_CFLAGS=$CFLAGS SAVE_CPPFLAGS=$CPPFLAGS + SAVE_LDFLAGS=$LDFLAGS CFLAGS="$CFLAGS $EMPATHY_CFLAGS" CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS" + LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS" AC_CHECK_HEADER(telepathy-logger/call-event.h, have_call_logs="yes", have_call_logs="no") CFLAGS=$SAVE_CFLAGS CPPFLAGS=$SAVE_CPPFLAGS + LDFLAGS=$SAVE_LDFLAGS if test "x$have_call_logs" = "xyes"; then AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support]) @@ -282,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]) @@ -327,40 +337,20 @@ 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") AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "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, [webkitgtk-3.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([Could not find webkit dependencies.]) -fi -AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes") - # ----------------------------------------------------------- # gudev # ----------------------------------------------------------- @@ -382,7 +372,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") @@ -419,7 +411,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") @@ -437,8 +431,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 @@ -449,7 +443,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") @@ -476,7 +472,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") @@ -505,7 +503,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") @@ -535,7 +535,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") @@ -560,47 +562,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], @@ -614,13 +615,17 @@ 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 fi AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) +# Help documentation +YELP_HELP_INIT # ----------------------------------------------------------- # Coding style checks @@ -646,6 +651,7 @@ AC_CONFIG_FILES([ libempathy-gtk/Makefile src/Makefile nautilus-sendto-plugin/Makefile + goa-mc-plugin/Makefile help/Makefile tests/Makefile tests/interactive/Makefile @@ -659,6 +665,7 @@ Configure summary: Compiler....................: ${CC} Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} + Linker Flags................: ${LDFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} @@ -666,10 +673,8 @@ 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} + 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} @@ -679,7 +684,8 @@ 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} + empathy-av (legacy).........: ${enable_empathy_av} "