diff -Nru empathy-2.29.90/debian/changelog empathy-2.29.90/debian/changelog --- empathy-2.29.90/debian/changelog 2010-02-12 16:26:03.000000000 +0000 +++ empathy-2.29.90/debian/changelog 2010-02-21 21:08:14.000000000 +0000 @@ -1,3 +1,9 @@ +empathy (2.29.90-0ubuntu3~asac1) lucid; urgency=low + + * use ntrack for online/offline detection + + -- Alexander Sack Sun, 21 Feb 2010 22:07:56 +0100 + empathy (2.29.90-0ubuntu2) lucid; urgency=low * debian/patches/20_libindicate.patch: diff -Nru empathy-2.29.90/debian/control empathy-2.29.90/debian/control --- empathy-2.29.90/debian/control 2010-02-12 16:26:03.000000000 +0000 +++ empathy-2.29.90/debian/control 2010-02-21 21:07:51.000000000 +0000 @@ -31,13 +31,12 @@ libtelepathy-farsight-dev (>= 0.0.4), libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, - libnm-glib-dev (>= 0.7), - libnm-util-dev (>= 0.7), libwebkit-dev (>= 1.1.15), libgnome-keyring-dev (>= 2.22), libindicate-dev (>= 0.3.0), libindicate-gtk-dev (>= 0.3.0), liblaunchpad-integration-dev (>= 0.1.17), + libntrack-gobject-dev, libunique-dev, nautilus-sendto (>= 2.28.1) Standards-Version: 3.8.3 diff -Nru empathy-2.29.90/debian/patches/40_ntrack.patch empathy-2.29.90/debian/patches/40_ntrack.patch --- empathy-2.29.90/debian/patches/40_ntrack.patch 1970-01-01 01:00:00.000000000 +0100 +++ empathy-2.29.90/debian/patches/40_ntrack.patch 2010-02-21 21:11:12.000000000 +0000 @@ -0,0 +1,291 @@ +--- + configure.ac | 47 +++++++++++++++++++++++++++++--------- + libempathy/Makefile.am | 2 + + libempathy/empathy-connectivity.c | 32 +++++++++++++++++++++++++ + 3 files changed, 70 insertions(+), 11 deletions(-) + +Index: empathy-2.29.90/configure.ac +=================================================================== +--- empathy-2.29.90.orig/configure.ac ++++ empathy-2.29.90/configure.ac +@@ -207,68 +207,92 @@ AC_SUBST(GETTEXT_PACKAGE) + 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@:>@], ++ AS_HELP_STRING([--with-connectivity=@<:@ntrack/nm/connman/auto/no@:>@], + [build with connectivity support]), , + with_connectivity=auto) + + if test "x$with_connectivity" = "xno"; then + have_nm=no + have_connman=no ++ have_ntrack=no ++ ++elif test "x$with_connectivity" = "xnm"; then ++ ++ 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 ++ have_ntrack=no ++ fi + + 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 ++ have_ntrack=no + fi + + else +- +- PKG_CHECK_MODULES(NETWORK_MANAGER, ++ PKG_CHECK_MODULES(NTRACK, + [ +- libnm_glib >= $NETWORK_MANAGER_REQUIRED +- ], have_nm="yes", have_nm="no") ++ libntrack-gobject ++ ], have_ntrack="yes", have_ntrack="no") + +- if test "x$have_nm" = "xyes"; then +- AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) ++ if test "x$have_ntrack" = "xyes"; then ++ AC_DEFINE(HAVE_NTRACK, 1, [Define if you have connman dependencies]) ++ have_nm=no + have_connman=no +- else ++ fi ++ ++ if ! test "x$have_ntrack" = "xyes"; then ++ + PKG_CHECK_MODULES(NETWORK_MANAGER, + [ +- libnm-glib >= $NETWORK_MANAGER_REQUIRED ++ 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 ++ AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) ++ have_connman=no ++ have_ntrack=no + fi + 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 + ++if test "x$with_connectivity" = "xntrack" -a "x$have_ntrack" != "xyes"; then ++ AC_MSG_ERROR([Couldn't find ntrack dependencies.]) ++fi ++ + AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes") ++AM_CONDITIONAL(HAVE_NTRACK, test "x$have_ntrack" = "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]), , +@@ -509,14 +533,15 @@ Configure summary: + Spell checking (enchant)....: ${have_enchant} + Display maps (libchamplain).: ${have_libchamplain} + Location awareness (Geoclue): ${have_geoclue} + Adium themes (Webkit).......: ${have_webkit} + Moblin widgets .............: ${have_moblin} + Message indicator support (libindicate): ${have_libindicate} + + Connectivity: ++ ntrack integration..........: ${have_ntrack} + NetworkManager integration..: ${have_nm} + ConnMan integration.........: ${have_connman} + + Extras: + Nautilus-sendto plugin......: ${have_nst} + " +Index: empathy-2.29.90/libempathy/Makefile.am +=================================================================== +--- empathy-2.29.90.orig/libempathy/Makefile.am ++++ empathy-2.29.90/libempathy/Makefile.am +@@ -5,16 +5,17 @@ AM_CPPFLAGS = + -I. \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DDATADIR=\""$(datadir)"\" \ + -DLOCALEDIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"empathy\" \ + $(LIBEMPATHY_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ ++ $(NTRACK_CFLAGS) \ + $(NETWORK_MANAGER_CFLAGS) \ + $(CONNMAN_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED) + + BUILT_SOURCES = \ + empathy-marshal.h \ + empathy-marshal.c \ +@@ -106,16 +107,17 @@ libempathy_la_SOURCES = \ + # do not distribute generated files + nodist_libempathy_la_SOURCES =\ + $(BUILT_SOURCES) + + libempathy_la_LIBADD = \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(LIBEMPATHY_LIBS) \ + $(GEOCLUE_LIBS) \ ++ $(NTRACK_LIBS) \ + $(NETWORK_MANAGER_LIBS) \ + $(CONNMAN_LIBS) + + check_c_sources = \ + $(libempathy_la_SOURCES) \ + $(libempathy_headers) + include $(top_srcdir)/tools/check-coding-style.mk + check-local: check-coding-style +Index: empathy-2.29.90/libempathy/empathy-connectivity.c +=================================================================== +--- empathy-2.29.90.orig/libempathy/empathy-connectivity.c ++++ empathy-2.29.90/libempathy/empathy-connectivity.c +@@ -21,16 +21,21 @@ + + #include "config.h" + #include "empathy-connectivity.h" + + #ifdef HAVE_NM + #include + #endif + ++#ifdef HAVE_NTRACK ++#include ++#include ++#endif ++ + #ifdef HAVE_CONNMAN + #include + #endif + + #include + + #include "empathy-utils.h" + #include "empathy-marshal.h" +@@ -45,16 +50,20 @@ typedef struct { + NMClient *nm_client; + gulong state_change_signal_id; + #endif + + #ifdef HAVE_CONNMAN + DBusGProxy *proxy; + #endif + ++#ifdef HAVE_NTRACK ++ NTrackGMonitor *monitor; ++#endif ++ + gboolean connected; + gboolean use_conn; + } EmpathyConnectivityPriv; + + enum { + STATE_CHANGE, + LAST_SIGNAL + }; +@@ -107,16 +116,28 @@ connectivity_nm_state_change_cb (NMClien + + DEBUG ("New NetworkManager network state %d (connected: %s)", state, + new_nm_connected ? "true" : "false"); + + connectivity_change_state (connectivity, new_nm_connected); + } + #endif + ++#ifdef HAVE_NTRACK ++static void ++_ntrack_state_changed (NTrackGMonitor *monitor, ++ NTrackGlibState old_state, ++ NTrackGlibState new_state, ++ gpointer data) ++{ ++ EmpathyConnectivity* connectivity = data; ++ connectivity_change_state (connectivity, new_state != NTRACK_STATE_OFFLINE); ++} ++#endif ++ + #ifdef HAVE_CONNMAN + static void + connectivity_connman_state_changed_cb (DBusGProxy *proxy, + const gchar *new_state, + EmpathyConnectivity *connectivity) + { + EmpathyConnectivityPriv *priv; + gboolean new_connected; +@@ -197,16 +218,21 @@ empathy_connectivity_init (EmpathyConnec + connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity); + } + else + { + DEBUG ("Failed to get NetworkManager proxy"); + } + #endif + ++#ifdef HAVE_NTRACK ++ priv->monitor = ntrack_g_monitor_get (); ++ g_signal_connect (priv->monitor, "ntrack-state-changed", (GCallback) _ntrack_state_changed, connectivity); ++#endif ++ + #ifdef HAVE_CONNMAN + connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + if (connection != NULL) + { + priv->proxy = dbus_g_proxy_new_for_name (connection, + "org.moblin.connman", "/", + "org.moblin.connman.Manager"); + +@@ -247,16 +273,22 @@ connectivity_finalize (GObject *object) + g_signal_handler_disconnect (priv->nm_client, + priv->state_change_signal_id); + priv->state_change_signal_id = 0; + g_object_unref (priv->nm_client); + priv->nm_client = NULL; + } + #endif + ++#ifdef HAVE_NTRACK ++ EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object); ++ EmpathyConnectivityPriv *priv = GET_PRIV (connectivity); ++ g_object_unref (priv->monitor); ++#endif ++ + #ifdef HAVE_CONNMAN + EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object); + EmpathyConnectivityPriv *priv = GET_PRIV (connectivity); + + if (priv->proxy != NULL) + { + dbus_g_proxy_disconnect_signal (priv->proxy, "StateChanged", + G_CALLBACK (connectivity_connman_state_changed_cb), connectivity); diff -Nru empathy-2.29.90/debian/patches/99_autoconf.patch empathy-2.29.90/debian/patches/99_autoconf.patch --- empathy-2.29.90/debian/patches/99_autoconf.patch 2010-02-12 16:26:03.000000000 +0000 +++ empathy-2.29.90/debian/patches/99_autoconf.patch 2010-02-21 21:12:30.000000000 +0000 @@ -1,6 +1,33 @@ === modified file 'INSTALL' ---- a/INSTALL 2010-02-09 04:47:04 +0000 -+++ b/INSTALL 2010-02-09 04:51:44 +0000 +--- + INSTALL | 367 +++++++++++++++++++++ + Makefile.in | 21 - + aclocal.m4 | 29 + + config.guess | 58 --- + config.h.in | 6 + config.sub | 15 + configure | 620 ++++++++++++++++++++++++++++--------- + data/Makefile.in | 10 + data/icons/Makefile.in | 6 + extensions/Makefile.in | 6 + help/Makefile.in | 6 + libempathy-gtk/Makefile.in | 6 + libempathy/Makefile.in | 11 + ltmain.sh | 8 + m4/libtool.m4 | 13 + m4/ltversion.m4 | 10 + nautilus-sendto-plugin/Makefile.in | 6 + src/Makefile.in | 57 ++- + tests/Makefile.in | 10 + tests/interactive/Makefile.in | 6 + tests/xml/Makefile.in | 6 + tools/Makefile.in | 6 + 22 files changed, 1030 insertions(+), 253 deletions(-) + +Index: empathy-2.29.90/INSTALL +=================================================================== +--- empathy-2.29.90.orig/INSTALL ++++ empathy-2.29.90/INSTALL @@ -1,2 +1,365 @@ -Please visite the Empathy website for installation instructions: -http://live.gnome.org/Empathy/Install @@ -369,17 +396,27 @@ +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + - -=== modified file 'Makefile.in' ---- a/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ +Index: empathy-2.29.90/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/Makefile.in ++++ empathy-2.29.90/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -175,6 +175,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -170,16 +170,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -388,7 +425,36 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -403,7 +405,7 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -212,16 +214,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -398,17 +402,17 @@ distclean-libtool: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -397,7 +463,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -428,7 +430,7 @@ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -423,17 +427,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -406,7 +482,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -592,7 +594,8 @@ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +@@ -587,17 +591,18 @@ distdir: $(DISTFILES) + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ fi; \ done -test -n "$(am__skip_mode_fix)" \ @@ -416,7 +502,17 @@ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -@@ -636,17 +639,17 @@ + || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + dist-bzip2: distdir +@@ -631,27 +636,27 @@ dist dist-all: distdir + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another + # tarfile. distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ @@ -438,17 +534,29 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - -=== modified file 'aclocal.m4' ---- a/aclocal.m4 2010-02-09 04:47:04 +0000 -+++ b/aclocal.m4 2010-02-09 04:51:41 +0000 -@@ -1,4 +1,4 @@ + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ +Index: empathy-2.29.90/aclocal.m4 +=================================================================== +--- empathy-2.29.90.orig/aclocal.m4 ++++ empathy-2.29.90/aclocal.m4 +@@ -1,25 +1,25 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -@@ -13,8 +13,8 @@ + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl @@ -459,7 +567,17 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -@@ -159,9 +159,8 @@ + + dnl AM_GCONF_SOURCE_2 + dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas + dnl (i.e. pass to gconftool-2 + dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +@@ -154,19 +154,18 @@ dnl + #include + #include + + int + main () { int major, minor, micro; char *tmp_version; @@ -470,7 +588,17 @@ /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_glib_version"); -@@ -966,7 +965,7 @@ + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + +@@ -961,33 +960,33 @@ fi[]dnl + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. @@ -479,7 +607,15 @@ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -@@ -982,7 +981,7 @@ + # _AM_AUTOCONF_VERSION(VERSION) + # ----------------------------- + # aclocal traces this macro to find the Autoconf version. + # This is a private macro too. Using m4_define simplifies + # the logic in aclocal, which can simply ignore this definition. + m4_define([_AM_AUTOCONF_VERSION], []) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], @@ -488,7 +624,17 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -@@ -1838,6 +1837,14 @@ + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +@@ -1833,16 +1832,24 @@ python2.1 python2.0]) + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ;; @@ -503,7 +649,17 @@ esac ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) -@@ -1868,6 +1875,14 @@ + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + +@@ -1863,16 +1870,24 @@ python2.1 python2.0]) + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ;; @@ -518,11 +674,16 @@ esac ]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) - -=== modified file 'config.guess' ---- a/config.guess 2010-02-09 04:47:04 +0000 -+++ b/config.guess 2010-02-09 04:51:43 +0000 -@@ -1,10 +1,10 @@ + + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + +Index: empathy-2.29.90/config.guess +=================================================================== +--- empathy-2.29.90.orig/config.guess ++++ empathy-2.29.90/config.guess +@@ -1,15 +1,15 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, @@ -535,7 +696,17 @@ # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -@@ -170,7 +170,7 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but + # WITHOUT ANY WARRANTY; without even the implied warranty of +@@ -165,17 +165,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -544,7 +715,17 @@ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? -@@ -656,7 +656,7 @@ + os=netbsd + else + os=netbsdelf + fi + ;; +@@ -651,17 +651,17 @@ EOF + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | @@ -553,7 +734,17 @@ then HP_ARCH="hppa2.0w" else -@@ -822,6 +822,9 @@ + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; +@@ -817,16 +817,19 @@ EOF + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -563,20 +754,34 @@ i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -882,40 +885,17 @@ + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +@@ -877,50 +880,27 @@ EOF + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU - #undef mips - #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= @@ -601,21 +806,21 @@ - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 -+ mips:Linux:*:* | mips64:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=${UNAME_MACHINE}el -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} #else CPU= #endif -@@ -947,7 +927,7 @@ + #endif + EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g +@@ -942,17 +922,17 @@ EOF + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac @@ -624,7 +829,17 @@ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; -@@ -1001,14 +981,6 @@ + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level +@@ -996,24 +976,16 @@ EOF + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; @@ -639,7 +854,17 @@ esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build -@@ -1074,7 +1046,7 @@ + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 +@@ -1069,17 +1041,17 @@ EOF + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; @@ -648,7 +873,17 @@ echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) -@@ -1182,7 +1154,7 @@ + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -1177,17 +1149,17 @@ EOF + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -657,11 +892,21 @@ echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) - -=== modified file 'config.h.in' ---- a/config.h.in 2010-02-09 04:47:04 +0000 -+++ b/config.h.in 2010-02-09 04:51:43 +0000 -@@ -48,6 +48,9 @@ + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; +Index: empathy-2.29.90/config.h.in +=================================================================== +--- empathy-2.29.90.orig/config.h.in ++++ empathy-2.29.90/config.h.in +@@ -43,28 +43,34 @@ + #undef HAVE_INTTYPES_H + + /* Define if your file defines LC_MESSAGES. */ + #undef HAVE_LC_MESSAGES + /* Define if you have libchamplain */ #undef HAVE_LIBCHAMPLAIN @@ -671,11 +916,31 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H - -=== modified file 'config.sub' ---- a/config.sub 2010-02-09 04:47:04 +0000 -+++ b/config.sub 2010-02-09 04:51:43 +0000 -@@ -1,10 +1,10 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_MEMORY_H + + /* Define if you have moblin */ + #undef HAVE_MOBLIN + + /* Define if you have libnm-glib */ + #undef HAVE_NM + ++/* Define if you have connman dependencies */ ++#undef HAVE_NTRACK ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_STDINT_H + + /* Define to 1 if you have the header file. */ + #undef HAVE_STDLIB_H + + /* Define to 1 if you have the header file. */ + #undef HAVE_STRINGS_H +Index: empathy-2.29.90/config.sub +=================================================================== +--- empathy-2.29.90.orig/config.sub ++++ empathy-2.29.90/config.sub +@@ -1,15 +1,15 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, @@ -688,7 +953,17 @@ # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software -@@ -153,6 +153,9 @@ + # can handle that machine. It does not imply ALL GNU software can. + # + # This file is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or +@@ -148,16 +148,19 @@ case $os in + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -698,7 +973,17 @@ -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 -@@ -467,6 +470,10 @@ + ;; + -scout) + ;; + -wrs) + os=-vxworks +@@ -462,16 +465,20 @@ case $basic_machine in + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; @@ -709,7 +994,17 @@ c90) basic_machine=c90-cray os=-unicos -@@ -1260,7 +1267,7 @@ + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; +@@ -1255,17 +1262,17 @@ case $os in + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ @@ -718,7 +1013,17 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -@@ -1613,7 +1620,7 @@ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ +@@ -1608,17 +1615,17 @@ case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; -sunos*) vendor=sun ;; @@ -727,11 +1032,16 @@ vendor=ibm ;; -beos*) - -=== modified file 'configure' ---- a/configure 2010-02-09 04:47:04 +0000 -+++ b/configure 2010-02-09 04:51:42 +0000 -@@ -1,12 +1,14 @@ + vendor=be + ;; + -hpux*) + vendor=hp + ;; +Index: empathy-2.29.90/configure +=================================================================== +--- empathy-2.29.90.orig/configure ++++ empathy-2.29.90/configure +@@ -1,17 +1,19 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for Empathy 2.29.90. @@ -749,7 +1059,17 @@ # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -@@ -682,7 +684,8 @@ + # + # + # Copyright (C) 2003-2007 Imendio AB + # Copyright (C) 2007-2008 Collabora Ltd. + # +@@ -677,17 +679,18 @@ fi + lt_ECHO=$ECHO + if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" + fi + @@ -759,7 +1079,17 @@ # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -@@ -755,6 +758,10 @@ + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + + # + # Initializations. +@@ -750,16 +753,20 @@ ac_subst_vars='am__EXEEXT_FALSE + am__EXEEXT_TRUE + LTLIBOBJS + LIBOBJS + ENABLE_CODING_STYLE_CHECKS + HAVE_NST_FALSE HAVE_NST_TRUE NST_LIBS NST_CFLAGS @@ -770,7 +1100,46 @@ HAVE_MOBLIN_FALSE HAVE_MOBLIN_TRUE MOBLIN_LIBS -@@ -1017,6 +1024,7 @@ + MOBLIN_CFLAGS + HAVE_GEOCLUE_FALSE + HAVE_GEOCLUE_TRUE + GEOCLUE_LIBS + GEOCLUE_CFLAGS +@@ -772,22 +779,26 @@ HAVE_ENCHANT_TRUE + ENCHANT_LIBS + ENCHANT_CFLAGS + HAVE_WEBKIT_FALSE + HAVE_WEBKIT_TRUE + WEBKIT_LIBS + WEBKIT_CFLAGS + HAVE_CONNMAN_FALSE + HAVE_CONNMAN_TRUE ++HAVE_NTRACK_FALSE ++HAVE_NTRACK_TRUE + HAVE_NM_FALSE + HAVE_NM_TRUE +-NETWORK_MANAGER_LIBS +-NETWORK_MANAGER_CFLAGS ++NTRACK_LIBS ++NTRACK_CFLAGS + CONNMAN_LIBS + CONNMAN_CFLAGS ++NETWORK_MANAGER_LIBS ++NETWORK_MANAGER_CFLAGS + MKINSTALLDIRS + POSUB + POFILES + PO_IN_DATADIR_FALSE + PO_IN_DATADIR_TRUE + INTLLIBS + INSTOBJEXT + GMOFILES +@@ -1012,16 +1023,17 @@ enable_valgrind + enable_Werror + enable_debug + with_connectivity + enable_webkit + enable_spell enable_map enable_location enable_moblin @@ -778,7 +1147,35 @@ enable_nautilus_sendto enable_coding_style_checks ' -@@ -1055,6 +1063,8 @@ + ac_precious_vars='build_alias + host_alias + target_alias + CC + CFLAGS +@@ -1036,30 +1048,34 @@ VALGRIND_LIBS + LIBEMPATHY_CFLAGS + LIBEMPATHY_LIBS + LIBEMPATHYGTK_CFLAGS + LIBEMPATHYGTK_LIBS + EMPATHY_CFLAGS + EMPATHY_LIBS + LIBNOTIFY_CFLAGS + LIBNOTIFY_LIBS +-CONNMAN_CFLAGS +-CONNMAN_LIBS + NETWORK_MANAGER_CFLAGS + NETWORK_MANAGER_LIBS ++CONNMAN_CFLAGS ++CONNMAN_LIBS ++NTRACK_CFLAGS ++NTRACK_LIBS + WEBKIT_CFLAGS + WEBKIT_LIBS + ENCHANT_CFLAGS + ENCHANT_LIBS + LIBCHAMPLAIN_CFLAGS + LIBCHAMPLAIN_LIBS + GEOCLUE_CFLAGS GEOCLUE_LIBS MOBLIN_CFLAGS MOBLIN_LIBS @@ -787,7 +1184,17 @@ NST_CFLAGS NST_LIBS' -@@ -1710,6 +1720,8 @@ + + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false + ac_unrecognized_opts= +@@ -1705,16 +1721,18 @@ Optional Features: + --enable-spell=[no/yes/auto] + Enable spell checking + --enable-map=[no/yes/auto] + Enable map view + --enable-location=[no/yes/auto] Enable location awareness --enable-moblin=@<:no/yes] Enable moblin widgets @@ -796,7 +1203,27 @@ --enable-nautilus-sendto=[no/yes/auto] build nautilus-sendto plugin --disable-coding-style-checks -@@ -1739,7 +1751,7 @@ + don't check coding style using grep + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +@@ -1725,26 +1743,26 @@ Optional Packages: + --with-help-dir=DIR path to help docs + --with-omf-dir=DIR path to OMF files + --with-help-formats=FORMATS + list of formats + --with-gconf-source=sourceaddress + Config database for installing schema files. + --with-gconf-schema-file-dir=dir + Directory for installing schema files. +- --with-connectivity=[nm/connman/auto/no] ++ --with-connectivity=[ntrack/nm/connman/auto/no] + build with connectivity support + + Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l @@ -805,7 +1232,49 @@ you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility -@@ -1790,6 +1802,10 @@ + XMKMF Path to xmkmf, Makefile generator for X Window System + VALGRIND_CFLAGS + C compiler flags for VALGRIND, overriding pkg-config + VALGRIND_LIBS + linker flags for VALGRIND, overriding pkg-config +@@ -1759,24 +1777,27 @@ Some influential environment variables: + EMPATHY_CFLAGS + C compiler flags for EMPATHY, overriding pkg-config + EMPATHY_LIBS + linker flags for EMPATHY, overriding pkg-config + LIBNOTIFY_CFLAGS + C compiler flags for LIBNOTIFY, overriding pkg-config + LIBNOTIFY_LIBS + linker flags for LIBNOTIFY, overriding pkg-config +- CONNMAN_CFLAGS +- C compiler flags for CONNMAN, overriding pkg-config +- CONNMAN_LIBS +- linker flags for CONNMAN, overriding pkg-config + NETWORK_MANAGER_CFLAGS + C compiler flags for NETWORK_MANAGER, overriding pkg-config + NETWORK_MANAGER_LIBS + linker flags for NETWORK_MANAGER, overriding pkg-config ++ CONNMAN_CFLAGS ++ C compiler flags for CONNMAN, overriding pkg-config ++ CONNMAN_LIBS ++ linker flags for CONNMAN, overriding pkg-config ++ NTRACK_CFLAGS ++ C compiler flags for NTRACK, overriding pkg-config ++ NTRACK_LIBS linker flags for NTRACK, overriding pkg-config + WEBKIT_CFLAGS + C compiler flags for WEBKIT, overriding pkg-config + WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config + ENCHANT_CFLAGS + C compiler flags for ENCHANT, overriding pkg-config + ENCHANT_LIBS + linker flags for ENCHANT, overriding pkg-config + LIBCHAMPLAIN_CFLAGS +@@ -1785,16 +1806,20 @@ Some influential environment variables: + linker flags for LIBCHAMPLAIN, overriding pkg-config + GEOCLUE_CFLAGS + C compiler flags for GEOCLUE, overriding pkg-config + GEOCLUE_LIBS + linker flags for GEOCLUE, overriding pkg-config MOBLIN_CFLAGS C compiler flags for MOBLIN, overriding pkg-config MOBLIN_LIBS linker flags for MOBLIN, overriding pkg-config @@ -816,7 +1285,17 @@ NST_CFLAGS C compiler flags for NST, overriding pkg-config NST_LIBS linker flags for NST, overriding pkg-config -@@ -1860,7 +1876,7 @@ + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + + Report bugs to . + _ACEOF +@@ -1855,17 +1880,17 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ + cd "$ac_pwd" || { ac_status=$?; break; } + done + fi + + test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Empathy configure 2.29.90 @@ -825,7 +1304,17 @@ Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation -@@ -1912,7 +1928,7 @@ + gives unlimited permission to copy, distribute and modify it. + + + Copyright (C) 2003-2007 Imendio AB + Copyright (C) 2007-2008 Collabora Ltd. +@@ -1907,17 +1932,17 @@ $as_echo "$ac_try_echo"; } >&5 + ac_retval=0 + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} @@ -834,7 +1323,17 @@ } # ac_fn_c_try_compile -@@ -1958,7 +1974,7 @@ + # ac_fn_c_try_link LINENO + # ----------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. + ac_fn_c_try_link () + { +@@ -1953,17 +1978,17 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 + fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} @@ -843,7 +1342,17 @@ } # ac_fn_c_try_link -@@ -1995,7 +2011,7 @@ + # ac_fn_c_try_cpp LINENO + # ---------------------- + # Try to preprocess conftest.$ac_ext, and return whether this succeeded. + ac_fn_c_try_cpp () + { +@@ -1990,17 +2015,17 @@ $as_echo "$ac_try_echo"; } >&5 + ac_retval=0 + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} @@ -852,7 +1361,17 @@ } # ac_fn_c_try_cpp -@@ -2037,7 +2053,7 @@ + # ac_fn_c_try_run LINENO + # ---------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes + # that executables *can* be run. + ac_fn_c_try_run () +@@ -2032,17 +2057,17 @@ else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} @@ -861,7 +1380,17 @@ } # ac_fn_c_try_run -@@ -2236,7 +2252,7 @@ + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES + # ------------------------------------------------------- + # Tests whether HEADER exists and can be compiled using the include files in + # INCLUDES, setting the cache variable VAR accordingly. + ac_fn_c_check_header_compile () +@@ -2231,17 +2256,17 @@ fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_header_mongrel + cat >config.log <<_ACEOF + This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Empathy $as_me 2.29.90, which was @@ -870,7 +1399,17 @@ $ $0 $@ -@@ -2489,7 +2505,7 @@ + _ACEOF + exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -2484,28 +2509,28 @@ elif test "x$prefix" != xNONE; then + ac_site_file2=$prefix/etc/config.site + else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site + fi for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue @@ -879,7 +1418,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 -@@ -2498,9 +2514,9 @@ + . "$ac_site_file" + fi done if test -r "$cache_file"; then @@ -892,16 +1432,36 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in -@@ -2603,6 +2619,8 @@ + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +@@ -2598,16 +2623,18 @@ LIBNOTIFY_REQUIRED=0.4.4 + LIBCANBERRA_GTK_REQUIRED=0.4 + LIBCHAMPLAIN_REQUIRED=0.4 + LIBCHAMPLAIN_GTK_REQUIRED=0.4 + CLUTTER_GTK_REQUIRED=0.10 + GEOCLUE_REQUIRED=0.11 WEBKIT_REQUIRED=1.1.15 KEYRING_REQUIRED=2.22 NETWORK_MANAGER_REQUIRED=0.7.0 -+INDICATE_REQUIRED=0.2.0 -+INDICATE_GTK_REQUIRED=0.2.0 ++INDICATE_REQUIRED=0.3.1 ++INDICATE_GTK_REQUIRED=0.3.1 NAUTILUS_SENDTO_REQUIRED=2.28.1 # Use --enable-maintainer-mode to disabled deprecated symbols -@@ -3007,6 +3025,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then : +@@ -3002,24 +3029,24 @@ do + esac + done + done + done + IFS=$as_save_IFS fi @@ -909,7 +1469,7 @@ if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else -@@ -3014,7 +3033,6 @@ + # As a last resort, use the slow shell script. Don't cache a # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. @@ -917,7 +1477,17 @@ MKDIR_P="$ac_install_sh -d" fi fi -@@ -3563,32 +3581,30 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" + case $mkdir_p in +@@ -3558,42 +3585,40 @@ eval ac_try_echo="\"\$as_me:${as_lineno- + $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 @@ -955,7 +1525,17 @@ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: -@@ -3650,10 +3666,10 @@ + ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + + ac_rmfiles= + for ac_file in $ac_files + do +@@ -3645,72 +3670,39 @@ do + break;; + esac + done + test "$ac_cv_exeext" = no && ac_cv_exeext= + else ac_file='' fi @@ -969,7 +1549,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -@@ -3661,51 +3677,18 @@ + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } @@ -1029,7 +1609,17 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" -@@ -3738,13 +3721,72 @@ + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +@@ -3733,23 +3725,82 @@ for ac_file in conftest.exe conftest con + esac + done + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi @@ -1103,7 +1693,17 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : -@@ -4514,8 +4556,8 @@ + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -4509,18 +4560,18 @@ eval ac_try_echo="\"\$as_me:${as_lineno- + $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 @@ -1113,7 +1713,17 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -@@ -5247,8 +5289,8 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } + if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 +@@ -5242,18 +5293,18 @@ fi + case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac @@ -1124,24 +1734,44 @@ -@@ -5789,13 +5831,13 @@ + + + + + +@@ -5784,23 +5835,23 @@ test -z "$NM" && NM=nm + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } + if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5792: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:5834: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5843: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5795: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:5837: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5846: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5798: output\"" >&5) -+ (eval echo "\"\$as_me:5840: output\"" >&5) ++ (eval echo "\"\$as_me:5849: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" -@@ -6261,7 +6303,7 @@ + fi + rm -f conftest* + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } +@@ -6256,17 +6307,17 @@ irix5* | irix6* | nonstopux*) + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. @@ -1150,30 +1780,60 @@ lt_cv_deplibs_check_method=pass_all ;; -@@ -7000,7 +7042,7 @@ + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' +@@ -6995,17 +7046,17 @@ ia64-*-hpux*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7003 "configure"' > conftest.$ac_ext -+ echo '#line 7045 "configure"' > conftest.$ac_ext ++ echo '#line 7054 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -8280,11 +8322,11 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -8275,21 +8326,21 @@ else + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8283: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8325: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8334: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8287: \$? = $ac_status" >&5 -+ echo "$as_me:8329: \$? = $ac_status" >&5 ++ echo "$as_me:8338: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -8449,7 +8491,7 @@ + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi +@@ -8444,17 +8495,17 @@ $as_echo_n "checking for $compiler optio + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. lt_prog_compiler_static='-non_shared' ;; @@ -1182,49 +1842,89 @@ case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) -@@ -8619,11 +8661,11 @@ + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. +@@ -8614,21 +8665,21 @@ else + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8622: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8664: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8673: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8626: \$? = $ac_status" >&5 -+ echo "$as_me:8668: \$? = $ac_status" >&5 ++ echo "$as_me:8677: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -8724,11 +8766,11 @@ + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi +@@ -8719,21 +8770,21 @@ else + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8727: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8769: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8778: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8731: \$? = $ac_status" >&5 -+ echo "$as_me:8773: \$? = $ac_status" >&5 ++ echo "$as_me:8782: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -8779,11 +8821,11 @@ + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes +@@ -8774,21 +8825,21 @@ else + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8782: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8824: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8833: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8786: \$? = $ac_status" >&5 -+ echo "$as_me:8828: \$? = $ac_status" >&5 ++ echo "$as_me:8837: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -8922,6 +8964,7 @@ + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes +@@ -8917,16 +8968,17 @@ $as_echo_n "checking whether the $compil + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= fi supports_anon_versioning=no case `$LD -v 2>&1` in @@ -1232,7 +1932,17 @@ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -9013,7 +9056,7 @@ + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. +@@ -9008,17 +9060,17 @@ _LT_EOF + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; @@ -1241,7 +1951,17 @@ tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in -@@ -10475,7 +10518,7 @@ + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no +@@ -10470,17 +10522,17 @@ irix5* | irix6* | nonstopux*) + ;; + + # No shared lib support for Linux oldld, aout, or coff. + linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no ;; # This must be Linux ELF. @@ -1250,25 +1970,55 @@ version_type=linux need_lib_prefix=no need_version=no -@@ -11162,7 +11205,7 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -11157,17 +11209,17 @@ if test "${lt_cv_dlopen_self+set}" = set + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross + else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11165 "configure" -+#line 11208 "configure" ++#line 11217 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11258,7 +11301,7 @@ + #include + #endif + + #include + +@@ -11253,17 +11305,17 @@ if test "${lt_cv_dlopen_self_static+set} + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross + else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11261 "configure" -+#line 11304 "configure" ++#line 11313 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11697,9 +11740,8 @@ + #include + #endif + + #include + +@@ -11692,19 +11744,18 @@ else + #include + #include + + int + main () { int major, minor, micro; char *tmp_version; @@ -1279,7 +2029,17 @@ /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_glib_version"); -@@ -13514,6 +13556,14 @@ + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + +@@ -13509,16 +13560,24 @@ else + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ;; @@ -1294,7 +2054,17 @@ esac fi -@@ -13544,6 +13594,14 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + + +@@ -13539,16 +13598,24 @@ else + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ;; @@ -1309,7 +2079,17 @@ esac fi -@@ -14476,6 +14534,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + +@@ -14471,31 +14538,33 @@ if test -n "$PKG_CONFIG"; then + libebook-1.2 + dbus-glib-1 + telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= \$KEYRING_REQUIRED @@ -1317,7 +2097,15 @@ \""; } >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= $GLIB_REQUIRED -@@ -14491,6 +14550,7 @@ + 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 + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED @@ -1325,7 +2113,17 @@ ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -14509,6 +14569,7 @@ + test $ac_status = 0; }; then + pkg_cv_EMPATHY_CFLAGS=`$PKG_CONFIG --cflags " + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gio-2.0 >= $GLIB_REQUIRED +@@ -14504,16 +14573,17 @@ if test -n "$PKG_CONFIG"; then + libebook-1.2 + dbus-glib-1 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED @@ -1333,7 +2131,17 @@ " 2>/dev/null` else pkg_failed=yes -@@ -14536,6 +14597,7 @@ + fi + fi + else + pkg_failed=untried + fi +@@ -14531,31 +14601,33 @@ if test -n "$PKG_CONFIG"; then + libebook-1.2 + dbus-glib-1 + telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= \$KEYRING_REQUIRED @@ -1341,7 +2149,15 @@ \""; } >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= $GLIB_REQUIRED -@@ -14551,6 +14613,7 @@ + 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 + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED @@ -1349,7 +2165,17 @@ ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -14569,6 +14632,7 @@ + test $ac_status = 0; }; then + pkg_cv_EMPATHY_LIBS=`$PKG_CONFIG --libs " + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gio-2.0 >= $GLIB_REQUIRED +@@ -14564,16 +14636,17 @@ if test -n "$PKG_CONFIG"; then + libebook-1.2 + dbus-glib-1 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED @@ -1357,7 +2183,17 @@ " 2>/dev/null` else pkg_failed=yes -@@ -14602,6 +14666,7 @@ + fi + fi + else + pkg_failed=untried + fi +@@ -14597,32 +14670,34 @@ fi + libebook-1.2 + dbus-glib-1 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED @@ -1365,7 +2201,16 @@ "` else EMPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " -@@ -14618,6 +14683,7 @@ + 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 + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED @@ -1373,7 +2218,17 @@ "` fi # Put the nasty error message in config.log where it belongs -@@ -14637,6 +14703,7 @@ + echo "$EMPATHY_PKG_ERRORS" >&5 + + as_fn_error "Package requirements ( + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 +@@ -14632,16 +14707,17 @@ fi + libebook-1.2 + dbus-glib-1 + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + telepathy-farsight + farsight2-0.10 gstreamer-0.10 unique-1.0 gnome-keyring-1 >= $KEYRING_REQUIRED @@ -1381,7 +2236,405 @@ ) were not met: $EMPATHY_PKG_ERRORS -@@ -16480,6 +16547,136 @@ + + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + + Alternatively, you may set the environment variables EMPATHY_CFLAGS +@@ -15505,16 +15581,115 @@ if test "${with_connectivity+set}" = set + else + with_connectivity=auto + fi + + + if test "x$with_connectivity" = "xno"; then + have_nm=no + have_connman=no ++ have_ntrack=no ++ ++elif test "x$with_connectivity" = "xnm"; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5 ++$as_echo_n "checking for NETWORK_MANAGER... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NETWORK_MANAGER_CFLAGS"; then ++ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ libnm_glib >= \$NETWORK_MANAGER_REQUIRED ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags " ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NETWORK_MANAGER_LIBS"; then ++ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ libnm_glib >= \$NETWORK_MANAGER_REQUIRED ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs " ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ "` ++ else ++ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ "` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$NETWORK_MANAGER_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_nm="no" ++elif test $pkg_failed = untried; then ++ have_nm="no" ++else ++ NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS ++ NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_nm="yes" ++fi ++ ++ if test "x$have_nm" = "xyes"; then ++ ++$as_echo "#define HAVE_NM 1" >>confdefs.h ++ ++ have_connman=no ++ have_ntrack=no ++ fi + + elif test "x$with_connectivity" = "xconnman"; then + + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONNMAN" >&5 + $as_echo_n "checking for CONNMAN... " >&6; } + +@@ -15601,65 +15776,65 @@ $as_echo "yes" >&6; } + have_connman="yes" + fi + + if test "x$have_connman" = "xyes"; then + + $as_echo "#define HAVE_CONNMAN 1" >>confdefs.h + + have_nm=no ++ have_ntrack=no + fi + + else + +- + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5 +-$as_echo_n "checking for NETWORK_MANAGER... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NTRACK" >&5 ++$as_echo_n "checking for NTRACK... " >&6; } + + if test -n "$PKG_CONFIG"; then +- if test -n "$NETWORK_MANAGER_CFLAGS"; then +- pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS" ++ if test -n "$NTRACK_CFLAGS"; then ++ pkg_cv_NTRACK_CFLAGS="$NTRACK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- libnm_glib >= \$NETWORK_MANAGER_REQUIRED ++ libntrack-gobject + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " +- libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ libntrack-gobject + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags " +- libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ pkg_cv_NTRACK_CFLAGS=`$PKG_CONFIG --cflags " ++ libntrack-gobject + " 2>/dev/null` + else + pkg_failed=yes + fi + fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then +- if test -n "$NETWORK_MANAGER_LIBS"; then +- pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS" ++ if test -n "$NTRACK_LIBS"; then ++ pkg_cv_NTRACK_LIBS="$NTRACK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- libnm_glib >= \$NETWORK_MANAGER_REQUIRED ++ libntrack-gobject + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " +- libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ libntrack-gobject + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs " +- libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ pkg_cv_NTRACK_LIBS=`$PKG_CONFIG --libs " ++ libntrack-gobject + " 2>/dev/null` + else + pkg_failed=yes + fi + fi + else + pkg_failed=untried + fi +@@ -15669,91 +15844,95 @@ fi + if test $pkg_failed = yes; then + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes + else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " +- libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ NTRACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ++ libntrack-gobject + "` + else +- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " +- libnm_glib >= $NETWORK_MANAGER_REQUIRED ++ NTRACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ++ libntrack-gobject + "` + fi + # Put the nasty error message in config.log where it belongs +- echo "$NETWORK_MANAGER_PKG_ERRORS" >&5 ++ echo "$NTRACK_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- have_nm="no" ++ have_ntrack="no" + elif test $pkg_failed = untried; then +- have_nm="no" ++ have_ntrack="no" + else +- NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS +- NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS ++ NTRACK_CFLAGS=$pkg_cv_NTRACK_CFLAGS ++ NTRACK_LIBS=$pkg_cv_NTRACK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- have_nm="yes" ++ have_ntrack="yes" + fi + +- if test "x$have_nm" = "xyes"; then ++ if test "x$have_ntrack" = "xyes"; then + +-$as_echo "#define HAVE_NM 1" >>confdefs.h ++$as_echo "#define HAVE_NTRACK 1" >>confdefs.h + ++ have_nm=no + have_connman=no +- else ++ fi ++ ++ if ! test "x$have_ntrack" = "xyes"; then ++ + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5 + $as_echo_n "checking for NETWORK_MANAGER... " >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$NETWORK_MANAGER_CFLAGS"; then + pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- libnm-glib >= \$NETWORK_MANAGER_REQUIRED ++ libnm_glib >= \$NETWORK_MANAGER_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " +- libnm-glib >= $NETWORK_MANAGER_REQUIRED ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags " +- libnm-glib >= $NETWORK_MANAGER_REQUIRED ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED + " 2>/dev/null` + else + pkg_failed=yes + fi + fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then + if test -n "$NETWORK_MANAGER_LIBS"; then + pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- libnm-glib >= \$NETWORK_MANAGER_REQUIRED ++ libnm_glib >= \$NETWORK_MANAGER_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " +- libnm-glib >= $NETWORK_MANAGER_REQUIRED ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs " +- libnm-glib >= $NETWORK_MANAGER_REQUIRED ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED + " 2>/dev/null` + else + pkg_failed=yes + fi + fi + else + pkg_failed=untried + fi +@@ -15764,21 +15943,21 @@ if test $pkg_failed = yes; then + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes + else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " +- libnm-glib >= $NETWORK_MANAGER_REQUIRED ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED + "` + else + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " +- libnm-glib >= $NETWORK_MANAGER_REQUIRED ++ libnm_glib >= $NETWORK_MANAGER_REQUIRED + "` + fi + # Put the nasty error message in config.log where it belongs + echo "$NETWORK_MANAGER_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + have_nm="no" +@@ -15791,37 +15970,50 @@ else + $as_echo "yes" >&6; } + have_nm="yes" + fi + + if test "x$have_nm" = "xyes"; then + + $as_echo "#define HAVE_NM 1" >>confdefs.h + +- have_connman=no ++ have_connman=no ++ have_ntrack=no + fi + fi + fi + + if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then + as_fn_error "Couldn't find connman dependencies." "$LINENO" 5 + fi + + if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then + as_fn_error "Couldn't find libnm-glib dependencies." "$LINENO" 5 + fi + ++if test "x$with_connectivity" = "xntrack" -a "x$have_ntrack" != "xyes"; then ++ as_fn_error "Couldn't find ntrack dependencies." "$LINENO" 5 ++fi ++ + if test "x$have_nm" = "xyes"; then + HAVE_NM_TRUE= + HAVE_NM_FALSE='#' + else + HAVE_NM_TRUE='#' + HAVE_NM_FALSE= + fi + ++ if test "x$have_ntrack" = "xyes"; then ++ HAVE_NTRACK_TRUE= ++ HAVE_NTRACK_FALSE='#' ++else ++ HAVE_NTRACK_TRUE='#' ++ HAVE_NTRACK_FALSE= ++fi ++ + if test "x$have_connman" = "xyes"; then + HAVE_CONNMAN_TRUE= + HAVE_CONNMAN_FALSE='#' + else + HAVE_CONNMAN_TRUE='#' + HAVE_CONNMAN_FALSE= + fi + +@@ -16475,16 +16667,146 @@ else + HAVE_MOBLIN_TRUE='#' + HAVE_MOBLIN_FALSE= + fi + + # ----------------------------------------------------------- @@ -1518,7 +2771,38 @@ # nautilus-sendto # ----------------------------------------------------------- # Check whether --enable-nautilus-sendto was given. -@@ -16780,6 +16977,10 @@ + if test "${enable_nautilus_sendto+set}" = set; then : + enableval=$enable_nautilus_sendto; + else + enable_nautilus_sendto=auto + fi +@@ -16751,16 +17073,20 @@ fi + if test -z "${HAVE_VALGRIND_TRUE}" && test -z "${HAVE_VALGRIND_FALSE}"; then + as_fn_error "conditional \"HAVE_VALGRIND\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_NM_TRUE}" && test -z "${HAVE_NM_FALSE}"; then + as_fn_error "conditional \"HAVE_NM\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${HAVE_NTRACK_TRUE}" && test -z "${HAVE_NTRACK_FALSE}"; then ++ as_fn_error "conditional \"HAVE_NTRACK\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${HAVE_CONNMAN_TRUE}" && test -z "${HAVE_CONNMAN_FALSE}"; then + as_fn_error "conditional \"HAVE_CONNMAN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_WEBKIT_TRUE}" && test -z "${HAVE_WEBKIT_FALSE}"; then + as_fn_error "conditional \"HAVE_WEBKIT\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +@@ -16775,16 +17101,20 @@ fi + if test -z "${HAVE_GEOCLUE_TRUE}" && test -z "${HAVE_GEOCLUE_FALSE}"; then + as_fn_error "conditional \"HAVE_GEOCLUE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_MOBLIN_TRUE}" && test -z "${HAVE_MOBLIN_FALSE}"; then as_fn_error "conditional \"HAVE_MOBLIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -1529,7 +2813,17 @@ if test -z "${HAVE_NST_TRUE}" && test -z "${HAVE_NST_FALSE}"; then as_fn_error "conditional \"HAVE_NST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -17193,7 +17394,7 @@ + fi + + : ${CONFIG_STATUS=./config.status} + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files +@@ -17188,17 +17518,17 @@ _ASEOF + test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by Empathy $as_me 2.29.90, which was @@ -1538,7 +2832,17 @@ CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -17233,6 +17434,7 @@ + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + + on `(hostname || uname -n) 2>/dev/null | sed 1q` +@@ -17228,16 +17558,17 @@ ac_cs_usage="\ + \`$as_me' instantiates files and other configuration actions + from templates according to the current configuration. Unless the files + and actions are specified as TAGs, all are instantiated by default. + + Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit @@ -1546,7 +2850,17 @@ -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files -@@ -17255,10 +17457,11 @@ + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE +@@ -17250,20 +17581,21 @@ $config_headers + + Configuration commands: + $config_commands + + Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -1560,7 +2874,17 @@ Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation -@@ -17296,6 +17499,8 @@ + gives unlimited permission to copy, distribute and modify it." + + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' +@@ -17291,16 +17623,18 @@ do + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; @@ -1569,7 +2893,17 @@ --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) -@@ -17756,7 +17961,7 @@ + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" +@@ -17751,31 +18085,31 @@ p + g + s/^[^!]*!// + :repl + t repl + s/'"$ac_delim"'$// t delim :nl h @@ -1578,7 +2912,13 @@ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p -@@ -17770,7 +17975,7 @@ + n + b repl + :more1 + s/["\\]/\\&/g; s/^/"/; s/$/"\\/ + p + g + s/.\{148\}// t nl :delim h @@ -1587,25 +2927,51 @@ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p -@@ -19043,6 +19248,7 @@ + b + :more2 + s/["\\]/\\&/g; s/^/"/; s/$/"\\/ + p + g +@@ -19038,16 +19372,18 @@ Configure summary: + 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} Moblin widgets .............: ${have_moblin} + Message indicator support (libindicate): ${have_libindicate} Connectivity: ++ ntrack integration..........: ${have_ntrack} NetworkManager integration..: ${have_nm} - -=== modified file 'data/Makefile.in' ---- a/data/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/data/Makefile.in 2010-02-09 04:51:43 +0000 -@@ -1,4 +1,4 @@ + ConnMan integration.........: ${have_connman} + + Extras: + Nautilus-sendto plugin......: ${have_nst} + " +Index: empathy-2.29.90/data/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/data/Makefile.in ++++ empathy-2.29.90/data/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -184,6 +184,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -179,16 +179,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1614,7 +2980,36 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -526,7 +528,7 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -221,16 +223,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -521,17 +525,17 @@ uninstall-streamingprefsDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -1623,7 +3018,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -551,7 +553,7 @@ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -546,17 +550,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -1632,17 +3037,32 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ - -=== modified file 'data/icons/Makefile.in' ---- a/data/icons/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/data/icons/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: empathy-2.29.90/data/icons/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/data/icons/Makefile.in ++++ empathy-2.29.90/data/icons/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -115,6 +115,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -110,16 +110,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1651,17 +3071,51 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'extensions/Makefile.in' ---- a/extensions/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/extensions/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -152,16 +154,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +Index: empathy-2.29.90/extensions/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/extensions/Makefile.in ++++ empathy-2.29.90/extensions/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -148,6 +148,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -143,16 +143,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1670,17 +3124,51 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'help/Makefile.in' ---- a/help/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/help/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -185,16 +187,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +Index: empathy-2.29.90/help/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/help/Makefile.in ++++ empathy-2.29.90/help/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -140,6 +140,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -135,16 +135,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1689,17 +3177,51 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'libempathy-gtk/Makefile.in' ---- a/libempathy-gtk/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/libempathy-gtk/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -177,16 +179,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +Index: empathy-2.29.90/libempathy-gtk/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/libempathy-gtk/Makefile.in ++++ empathy-2.29.90/libempathy-gtk/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -279,6 +279,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -274,16 +274,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1708,17 +3230,71 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'libempathy/Makefile.in' ---- a/libempathy/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/libempathy/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -316,16 +318,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +Index: empathy-2.29.90/libempathy/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/libempathy/Makefile.in ++++ empathy-2.29.90/libempathy/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -196,6 +196,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -54,17 +54,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + libempathy_la_DEPENDENCIES = \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + am__objects_1 = + am_libempathy_la_OBJECTS = $(am__objects_1) \ + empathy-account-settings.lo empathy-call-factory.lo \ + empathy-call-handler.lo empathy-chatroom-manager.lo \ + empathy-chatroom.lo empathy-connection-managers.lo \ + empathy-connectivity.lo empathy-contact-groups.lo \ + empathy-contact-list.lo empathy-contact-manager.lo \ + empathy-contact-monitor.lo empathy-contact.lo empathy-debug.lo \ +@@ -191,16 +192,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1727,11 +3303,71 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'ltmain.sh' ---- a/ltmain.sh 2010-02-09 04:47:04 +0000 -+++ b/ltmain.sh 2010-02-09 04:51:39 +0000 -@@ -1,6 +1,6 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -233,16 +236,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -341,16 +346,17 @@ AM_CPPFLAGS = \ + -I. \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DDATADIR=\""$(datadir)"\" \ + -DLOCALEDIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"empathy\" \ + $(LIBEMPATHY_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ ++ $(NTRACK_CFLAGS) \ + $(NETWORK_MANAGER_CFLAGS) \ + $(CONNMAN_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED) + + BUILT_SOURCES = \ + empathy-marshal.h \ + empathy-marshal.c \ +@@ -442,16 +448,17 @@ libempathy_la_SOURCES = \ + # do not distribute generated files + nodist_libempathy_la_SOURCES = \ + $(BUILT_SOURCES) + + libempathy_la_LIBADD = \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(LIBEMPATHY_LIBS) \ + $(GEOCLUE_LIBS) \ ++ $(NTRACK_LIBS) \ + $(NETWORK_MANAGER_LIBS) \ + $(CONNMAN_LIBS) + + check_c_sources = \ + $(libempathy_la_SOURCES) \ + $(libempathy_headers) + + dtddir = $(datadir)/empathy +Index: empathy-2.29.90/ltmain.sh +=================================================================== +--- empathy-2.29.90.orig/ltmain.sh ++++ empathy-2.29.90/ltmain.sh +@@ -1,11 +1,11 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 @@ -1739,7 +3375,17 @@ # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. -@@ -65,7 +65,7 @@ + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + # GNU Libtool is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -60,27 +60,27 @@ + # When reporting a bug, please describe a test case to reproduce it and + # include the following information: + # + # host-triplet: $host + # shell: $SHELL # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) @@ -1748,7 +3394,7 @@ # automake: $automake_version # autoconf: $autoconf_version # -@@ -73,9 +73,9 @@ + # Report bugs to . PROGRAM=ltmain.sh PACKAGE=libtool @@ -1760,11 +3406,21 @@ # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - -=== modified file 'm4/libtool.m4' ---- a/m4/libtool.m4 2010-02-09 04:47:04 +0000 -+++ b/m4/libtool.m4 2010-02-09 04:51:39 +0000 -@@ -2445,7 +2445,7 @@ + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +Index: empathy-2.29.90/m4/libtool.m4 +=================================================================== +--- empathy-2.29.90.orig/m4/libtool.m4 ++++ empathy-2.29.90/m4/libtool.m4 +@@ -2440,17 +2440,17 @@ irix5* | irix6* | nonstopux*) + ;; + + # No shared lib support for Linux oldld, aout, or coff. + linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no ;; # This must be Linux ELF. @@ -1773,7 +3429,17 @@ version_type=linux need_lib_prefix=no need_version=no -@@ -3084,7 +3084,7 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -3079,17 +3079,17 @@ irix5* | irix6* | nonstopux*) + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. @@ -1782,7 +3448,17 @@ lt_cv_deplibs_check_method=pass_all ;; -@@ -3705,7 +3705,7 @@ + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +@@ -3700,17 +3700,17 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) ;; esac ;; @@ -1791,7 +3467,17 @@ case $cc_basename in KCC*) # KAI C++ Compiler -@@ -3989,7 +3989,7 @@ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. +@@ -3984,17 +3984,17 @@ m4_if([$1], [CXX], [ + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; @@ -1800,7 +3486,17 @@ case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) -@@ -4285,6 +4285,7 @@ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. +@@ -4280,16 +4280,17 @@ dnl Note also adjust exclude_expsyms for + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no case `$LD -v 2>&1` in @@ -1808,7 +3504,17 @@ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -4376,7 +4377,7 @@ + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. +@@ -4371,17 +4372,17 @@ _LT_EOF + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; @@ -1817,7 +3523,17 @@ tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in -@@ -5860,7 +5861,7 @@ + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no +@@ -5855,17 +5856,17 @@ if test "$_lt_caught_CXX_error" != yes; + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; @@ -1826,11 +3542,21 @@ case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler - -=== modified file 'm4/ltversion.m4' ---- a/m4/ltversion.m4 2010-02-09 04:47:04 +0000 -+++ b/m4/ltversion.m4 2010-02-09 04:51:39 +0000 -@@ -9,15 +9,15 @@ + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +Index: empathy-2.29.90/m4/ltversion.m4 +=================================================================== +--- empathy-2.29.90.orig/m4/ltversion.m4 ++++ empathy-2.29.90/m4/ltversion.m4 +@@ -4,20 +4,20 @@ + # Written by Scott James Remnant, 2004 + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. # Generated from ltversion.in. @@ -1851,17 +3577,27 @@ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) - -=== modified file 'nautilus-sendto-plugin/Makefile.in' ---- a/nautilus-sendto-plugin/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/nautilus-sendto-plugin/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ +Index: empathy-2.29.90/nautilus-sendto-plugin/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/nautilus-sendto-plugin/Makefile.in ++++ empathy-2.29.90/nautilus-sendto-plugin/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -173,6 +173,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -168,16 +168,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1870,17 +3606,51 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'src/Makefile.in' ---- a/src/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/src/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -210,16 +212,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +Index: empathy-2.29.90/src/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/src/Makefile.in ++++ empathy-2.29.90/src/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -40,14 +40,24 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -35,24 +35,34 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in \ $(top_srcdir)/tools/check-coding-style.mk \ $(top_srcdir)/tools/flymake.mk bin_PROGRAMS = empathy$(EXEEXT) @@ -1908,7 +3678,17 @@ @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.c \ @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.h \ @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.ui -@@ -94,10 +104,14 @@ + + subdir = src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ + $(top_srcdir)/m4/empathy-args.m4 \ +@@ -89,49 +99,54 @@ am__empathy_SOURCES_DIST = empathy-about + empathy-import-pidgin.h empathy-import-utils.c \ + empathy-import-utils.h empathy-import-widget.c \ + empathy-import-widget.h empathy-invite-participant-dialog.c \ + empathy-invite-participant-dialog.h empathy-main-window.c \ + empathy-main-window.h empathy-new-chatroom-dialog.c \ empathy-new-chatroom-dialog.h empathy-preferences.c \ empathy-preferences.h empathy-sidebar.c empathy-sidebar.h \ empathy-status-icon.c empathy-status-icon.h empathy.c \ @@ -1927,7 +3707,16 @@ empathy-account-assistant.$(OBJEXT) \ empathy-accounts-dialog.$(OBJEXT) \ empathy-auto-salut-account-helper.$(OBJEXT) \ -@@ -114,10 +128,10 @@ + empathy-call-window-fullscreen.$(OBJEXT) \ + empathy-call-window.$(OBJEXT) empathy-chat-window.$(OBJEXT) \ + empathy-chatrooms-window.$(OBJEXT) \ + empathy-debug-window.$(OBJEXT) empathy-event-manager.$(OBJEXT) \ + empathy-ft-manager.$(OBJEXT) empathy-import-dialog.$(OBJEXT) \ + empathy-import-mc4-accounts.$(OBJEXT) \ + empathy-import-pidgin.$(OBJEXT) empathy-import-utils.$(OBJEXT) \ + empathy-import-widget.$(OBJEXT) \ + empathy-invite-participant-dialog.$(OBJEXT) \ + empathy-main-window.$(OBJEXT) \ empathy-new-chatroom-dialog.$(OBJEXT) \ empathy-preferences.$(OBJEXT) empathy-sidebar.$(OBJEXT) \ empathy-status-icon.$(OBJEXT) empathy.$(OBJEXT) \ @@ -1942,7 +3731,8 @@ empathy_OBJECTS = $(am_empathy_OBJECTS) $(nodist_empathy_OBJECTS) empathy_LDADD = $(LDADD) am__DEPENDENCIES_1 = -@@ -126,7 +140,8 @@ + empathy_DEPENDENCIES = \ + $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(top_builddir)/libempathy/libempathy.la \ $(top_builddir)/extensions/libemp-extensions.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -1952,7 +3742,17 @@ AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent -@@ -242,6 +257,8 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -237,16 +252,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -1961,7 +3761,36 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -386,8 +403,10 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -279,16 +296,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -381,28 +400,31 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"empathy\" \ @@ -1972,7 +3801,10 @@ $(LIBCHAMPLAIN_CFLAGS) \ $(DISABLE_DEPRECATED) \ $(WEBKIT_CFLAGS) \ -@@ -398,6 +417,7 @@ + $(WARN_CFLAGS) + + LDADD = \ + $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(top_builddir)/libempathy/libempathy.la \ $(top_builddir)/extensions/libemp-extensions.la \ $(LIBNOTIFY_LIBS) \ @@ -1980,7 +3812,17 @@ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ $(WEBKIT_LIBS) -@@ -426,7 +446,7 @@ + + BUILT_SOURCES = + empathy_handwritten_source = empathy-about-dialog.c \ + empathy-about-dialog.h empathy-account-assistant.c \ + empathy-account-assistant.h empathy-accounts-dialog.c \ +@@ -421,34 +443,35 @@ empathy_handwritten_source = empathy-abo + empathy-import-pidgin.h empathy-import-utils.c \ + empathy-import-utils.h empathy-import-widget.c \ + empathy-import-widget.h empathy-invite-participant-dialog.c \ + empathy-invite-participant-dialog.h empathy-main-window.c \ + empathy-main-window.h empathy-new-chatroom-dialog.c \ empathy-new-chatroom-dialog.h empathy-preferences.c \ empathy-preferences.h empathy-sidebar.c empathy-sidebar.h \ empathy-status-icon.c empathy-status-icon.h empathy.c \ @@ -1989,7 +3831,15 @@ empathy_SOURCES = \ $(empathy_handwritten_source) \ ephy-spinner.c ephy-spinner.h -@@ -442,8 +462,9 @@ + + nodist_empathy_SOURCES = $(BUILT_SOURCES) + check_c_sources = \ + $(empathy_handwritten_source) \ + $(empathy_logs_SOURCES) + + uidir = $(datadir)/empathy + ui_DATA = empathy-accounts-dialog.ui empathy-call-window-fullscreen.ui \ + empathy-call-window.ui empathy-chat-window.ui \ empathy-chatrooms-window.ui empathy-ft-manager.ui \ empathy-import-dialog.ui empathy-main-window.ui \ empathy-new-chatroom-dialog.ui empathy-preferences.ui \ @@ -2001,7 +3851,17 @@ dist_man_MANS = \ empathy.1 -@@ -552,6 +573,8 @@ + CLEANFILES = $(BUILT_SOURCES) + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: +@@ -547,16 +570,18 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-debug-window.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-event-manager.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-ft-manager.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-mc4-accounts.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-pidgin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-widget.Po@am__quote@ @@ -2010,17 +3870,32 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-invite-participant-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-main-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-map-view.Po@am__quote@ - -=== modified file 'tests/Makefile.in' ---- a/tests/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/tests/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-new-chatroom-dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-preferences.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-sidebar.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-status-icon.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy.Po@am__quote@ +Index: empathy-2.29.90/tests/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/tests/Makefile.in ++++ empathy-2.29.90/tests/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -253,6 +253,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -248,16 +248,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -2029,7 +3904,36 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -568,7 +570,7 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -290,16 +292,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -563,17 +567,17 @@ clean-libtool: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -2038,7 +3942,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -593,7 +595,7 @@ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -588,17 +592,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -2047,17 +3961,32 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ - -=== modified file 'tests/interactive/Makefile.in' ---- a/tests/interactive/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/tests/interactive/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: empathy-2.29.90/tests/interactive/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/tests/interactive/Makefile.in ++++ empathy-2.29.90/tests/interactive/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -214,6 +214,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -209,16 +209,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -2066,17 +3995,51 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'tests/xml/Makefile.in' ---- a/tests/xml/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/tests/xml/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -251,16 +253,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +Index: empathy-2.29.90/tests/xml/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/tests/xml/Makefile.in ++++ empathy-2.29.90/tests/xml/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -115,6 +115,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -110,16 +110,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -2085,17 +4048,51 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -=== modified file 'tools/Makefile.in' ---- a/tools/Makefile.in 2010-02-09 04:47:04 +0000 -+++ b/tools/Makefile.in 2010-02-09 04:51:44 +0000 -@@ -1,4 +1,4 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -152,16 +154,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +Index: empathy-2.29.90/tools/Makefile.in +=================================================================== +--- empathy-2.29.90.orig/tools/Makefile.in ++++ empathy-2.29.90/tools/Makefile.in +@@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -117,6 +117,8 @@ + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -112,16 +112,18 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HELP_DIR = @HELP_DIR@ @@ -2104,4 +4101,27 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +@@ -154,16 +156,18 @@ MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ + NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ + NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ + NM = @NM@ + NMEDIT = @NMEDIT@ + NST_CFLAGS = @NST_CFLAGS@ + NST_LIBS = @NST_LIBS@ ++NTRACK_CFLAGS = @NTRACK_CFLAGS@ ++NTRACK_LIBS = @NTRACK_LIBS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ diff -Nru empathy-2.29.90/debian/patches/series empathy-2.29.90/debian/patches/series --- empathy-2.29.90/debian/patches/series 2010-02-12 16:26:03.000000000 +0000 +++ empathy-2.29.90/debian/patches/series 2010-02-21 21:08:36.000000000 +0000 @@ -5,4 +5,5 @@ 32_append_notifications.patch 34_start_raised_execpt_in_session.patch 35_check_actions_notifications.patch +40_ntrack.patch 99_autoconf.patch diff -Nru empathy-2.29.90/debian/rules empathy-2.29.90/debian/rules --- empathy-2.29.90/debian/rules 2010-02-12 16:26:03.000000000 +0000 +++ empathy-2.29.90/debian/rules 2010-02-21 21:12:41.000000000 +0000 @@ -14,7 +14,7 @@ #LDFLAGS += -Wl,-z,defs -Wl,-O1 DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \ - --with-connectivity=nm \ + --with-connectivity=ntrack \ --enable-libindicate \ --enable-webkit \ --enable-location=no \