1
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/aclocal.m4 empathy-2.30.0.new/aclocal.m4
2
--- empathy-2.30.0/aclocal.m4 2010-03-29 14:04:53.000000000 +0200
3
+++ empathy-2.30.0.new/aclocal.m4 2010-03-29 16:23:55.228562824 +0200
5
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
6
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
8
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
9
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12
m4_ifndef([AC_AUTOCONF_VERSION],
13
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
14
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
15
-[m4_warning([this file was generated for autoconf 2.64.
16
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
17
+[m4_warning([this file was generated for autoconf 2.65.
18
You have another version of autoconf. It may work, but is not guaranteed to.
19
If you have problems, you may need to regenerate the build system entirely.
20
To do so, use the procedure documented by the package, typically `autoreconf'.])])
23
int major, minor, micro;
27
- ignored = system ("touch conf.glibtest");
28
+ fclose (fopen ("conf.glibtest", "w"));
30
/* HP/UX 9 (%@#!) writes to sscanf strings */
31
tmp_version = g_strdup("$min_glib_version");
33
[am__api_version='1.11'
34
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
35
dnl require some minimum version. Point them to the right macro.
36
-m4_if([$1], [1.11], [],
37
+m4_if([$1], [1.11.1], [],
38
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
42
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
43
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
44
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
45
-[AM_AUTOMAKE_VERSION([1.11])dnl
46
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
47
m4_ifndef([AC_AUTOCONF_VERSION],
48
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
49
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
50
@@ -1838,6 +1837,14 @@
51
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
52
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
55
+ case $am_py_prefix in
58
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
64
AC_SUBST([pythondir], [$am_cv_python_pythondir])
65
@@ -1868,6 +1875,14 @@
66
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
67
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
70
+ case $am_py_exec_prefix in
73
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
79
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
80
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/config.h.in empathy-2.30.0.new/config.h.in
81
--- empathy-2.30.0/config.h.in 2010-03-29 14:04:54.000000000 +0200
82
+++ empathy-2.30.0.new/config.h.in 2010-03-29 16:23:57.004547340 +0200
84
/* Define if you have libchamplain */
85
#undef HAVE_LIBCHAMPLAIN
87
+/* Define if you have libindicate */
88
+#undef HAVE_LIBINDICATE
90
/* Define to 1 if you have the <locale.h> header file. */
93
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/configure empathy-2.30.0.new/configure
94
--- empathy-2.30.0/configure 2010-03-29 14:04:54.000000000 +0200
95
+++ empathy-2.30.0.new/configure 2010-03-29 16:23:56.664545328 +0200
98
# Guess values for system-dependent variables and create Makefiles.
99
-# Generated by GNU Autoconf 2.64 for Empathy 2.30.0.
100
+# Generated by GNU Autoconf 2.65 for Empathy 2.30.0.
102
# Report bugs to <http://bugzilla.gnome.org/browse.cgi?product=empathy>.
105
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
106
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
108
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
112
# This configure script is free software; the Free Software Foundation
113
# gives unlimited permission to copy, distribute and modify it.
118
-exec 7<&0 </dev/null 6>&1
119
+test -n "$DJDIR" || exec 7<&0 </dev/null
123
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
128
+HAVE_LIBINDICATE_FALSE
129
+HAVE_LIBINDICATE_TRUE
132
HAVE_FAVOURITE_CONTACTS_FALSE
133
HAVE_FAVOURITE_CONTACTS_TRUE
134
TELEPATHY_LOGGER_LIBS
135
@@ -1034,6 +1041,7 @@
138
enable_favourite_contacts
140
enable_nautilus_sendto
141
enable_control_center_embedding
142
enable_coding_style_checks
143
@@ -1079,6 +1087,8 @@
145
TELEPATHY_LOGGER_CFLAGS
146
TELEPATHY_LOGGER_LIBS
151
CONTROL_CENTER_EMBEDDING_CFLAGS
152
@@ -1740,6 +1750,8 @@
154
--enable-favourite-contacts=@<:no/yes]
155
Enable favourite contacts
156
+ --enable-libindicate=[no/yes/auto]
157
+ build libindicate support
158
--enable-nautilus-sendto=[no/yes/auto]
159
build nautilus-sendto plugin
160
--enable-control-center-embedding=[no/yes/auto]
161
@@ -1771,7 +1783,7 @@
162
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
163
nonstandard directory <lib dir>
164
LIBS libraries to pass to the linker, e.g. -l<library>
165
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
166
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
167
you have headers in a nonstandard directory <include dir>
169
PKG_CONFIG path to pkg-config utility
170
@@ -1834,6 +1846,10 @@
171
C compiler flags for TELEPATHY_LOGGER, overriding pkg-config
172
TELEPATHY_LOGGER_LIBS
173
linker flags for TELEPATHY_LOGGER, overriding pkg-config
175
+ C compiler flags for INDICATE, overriding pkg-config
177
+ linker flags for INDICATE, overriding pkg-config
178
NST_CFLAGS C compiler flags for NST, overriding pkg-config
179
NST_LIBS linker flags for NST, overriding pkg-config
180
CONTROL_CENTER_EMBEDDING_CFLAGS
181
@@ -1909,7 +1925,7 @@
182
if $ac_init_version; then
184
Empathy configure 2.30.0
185
-generated by GNU Autoconf 2.64
186
+generated by GNU Autoconf 2.65
188
Copyright (C) 2009 Free Software Foundation, Inc.
189
This configure script is free software; the Free Software Foundation
190
@@ -1961,7 +1977,7 @@
193
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
195
+ as_fn_set_status $ac_retval
197
} # ac_fn_c_try_compile
199
@@ -2007,7 +2023,7 @@
200
# left behind by Apple's compiler. We do this before executing the actions.
201
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
202
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
204
+ as_fn_set_status $ac_retval
208
@@ -2044,7 +2060,7 @@
211
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
213
+ as_fn_set_status $ac_retval
217
@@ -2086,7 +2102,7 @@
219
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
220
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
222
+ as_fn_set_status $ac_retval
226
@@ -2285,7 +2301,7 @@
227
running configure, to aid debugging if configure makes a mistake.
229
It was created by Empathy $as_me 2.30.0, which was
230
-generated by GNU Autoconf 2.64. Invocation command line was
231
+generated by GNU Autoconf 2.65. Invocation command line was
235
@@ -2538,7 +2554,7 @@
236
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
238
test "x$ac_site_file" = xNONE && continue
239
- if test -r "$ac_site_file"; then
240
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
241
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
242
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
243
sed 's/^/| /' "$ac_site_file" >&5
244
@@ -2547,9 +2563,9 @@
247
if test -r "$cache_file"; then
248
- # Some versions of bash will fail to source /dev/null (special
249
- # files actually), so we avoid doing that.
250
- if test -f "$cache_file"; then
251
+ # Some versions of bash will fail to source /dev/null (special files
252
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
253
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
254
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
255
$as_echo "$as_me: loading cache $cache_file" >&6;}
257
@@ -2653,6 +2669,8 @@
258
WEBKIT_REQUIRED=1.1.15
259
KEYRING_REQUIRED=2.22
260
NETWORK_MANAGER_REQUIRED=0.7.0
261
+INDICATE_REQUIRED=0.3.1
262
+INDICATE_GTK_REQUIRED=0.3.1
263
NAUTILUS_SENDTO_REQUIRED=2.28.1
265
# Use --enable-maintainer-mode to disabled deprecated symbols
266
@@ -3057,6 +3075,7 @@
270
+ test -d ./--version && rmdir ./--version
271
if test "${ac_cv_path_mkdir+set}" = set; then
272
MKDIR_P="$ac_cv_path_mkdir -p"
274
@@ -3064,7 +3083,6 @@
275
# value for MKDIR_P within a source directory, because that will
276
# break other packages using the cache if that directory is
277
# removed, or if the value is a relative name.
278
- test -d ./--version && rmdir ./--version
279
MKDIR_P="$ac_install_sh -d"
282
@@ -3613,32 +3631,30 @@
283
... rest of stderr output deleted ...
284
10q' conftest.err >conftest.er1
286
- rm -f conftest.er1 conftest.err
288
+ rm -f conftest.er1 conftest.err
289
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
290
test $ac_status = 0; }
293
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
294
/* end confdefs.h. */
300
-FILE *f = fopen ("conftest.out", "w");
301
- return ferror (f) || fclose (f) != 0;
307
ac_clean_files_save=$ac_clean_files
308
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
309
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
310
# Try to create an executable without -o first, disregard a.out.
311
# It will help us diagnose broken compilers, and finding out an intuition
313
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
314
-$as_echo_n "checking for C compiler default output file name... " >&6; }
315
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
316
+$as_echo_n "checking whether the C compiler works... " >&6; }
317
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
319
# The possible output files:
320
@@ -3700,10 +3716,10 @@
324
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
325
-$as_echo "$ac_file" >&6; }
326
if test -z "$ac_file"; then :
327
- $as_echo "$as_me: failed program was:" >&5
328
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
329
+$as_echo "no" >&6; }
330
+$as_echo "$as_me: failed program was:" >&5
331
sed 's/^/| /' conftest.$ac_ext >&5
333
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
334
@@ -3711,51 +3727,18 @@
335
{ as_fn_set_status 77
336
as_fn_error "C compiler cannot create executables
337
See \`config.log' for more details." "$LINENO" 5; }; }
339
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
340
+$as_echo "yes" >&6; }
342
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
343
+$as_echo_n "checking for C compiler default output file name... " >&6; }
344
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
345
+$as_echo "$ac_file" >&6; }
346
ac_exeext=$ac_cv_exeext
348
-# Check that the compiler produces executables we can run. If not, either
349
-# the compiler is broken, or we cross compile.
350
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
351
-$as_echo_n "checking whether the C compiler works... " >&6; }
352
-# If not cross compiling, check that we can run a simple program.
353
-if test "$cross_compiling" != yes; then
354
- if { ac_try='./$ac_file'
355
- { { case "(($ac_try" in
356
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
357
- *) ac_try_echo=$ac_try;;
359
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
360
-$as_echo "$ac_try_echo"; } >&5
361
- (eval "$ac_try") 2>&5
363
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
364
- test $ac_status = 0; }; }; then
367
- if test "$cross_compiling" = maybe; then
368
- cross_compiling=yes
370
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
371
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
372
-as_fn_error "cannot run C compiled programs.
373
-If you meant to cross compile, use \`--host'.
374
-See \`config.log' for more details." "$LINENO" 5; }
378
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
379
-$as_echo "yes" >&6; }
381
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
382
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
383
ac_clean_files=$ac_clean_files_save
384
-# Check that the compiler produces executables we can run. If not, either
385
-# the compiler is broken, or we cross compile.
386
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
387
-$as_echo_n "checking whether we are cross compiling... " >&6; }
388
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
389
-$as_echo "$cross_compiling" >&6; }
391
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
392
$as_echo_n "checking for suffix of executables... " >&6; }
393
if { { ac_try="$ac_link"
394
@@ -3788,13 +3771,72 @@
395
as_fn_error "cannot compute suffix of executables: cannot compile and link
396
See \`config.log' for more details." "$LINENO" 5; }
398
-rm -f conftest$ac_cv_exeext
399
+rm -f conftest conftest$ac_cv_exeext
400
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
401
$as_echo "$ac_cv_exeext" >&6; }
403
rm -f conftest.$ac_ext
406
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
407
+/* end confdefs.h. */
412
+FILE *f = fopen ("conftest.out", "w");
413
+ return ferror (f) || fclose (f) != 0;
419
+ac_clean_files="$ac_clean_files conftest.out"
420
+# Check that the compiler produces executables we can run. If not, either
421
+# the compiler is broken, or we cross compile.
422
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
423
+$as_echo_n "checking whether we are cross compiling... " >&6; }
424
+if test "$cross_compiling" != yes; then
425
+ { { ac_try="$ac_link"
427
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
428
+ *) ac_try_echo=$ac_try;;
430
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
431
+$as_echo "$ac_try_echo"; } >&5
432
+ (eval "$ac_link") 2>&5
434
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
435
+ test $ac_status = 0; }
436
+ if { ac_try='./conftest$ac_cv_exeext'
437
+ { { case "(($ac_try" in
438
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
439
+ *) ac_try_echo=$ac_try;;
441
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
442
+$as_echo "$ac_try_echo"; } >&5
443
+ (eval "$ac_try") 2>&5
445
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
446
+ test $ac_status = 0; }; }; then
449
+ if test "$cross_compiling" = maybe; then
450
+ cross_compiling=yes
452
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
453
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
454
+as_fn_error "cannot run C compiled programs.
455
+If you meant to cross compile, use \`--host'.
456
+See \`config.log' for more details." "$LINENO" 5; }
460
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
461
+$as_echo "$cross_compiling" >&6; }
463
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
464
+ac_clean_files=$ac_clean_files_save
465
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
466
$as_echo_n "checking for suffix of object files... " >&6; }
467
if test "${ac_cv_objext+set}" = set; then :
468
@@ -4564,8 +4606,8 @@
469
... rest of stderr output deleted ...
470
10q' conftest.err >conftest.er1
472
- rm -f conftest.er1 conftest.err
474
+ rm -f conftest.er1 conftest.err
475
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
476
test $ac_status = 0; }
478
@@ -5297,8 +5339,8 @@
482
-macro_version='2.2.6'
483
-macro_revision='1.3012'
484
+macro_version='2.2.6b'
485
+macro_revision='1.3017'
489
@@ -5839,13 +5881,13 @@
491
lt_cv_nm_interface="BSD nm"
492
echo "int some_variable = 0;" > conftest.$ac_ext
493
- (eval echo "\"\$as_me:5842: $ac_compile\"" >&5)
494
+ (eval echo "\"\$as_me:5884: $ac_compile\"" >&5)
495
(eval "$ac_compile" 2>conftest.err)
497
- (eval echo "\"\$as_me:5845: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
498
+ (eval echo "\"\$as_me:5887: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
499
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
501
- (eval echo "\"\$as_me:5848: output\"" >&5)
502
+ (eval echo "\"\$as_me:5890: output\"" >&5)
504
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
505
lt_cv_nm_interface="MS dumpbin"
506
@@ -7050,7 +7092,7 @@
509
# Find out which ABI we are using.
510
- echo '#line 7053 "configure"' > conftest.$ac_ext
511
+ echo '#line 7095 "configure"' > conftest.$ac_ext
512
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
513
(eval $ac_compile) 2>&5
515
@@ -8330,11 +8372,11 @@
516
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
517
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
518
-e 's:$: $lt_compiler_flag:'`
519
- (eval echo "\"\$as_me:8333: $lt_compile\"" >&5)
520
+ (eval echo "\"\$as_me:8375: $lt_compile\"" >&5)
521
(eval "$lt_compile" 2>conftest.err)
524
- echo "$as_me:8337: \$? = $ac_status" >&5
525
+ echo "$as_me:8379: \$? = $ac_status" >&5
526
if (exit $ac_status) && test -s "$ac_outfile"; then
527
# The compiler can only warn and ignore the option if not recognized
528
# So say no if there are warnings other than the usual output.
529
@@ -8669,11 +8711,11 @@
530
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
531
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
532
-e 's:$: $lt_compiler_flag:'`
533
- (eval echo "\"\$as_me:8672: $lt_compile\"" >&5)
534
+ (eval echo "\"\$as_me:8714: $lt_compile\"" >&5)
535
(eval "$lt_compile" 2>conftest.err)
538
- echo "$as_me:8676: \$? = $ac_status" >&5
539
+ echo "$as_me:8718: \$? = $ac_status" >&5
540
if (exit $ac_status) && test -s "$ac_outfile"; then
541
# The compiler can only warn and ignore the option if not recognized
542
# So say no if there are warnings other than the usual output.
543
@@ -8774,11 +8816,11 @@
544
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
545
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
546
-e 's:$: $lt_compiler_flag:'`
547
- (eval echo "\"\$as_me:8777: $lt_compile\"" >&5)
548
+ (eval echo "\"\$as_me:8819: $lt_compile\"" >&5)
549
(eval "$lt_compile" 2>out/conftest.err)
551
cat out/conftest.err >&5
552
- echo "$as_me:8781: \$? = $ac_status" >&5
553
+ echo "$as_me:8823: \$? = $ac_status" >&5
554
if (exit $ac_status) && test -s out/conftest2.$ac_objext
556
# The compiler can only warn and ignore the option if not recognized
557
@@ -8829,11 +8871,11 @@
558
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
559
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
560
-e 's:$: $lt_compiler_flag:'`
561
- (eval echo "\"\$as_me:8832: $lt_compile\"" >&5)
562
+ (eval echo "\"\$as_me:8874: $lt_compile\"" >&5)
563
(eval "$lt_compile" 2>out/conftest.err)
565
cat out/conftest.err >&5
566
- echo "$as_me:8836: \$? = $ac_status" >&5
567
+ echo "$as_me:8878: \$? = $ac_status" >&5
568
if (exit $ac_status) && test -s out/conftest2.$ac_objext
570
# The compiler can only warn and ignore the option if not recognized
571
@@ -11212,7 +11254,7 @@
572
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
573
lt_status=$lt_dlunknown
574
cat > conftest.$ac_ext <<_LT_EOF
575
-#line 11215 "configure"
576
+#line 11257 "configure"
577
#include "confdefs.h"
580
@@ -11308,7 +11350,7 @@
581
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
582
lt_status=$lt_dlunknown
583
cat > conftest.$ac_ext <<_LT_EOF
584
-#line 11311 "configure"
585
+#line 11353 "configure"
586
#include "confdefs.h"
589
@@ -11747,9 +11789,8 @@
591
int major, minor, micro;
595
- ignored = system ("touch conf.glibtest");
596
+ fclose (fopen ("conf.glibtest", "w"));
598
/* HP/UX 9 (%@#!) writes to sscanf strings */
599
tmp_version = g_strdup("$min_glib_version");
600
@@ -13566,6 +13607,14 @@
601
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
602
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
605
+ case $am_py_prefix in
608
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
615
@@ -13596,6 +13645,14 @@
616
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
617
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
620
+ case $am_py_exec_prefix in
623
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
630
@@ -14669,6 +14726,7 @@
633
gnome-keyring-1 >= \$KEYRING_REQUIRED
634
+ launchpad-integration
636
($PKG_CONFIG --exists --print-errors "
637
glib-2.0 >= $GLIB_REQUIRED
638
@@ -14684,6 +14742,7 @@
641
gnome-keyring-1 >= $KEYRING_REQUIRED
642
+ launchpad-integration
645
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
646
@@ -14702,6 +14761,7 @@
649
gnome-keyring-1 >= $KEYRING_REQUIRED
650
+ launchpad-integration
654
@@ -14729,6 +14789,7 @@
657
gnome-keyring-1 >= \$KEYRING_REQUIRED
658
+ launchpad-integration
660
($PKG_CONFIG --exists --print-errors "
661
glib-2.0 >= $GLIB_REQUIRED
662
@@ -14744,6 +14805,7 @@
665
gnome-keyring-1 >= $KEYRING_REQUIRED
666
+ launchpad-integration
669
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
670
@@ -14762,6 +14824,7 @@
673
gnome-keyring-1 >= $KEYRING_REQUIRED
674
+ launchpad-integration
678
@@ -14795,6 +14858,7 @@
681
gnome-keyring-1 >= $KEYRING_REQUIRED
682
+ launchpad-integration
685
EMPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
686
@@ -14811,6 +14875,7 @@
689
gnome-keyring-1 >= $KEYRING_REQUIRED
690
+ launchpad-integration
693
# Put the nasty error message in config.log where it belongs
694
@@ -14830,6 +14895,7 @@
697
gnome-keyring-1 >= $KEYRING_REQUIRED
698
+ launchpad-integration
702
@@ -16987,6 +17053,136 @@
705
# -----------------------------------------------------------
707
+# -----------------------------------------------------------
708
+# Check whether --enable-libindicate was given.
709
+if test "${enable_libindicate+set}" = set; then :
710
+ enableval=$enable_libindicate;
712
+ enable_libindicate=auto
716
+if test "x$enable_libindicate" != "xno"; then
719
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATE" >&5
720
+$as_echo_n "checking for INDICATE... " >&6; }
722
+if test -n "$PKG_CONFIG"; then
723
+ if test -n "$INDICATE_CFLAGS"; then
724
+ pkg_cv_INDICATE_CFLAGS="$INDICATE_CFLAGS"
726
+ if test -n "$PKG_CONFIG" && \
727
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
728
+ indicate >= \$INDICATE_REQUIRED,
729
+ indicate-gtk >= \$INDICATE_GTK_REQUIRED
731
+ ($PKG_CONFIG --exists --print-errors "
732
+ indicate >= $INDICATE_REQUIRED,
733
+ indicate-gtk >= $INDICATE_GTK_REQUIRED
736
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
737
+ test $ac_status = 0; }; then
738
+ pkg_cv_INDICATE_CFLAGS=`$PKG_CONFIG --cflags "
739
+ indicate >= $INDICATE_REQUIRED,
740
+ indicate-gtk >= $INDICATE_GTK_REQUIRED
749
+if test -n "$PKG_CONFIG"; then
750
+ if test -n "$INDICATE_LIBS"; then
751
+ pkg_cv_INDICATE_LIBS="$INDICATE_LIBS"
753
+ if test -n "$PKG_CONFIG" && \
754
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
755
+ indicate >= \$INDICATE_REQUIRED,
756
+ indicate-gtk >= \$INDICATE_GTK_REQUIRED
758
+ ($PKG_CONFIG --exists --print-errors "
759
+ indicate >= $INDICATE_REQUIRED,
760
+ indicate-gtk >= $INDICATE_GTK_REQUIRED
763
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
764
+ test $ac_status = 0; }; then
765
+ pkg_cv_INDICATE_LIBS=`$PKG_CONFIG --libs "
766
+ indicate >= $INDICATE_REQUIRED,
767
+ indicate-gtk >= $INDICATE_GTK_REQUIRED
779
+if test $pkg_failed = yes; then
781
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
782
+ _pkg_short_errors_supported=yes
784
+ _pkg_short_errors_supported=no
786
+ if test $_pkg_short_errors_supported = yes; then
787
+ INDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
788
+ indicate >= $INDICATE_REQUIRED,
789
+ indicate-gtk >= $INDICATE_GTK_REQUIRED
792
+ INDICATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
793
+ indicate >= $INDICATE_REQUIRED,
794
+ indicate-gtk >= $INDICATE_GTK_REQUIRED
797
+ # Put the nasty error message in config.log where it belongs
798
+ echo "$INDICATE_PKG_ERRORS" >&5
800
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
801
+$as_echo "no" >&6; }
802
+ have_libindicate="no"
803
+elif test $pkg_failed = untried; then
804
+ have_libindicate="no"
806
+ INDICATE_CFLAGS=$pkg_cv_INDICATE_CFLAGS
807
+ INDICATE_LIBS=$pkg_cv_INDICATE_LIBS
808
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
809
+$as_echo "yes" >&6; }
810
+ have_libindicate="yes"
813
+ if test "x$have_libindicate" = "xyes"; then
815
+$as_echo "#define HAVE_LIBINDICATE 1" >>confdefs.h
819
+ have_libindicate=no
822
+if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then
823
+ as_fn_error "Couldn't find libindicate." "$LINENO" 5
826
+ if test "x$have_libindicate" = "xyes"; then
827
+ HAVE_LIBINDICATE_TRUE=
828
+ HAVE_LIBINDICATE_FALSE='#'
830
+ HAVE_LIBINDICATE_TRUE='#'
831
+ HAVE_LIBINDICATE_FALSE=
835
+# -----------------------------------------------------------
837
# -----------------------------------------------------------
838
# Check whether --enable-nautilus-sendto was given.
839
@@ -17419,6 +17615,10 @@
840
as_fn_error "conditional \"HAVE_FAVOURITE_CONTACTS\" was never defined.
841
Usually this means the macro was only invoked conditionally." "$LINENO" 5
843
+if test -z "${HAVE_LIBINDICATE_TRUE}" && test -z "${HAVE_LIBINDICATE_FALSE}"; then
844
+ as_fn_error "conditional \"HAVE_LIBINDICATE\" was never defined.
845
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
847
if test -z "${HAVE_NST_TRUE}" && test -z "${HAVE_NST_FALSE}"; then
848
as_fn_error "conditional \"HAVE_NST\" was never defined.
849
Usually this means the macro was only invoked conditionally." "$LINENO" 5
850
@@ -17836,7 +18036,7 @@
851
# values after options handling.
853
This file was extended by Empathy $as_me 2.30.0, which was
854
-generated by GNU Autoconf 2.64. Invocation command line was
855
+generated by GNU Autoconf 2.65. Invocation command line was
857
CONFIG_FILES = $CONFIG_FILES
858
CONFIG_HEADERS = $CONFIG_HEADERS
859
@@ -17876,6 +18076,7 @@
861
-h, --help print this help, then exit
862
-V, --version print version number and configuration settings, then exit
863
+ --config print configuration, then exit
864
-q, --quiet, --silent
865
do not print progress messages
866
-d, --debug don't remove temporary files
867
@@ -17898,10 +18099,11 @@
870
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
871
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
873
Empathy config.status 2.30.0
874
-configured by $0, generated by GNU Autoconf 2.64,
875
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
876
+configured by $0, generated by GNU Autoconf 2.65,
877
+ with options \\"\$ac_cs_config\\"
879
Copyright (C) 2009 Free Software Foundation, Inc.
880
This config.status script is free software; the Free Software Foundation
881
@@ -17939,6 +18141,8 @@
883
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
884
$as_echo "$ac_cs_version"; exit ;;
885
+ --config | --confi | --conf | --con | --co | --c )
886
+ $as_echo "$ac_cs_config"; exit ;;
887
--debug | --debu | --deb | --de | --d | -d )
889
--file | --fil | --fi | --f )
890
@@ -18400,7 +18604,7 @@
894
-s/\(.\{148\}\).*/\1/
895
+s/\(.\{148\}\)..*/\1/
897
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
899
@@ -18414,7 +18618,7 @@
903
-s/\(.\{148\}\).*/\1/
904
+s/\(.\{148\}\)..*/\1/
906
s/["\\]/\\&/g; s/^/"/; s/$/"/
908
@@ -19682,6 +19886,7 @@
909
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
912
+ Message indicator support (libindicate): ${have_libindicate}
913
Spell checking (enchant)....: ${have_enchant}
914
Display maps (libchamplain).: ${have_libchamplain}
915
Location awareness (Geoclue): ${have_geoclue}
916
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/data/icons/Makefile.in empathy-2.30.0.new/data/icons/Makefile.in
917
--- empathy-2.30.0/data/icons/Makefile.in 2010-03-29 14:04:55.000000000 +0200
918
+++ empathy-2.30.0.new/data/icons/Makefile.in 2010-03-29 16:23:57.877545593 +0200
920
-# Makefile.in generated by automake 1.11 from Makefile.am.
921
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
924
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
926
GOBJECT_QUERY = @GOBJECT_QUERY@
928
HELP_DIR = @HELP_DIR@
929
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
930
+INDICATE_LIBS = @INDICATE_LIBS@
932
INSTALL_DATA = @INSTALL_DATA@
933
INSTALL_PROGRAM = @INSTALL_PROGRAM@
934
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/data/Makefile.in empathy-2.30.0.new/data/Makefile.in
935
--- empathy-2.30.0/data/Makefile.in 2010-03-29 14:04:55.000000000 +0200
936
+++ empathy-2.30.0.new/data/Makefile.in 2010-03-29 16:23:57.805546008 +0200
938
-# Makefile.in generated by automake 1.11 from Makefile.am.
939
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
942
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
944
GOBJECT_QUERY = @GOBJECT_QUERY@
946
HELP_DIR = @HELP_DIR@
947
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
948
+INDICATE_LIBS = @INDICATE_LIBS@
950
INSTALL_DATA = @INSTALL_DATA@
951
INSTALL_PROGRAM = @INSTALL_PROGRAM@
953
# (which will cause the Makefiles to be regenerated when you run `make');
954
# (2) otherwise, pass the desired values on the `make' command line.
955
$(RECURSIVE_TARGETS):
956
- @failcom='exit 1'; \
957
+ @fail= failcom='exit 1'; \
958
for f in x $$MAKEFLAGS; do \
964
$(RECURSIVE_CLEAN_TARGETS):
965
- @failcom='exit 1'; \
966
+ @fail= failcom='exit 1'; \
967
for f in x $$MAKEFLAGS; do \
970
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/extensions/Makefile.in empathy-2.30.0.new/extensions/Makefile.in
971
--- empathy-2.30.0/extensions/Makefile.in 2010-03-29 14:04:55.000000000 +0200
972
+++ empathy-2.30.0.new/extensions/Makefile.in 2010-03-29 16:23:58.041545754 +0200
974
-# Makefile.in generated by automake 1.11 from Makefile.am.
975
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
978
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
980
GOBJECT_QUERY = @GOBJECT_QUERY@
982
HELP_DIR = @HELP_DIR@
983
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
984
+INDICATE_LIBS = @INDICATE_LIBS@
986
INSTALL_DATA = @INSTALL_DATA@
987
INSTALL_PROGRAM = @INSTALL_PROGRAM@
988
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/help/Makefile.in empathy-2.30.0.new/help/Makefile.in
989
--- empathy-2.30.0/help/Makefile.in 2010-03-29 14:04:55.000000000 +0200
990
+++ empathy-2.30.0.new/help/Makefile.in 2010-03-29 16:23:58.141545968 +0200
992
-# Makefile.in generated by automake 1.11 from Makefile.am.
993
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
996
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
998
GOBJECT_QUERY = @GOBJECT_QUERY@
1000
HELP_DIR = @HELP_DIR@
1001
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1002
+INDICATE_LIBS = @INDICATE_LIBS@
1004
INSTALL_DATA = @INSTALL_DATA@
1005
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1006
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/libempathy/Makefile.in empathy-2.30.0.new/libempathy/Makefile.in
1007
--- empathy-2.30.0/libempathy/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1008
+++ empathy-2.30.0.new/libempathy/Makefile.in 2010-03-29 16:23:58.369546184 +0200
1010
-# Makefile.in generated by automake 1.11 from Makefile.am.
1011
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1014
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1016
GOBJECT_QUERY = @GOBJECT_QUERY@
1018
HELP_DIR = @HELP_DIR@
1019
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1020
+INDICATE_LIBS = @INDICATE_LIBS@
1022
INSTALL_DATA = @INSTALL_DATA@
1023
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1024
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/libempathy-gtk/Makefile.in empathy-2.30.0.new/libempathy-gtk/Makefile.in
1025
--- empathy-2.30.0/libempathy-gtk/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1026
+++ empathy-2.30.0.new/libempathy-gtk/Makefile.in 2010-03-29 16:23:58.257546401 +0200
1028
-# Makefile.in generated by automake 1.11 from Makefile.am.
1029
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1032
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1034
GOBJECT_QUERY = @GOBJECT_QUERY@
1036
HELP_DIR = @HELP_DIR@
1037
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1038
+INDICATE_LIBS = @INDICATE_LIBS@
1040
INSTALL_DATA = @INSTALL_DATA@
1041
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1042
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/ltmain.sh empathy-2.30.0.new/ltmain.sh
1043
--- empathy-2.30.0/ltmain.sh 2010-03-29 14:04:50.000000000 +0200
1044
+++ empathy-2.30.0.new/ltmain.sh 2010-03-29 16:23:51.840547945 +0200
1046
# Generated from ltmain.m4sh.
1048
-# ltmain.sh (GNU libtool) 2.2.6
1049
+# ltmain.sh (GNU libtool) 2.2.6b
1050
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
1052
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
1055
# compiler flags: $LTCFLAGS
1056
# linker: $LD (gnu? $with_gnu_ld)
1057
-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
1058
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
1059
# automake: $automake_version
1060
# autoconf: $autoconf_version
1066
-VERSION="2.2.6 Debian-2.2.6a-4"
1067
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
1069
-package_revision=1.3012
1070
+package_revision=1.3017
1072
# Be Bourne compatible
1073
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1074
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/m4/ltversion.m4 empathy-2.30.0.new/m4/ltversion.m4
1075
--- empathy-2.30.0/m4/ltversion.m4 2010-03-29 14:04:50.000000000 +0200
1076
+++ empathy-2.30.0.new/m4/ltversion.m4 2010-03-29 16:23:52.092546370 +0200
1079
# Generated from ltversion.in.
1081
-# serial 3012 ltversion.m4
1082
+# serial 3017 ltversion.m4
1083
# This file is part of GNU Libtool
1085
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
1086
-m4_define([LT_PACKAGE_REVISION], [1.3012])
1087
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
1088
+m4_define([LT_PACKAGE_REVISION], [1.3017])
1090
AC_DEFUN([LTVERSION_VERSION],
1091
-[macro_version='2.2.6'
1092
-macro_revision='1.3012'
1093
+[macro_version='2.2.6b'
1094
+macro_revision='1.3017'
1095
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
1096
_LT_DECL(, macro_revision, 0)
1098
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/Makefile.in empathy-2.30.0.new/Makefile.in
1099
--- empathy-2.30.0/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1100
+++ empathy-2.30.0.new/Makefile.in 2010-03-29 16:23:59.076546081 +0200
1102
-# Makefile.in generated by automake 1.11 from Makefile.am.
1103
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1106
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1108
GOBJECT_QUERY = @GOBJECT_QUERY@
1110
HELP_DIR = @HELP_DIR@
1111
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1112
+INDICATE_LIBS = @INDICATE_LIBS@
1114
INSTALL_DATA = @INSTALL_DATA@
1115
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1117
# (which will cause the Makefiles to be regenerated when you run `make');
1118
# (2) otherwise, pass the desired values on the `make' command line.
1119
$(RECURSIVE_TARGETS):
1120
- @failcom='exit 1'; \
1121
+ @fail= failcom='exit 1'; \
1122
for f in x $$MAKEFLAGS; do \
1126
fi; test -z "$$fail"
1128
$(RECURSIVE_CLEAN_TARGETS):
1129
- @failcom='exit 1'; \
1130
+ @fail= failcom='exit 1'; \
1131
for f in x $$MAKEFLAGS; do \
1137
-test -n "$(am__skip_mode_fix)" \
1138
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
1139
+ || find "$(distdir)" -type d ! -perm -755 \
1140
+ -exec chmod u+rwx,go+rx {} \; -o \
1141
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
1142
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
1143
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1144
@@ -649,17 +652,17 @@
1146
case '$(DIST_ARCHIVES)' in \
1148
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
1149
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1151
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
1152
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1154
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
1155
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
1157
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
1159
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1161
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
1162
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
1164
unzip $(distdir).zip ;;\
1166
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/nautilus-sendto-plugin/Makefile.in empathy-2.30.0.new/nautilus-sendto-plugin/Makefile.in
1167
--- empathy-2.30.0/nautilus-sendto-plugin/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1168
+++ empathy-2.30.0.new/nautilus-sendto-plugin/Makefile.in 2010-03-29 16:23:58.453546311 +0200
1170
-# Makefile.in generated by automake 1.11 from Makefile.am.
1171
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1174
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1176
GOBJECT_QUERY = @GOBJECT_QUERY@
1178
HELP_DIR = @HELP_DIR@
1179
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1180
+INDICATE_LIBS = @INDICATE_LIBS@
1182
INSTALL_DATA = @INSTALL_DATA@
1183
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1184
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/src/Makefile.in empathy-2.30.0.new/src/Makefile.in
1185
--- empathy-2.30.0/src/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1186
+++ empathy-2.30.0.new/src/Makefile.in 2010-03-29 16:23:58.632546010 +0200
1188
-# Makefile.in generated by automake 1.11 from Makefile.am.
1189
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1192
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1194
$(top_srcdir)/tools/flymake.mk
1195
bin_PROGRAMS = empathy$(EXEEXT) empathy-accounts$(EXEEXT) \
1196
empathy-debugger$(EXEEXT)
1197
-@HAVE_LIBCHAMPLAIN_TRUE@am__append_1 = \
1198
+@HAVE_LIBINDICATE_TRUE@am__append_1 = \
1199
+@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.c \
1200
+@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.h \
1201
+@HAVE_LIBINDICATE_TRUE@ empathy-indicator.c empathy-indicator.h
1203
+@HAVE_LIBINDICATE_FALSE@am__append_2 = \
1204
+@HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.c \
1205
+@HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.h \
1206
+@HAVE_LIBINDICATE_FALSE@ empathy-indicator.c empathy-indicator.h
1208
+@HAVE_LIBCHAMPLAIN_TRUE@am__append_3 = \
1209
@HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.c \
1210
@HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.h
1212
-@HAVE_LIBCHAMPLAIN_TRUE@am__append_2 = \
1213
+@HAVE_LIBCHAMPLAIN_TRUE@am__append_4 = \
1214
@HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.ui
1216
-@HAVE_LIBCHAMPLAIN_FALSE@am__append_3 = \
1217
+@HAVE_LIBCHAMPLAIN_FALSE@am__append_5 = \
1218
@HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.c \
1219
@HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.h \
1220
@HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.ui
1222
-@HAVE_CONTROL_CENTER_EMBEDDING_FALSE@am__append_4 = $(libempathy_accounts_panel_la_SOURCES)
1223
-@HAVE_CONTROL_CENTER_EMBEDDING_TRUE@am__append_5 = $(libempathy_accounts_panel_la_SOURCES)
1224
+@HAVE_CONTROL_CENTER_EMBEDDING_FALSE@am__append_6 = $(libempathy_accounts_panel_la_SOURCES)
1225
+@HAVE_CONTROL_CENTER_EMBEDDING_TRUE@am__append_7 = $(libempathy_accounts_panel_la_SOURCES)
1227
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1228
am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
1229
@@ -146,9 +156,14 @@
1230
empathy-new-chatroom-dialog.h empathy-preferences.c \
1231
empathy-preferences.h empathy-sidebar.c empathy-sidebar.h \
1232
empathy-status-icon.c empathy-status-icon.h empathy.c \
1233
- empathy-map-view.c empathy-map-view.h
1234
-@HAVE_LIBCHAMPLAIN_TRUE@am__objects_1 = empathy-map-view.$(OBJEXT)
1235
-am__objects_2 = empathy-about-dialog.$(OBJEXT) \
1236
+ empathy-indicator-manager.c empathy-indicator-manager.h \
1237
+ empathy-indicator.c empathy-indicator.h empathy-map-view.c \
1238
+ empathy-map-view.h
1239
+@HAVE_LIBINDICATE_TRUE@am__objects_1 = \
1240
+@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.$(OBJEXT) \
1241
+@HAVE_LIBINDICATE_TRUE@ empathy-indicator.$(OBJEXT)
1242
+@HAVE_LIBCHAMPLAIN_TRUE@am__objects_2 = empathy-map-view.$(OBJEXT)
1243
+am__objects_3 = empathy-about-dialog.$(OBJEXT) \
1244
empathy-call-window-fullscreen.$(OBJEXT) \
1245
empathy-call-window.$(OBJEXT) empathy-chat-window.$(OBJEXT) \
1246
empathy-chatrooms-window.$(OBJEXT) \
1247
@@ -159,17 +174,18 @@
1248
empathy-new-chatroom-dialog.$(OBJEXT) \
1249
empathy-preferences.$(OBJEXT) empathy-sidebar.$(OBJEXT) \
1250
empathy-status-icon.$(OBJEXT) empathy.$(OBJEXT) \
1252
-am_empathy_OBJECTS = $(am__objects_2)
1254
-nodist_empathy_OBJECTS = $(am__objects_3)
1255
+ $(am__objects_1) $(am__objects_2)
1256
+am_empathy_OBJECTS = $(am__objects_3)
1258
+nodist_empathy_OBJECTS = $(am__objects_4)
1259
empathy_OBJECTS = $(am_empathy_OBJECTS) $(nodist_empathy_OBJECTS)
1260
empathy_DEPENDENCIES = libempathy-accounts-common.la \
1261
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
1262
$(top_builddir)/libempathy/libempathy.la \
1263
$(top_builddir)/extensions/libemp-extensions.la \
1264
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1265
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1266
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1267
+ $(am__DEPENDENCIES_1)
1268
am_empathy_accounts_OBJECTS = empathy-accounts.$(OBJEXT)
1269
empathy_accounts_OBJECTS = $(am_empathy_accounts_OBJECTS)
1270
am__DEPENDENCIES_2 = $(top_builddir)/libempathy-gtk/libempathy-gtk.la \
1272
$(top_builddir)/extensions/libemp-extensions.la \
1273
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1274
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1275
- $(am__DEPENDENCIES_1)
1276
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1277
empathy_accounts_DEPENDENCIES = $(am__DEPENDENCIES_2) \
1278
libempathy-accounts-common.la
1279
am_empathy_debugger_OBJECTS = empathy-debug-window.$(OBJEXT) \
1281
$(top_builddir)/extensions/libemp-extensions.la \
1282
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1283
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1284
- $(am__DEPENDENCIES_1)
1285
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1286
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
1287
depcomp = $(SHELL) $(top_srcdir)/depcomp
1288
am__depfiles_maybe = depfiles
1290
GOBJECT_QUERY = @GOBJECT_QUERY@
1292
HELP_DIR = @HELP_DIR@
1293
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1294
+INDICATE_LIBS = @INDICATE_LIBS@
1296
INSTALL_DATA = @INSTALL_DATA@
1297
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1301
-DG_LOG_DOMAIN=\"empathy\" \
1302
+ -DDESKTOPDIR=\"$(datadir)/applications\" \
1303
-DBIN_DIR=\"$(bindir)\" \
1304
$(DISABLE_DEPRECATED) \
1307
$(CPPFLAGS_COMMON) \
1309
$(LIBNOTIFY_CFLAGS) \
1310
+ $(INDICATE_CFLAGS) \
1311
$(LIBCHAMPLAIN_CFLAGS) \
1315
$(top_builddir)/extensions/libemp-extensions.la \
1318
+ $(INDICATE_LIBS) \
1320
$(LIBCHAMPLAIN_LIBS) \
1323
empathy-new-chatroom-dialog.h empathy-preferences.c \
1324
empathy-preferences.h empathy-sidebar.c empathy-sidebar.h \
1325
empathy-status-icon.c empathy-status-icon.h empathy.c \
1327
+ $(am__append_1) $(am__append_3)
1329
$(empathy_handwritten_source) \
1331
@@ -551,22 +572,23 @@
1332
$(top_builddir)/extensions/libemp-extensions.la \
1335
+ $(INDICATE_LIBS) \
1336
$(LIBCHAMPLAIN_LIBS) \
1340
nodist_empathy_SOURCES = $(BUILT_SOURCES)
1341
check_c_sources = $(empathy_handwritten_source) \
1342
- $(empathy_logs_SOURCES) $(am__append_5)
1343
+ $(empathy_logs_SOURCES) $(am__append_7)
1344
uidir = $(datadir)/empathy
1345
ui_DATA = empathy-accounts-dialog.ui empathy-call-window-fullscreen.ui \
1346
empathy-call-window.ui empathy-chat-window.ui \
1347
empathy-chatrooms-window.ui empathy-ft-manager.ui \
1348
empathy-import-dialog.ui empathy-main-window.ui \
1349
empathy-new-chatroom-dialog.ui empathy-preferences.ui \
1350
- empathy-status-icon.ui $(am__append_2)
1351
-EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_3) \
1353
+ empathy-status-icon.ui $(am__append_4)
1354
+EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_2) \
1355
+ $(am__append_5) $(am__append_6)
1360
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-pidgin.Plo@am__quote@
1361
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-utils.Plo@am__quote@
1362
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-widget.Plo@am__quote@
1363
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator-manager.Po@am__quote@
1364
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator.Po@am__quote@
1365
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-invite-participant-dialog.Po@am__quote@
1366
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-main-window.Po@am__quote@
1367
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-map-view.Po@am__quote@
1368
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/tests/interactive/Makefile.in empathy-2.30.0.new/tests/interactive/Makefile.in
1369
--- empathy-2.30.0/tests/interactive/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1370
+++ empathy-2.30.0.new/tests/interactive/Makefile.in 2010-03-29 16:23:58.844545870 +0200
1372
-# Makefile.in generated by automake 1.11 from Makefile.am.
1373
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1376
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1378
GOBJECT_QUERY = @GOBJECT_QUERY@
1380
HELP_DIR = @HELP_DIR@
1381
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1382
+INDICATE_LIBS = @INDICATE_LIBS@
1384
INSTALL_DATA = @INSTALL_DATA@
1385
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1386
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/tests/Makefile.in empathy-2.30.0.new/tests/Makefile.in
1387
--- empathy-2.30.0/tests/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1388
+++ empathy-2.30.0.new/tests/Makefile.in 2010-03-29 16:23:58.740545634 +0200
1390
-# Makefile.in generated by automake 1.11 from Makefile.am.
1391
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1394
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1396
GOBJECT_QUERY = @GOBJECT_QUERY@
1398
HELP_DIR = @HELP_DIR@
1399
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1400
+INDICATE_LIBS = @INDICATE_LIBS@
1402
INSTALL_DATA = @INSTALL_DATA@
1403
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1405
# (which will cause the Makefiles to be regenerated when you run `make');
1406
# (2) otherwise, pass the desired values on the `make' command line.
1407
$(RECURSIVE_TARGETS):
1408
- @failcom='exit 1'; \
1409
+ @fail= failcom='exit 1'; \
1410
for f in x $$MAKEFLAGS; do \
1414
fi; test -z "$$fail"
1416
$(RECURSIVE_CLEAN_TARGETS):
1417
- @failcom='exit 1'; \
1418
+ @fail= failcom='exit 1'; \
1419
for f in x $$MAKEFLAGS; do \
1422
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/tests/xml/Makefile.in empathy-2.30.0.new/tests/xml/Makefile.in
1423
--- empathy-2.30.0/tests/xml/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1424
+++ empathy-2.30.0.new/tests/xml/Makefile.in 2010-03-29 16:23:58.908545413 +0200
1426
-# Makefile.in generated by automake 1.11 from Makefile.am.
1427
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1430
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1432
GOBJECT_QUERY = @GOBJECT_QUERY@
1434
HELP_DIR = @HELP_DIR@
1435
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1436
+INDICATE_LIBS = @INDICATE_LIBS@
1438
INSTALL_DATA = @INSTALL_DATA@
1439
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1440
diff -Nur -x '*.orig' -x '*~' empathy-2.30.0/tools/Makefile.in empathy-2.30.0.new/tools/Makefile.in
1441
--- empathy-2.30.0/tools/Makefile.in 2010-03-29 14:04:56.000000000 +0200
1442
+++ empathy-2.30.0.new/tools/Makefile.in 2010-03-29 16:23:58.980546248 +0200
1444
-# Makefile.in generated by automake 1.11 from Makefile.am.
1445
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1448
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1450
GOBJECT_QUERY = @GOBJECT_QUERY@
1452
HELP_DIR = @HELP_DIR@
1453
+INDICATE_CFLAGS = @INDICATE_CFLAGS@
1454
+INDICATE_LIBS = @INDICATE_LIBS@
1456
INSTALL_DATA = @INSTALL_DATA@
1457
INSTALL_PROGRAM = @INSTALL_PROGRAM@