X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=31fd170166d15d1274e47aafcadffe9a6ff38038;hp=a8fc1c4ff15cfdafd63b64fa9f533c04c8284d63;hb=da659f441dc3a8de5b25faa46f43c2e805d3d582;hpb=d853bea8e7e8a51aad15b479fcf39d7e95c4022a diff --git a/configure.ac b/configure.ac index a8fc1c4f..31fd1701 100644 --- a/configure.ac +++ b/configure.ac @@ -1,29 +1,20 @@ -AC_INIT(Empathy, 0.21.4, http://bugzilla.gnome.org/browse.cgi?product=empathy) +AC_INIT(Empathy, 0.21.5.1, http://bugzilla.gnome.org/browse.cgi?product=empathy) AC_PREREQ(2.59) AC_COPYRIGHT([ Copyright (C) 2003-2007 Imendio AB Copyright (C) 2007 Collabora Ltd. ]) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define) - -AM_MAINTAINER_MODE - -AC_ISC_POSIX -AC_PROG_CC -AC_HEADER_STDC - # LT Version numbers, remember to change them just *before* a release. # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) # (Interfaces added: CURRENT++, AGE++, REVISION=0) # (No interfaces changed: REVISION++) -LIBEMPATHY_CURRENT=8 -LIBEMPATHY_AGE=1 +LIBEMPATHY_CURRENT=9 +LIBEMPATHY_AGE=2 LIBEMPATHY_REVISION=0 -LIBEMPATHY_GTK_CURRENT=8 -LIBEMPATHY_GTK_AGE=1 +LIBEMPATHY_GTK_CURRENT=9 +LIBEMPATHY_GTK_AGE=0 LIBEMPATHY_GTK_REVISION=0 AC_SUBST(LIBEMPATHY_CURRENT) @@ -33,18 +24,7 @@ AC_SUBST(LIBEMPATHY_GTK_CURRENT) AC_SUBST(LIBEMPATHY_GTK_AGE) AC_SUBST(LIBEMPATHY_GTK_REVISION) -AM_PROG_LIBTOOL -AM_PATH_GLIB_2_0 -AC_PATH_XTRA - -AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) -AC_PATH_PROG(GCONFTOOL, gconftool-2) -AM_GCONF_SOURCE_2 - -IT_PROG_INTLTOOL([0.35.0]) - -GTK_DOC_CHECK([1.3]) - +# Minimal version required GLIB_REQUIRED=2.14.0 GTK_REQUIRED=2.12.0 GCONF_REQUIRED=1.2.0 @@ -52,39 +32,38 @@ LIBGLADE_REQUIRED=2.0.0 LIBPANELAPPLET_REQUIRED=2.10.0 TELEPATHY_REQUIRED=0.3.1 TELEPATHY_GLIB_REQUIRED=0.7.0 -MISSION_CONTROL_REQUIRED=4.37 - -IDT_COMPILE_WARNINGS +MISSION_CONTROL_REQUIRED=4.53 -dnl Uncomment that to build without deprecated symbols -dnl AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols]) -dnl AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols]) -dnl AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols]) +# Uncomment that to build without deprecated symbols +# AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols]) +# AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols]) +# AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR(.) +AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define) +AM_MAINTAINER_MODE +AC_ISC_POSIX +AC_PROG_CC +AC_HEADER_STDC +AM_PROG_LIBTOOL +AM_PATH_GLIB_2_0 +AC_PATH_XTRA +IT_PROG_INTLTOOL([0.35.0]) +GTK_DOC_CHECK([1.3]) +IDT_COMPILE_WARNINGS +AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) +AC_PATH_PROG(GCONFTOOL, gconftool-2) +AM_GCONF_SOURCE_2 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` AC_SUBST(GLIB_GENMARSHAL) -dnl ----------------------------------------------------------- -dnl SVN for ChangeLog generation -dnl ----------------------------------------------------------- +EMPATHY_ARG_VALGRIND -AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn]) -AC_SUBST([SVN_MODULE],[empathy]) -AC_SUBST([SVN_BRANCH],["trunk"]) - -dnl ----------------------------------------------------------- -dnl Language Support -dnl ----------------------------------------------------------- - -GETTEXT_PACKAGE=empathy -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) - -AM_GLIB_GNU_GETTEXT - -dnl ----------------------------------------------------------- -dnl Pkg-Config dependency checks -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# Pkg-Config dependency checks +# ----------------------------------------------------------- PKG_CHECK_MODULES(LIBEMPATHY, [ @@ -113,9 +92,19 @@ PKG_CHECK_MODULES(EMPATHY, libebook-1.2 ]) -dnl ----------------------------------------------------------- -dnl ISO codes, used for aspell support -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# Language Support +# ----------------------------------------------------------- + +GETTEXT_PACKAGE=empathy +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) + +AM_GLIB_GNU_GETTEXT + +# ----------------------------------------------------------- +# ISO codes, used for aspell support +# ----------------------------------------------------------- AC_MSG_CHECKING([whether iso-codes exists and has iso-639 domain]) if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 ; then AC_MSG_RESULT([yes]) @@ -131,9 +120,9 @@ fi AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$iso_codes_prefix"],[ISO codes prefix]) -dnl ----------------------------------------------------------- -dnl ASpell -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# ASpell +# ----------------------------------------------------------- AC_ARG_ENABLE(aspell, AS_HELP_STRING([--enable-aspell=@<:@no/yes/auto@:>@], [compile with aspell support]), , @@ -161,9 +150,9 @@ if test "x$enable_aspell" = "xyes" -a "x$have_aspell" != "xyes"; then fi -dnl ----------------------------------------------------------- -dnl Megaphone -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# Megaphone +# ----------------------------------------------------------- AC_ARG_ENABLE(megaphone, AS_HELP_STRING([--enable-megaphone=@<:@no/yes/auto@:>@], [build megaphone applet]), , @@ -191,9 +180,9 @@ fi AM_CONDITIONAL(HAVE_MEGAPHONE, test "x$have_megaphone" = "xyes") -dnl ----------------------------------------------------------- -dnl Nothere -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# Nothere +# ----------------------------------------------------------- AC_ARG_ENABLE(nothere, AS_HELP_STRING([--enable-nothere=@<:@no/yes/auto@:>@], [build nothere applet]), , @@ -220,19 +209,32 @@ fi AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes") -dnl ----------------------------------------------------------- -dnl Tests -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# Tests +# ----------------------------------------------------------- AC_ARG_ENABLE(tests, - AS_HELP_STRING([--enable-tests=@<:@no/yes@:>@], + AS_HELP_STRING([--enable-tests=@<:@no/yes/auto@:>@], [build tests]), , - enable_tests=no) + enable_tests=auto) + +if test "x$enable_tests" != "xno"; then + PKG_CHECK_MODULES(CHECK, + [ + check >= 0.9.4 + ], have_check="yes", have_check="no") +else + have_check=no +fi + +if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then + AC_MSG_ERROR([Couldn't find check dependencies.]) +fi -AM_CONDITIONAL(HAVE_TESTS, test "x$enable_tests" = "xyes") +AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes") -dnl ----------------------------------------------------------- -dnl Python Bindings -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# Python Bindings +# ----------------------------------------------------------- AC_ARG_ENABLE(python, AS_HELP_STRING([--enable-python=@<:@no/yes/auto@:>@], [build python bindings to libempathy and libempathy-gtk]), , @@ -267,9 +269,9 @@ fi AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes") -dnl ----------------------------------------------------------- -dnl VoIP support -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# VoIP support +# ----------------------------------------------------------- AC_ARG_ENABLE(voip, AS_HELP_STRING([--enable-voip=@<:@no/yes@:>@], [Add support for Voice and Video call]), , @@ -281,7 +283,7 @@ fi AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes") -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- AC_OUTPUT([ Makefile