X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=a5d30bcdc29b4c59ca02be9515eeb9b4214afe98;hp=4b301caacba9bb108c2f1f8ddb1541e46b3613ac;hb=737ac3b6cd405faf6abaea3c305c7e64f3d7dd49;hpb=bcb8528a437f58957042c01fedc40ad269bd8703 diff --git a/configure.ac b/configure.ac index 4b301caa..a5d30bcd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,30 +1,21 @@ -AC_INIT(Empathy, 0.14, http://bugzilla.gnome.org/browse.cgi?product=empathy) +AC_INIT(Empathy, 0.23.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=4 -LIBEMPATHY_AGE=1 -LIBEMPATHY_REVISION=0 +LIBEMPATHY_CURRENT=11 +LIBEMPATHY_AGE=0 +LIBEMPATHY_REVISION=1 -LIBEMPATHY_GTK_CURRENT=5 -LIBEMPATHY_GTK_AGE=1 -LIBEMPATHY_GTK_REVISION=0 +LIBEMPATHY_GTK_CURRENT=11 +LIBEMPATHY_GTK_AGE=0 +LIBEMPATHY_GTK_REVISION=1 AC_SUBST(LIBEMPATHY_CURRENT) AC_SUBST(LIBEMPATHY_AGE) @@ -33,52 +24,68 @@ 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]) - -GLIB_REQUIRED=2.14.0 +# Minimal version required +GLIB_REQUIRED=2.15.5 GTK_REQUIRED=2.12.0 GCONF_REQUIRED=1.2.0 LIBGLADE_REQUIRED=2.0.0 LIBPANELAPPLET_REQUIRED=2.10.0 -TELEPATHY_REQUIRED=0.0.57 -MISSION_CONTROL_REQUIRED=4.33 +TELEPATHY_REQUIRED=0.3.2 +TELEPATHY_GLIB_REQUIRED=0.7.3 +MISSION_CONTROL_REQUIRED=4.53 -IDT_COMPILE_WARNINGS +# 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_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_MAINTAINER_MODE +AC_ISC_POSIX +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]) +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 Language Support -dnl ----------------------------------------------------------- - -GETTEXT_PACKAGE=empathy -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) +AC_CHECK_PROGS([XSLTPROC], [xsltproc]) +if test -z "$XSLTPROC"; then + AC_MSG_ERROR([xsltproc (from libxslt) is required]) +fi +AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) +if test -z "$PYTHON"; then + AC_MSG_ERROR([Python is required]) +fi -AM_GLIB_GNU_GETTEXT +EMPATHY_ARG_VALGRIND -dnl ----------------------------------------------------------- -dnl Pkg-Config dependency checks -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- +# Pkg-Config dependency checks +# ----------------------------------------------------------- PKG_CHECK_MODULES(LIBEMPATHY, [ glib-2.0 >= $GLIB_REQUIRED gobject-2.0 - gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 libtelepathy >= $TELEPATHY_REQUIRED + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED ]) @@ -86,19 +93,30 @@ PKG_CHECK_MODULES(EMPATHY, [ glib-2.0 >= $GLIB_REQUIRED gobject-2.0 + gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED - libxml-2.0 - gnome-vfs-2.0 libtelepathy >= $TELEPATHY_REQUIRED + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED gtk+-2.0 >= $GTK_REQUIRED + x11 libglade-2.0 >= $LIBGLADE_REQUIRED 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]) @@ -114,9 +132,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]), , @@ -144,9 +162,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]), , @@ -160,7 +178,6 @@ if test "x$enable_megaphone" != "xno"; then gtk+-2.0 >= $GTK_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED - gnome-vfs-2.0 libtelepathy >= $TELEPATHY_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED ], have_megaphone="yes", have_megaphone="no") @@ -174,9 +191,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]), , @@ -203,19 +220,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]), , @@ -233,7 +263,6 @@ if test "x$enable_python" != "xno"; then gobject-2.0 gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 - gnome-vfs-2.0 libtelepathy >= $TELEPATHY_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED gtk+-2.0 >= $GTK_REQUIRED @@ -250,9 +279,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]), , @@ -264,18 +293,14 @@ fi AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes") -dnl ----------------------------------------------------------- +# ----------------------------------------------------------- AC_OUTPUT([ Makefile data/Makefile data/empathy.desktop.in - data/16x16/Makefile - data/22x22/Makefile - data/24x24/Makefile - data/32x32/Makefile - data/48x48/Makefile - data/scalable/Makefile + data/icons/Makefile + extensions/Makefile po/Makefile.in libempathy/Makefile libempathy/libempathy.pc @@ -288,11 +313,15 @@ AC_OUTPUT([ nothere/Makefile nothere/src/Makefile nothere/data/Makefile - doc/Makefile - doc/libempathy/Makefile - doc/libempathy-gtk/Makefile + docs/Makefile + docs/libempathy/Makefile + docs/libempathy/version.xml + docs/libempathy-gtk/Makefile + docs/libempathy-gtk/version.xml python/Makefile python/pyempathy/Makefile python/pyempathygtk/Makefile tests/Makefile + tests/xml/Makefile + tools/Makefile ])