X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=c3926fdb20aafd2c0e56dc71472ff154cd6323a7;hp=374756a5637d04a24665bbc0fe0c53159652cce8;hb=814e6198069aaa5df9cf63e51b29afe78ef22dde;hpb=d8af806a5349ed9a64838c250ff8ff7c8de2e118 diff --git a/configure.ac b/configure.ac index 374756a5..c3926fdb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,20 @@ -AC_INIT(Empathy, 0.23.2, http://bugzilla.gnome.org/browse.cgi?product=empathy) +AC_INIT(Empathy, 2.27.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. + Copyright (C) 2007-2008 Collabora Ltd. ]) # 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=12 +LIBEMPATHY_CURRENT=22 LIBEMPATHY_AGE=0 LIBEMPATHY_REVISION=0 -LIBEMPATHY_GTK_CURRENT=12 -LIBEMPATHY_GTK_AGE=0 +LIBEMPATHY_GTK_CURRENT=21 +LIBEMPATHY_GTK_AGE=2 LIBEMPATHY_GTK_REVISION=0 AC_SUBST(LIBEMPATHY_CURRENT) @@ -25,17 +25,24 @@ AC_SUBST(LIBEMPATHY_GTK_AGE) AC_SUBST(LIBEMPATHY_GTK_REVISION) # Minimal version required -GLIB_REQUIRED=2.15.5 -GTK_REQUIRED=2.12.0 +GLIB_REQUIRED=2.16.0 +GTK_REQUIRED=2.16.0 GCONF_REQUIRED=1.2.0 -LIBGLADE_REQUIRED=2.0.0 LIBPANELAPPLET_REQUIRED=2.10.0 -TELEPATHY_GLIB_REQUIRED=0.7.3 +TELEPATHY_GLIB_REQUIRED=0.7.23 MISSION_CONTROL_REQUIRED=4.61 +ENCHANT_REQUIRED=1.2.0 +ISO_CODES_REQUIRED=0.35 +LIBNOTIFY_REQUIRED=0.4.4 +LIBCANBERRA_GTK_REQUIRED=0.4 + +# Use --enable-maintainer-mode to disabled deprecated symbols +GNOME_MAINTAINER_MODE_DEFINES -# 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]) +# 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]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -45,7 +52,6 @@ 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 @@ -67,10 +73,7 @@ AC_CHECK_PROGS([XSLTPROC], [xsltproc]) if test -z "$XSLTPROC"; then AC_MSG_ERROR([xsltproc (from libxslt) is required]) fi -AC_CHECK_PROGS([PYTHON], [python python2.3 python2.4 python2.5]) -if test -z "$PYTHON"; then - AC_MSG_ERROR([Python is required]) -fi +AM_PATH_PYTHON([2.3]) EMPATHY_ARG_VALGRIND @@ -82,25 +85,61 @@ PKG_CHECK_MODULES(LIBEMPATHY, [ glib-2.0 >= $GLIB_REQUIRED gobject-2.0 + gio-2.0 >= $GLIB_REQUIRED + gio-unix-2.0 >= $GLIB_REQUIRED libxml-2.0 telepathy-glib >= $TELEPATHY_GLIB_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED + telepathy-farsight ]) -PKG_CHECK_MODULES(EMPATHY, +PKG_CHECK_MODULES(LIBEMPATHYGTK, [ glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED + x11 + gtk+-2.0 >= $GTK_REQUIRED + libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED telepathy-glib >= $TELEPATHY_GLIB_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED + telepathy-farsight + gstreamer-0.10 + gstreamer-interfaces-0.10 +]) + +PKG_CHECK_MODULES(EMPATHY, +[ + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gio-2.0 >= $GLIB_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED x11 - libglade-2.0 >= $LIBGLADE_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED libebook-1.2 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + libmissioncontrol >= $MISSION_CONTROL_REQUIRED + telepathy-farsight + gstreamer-0.10 + gstreamer-interfaces-0.10 ]) +PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) + +# ----------------------------------------------------------- +# Enable debug +# ----------------------------------------------------------- + +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--disable-debug],[compile without debug code]), + enable_debug=$enableval, enable_debug=yes ) + +if test x$enable_debug = xyes; then + AC_DEFINE(ENABLE_DEBUG, [], [Enable debug code]) +fi + # ----------------------------------------------------------- # Language Support # ----------------------------------------------------------- @@ -111,63 +150,43 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) AM_GLIB_GNU_GETTEXT -dnl ================================================================ -dnl spellchecking checks: enchant and iso-codes -dnl ================================================================ - -ENCHANT_REQUIRED=1.2.0 -ISO_CODES_REQUIRED=0.35 +# ----------------------------------------------------------- +# spellchecking checks: enchant and iso-codes +# ----------------------------------------------------------- +AC_ARG_ENABLE(spell, + AS_HELP_STRING([--enable-spell=@<:@no/yes/auto@:>@], + [Enable spell checking]), , + enable_spell=auto) -AC_ARG_ENABLE([spell], - AS_HELP_STRING([--disable-spell],[Disable spell checking (default: enabled)]), - [enable_enchant=$enableval], - [enable_enchant=yes]) - -if test "x$enable_enchant" = "xyes" ; then - - PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED, \ - have_enchant=yes, have_enchant=no) - - if test "x$have_enchant" = "xyes"; then - - PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED], - [have_iso_codes=yes],[have_iso_codes=no]) - - if test "x$have_iso_codes" = "xyes"; then - AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains]) - if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \ - $PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then - result=yes - else - result=no - have_iso_codes=no - fi - AC_MSG_RESULT([$result]) - fi - - if test "x$have_iso_codes" = "xyes"; then - AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix]) - AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package]) - else - AC_MSG_ERROR([iso-codes is required for spellchecking. Use --disable-spell to build without spellchecking support.]) - fi - - enable_enchant=yes - ENCHANT_CFLAGS="${ENCHANT_CFLAGS}" - ENCHANT_LIBS="${ENCHANT_LIBS}" - AC_DEFINE([HAVE_ENCHANT],[1],[Define if you have libenchant]) - else - AC_MSG_ERROR([Enchant library not found or too old. Use --disable-spell to build without spellchecking support.]) - fi +if test "x$enable_spell" != "xno"; then + PKG_CHECK_MODULES(ENCHANT, + [ + enchant >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + ], have_enchant="yes", have_enchant="no") + + if test "x$have_enchant" = "xyes"; then + AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains]) + if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \ + $PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then + AC_DEFINE_UNQUOTED(ISO_CODES_PREFIX, ["`$PKG_CONFIG --variable=prefix iso-codes`"], [ISO codes prefix]) + AC_DEFINE(HAVE_ENCHANT, [], [Define if you have libenchant]) + result=yes + else + result=no + have_enchant="no" + fi + AC_MSG_RESULT([$result]) + fi else - enable_enchant=no - ENCHANT_CFLAGS= - ENCHANT_LIBS= + have_enchant=no fi -AC_SUBST(ENCHANT_CFLAGS) -AC_SUBST(ENCHANT_LIBS) +if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then + AC_MSG_ERROR([Couldn't find spell dependencies.]) +fi +AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes") # ----------------------------------------------------------- # Megaphone @@ -184,7 +203,6 @@ if test "x$enable_megaphone" != "xno"; then glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gconf-2.0 >= $GCONF_REQUIRED - libglade-2.0 >= $LIBGLADE_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED ], have_megaphone="yes", have_megaphone="no") else @@ -212,7 +230,6 @@ if test "x$enable_nothere" != "xno"; then glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gconf-2.0 >= $GCONF_REQUIRED - libglade-2.0 >= $LIBGLADE_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED ], have_nothere="yes", have_nothere="no") else @@ -257,24 +274,22 @@ AC_ARG_ENABLE(python, enable_python=auto) if test "x$enable_python" != "xno"; then - AM_PATH_PYTHON - if test -z "$PYTHON" ; then - have_python="no" - else - PKG_CHECK_MODULES(PYTHON_BINDING, - [ - pygtk-2.0, - glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 - gconf-2.0 >= $GCONF_REQUIRED - libxml-2.0 - libmissioncontrol >= $MISSION_CONTROL_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - libglade-2.0 >= $LIBGLADE_REQUIRED - ], have_python="yes", have_python="no") - if test "x$have_python" = "xyes" ; then - AM_CHECK_PYTHON_HEADERS(,have_python="no") - fi + PKG_CHECK_MODULES(PYTHON_BINDING, + [ + pygtk-2.0, + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gconf-2.0 >= $GCONF_REQUIRED + libxml-2.0 + libmissioncontrol >= $MISSION_CONTROL_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gstreamer-0.10 + gstreamer-interfaces-0.10 + telepathy-farsight + ], have_python="yes", have_python="no") + if test "x$have_python" = "xyes" ; then + AM_CHECK_PYTHON_HEADERS(,have_python="no") + AC_CHECK_PROGS([PYGOBJECTCODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0]) fi else have_python=no @@ -286,20 +301,6 @@ fi AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes") -# ----------------------------------------------------------- -# VoIP support -# ----------------------------------------------------------- -AC_ARG_ENABLE(voip, - AS_HELP_STRING([--enable-voip=@<:@no/yes@:>@], - [Add support for Voice and Video call]), , - enable_voip=yes) - -if test "x$enable_voip" = "xyes"; then - AC_DEFINE(HAVE_VOIP, 1, [Define if we have voip]) -fi - -AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes") - # ----------------------------------------------------------- AC_OUTPUT([