X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=8bad2e2c6e0a0c8176cda0e8aaa4779b78620abb;hp=afbe58c23a31e5d1de93c4e15039b6834af0ad7e;hb=1f5c37347a4d759b8f3b56e3e9986a3f255b893c;hpb=e89165fdf3678afa1bf804b63595cf4895bc30c3 diff --git a/configure.ac b/configure.ac index afbe58c2..8bad2e2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(Empathy, 2.25.4, http://bugzilla.gnome.org/browse.cgi?product=empathy) +AC_INIT(Empathy, 2.27.92, http://bugzilla.gnome.org/browse.cgi?product=empathy) AC_PREREQ(2.59) AC_COPYRIGHT([ Copyright (C) 2003-2007 Imendio AB @@ -9,12 +9,12 @@ AC_COPYRIGHT([ # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) # (Interfaces added: CURRENT++, AGE++, REVISION=0) # (No interfaces changed: REVISION++) -LIBEMPATHY_CURRENT=19 +LIBEMPATHY_CURRENT=29 LIBEMPATHY_AGE=0 LIBEMPATHY_REVISION=0 -LIBEMPATHY_GTK_CURRENT=18 -LIBEMPATHY_GTK_AGE=1 +LIBEMPATHY_GTK_CURRENT=27 +LIBEMPATHY_GTK_AGE=0 LIBEMPATHY_GTK_REVISION=0 AC_SUBST(LIBEMPATHY_CURRENT) @@ -26,20 +26,24 @@ AC_SUBST(LIBEMPATHY_GTK_REVISION) # Minimal version required GLIB_REQUIRED=2.16.0 -GTK_REQUIRED=2.14.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.15 -MISSION_CONTROL_REQUIRED=4.61 +TELEPATHY_GLIB_REQUIRED=0.7.34 ENCHANT_REQUIRED=1.2.0 ISO_CODES_REQUIRED=0.35 - -# Uncomment that to build with deprecated symbols disabled -#AC_DEFINE(G_DISABLE_DEPRECATED, [], [Disable deprecated GLib symbols]) -#AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED, [], [Disable deprecated GDK pixbuf symbols]) -#AC_DEFINE(GDK_DISABLE_DEPRECATED, [], [Disable deprecated GDK symbols]) -#AC_DEFINE(GTK_DISABLE_DEPRECATED, [], [Disable deprecated GTK symbols]) +LIBNOTIFY_REQUIRED=0.4.4 +LIBCANBERRA_GTK_REQUIRED=0.4 +LIBCHAMPLAIN_REQUIRED=0.3.6 +LIBCHAMPLAIN_GTK_REQUIRED=0.3.6 +CLUTTER_GTK_REQUIRED=0.10 +GEOCLUE_REQUIRED=0.11 +WEBKIT_REQUIRED=1.1.7 +KEYRING_REQUIRED=2.22 +NETWORK_MANAGER_REQUIRED=0.7.0 + +# 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]) @@ -54,7 +58,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 @@ -64,7 +67,7 @@ AM_PATH_GLIB_2_0 AC_PATH_XTRA IT_PROG_INTLTOOL([0.35.0]) GTK_DOC_CHECK([1.3]) -GNOME_DOC_INIT +GNOME_DOC_INIT([0.17.3]) IDT_COMPILE_WARNINGS AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) AC_PATH_PROG(GCONFTOOL, gconftool-2) @@ -88,28 +91,48 @@ PKG_CHECK_MODULES(LIBEMPATHY, [ glib-2.0 >= $GLIB_REQUIRED gobject-2.0 - libxml-2.0 - telepathy-glib >= $TELEPATHY_GLIB_REQUIRED - libmissioncontrol >= $MISSION_CONTROL_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED + libxml-2.0 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + telepathy-farsight + farsight2-0.10 + gstreamer-0.10 ]) -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 + farsight2-0.10 + gstreamer-0.10 + gstreamer-interfaces-0.10 +]) + +PKG_CHECK_MODULES(EMPATHY, +[ + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gio-2.0 >= $GLIB_REQUIRED + gdk-x11-2.0 gtk+-2.0 >= $GTK_REQUIRED - x11 - libglade-2.0 >= $LIBGLADE_REQUIRED libebook-1.2 - libcanberra-gtk >= 0.4 + dbus-glib-1 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + telepathy-farsight + gstreamer-0.10 + unique-1.0 + gnome-keyring-1 >= $KEYRING_REQUIRED ]) +PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) + # ----------------------------------------------------------- # Enable debug # ----------------------------------------------------------- @@ -132,6 +155,80 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) AM_GLIB_GNU_GETTEXT +# ----------------------------------------------------------- +# Connectivity integration +# ----------------------------------------------------------- +AC_ARG_WITH(connectivity, + AS_HELP_STRING([--with-connectivity=@<:@nm/connman/auto/no@:>@], + [build with connectivity support]), , + with_connectivity=auto) + +if test "x$with_connectivity" = "xno"; then + have_nm=no + have_connman=no + +elif test "x$with_connectivity" = "xconnman"; then + + PKG_CHECK_MODULES(CONNMAN, + [ + dbus-glib-1 + ], have_connman="yes", have_connman="no") + + if test "x$have_connman" = "xyes"; then + AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies]) + have_nm=no + fi + +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 + +if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then + AC_MSG_ERROR([Couldn't find connman dependencies.]) +fi + +if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then + AC_MSG_ERROR([Couldn't find libnm-glib dependencies.]) +fi + +AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes") +AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "xyes") + +# ----------------------------------------------------------- +# Webkit +# ----------------------------------------------------------- +AC_ARG_ENABLE(webkit, + AS_HELP_STRING([--enable-webkit=@<:@no/yes/auto@:>@], + [build with webkit support]), , + enable_webkit=auto) + +if test "x$enable_webkit" != "xno"; then + PKG_CHECK_MODULES(WEBKIT, + [ + webkit-1.0 >= $WEBKIT_REQUIRED + ], have_webkit="yes", have_webkit="no") + + if test "x$have_webkit" = "xyes"; then + AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk]) + fi +else + have_webkit=no +fi + +if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then + AC_MSG_ERROR([Couldn't find webkit dependencies.]) +fi +AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes") + # ----------------------------------------------------------- # spellchecking checks: enchant and iso-codes # ----------------------------------------------------------- @@ -170,6 +267,64 @@ fi AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes") +# ----------------------------------------------------------- +# Map view checks: libchamplain +# ----------------------------------------------------------- +AC_ARG_ENABLE(map, + AS_HELP_STRING([--enable-map=@<:@no/yes/auto@:>@], + [Enable map view]), , + enable_map=auto) + +if test "x$enable_map" != "xno"; then + PKG_CHECK_MODULES(LIBCHAMPLAIN, + [ + champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, + champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED + clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED + ], have_libchamplain="yes", have_libchamplain="no") + + if test "x$have_libchamplain" = "xyes"; then + AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain]) + fi +else + have_libchamplain=no +fi + +if test "x$enable_map" = "xyes" -a "x$have_libchamplain" != "xyes"; then + AC_MSG_ERROR([Couldn't find map view dependencies.]) +fi + +AM_CONDITIONAL(HAVE_LIBCHAMPLAIN, test "x$have_libchamplain" = "xyes") + +# ----------------------------------------------------------- +# location checks: geoclue +# ----------------------------------------------------------- +AC_ARG_ENABLE(location, + AS_HELP_STRING([--enable-location=@<:@no/yes/auto@:>@], + [Enable location awareness]), , + enable_location=auto) + +if test "x$enable_location" != "xno"; then + PKG_CHECK_MODULES(GEOCLUE, + [ + geoclue >= $GEOCLUE_REQUIRED + ], have_geoclue="yes", have_geoclue="no") + + if test "x$have_geoclue" = "xyes"; then + AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue]) + fi +else + have_geoclue="no" +fi + +if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then + AC_MSG_ERROR([Couldn't find location dependencies.]) +fi + +AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes") +AC_SUBST(GEOCLUE_CFLAGS) +AC_SUBST(GEOCLUE_LIBS) + # ----------------------------------------------------------- # Megaphone # ----------------------------------------------------------- @@ -185,8 +340,7 @@ 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 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED ], have_megaphone="yes", have_megaphone="no") else have_megaphone=no @@ -213,8 +367,7 @@ 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 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED ], have_nothere="yes", have_nothere="no") else have_nothere=no @@ -265,9 +418,10 @@ if test "x$enable_python" != "xno"; then 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 + 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") @@ -284,6 +438,17 @@ fi AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes") # ----------------------------------------------------------- +# Coding style checks +# ----------------------------------------------------------- +AC_ARG_ENABLE(coding-style-checks, + AC_HELP_STRING([--disable-coding-style-checks], + [don't check coding style using grep]), + [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes]) + +AC_SUBST([ENABLE_CODING_STYLE_CHECKS]) +# ----------------------------------------------------------- + +SHAVE_INIT(.) AC_OUTPUT([ Makefile @@ -315,4 +480,33 @@ AC_OUTPUT([ tests/Makefile tests/xml/Makefile tools/Makefile + shave + shave-libtool ]) + +echo " +Configure summary: + + Compiler....................: ${CC} + Compiler Flags..............: ${CFLAGS} + Prefix......................: ${prefix} + Shaved build................: ${enable_shave} + Tests.......................: ${have_check} + Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} + + Features: + Spell checking (enchant)....: ${have_enchant} + Display maps (libchamplain).: ${have_libchamplain} + Location awareness (Geoclue): ${have_geoclue} + Adium themes (Webkit).......: ${have_webkit} + + Connectivity: + NetworkManager integration..: ${have_nm} + ConnMan integration.........: ${have_connman} + + Extras: + Documentation...............: ${enable_gtk_doc} + Python bindings.............: ${have_python} + Megaphone applet............: ${have_megaphone} + Nothere applet..............: ${have_nothere} +"