X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=9ca9f61e7d60b77990a10986ab9a5991b95a45e5;hp=8854750af30232856ae2e85fc707fe0680bed914;hb=f8148be971e1b51e43374473ab33e5ac8fd14a40;hpb=4cb792eb96fc4d38aa49614fc378e70d2dfc508a diff --git a/configure.ac b/configure.ac index 8854750a..9ca9f61e 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], [2]) -m4_define([empathy_nano_version], [1]) +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' m4_define([empathy_base_version], @@ -19,10 +19,13 @@ m4_define(empathy_maybe_datestamp, m4_define(empathy_version, empathy_full_version[]empathy_maybe_datestamp) -AC_INIT(Empathy, empathy_version, http://bugzilla.gnome.org/browse.cgi?product=empathy) +AC_INIT([Empathy], + [empathy_version], + [http://bugzilla.gnome.org/browse.cgi?product=empathy], + [empathy], + [https://live.gnome.org/Empathy]) - -AC_PREREQ(2.59) +AC_PREREQ([2.64]) AC_COPYRIGHT([ Copyright (C) 2003-2007 Imendio AB Copyright (C) 2007-2010 Collabora Ltd. @@ -31,8 +34,8 @@ AC_COPYRIGHT([ # Minimal version required # Hardp deps -FOLKS_REQUIRED=0.5.1 -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 @@ -41,20 +44,18 @@ 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_GLIB_REQUIRED=0.15.5 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 -WEBKIT_REQUIRED=1.3.2 -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, @@ -77,23 +78,24 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR(.) -GNOME_COMMON_INIT - -AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability) +AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability tar-ustar no-dist-gzip dist-xz]) -# Support silent build rules, requires at least automake-1.11. Disable +# Support silent build rules. Disable # by either passing --disable-silent-rules to configure or passing V=1 # to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AM_SILENT_RULES([yes]) -AC_ISC_POSIX +# Check for programs AC_PROG_CC AC_HEADER_STDC -AM_PROG_LIBTOOL AM_PROG_MKDIR_P AM_PATH_GLIB_2_0 AC_PATH_XTRA -IT_PROG_INTLTOOL([0.35.0]) + +# Initialize libtool +LT_PREREQ([2.2]) +LT_INIT + GNOME_DOC_INIT([0.17.3]) AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) GLIB_GSETTINGS @@ -116,7 +118,8 @@ AS_COMPILER_FLAG(-Wall, ERROR_CFLAGS="-Wall", ERROR_CFLAGS="") AS_COMPILER_FLAG(-Werror, werror=yes, werror=no) AC_ARG_ENABLE(Werror, - AC_HELP_STRING([--disable-Werror],[compile without -Werror (normally enabled in development builds)]), + AS_HELP_STRING([--disable-Werror], + [compile without -Werror (normally enabled in development builds)]), werror=$enableval, :) AS_COMPILER_FLAG(-Wextra, wextra=yes, wextra=no) @@ -147,10 +150,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 @@ -174,6 +191,9 @@ PKG_CHECK_MODULES(EMPATHY, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED libnotify >= $LIBNOTIFY_REQUIRED gcr-3 >= $GCR_REQUIRED + libpulse + libpulse-mainloop-glib + webkitgtk-3.0 >= $WEBKIT_REQUIRED ]) PKG_CHECK_MODULES(YELL, [telepathy-yell]) @@ -187,48 +207,56 @@ PKG_CHECK_MODULES(EMPATHY_AV, # ----------------------------------------------------------- # Call interface # ----------------------------------------------------------- -AC_ARG_WITH(call, - AC_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@], +AC_ARG_ENABLE(call, + AS_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@], [build with Call interface support]),, - [with_call=auto]) -if test "x$with_call" != "xno" ; then + [enable_call=auto]) +if test "x$enable_call" != "xno" ; then PKG_CHECK_MODULES(EMPATHY_CALL, [ farsight2-0.10 telepathy-farstream - ], have_farstream="yes", have_farstream="no" ) + clutter-1.0 >= $CLUTTER_REQUIRED + clutter-gtk-1.0 + clutter-gst-1.0 + ], have_call="yes", have_call="no" ) - if test "x$have_farstream" = "xyes"; then + if test "x$have_call" = "xyes"; then AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support]) fi else - have_farstream=no + have_call=no fi -if test "x$with_call" = "xyes" -a "x$have_farstream" != "xyes"; then - AC_MSG_ERROR([Could not find Call handler dependencies.]) +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]) fi -AM_CONDITIONAL(HAVE_CALL, test "x$have_farstream" = "xyes") +AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes") # ----------------------------------------------------------- # Call support in tp-logger # ----------------------------------------------------------- -AC_ARG_WITH(call-logs, - AC_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@], +AC_ARG_ENABLE(call-logs, + AS_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 + [enable_call_logs=auto]) +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]) @@ -237,7 +265,7 @@ else have_call_logs=no fi -if test "x$with_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then +if test "x$enable_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 @@ -246,7 +274,8 @@ fi # evolution-data-server (about-me) # ----------------------------------------------------------- AC_ARG_WITH(eds, - AC_HELP_STRING([--with-eds], [build with evolution-data-server support]),, + AS_HELP_STRING([--with-eds], + [build with evolution-data-server support]),, [with_eds=yes]) if test x"$with_eds" = x"yes" ; then PKG_CHECK_MODULES(EDS, [libebook-1.2]) @@ -258,7 +287,8 @@ fi # ----------------------------------------------------------- AC_ARG_ENABLE(debug, - AC_HELP_STRING([--disable-debug],[compile without debug code]), + AS_HELP_STRING([--disable-debug], + [compile without debug code]), enable_debug=$enableval, enable_debug=yes ) if test x$enable_debug = xyes; then @@ -268,13 +298,15 @@ fi # ----------------------------------------------------------- # Language Support # ----------------------------------------------------------- +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]) -AM_GLIB_GNU_GETTEXT - # ----------------------------------------------------------- # Connectivity integration # ----------------------------------------------------------- @@ -313,39 +345,46 @@ 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 +# gudev # ----------------------------------------------------------- -AC_ARG_ENABLE(webkit, - AS_HELP_STRING([--enable-webkit=@<:@no/yes/auto@:>@], - [build with webkit support]), , - enable_webkit=auto) +AC_ARG_ENABLE(gudev, + AS_HELP_STRING([--enable-gudev=@<:@no/yes/auto@:>@], + [build with gudev support]), , + enable_gudev=auto) + +if test "x$enable_gudev" != "xno"; then -if test "x$enable_webkit" != "xno"; then - PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED], - have_webkit="yes", have_webkit="no") + PKG_CHECK_MODULES(UDEV, [gudev-1.0], + have_gudev="yes", have_gudev="no") - if test "x$have_webkit" = "xyes"; then - AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk]) + if test "x$have_gudev" = "xyes"; then + AC_DEFINE(HAVE_UDEV, 1, [Define if you have gudev]) fi else - have_webkit=no + have_gudev=no fi -if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then - AC_MSG_ERROR([Could not find webkit dependencies.]) +if test "x$enable_gudev" = "xyes" -a "x$have_gudev" != "xyes"; then + AC_MSG_ERROR([Could not find gudev dependencies: + +$UDEV_PKG_ERRORS]) fi -AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes") +AM_CONDITIONAL(HAVE_UDEV, test "x$have_gudev" = "xyes") # ----------------------------------------------------------- # spellchecking checks: enchant and iso-codes @@ -380,7 +419,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") @@ -398,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 @@ -410,7 +451,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") @@ -437,7 +480,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") @@ -466,7 +511,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") @@ -496,7 +543,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") @@ -521,51 +570,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) +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.]) +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], - AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),, + AS_HELP_STRING([--with-cheese], + [enable cheese webcam support]),, with_cheese=auto) if test x"$with_cheese" != x"no" ; then @@ -574,7 +618,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 @@ -586,14 +632,15 @@ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) # Coding style checks # ----------------------------------------------------------- AC_ARG_ENABLE(coding-style-checks, - AC_HELP_STRING([--disable-coding-style-checks], + AS_HELP_STRING([--disable-coding-style-checks], [do not check coding style using grep]), - [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes]) + [ENABLE_CODING_STYLE_CHECKS=$enableval], + [ENABLE_CODING_STYLE_CHECKS=yes]) AC_SUBST([ENABLE_CODING_STYLE_CHECKS]) # ----------------------------------------------------------- -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile data/Makefile data/empathy.desktop.in @@ -605,18 +652,21 @@ AC_OUTPUT([ libempathy-gtk/Makefile src/Makefile nautilus-sendto-plugin/Makefile + goa-mc-plugin/Makefile help/Makefile tests/Makefile tests/interactive/Makefile tests/xml/Makefile tools/Makefile ]) +AC_OUTPUT echo " Configure summary: Compiler....................: ${CC} Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} + Linker Flags................: ${LDFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} @@ -624,11 +674,10 @@ 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} Connectivity: NetworkManager integration..: ${have_nm} @@ -636,7 +685,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_farstream} + Exp. Call channel handler...: ${have_call} Exp. Call log support.......: ${have_call_logs} "