X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=952ff13cdf194e24be1a3b621c540ef2f63668be;hp=8f1772c7a5729300862ac87c40300adb69a83d00;hb=f3842fe890a0819331c3a5901437c88b2e88d282;hpb=bf79f1c56928a7270b679e5c35bff860440c077e diff --git a/configure.ac b/configure.ac index 8f1772c7..952ff13c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,24 @@ -# Making releases: -# set the new version number: -# odd minor -> development series -# even minor -> stable series -# increment micro for each release within a series -# set empathy_nano_version to 0. +dnl If not 1, append datestamp to the version number +m4_define(empathy_released, 0) m4_define([empathy_major_version], [2]) m4_define([empathy_minor_version], [29]) -m4_define([empathy_micro_version], [1]) -m4_define([empathy_nano_version], [1]) +m4_define([empathy_micro_version], [92]) +m4_define([empathy_nano_version], [0]) +dnl Display the nano_version only if it's not '0' m4_define([empathy_base_version], [empathy_major_version.empathy_minor_version.empathy_micro_version]) -m4_define([empathy_version], +m4_define([empathy_full_version], [m4_if(empathy_nano_version, 0, [empathy_base_version], [empathy_base_version].[empathy_nano_version])]) +m4_define(empathy_maybe_datestamp, + m4_esyscmd([if test x]empathy_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) + +m4_define(empathy_version, empathy_full_version[]empathy_maybe_datestamp) + + AC_INIT(Empathy, empathy_version, http://bugzilla.gnome.org/browse.cgi?product=empathy) @@ -27,10 +30,10 @@ AC_COPYRIGHT([ # Minimal version required GLIB_REQUIRED=2.22.0 -GTK_REQUIRED=2.16.0 +GTK_REQUIRED=2.18.0 GCONF_REQUIRED=1.2.0 -LIBPANELAPPLET_REQUIRED=2.10.0 -TELEPATHY_GLIB_REQUIRED=0.7.35 +TELEPATHY_GLIB_REQUIRED=0.9.2 +TELEPATHY_LOGGER=0.1.1 ENCHANT_REQUIRED=1.2.0 ISO_CODES_REQUIRED=0.35 LIBNOTIFY_REQUIRED=0.4.4 @@ -42,15 +45,15 @@ GEOCLUE_REQUIRED=0.11 WEBKIT_REQUIRED=1.1.15 KEYRING_REQUIRED=2.22 NETWORK_MANAGER_REQUIRED=0.7.0 -NAUTILUS_SENDTO_REQUIRED=2.28.0.1 +NAUTILUS_SENDTO_REQUIRED=2.28.1 # Use --enable-maintainer-mode to disabled deprecated symbols GNOME_MAINTAINER_MODE_DEFINES -# Uncomment that to build with single include disabled -#AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib]) -#AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf]) -#AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK]) +# Warning if GLib/GDK/GTK headers are included +AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib]) +AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf]) +AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -60,6 +63,12 @@ AC_CONFIG_AUX_DIR(.) GNOME_COMMON_INIT AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability) + +# Support silent build rules, requires at least automake-1.11. Disable +# by either passing --disable-silent-rules to configure or passing V=1 +# to make +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AC_ISC_POSIX AC_PROG_CC AC_HEADER_STDC @@ -75,6 +84,8 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` AC_SUBST(GLIB_GENMARSHAL) +CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center-extension` +AC_SUBST(CONTROL_CENTER_EXTENSIONDIR) AC_CHECK_PROGS([XSLTPROC], [xsltproc]) if test -z "$XSLTPROC"; then @@ -103,7 +114,7 @@ AS_COMPILER_FLAG(-Wno-unused-parameter, wno_unused_parameter=yes, wno_unused_parameter=no) -ifelse(empathy_nano_version, 0, [], +ifelse(empathy_released, 1, [], [ if test x$werror = xyes; then ERROR_CFLAGS="$ERROR_CFLAGS -Werror" @@ -124,6 +135,30 @@ AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-d AC_SUBST(ERROR_CFLAGS) +# ----------------------------------------------------------- +# Enable TPL +# ----------------------------------------------------------- + +# It needs to be defined before PKG_CHECK_MODULES calls +AC_ARG_ENABLE(tpl, + AC_HELP_STRING([--enable-tpl],[enable telepathy-logger code and disable the + empathy logger]), enable_tpl=$enableval, enable_tpl=no ) +AM_CONDITIONAL(ENABLE_TPL, test "x$enable_tpl" = "xyes") + +if test x${enable_tpl} = xyes; then + AC_DEFINE(ENABLE_TPL, [], [Enable TPL code]) +fi + +if test "x$enable_tpl" = "xyes"; then + PKG_CHECK_MODULES(TPL, + [ + telepathy-logger = $TELEPATHY_LOGGER + ]) + AC_SUBST(TPL_CFLAGS) + AC_SUBST(TPL_LIBS) +fi + + # ----------------------------------------------------------- # Pkg-Config dependency checks # ----------------------------------------------------------- @@ -167,11 +202,26 @@ PKG_CHECK_MODULES(EMPATHY, dbus-glib-1 telepathy-glib >= $TELEPATHY_GLIB_REQUIRED telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED ]) +PKG_CHECK_MODULES(LIBEMPATHY_ACCOUNTS_PANEL, +[ + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gio-2.0 >= $GLIB_REQUIRED + gdk-x11-2.0 + gtk+-2.0 >= $GTK_REQUIRED + libebook-1.2 + dbus-glib-1 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + unique-1.0 + gnome-keyring-1 >= $KEYRING_REQUIRED +]) + PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) # ----------------------------------------------------------- @@ -230,6 +280,16 @@ else if test "x$have_nm" = "xyes"; then AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) have_connman=no + else + PKG_CHECK_MODULES(NETWORK_MANAGER, + [ + libnm-glib >= $NETWORK_MANAGER_REQUIRED + ], have_nm="yes", have_nm="no") + + if test "x$have_nm" = "xyes"; then + AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) + have_connman=no + fi fi fi @@ -367,33 +427,62 @@ AC_SUBST(GEOCLUE_CFLAGS) AC_SUBST(GEOCLUE_LIBS) # ----------------------------------------------------------- -# moblin widgets support +# meego widgets support +# ----------------------------------------------------------- +AC_ARG_ENABLE(meego, + AS_HELP_STRING([--enable-meego=@<:no/yes@:>@], + [Enable meego widgets]), , + enable_meego=no) + +if test "x$enable_meego" != "xno"; then + PKG_CHECK_MODULES(MEEGO, + [ + mx-gtk-1.0 + ], have_meego="yes", have_meego="no") + + if test "x$have_meego" = "xyes"; then + AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego]) + chain_enable_favourite_contacts="yes" + fi +else + have_meego="no" +fi + +if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then + AC_MSG_ERROR([Couldn't find meego dependencies.]) +fi + +AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes") +AC_SUBST(MEEGO_CFLAGS) +AC_SUBST(MEEGO_LIBS) + +# ----------------------------------------------------------- +# favourite contacts support # ----------------------------------------------------------- -AC_ARG_ENABLE(moblin, - AS_HELP_STRING([--enable-moblin=@<:no/yes@:>@], - [Enable moblin widgets]), , - enable_moblin=no) +AC_ARG_ENABLE(favourite_contacts, + AS_HELP_STRING([--enable-favourite-contacts=@<:no/yes@:>@], + [Enable favourite contacts]), , + enable_favourite_contacts=no) -if test "x$enable_moblin" != "xno"; then - PKG_CHECK_MODULES(MOBLIN, +if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then + PKG_CHECK_MODULES(TELEPATHY_LOGGER, [ - nbtk-gtk-1.2 - ], have_moblin="yes", have_moblin="no") + telepathy-logger + ], have_telepathy_logger="yes", have_telepathy_logger="no") - if test "x$have_moblin" = "xyes"; then - AC_DEFINE(HAVE_MOBLIN, 1, [Define if you have moblin]) + if test "x$have_telepathy_logger" = "xyes"; then + have_favourite_contacts="yes" + AC_DEFINE(HAVE_FAVOURITE_CONTACTS, 1, [Define if you want favourite contacts support]) fi else - have_moblin="no" + have_favourite_contacts="no" fi -if test "x$enable_moblin" = "xyes" -a "x$have_moblin" != "xyes"; then - AC_MSG_ERROR([Couldn't find moblin dependencies.]) +if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" != "xyes"; then + AC_MSG_ERROR([Couldn't find favourite contacts dependencies.]) fi -AM_CONDITIONAL(HAVE_MOBLIN, test "x$have_moblin" = "xyes") -AC_SUBST(MOBLIN_CFLAGS) -AC_SUBST(MOBLIN_LIBS) +AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes") # ----------------------------------------------------------- # nautilus-sendto @@ -401,9 +490,9 @@ AC_SUBST(MOBLIN_LIBS) AC_ARG_ENABLE(nautilus-sendto, AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@], [build nautilus-sendto plugin]), , - enable_nst=auto) + enable_nautilus_sendto=auto) -if test "x$enable_nst" != "xno"; then +if test "x$enable_nautilus_sendto" != "xno"; then PKG_CHECK_MODULES(NST, [ nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED @@ -412,34 +501,40 @@ else have_nst=no fi -if test "x$enable_nst" = "xyes" -a "x$have_nst" != "xyes"; then +if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then AC_MSG_ERROR([Couldn't find nautilus-sendto dependencies.]) fi AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes") # ----------------------------------------------------------- -# Tests +# new, single-window control center # ----------------------------------------------------------- -AC_ARG_ENABLE(tests, - AS_HELP_STRING([--enable-tests=@<:@no/yes/auto@:>@], - [build tests]), , - enable_tests=auto) +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_tests" != "xno"; then - PKG_CHECK_MODULES(CHECK, +if test "x$enable_control_center_embedding" != "xno"; then + PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [ - check >= 0.9.4 - ], have_check="yes", have_check="no") + libgnome-control-center-extension + ], have_control_center_embedding="yes", have_control_center_embedding="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]) + fi else - have_check=no + have_control_center_embedding="no" fi -if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then - AC_MSG_ERROR([Couldn't find check dependencies.]) +if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then + AC_MSG_ERROR([Couldn't find single-window control center dependencies.]) fi -AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes") +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) # ----------------------------------------------------------- # Coding style checks @@ -452,12 +547,11 @@ AC_ARG_ENABLE(coding-style-checks, AC_SUBST([ENABLE_CODING_STYLE_CHECKS]) # ----------------------------------------------------------- -SHAVE_INIT(.) - AC_OUTPUT([ Makefile data/Makefile data/empathy.desktop.in + data/empathy-accounts.desktop.in data/icons/Makefile extensions/Makefile po/Makefile.in @@ -467,10 +561,9 @@ AC_OUTPUT([ nautilus-sendto-plugin/Makefile help/Makefile tests/Makefile + tests/interactive/Makefile tests/xml/Makefile tools/Makefile - shave - shave-libtool ]) echo " @@ -479,8 +572,6 @@ Configure summary: Compiler....................: ${CC} Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} Prefix......................: ${prefix} - Shaved build................: ${enable_shave} - Tests.......................: ${have_check} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} Features: @@ -488,7 +579,12 @@ Configure summary: Display maps (libchamplain).: ${have_libchamplain} Location awareness (Geoclue): ${have_geoclue} Adium themes (Webkit).......: ${have_webkit} - Moblin widgets .............: ${have_moblin} + Meego widgets ..............: ${have_meego} + Favourite contacts .........: ${have_favourite_contacts} + Control center embedding....: ${have_control_center_embedding} + + Logging: + Telepathy Logger............: ${enable_tpl} Connectivity: NetworkManager integration..: ${have_nm}