~ubuntu-branches/ubuntu/hardy/evince/hardy-security
» Revision
52
: debian/patches/99_autoreconf.patch
« back to all changes in this revision
Viewing changes to debian/patches/99_autoreconf.patch
- browse files at revision 52
- compare with another revision
- download diff
- download tarball
- view history from revision 52
- Committer: Bazaar Package Importer
- Author(s): Sebastien Bacher
- Date: 2008-04-08 23:52:57 UTC
- mfrom: (1.1.28 upstream)
- Revision ID: james.westby@ubuntu.com-20080408235257-0rd70trs4y6gxf9z
Tags: 2.22.1.1-0ubuntu1
* New upstream version:
Bug fixes:
- Fix build in FreeBSD
- Fixes djvu backend links
* debian/control.in, debian/patches/01_launchpad.patch:
- updated to the launchpad integration changes
* debian/patches/99_autoreconf.patch:
- new version update
Bug fixes:
- Fix build in FreeBSD
- Fixes djvu backend links
* debian/control.in, debian/patches/01_launchpad.patch:
- updated to the launchpad integration changes
* debian/patches/99_autoreconf.patch:
- new version update
- files modified:
- ChangeLog
added
removed
debian/patches/99_autoreconf.patch
1
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/aclocal.m4 evince-2.22.1.new/aclocal.m4
2
--- evince-2.22.1/aclocal.m4 2008-04-07 18:31:55.000000000 +0200
3
+++ evince-2.22.1.new/aclocal.m4 2008-04-07 22:46:04.000000000 +0200
1
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/aclocal.m4 evince-2.22.1.1.new/aclocal.m4
2
--- evince-2.22.1.1/aclocal.m4 2008-04-08 21:18:49.000000000 +0200
3
+++ evince-2.22.1.1.new/aclocal.m4 2008-04-08 23:59:06.000000000 +0200
4
4
@@ -1,7 +1,7 @@
5
5
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
6
6
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
140
140
])
141
141
142
142
143
@@ -848,6 +841,20 @@
144
AC_SUBST(INTLTOOL_SERVICE_RULE)
145
AC_SUBST(INTLTOOL_POLICY_RULE)
146
147
+# Check the gettext tools to make sure they are GNU
148
+AC_PATH_PROG(XGETTEXT, xgettext)
149
+AC_PATH_PROG(MSGMERGE, msgmerge)
150
+AC_PATH_PROG(MSGFMT, msgfmt)
151
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
152
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
153
+fi
154
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
155
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
156
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
157
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
158
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
159
+fi
160
+
161
# Use the tools built into the package, not the ones that are installed.
162
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
163
AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
164
@@ -982,7 +989,7 @@
143
@@ -996,7 +989,7 @@
165
144
166
145
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
167
146
170
149
171
150
172
151
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
173
@@ -1070,7 +1077,6 @@
152
@@ -1084,7 +1077,6 @@
174
153
AC_REQUIRE([AC_OBJEXT])dnl
175
154
AC_REQUIRE([AC_EXEEXT])dnl
176
155
dnl
178
157
AC_LIBTOOL_SYS_MAX_CMD_LEN
179
158
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
180
159
AC_LIBTOOL_OBJDIR
181
@@ -1172,6 +1178,8 @@
160
@@ -1186,6 +1178,8 @@
182
161
;;
183
162
esac
184
163
187
166
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
188
167
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
189
168
enable_win32_dll=yes, enable_win32_dll=no)
190
@@ -1251,9 +1259,80 @@
169
@@ -1265,9 +1259,80 @@
191
170
echo "$lt_simple_link_test_code" >conftest.$ac_ext
192
171
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
193
172
_lt_linker_boilerplate=`cat conftest.err`
269
248
270
249
# _LT_AC_SYS_LIBPATH_AIX
271
250
# ----------------------
272
@@ -1534,7 +1613,6 @@
251
@@ -1548,7 +1613,6 @@
273
252
esac
274
253
;;
275
254
*64-bit*)
277
256
case $host in
278
257
x86_64-*kfreebsd*-gnu)
279
258
LD="${LD-ld} -m elf_x86_64_fbsd"
280
@@ -1579,7 +1657,11 @@
259
@@ -1593,7 +1657,11 @@
281
260
*64-bit*)
282
261
case $lt_cv_prog_gnu_ld in
283
262
yes*) LD="${LD-ld} -m elf64_sparc" ;;
290
269
esac
291
270
;;
292
271
esac
293
@@ -1672,7 +1754,7 @@
272
@@ -1686,7 +1754,7 @@
294
273
$2=yes
295
274
fi
296
275
fi
299
278
LDFLAGS="$save_LDFLAGS"
300
279
])
301
280
302
@@ -1943,7 +2025,7 @@
281
@@ -1957,7 +2025,7 @@
303
282
AC_CHECK_FUNC([shl_load],
304
283
[lt_cv_dlopen="shl_load"],
305
284
[AC_CHECK_LIB([dld], [shl_load],
308
287
[AC_CHECK_FUNC([dlopen],
309
288
[lt_cv_dlopen="dlopen"],
310
289
[AC_CHECK_LIB([dl], [dlopen],
311
@@ -1951,7 +2033,7 @@
290
@@ -1965,7 +2033,7 @@
312
291
[AC_CHECK_LIB([svld], [dlopen],
313
292
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
314
293
[AC_CHECK_LIB([dld], [dld_link],
317
296
])
318
297
])
319
298
])
320
@@ -2268,7 +2350,7 @@
299
@@ -2282,7 +2350,7 @@
321
300
soname_spec='${libname}${release}${shared_ext}$major'
322
301
;;
323
302
326
305
version_type=linux
327
306
need_lib_prefix=no
328
307
need_version=no
329
@@ -2593,13 +2675,11 @@
308
@@ -2607,13 +2675,11 @@
330
309
# Some rework will be needed to allow for fast_install
331
310
# before this can be enabled.
332
311
hardcode_into_libs=yes
341
320
fi
342
321
343
322
# We used to test for /lib/ld.so.1 and disable shared libraries on
344
@@ -2611,6 +2691,18 @@
323
@@ -2625,6 +2691,18 @@
345
324
dynamic_linker='GNU/Linux ld.so'
346
325
;;
347
326
360
339
netbsd*)
361
340
version_type=sunos
362
341
need_lib_prefix=no
363
@@ -2791,6 +2883,13 @@
342
@@ -2805,6 +2883,13 @@
364
343
AC_MSG_RESULT([$dynamic_linker])
365
344
test "$dynamic_linker" = no && can_build_shared=no
366
345
374
353
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
375
354
if test "$GCC" = yes; then
376
355
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
377
@@ -3290,7 +3389,7 @@
356
@@ -3304,7 +3389,7 @@
378
357
# whether `pass_all' will *always* work, you probably want this one.
379
358
380
359
case $host_os in
383
362
lt_cv_deplibs_check_method=pass_all
384
363
;;
385
364
386
@@ -3385,7 +3484,7 @@
365
@@ -3399,7 +3484,7 @@
387
366
lt_cv_deplibs_check_method=pass_all
388
367
;;
389
368
392
371
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
393
372
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
394
373
else
395
@@ -3726,7 +3825,7 @@
374
@@ -3740,7 +3825,7 @@
396
375
fi
397
376
;;
398
377
401
380
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
402
381
test "$enable_shared" = yes && enable_static=no
403
382
fi
404
@@ -3783,6 +3882,7 @@
383
@@ -3797,6 +3882,7 @@
405
384
_LT_AC_TAGVAR(predeps, $1)=
406
385
_LT_AC_TAGVAR(postdeps, $1)=
407
386
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
409
388
410
389
# Source file extension for C++ test sources.
411
390
ac_ext=cpp
412
@@ -3892,7 +3992,7 @@
391
@@ -3906,7 +3992,7 @@
413
392
# FIXME: insert proper C++ library support
414
393
_LT_AC_TAGVAR(ld_shlibs, $1)=no
415
394
;;
418
397
if test "$host_cpu" = ia64; then
419
398
# On IA64, the linker does run time linking by default, so we don't
420
399
# have to do anything special.
421
@@ -3905,7 +4005,7 @@
400
@@ -3919,7 +4005,7 @@
422
401
# Test if we are trying to use run time linking or normal
423
402
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
424
403
# need to do runtime linking.
427
406
for ld_flag in $LDFLAGS; do
428
407
case $ld_flag in
429
408
*-brtl*)
430
@@ -4051,51 +4151,23 @@
409
@@ -4065,51 +4151,23 @@
431
410
fi
432
411
;;
433
412
darwin* | rhapsody*)
488
467
else
489
468
case $cc_basename in
490
469
xlc*)
491
@@ -4346,7 +4418,7 @@
470
@@ -4360,7 +4418,7 @@
492
471
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
493
472
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
494
473
;;
497
476
# Portland Group C++ compiler
498
477
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
499
478
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
500
@@ -4419,7 +4491,7 @@
479
@@ -4433,7 +4491,7 @@
501
480
;;
502
481
esac
503
482
;;
506
485
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
507
486
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
508
487
wlarc=
509
@@ -4781,7 +4853,8 @@
488
@@ -4795,7 +4853,8 @@
510
489
# compiler output when linking a shared library.
511
490
# Parse the compiler output and extract the necessary
512
491
# objects, libraries and library flags.
516
495
dnl we can't use the lt_simple_compile_test_code here,
517
496
dnl because it contains code intended for an executable,
518
497
dnl not a library. It's possible we should let each
519
@@ -4906,6 +4979,11 @@
498
@@ -4920,6 +4979,11 @@
520
499
521
500
$rm -f confest.$objext
522
501
528
507
# PORTME: override above test on systems where it is broken
529
508
ifelse([$1],[CXX],
530
509
[case $host_os in
531
@@ -4962,7 +5040,6 @@
510
@@ -4976,7 +5040,6 @@
532
511
;;
533
512
esac
534
513
])
536
515
case " $_LT_AC_TAGVAR(postdeps, $1) " in
537
516
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
538
517
esac
539
@@ -5047,7 +5124,7 @@
518
@@ -5061,7 +5124,7 @@
540
519
postinstall_cmds='$RANLIB $lib'
541
520
fi
542
521
;;
545
524
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
546
525
test "$enable_shared" = yes && enable_static=no
547
526
fi
548
@@ -5224,6 +5301,7 @@
527
@@ -5238,6 +5301,7 @@
549
528
_LT_AC_TAGVAR(predeps, $1) \
550
529
_LT_AC_TAGVAR(postdeps, $1) \
551
530
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
553
532
_LT_AC_TAGVAR(archive_cmds, $1) \
554
533
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
555
534
_LT_AC_TAGVAR(postinstall_cmds, $1) \
556
@@ -5286,7 +5364,7 @@
535
@@ -5300,7 +5364,7 @@
557
536
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
558
537
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
559
538
#
562
541
# Free Software Foundation, Inc.
563
542
#
564
543
# This file is part of GNU Libtool:
565
@@ -5523,6 +5601,10 @@
544
@@ -5537,6 +5601,10 @@
566
545
# shared library.
567
546
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
568
547
573
552
# The library search path used internally by the compiler when linking
574
553
# a shared library.
575
554
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
576
@@ -5872,7 +5954,7 @@
555
@@ -5886,7 +5954,7 @@
577
556
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
578
557
cat conftest.$ac_ext >&5
579
558
fi
582
561
583
562
# Do not use the global_symbol_pipe unless it works.
584
563
if test "$pipe_works" = yes; then
585
@@ -5929,7 +6011,8 @@
564
@@ -5943,7 +6011,8 @@
586
565
# built for inclusion in a dll (and should export symbols for example).
587
566
# Although the cygwin gcc ignores -fPIC, still need this for old-style
588
567
# (--disable-auto-import) libraries
592
571
;;
593
572
darwin* | rhapsody*)
594
573
# PIC is the default on this platform
595
@@ -5966,7 +6049,7 @@
574
@@ -5980,7 +6049,7 @@
596
575
esac
597
576
else
598
577
case $host_os in
601
580
# All AIX code is PIC.
602
581
if test "$host_cpu" = ia64; then
603
582
# AIX 5 now supports IA64 processor
604
@@ -6062,7 +6145,7 @@
583
@@ -6076,7 +6145,7 @@
605
584
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
606
585
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
607
586
;;
610
589
# Portland Group C++ compiler.
611
590
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
612
591
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
613
@@ -6100,7 +6183,7 @@
592
@@ -6114,7 +6183,7 @@
614
593
;;
615
594
esac
616
595
;;
619
598
;;
620
599
osf3* | osf4* | osf5*)
621
600
case $cc_basename in
622
@@ -6213,7 +6296,8 @@
601
@@ -6227,7 +6296,8 @@
623
602
# built for inclusion in a dll (and should export symbols for example).
624
603
# Although the cygwin gcc ignores -fPIC, still need this for old-style
625
604
# (--disable-auto-import) libraries
629
608
;;
630
609
631
610
darwin* | rhapsody*)
632
@@ -6283,7 +6367,8 @@
611
@@ -6297,7 +6367,8 @@
633
612
mingw* | cygwin* | pw32* | os2*)
634
613
# This hack is so that the source file can tell whether it is being
635
614
# built for inclusion in a dll (and should export symbols for example).
639
618
;;
640
619
641
620
hpux9* | hpux10* | hpux11*)
642
@@ -6420,7 +6505,7 @@
621
@@ -6434,7 +6505,7 @@
643
622
#
644
623
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
645
624
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
648
627
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
649
628
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
650
629
"" | " "*) ;;
651
@@ -6444,7 +6529,7 @@
630
@@ -6458,7 +6529,7 @@
652
631
#
653
632
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
654
633
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
657
636
$lt_tmp_static_flag,
658
637
[],
659
638
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
660
@@ -6460,7 +6545,7 @@
639
@@ -6474,7 +6545,7 @@
661
640
ifelse([$1],[CXX],[
662
641
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
663
642
case $host_os in
666
645
# If we're using GNU nm, then we don't want the "-C" option.
667
646
# -C means demangle to AIX nm, but means don't demangle with GNU nm
668
647
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
669
@@ -6475,10 +6560,14 @@
648
@@ -6489,10 +6560,14 @@
670
649
cygwin* | mingw*)
671
650
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
672
651
;;
681
660
],[
682
661
runpath_var=
683
662
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
684
@@ -6509,12 +6598,14 @@
663
@@ -6523,12 +6598,14 @@
685
664
# it will be wrapped by ` (' and `)$', so one must not match beginning or
686
665
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
687
666
# as well as any symbol that contains `d'.
697
676
extract_expsyms_cmds=
698
677
# Just being paranoid about ensuring that cc_basename is set.
699
678
_LT_CC_BASENAME([$compiler])
700
@@ -6564,7 +6655,7 @@
679
@@ -6578,7 +6655,7 @@
701
680
702
681
# See if GNU ld supports shared libraries.
703
682
case $host_os in
706
685
# On AIX/PPC, the GNU linker is very broken
707
686
if test "$host_cpu" != ia64; then
708
687
_LT_AC_TAGVAR(ld_shlibs, $1)=no
709
@@ -6680,12 +6771,13 @@
688
@@ -6694,12 +6771,13 @@
710
689
$echo "local: *; };" >> $output_objdir/$libname.ver~
711
690
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
712
691
fi
721
700
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
722
701
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
723
702
wlarc=
724
@@ -6783,7 +6875,7 @@
703
@@ -6797,7 +6875,7 @@
725
704
fi
726
705
;;
727
706
730
709
if test "$host_cpu" = ia64; then
731
710
# On IA64, the linker does run time linking by default, so we don't
732
711
# have to do anything special.
733
@@ -6803,7 +6895,7 @@
712
@@ -6817,7 +6895,7 @@
734
713
# Test if we are trying to use run time linking or normal
735
714
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
736
715
# need to do runtime linking.
739
718
for ld_flag in $LDFLAGS; do
740
719
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
741
720
aix_use_runtimelinking=yes
742
@@ -6963,11 +7055,10 @@
721
@@ -6977,11 +7055,10 @@
743
722
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
744
723
if test "$GCC" = yes ; then
745
724
output_verbose_link_cmd='echo'
755
734
else
756
735
case $cc_basename in
757
736
xlc*)
758
@@ -7117,7 +7208,7 @@
737
@@ -7131,7 +7208,7 @@
759
738
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
760
739
;;
761
740
764
743
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
765
744
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
766
745
else
767
@@ -7706,7 +7797,7 @@
746
@@ -7720,7 +7797,7 @@
768
747
fi[]dnl
769
748
])# PKG_CHECK_MODULES
770
749
773
752
#
774
753
# This file is free software; the Free Software Foundation
775
754
# gives unlimited permission to copy and/or distribute it,
776
@@ -7721,7 +7812,7 @@
755
@@ -7735,7 +7812,7 @@
777
756
[am__api_version='1.10'
778
757
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
779
758
dnl require some minimum version. Point them to the right macro.
782
761
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
783
762
])
784
763
785
@@ -7737,8 +7828,10 @@
764
@@ -7751,8 +7828,10 @@
786
765
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
787
766
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
788
767
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
795
774
796
775
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
797
776
798
@@ -8033,7 +8126,7 @@
777
@@ -8047,7 +8126,7 @@
799
778
# each Makefile.in and add a new line on top of each file to say so.
800
779
# Grep'ing the whole file is not good either: AIX grep has a line
801
780
# limit of 2048, but all sed's we know have understand at least 4000.
804
783
dirpart=`AS_DIRNAME("$mf")`
805
784
else
806
785
continue
807
@@ -8093,13 +8186,13 @@
786
@@ -8107,13 +8186,13 @@
808
787
# Do all the work for Automake. -*- Autoconf -*-
809
788
810
789
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
820
799
821
800
# This macro actually does too much. Some checks are only needed if
822
801
# your package does certain things. But this isn't really a big deal.
823
@@ -8204,16 +8297,17 @@
802
@@ -8218,16 +8297,17 @@
824
803
# our stamp files there.
825
804
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
826
805
[# Compute $1's index in $config_headers.
840
819
841
820
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
842
821
#
843
@@ -8514,7 +8608,7 @@
822
@@ -8528,7 +8608,7 @@
844
823
845
824
# _AM_SUBST_NOTMAKE(VARIABLE)
846
825
# ---------------------------
849
828
# This macro is traced by Automake.
850
829
AC_DEFUN([_AM_SUBST_NOTMAKE])
851
830
852
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/comics/Makefile.in evince-2.22.1.new/backend/comics/Makefile.in
853
--- evince-2.22.1/backend/comics/Makefile.in 2008-04-07 18:42:49.000000000 +0200
854
+++ evince-2.22.1.new/backend/comics/Makefile.in 2008-04-07 22:46:11.000000000 +0200
831
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/comics/Makefile.in evince-2.22.1.1.new/backend/comics/Makefile.in
832
--- evince-2.22.1.1/backend/comics/Makefile.in 2008-04-08 21:19:00.000000000 +0200
833
+++ evince-2.22.1.1.new/backend/comics/Makefile.in 2008-04-08 23:59:13.000000000 +0200
855
834
@@ -1,8 +1,8 @@
856
835
-# Makefile.in generated by automake 1.10 from Makefile.am.
857
836
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
895
874
HTML_DIR = @HTML_DIR@
896
875
INSTALL = @INSTALL@
897
876
INSTALL_DATA = @INSTALL_DATA@
898
@@ -192,9 +197,11 @@
899
MKINSTALLDIRS = @MKINSTALLDIRS@
900
MSGFMT = @MSGFMT@
901
MSGFMT_OPTS = @MSGFMT_OPTS@
902
+MSGMERGE = @MSGMERGE@
877
@@ -196,6 +201,7 @@
903
878
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
904
879
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
905
880
NAUTILUS_LIBS = @NAUTILUS_LIBS@
907
882
OBJEXT = @OBJEXT@
908
883
OMF_DIR = @OMF_DIR@
909
884
PACKAGE = @PACKAGE@
910
@@ -342,8 +349,8 @@
885
@@ -343,8 +349,8 @@
911
886
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
912
887
if test -f $$p; then \
913
888
f=$(am__strip_dir) \
918
893
else :; fi; \
919
894
done
920
895
921
@@ -351,8 +358,8 @@
896
@@ -352,8 +358,8 @@
922
897
@$(NORMAL_UNINSTALL)
923
898
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
924
899
p=$(am__strip_dir) \
929
904
done
930
905
931
906
clean-backendLTLIBRARIES:
932
@@ -423,8 +430,8 @@
907
@@ -424,8 +430,8 @@
933
908
unique=`for i in $$list; do \
934
909
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
935
910
done | \
940
915
mkid -fID $$unique
941
916
tags: TAGS
942
917
943
@@ -436,8 +443,8 @@
918
@@ -437,8 +443,8 @@
944
919
unique=`for i in $$list; do \
945
920
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
946
921
done | \
951
926
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
952
927
test -n "$$unique" || unique=$$empty_fix; \
953
928
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
954
@@ -447,13 +454,12 @@
929
@@ -448,13 +454,12 @@
955
930
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
956
931
$(TAGS_FILES) $(LISP)
957
932
tags=; \
967
942
test -z "$(CTAGS_ARGS)$$tags$$unique" \
968
943
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
969
944
$$tags $$unique
970
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/djvu/Makefile.in evince-2.22.1.new/backend/djvu/Makefile.in
971
--- evince-2.22.1/backend/djvu/Makefile.in 2008-04-07 18:42:49.000000000 +0200
972
+++ evince-2.22.1.new/backend/djvu/Makefile.in 2008-04-07 22:46:11.000000000 +0200
945
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/djvu/Makefile.in evince-2.22.1.1.new/backend/djvu/Makefile.in
946
--- evince-2.22.1.1/backend/djvu/Makefile.in 2008-04-08 21:19:00.000000000 +0200
947
+++ evince-2.22.1.1.new/backend/djvu/Makefile.in 2008-04-08 23:59:13.000000000 +0200
973
948
@@ -1,8 +1,8 @@
974
949
-# Makefile.in generated by automake 1.10 from Makefile.am.
975
950
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1013
988
HTML_DIR = @HTML_DIR@
1014
989
INSTALL = @INSTALL@
1015
990
INSTALL_DATA = @INSTALL_DATA@
1016
@@ -193,9 +198,11 @@
1017
MKINSTALLDIRS = @MKINSTALLDIRS@
1018
MSGFMT = @MSGFMT@
1019
MSGFMT_OPTS = @MSGFMT_OPTS@
1020
+MSGMERGE = @MSGMERGE@
991
@@ -197,6 +202,7 @@
1021
992
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1022
993
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1023
994
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1025
996
OBJEXT = @OBJEXT@
1026
997
OMF_DIR = @OMF_DIR@
1027
998
PACKAGE = @PACKAGE@
1028
@@ -351,8 +358,8 @@
999
@@ -352,8 +358,8 @@
1029
1000
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1030
1001
if test -f $$p; then \
1031
1002
f=$(am__strip_dir) \
1036
1007
else :; fi; \
1037
1008
done
1038
1009
1039
@@ -360,8 +367,8 @@
1010
@@ -361,8 +367,8 @@
1040
1011
@$(NORMAL_UNINSTALL)
1041
1012
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1042
1013
p=$(am__strip_dir) \
1047
1018
done
1048
1019
1049
1020
clean-backendLTLIBRARIES:
1050
@@ -435,8 +442,8 @@
1021
@@ -436,8 +442,8 @@
1051
1022
unique=`for i in $$list; do \
1052
1023
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1053
1024
done | \
1058
1029
mkid -fID $$unique
1059
1030
tags: TAGS
1060
1031
1061
@@ -448,8 +455,8 @@
1032
@@ -449,8 +455,8 @@
1062
1033
unique=`for i in $$list; do \
1063
1034
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1064
1035
done | \
1069
1040
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1070
1041
test -n "$$unique" || unique=$$empty_fix; \
1071
1042
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1072
@@ -459,13 +466,12 @@
1043
@@ -460,13 +466,12 @@
1073
1044
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1074
1045
$(TAGS_FILES) $(LISP)
1075
1046
tags=; \
1085
1056
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1086
1057
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1087
1058
$$tags $$unique
1088
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/dvi/Makefile.in evince-2.22.1.new/backend/dvi/Makefile.in
1089
--- evince-2.22.1/backend/dvi/Makefile.in 2008-04-07 18:42:50.000000000 +0200
1090
+++ evince-2.22.1.new/backend/dvi/Makefile.in 2008-04-07 22:46:11.000000000 +0200
1059
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/dvi/Makefile.in evince-2.22.1.1.new/backend/dvi/Makefile.in
1060
--- evince-2.22.1.1/backend/dvi/Makefile.in 2008-04-08 21:19:01.000000000 +0200
1061
+++ evince-2.22.1.1.new/backend/dvi/Makefile.in 2008-04-08 23:59:13.000000000 +0200
1091
1062
@@ -1,8 +1,8 @@
1092
1063
-# Makefile.in generated by automake 1.10 from Makefile.am.
1093
1064
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1131
1102
HTML_DIR = @HTML_DIR@
1132
1103
INSTALL = @INSTALL@
1133
1104
INSTALL_DATA = @INSTALL_DATA@
1134
@@ -205,9 +210,11 @@
1135
MKINSTALLDIRS = @MKINSTALLDIRS@
1136
MSGFMT = @MSGFMT@
1137
MSGFMT_OPTS = @MSGFMT_OPTS@
1138
+MSGMERGE = @MSGMERGE@
1105
@@ -209,6 +214,7 @@
1139
1106
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1140
1107
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1141
1108
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1143
1110
OBJEXT = @OBJEXT@
1144
1111
OMF_DIR = @OMF_DIR@
1145
1112
PACKAGE = @PACKAGE@
1146
@@ -357,8 +364,8 @@
1113
@@ -358,8 +364,8 @@
1147
1114
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1148
1115
if test -f $$p; then \
1149
1116
f=$(am__strip_dir) \
1154
1121
else :; fi; \
1155
1122
done
1156
1123
1157
@@ -366,8 +373,8 @@
1124
@@ -367,8 +373,8 @@
1158
1125
@$(NORMAL_UNINSTALL)
1159
1126
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1160
1127
p=$(am__strip_dir) \
1165
1132
done
1166
1133
1167
1134
clean-backendLTLIBRARIES:
1168
@@ -510,8 +517,8 @@
1135
@@ -511,8 +517,8 @@
1169
1136
unique=`for i in $$list; do \
1170
1137
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1171
1138
done | \
1176
1143
mkid -fID $$unique
1177
1144
tags: TAGS
1178
1145
1179
@@ -536,8 +543,8 @@
1146
@@ -537,8 +543,8 @@
1180
1147
unique=`for i in $$list; do \
1181
1148
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1182
1149
done | \
1187
1154
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1188
1155
test -n "$$unique" || unique=$$empty_fix; \
1189
1156
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1190
@@ -547,13 +554,12 @@
1157
@@ -548,13 +554,12 @@
1191
1158
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1192
1159
$(TAGS_FILES) $(LISP)
1193
1160
tags=; \
1203
1170
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1204
1171
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1205
1172
$$tags $$unique
1206
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/dvi/mdvi-lib/Makefile.in evince-2.22.1.new/backend/dvi/mdvi-lib/Makefile.in
1207
--- evince-2.22.1/backend/dvi/mdvi-lib/Makefile.in 2008-04-07 18:42:50.000000000 +0200
1208
+++ evince-2.22.1.new/backend/dvi/mdvi-lib/Makefile.in 2008-04-07 22:46:11.000000000 +0200
1173
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/dvi/mdvi-lib/Makefile.in evince-2.22.1.1.new/backend/dvi/mdvi-lib/Makefile.in
1174
--- evince-2.22.1.1/backend/dvi/mdvi-lib/Makefile.in 2008-04-08 21:19:01.000000000 +0200
1175
+++ evince-2.22.1.1.new/backend/dvi/mdvi-lib/Makefile.in 2008-04-08 23:59:13.000000000 +0200
1209
1176
@@ -1,8 +1,8 @@
1210
1177
-# Makefile.in generated by automake 1.10 from Makefile.am.
1211
1178
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1249
1216
HTML_DIR = @HTML_DIR@
1250
1217
INSTALL = @INSTALL@
1251
1218
INSTALL_DATA = @INSTALL_DATA@
1252
@@ -178,9 +183,11 @@
1253
MKINSTALLDIRS = @MKINSTALLDIRS@
1254
MSGFMT = @MSGFMT@
1255
MSGFMT_OPTS = @MSGFMT_OPTS@
1256
+MSGMERGE = @MSGMERGE@
1219
@@ -182,6 +187,7 @@
1257
1220
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1258
1221
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1259
1222
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1261
1224
OBJEXT = @OBJEXT@
1262
1225
OMF_DIR = @OMF_DIR@
1263
1226
PACKAGE = @PACKAGE@
1264
@@ -411,8 +418,8 @@
1227
@@ -412,8 +418,8 @@
1265
1228
unique=`for i in $$list; do \
1266
1229
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1267
1230
done | \
1272
1235
mkid -fID $$unique
1273
1236
tags: TAGS
1274
1237
1275
@@ -424,8 +431,8 @@
1238
@@ -425,8 +431,8 @@
1276
1239
unique=`for i in $$list; do \
1277
1240
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1278
1241
done | \
1283
1246
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1284
1247
test -n "$$unique" || unique=$$empty_fix; \
1285
1248
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1286
@@ -435,13 +442,12 @@
1249
@@ -436,13 +442,12 @@
1287
1250
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1288
1251
$(TAGS_FILES) $(LISP)
1289
1252
tags=; \
1299
1262
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1300
1263
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1301
1264
$$tags $$unique
1302
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/impress/Makefile.in evince-2.22.1.new/backend/impress/Makefile.in
1303
--- evince-2.22.1/backend/impress/Makefile.in 2008-04-07 18:42:51.000000000 +0200
1304
+++ evince-2.22.1.new/backend/impress/Makefile.in 2008-04-07 22:46:12.000000000 +0200
1265
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/impress/Makefile.in evince-2.22.1.1.new/backend/impress/Makefile.in
1266
--- evince-2.22.1.1/backend/impress/Makefile.in 2008-04-08 21:19:01.000000000 +0200
1267
+++ evince-2.22.1.1.new/backend/impress/Makefile.in 2008-04-08 23:59:13.000000000 +0200
1305
1268
@@ -1,8 +1,8 @@
1306
1269
-# Makefile.in generated by automake 1.10 from Makefile.am.
1307
1270
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1345
1308
HTML_DIR = @HTML_DIR@
1346
1309
INSTALL = @INSTALL@
1347
1310
INSTALL_DATA = @INSTALL_DATA@
1348
@@ -197,9 +202,11 @@
1349
MKINSTALLDIRS = @MKINSTALLDIRS@
1350
MSGFMT = @MSGFMT@
1351
MSGFMT_OPTS = @MSGFMT_OPTS@
1352
+MSGMERGE = @MSGMERGE@
1311
@@ -201,6 +206,7 @@
1353
1312
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1354
1313
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1355
1314
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1357
1316
OBJEXT = @OBJEXT@
1358
1317
OMF_DIR = @OMF_DIR@
1359
1318
PACKAGE = @PACKAGE@
1360
@@ -375,8 +382,8 @@
1319
@@ -376,8 +382,8 @@
1361
1320
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1362
1321
if test -f $$p; then \
1363
1322
f=$(am__strip_dir) \
1368
1327
else :; fi; \
1369
1328
done
1370
1329
1371
@@ -384,8 +391,8 @@
1330
@@ -385,8 +391,8 @@
1372
1331
@$(NORMAL_UNINSTALL)
1373
1332
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1374
1333
p=$(am__strip_dir) \
1379
1338
done
1380
1339
1381
1340
clean-backendLTLIBRARIES:
1382
@@ -468,8 +475,8 @@
1341
@@ -469,8 +475,8 @@
1383
1342
unique=`for i in $$list; do \
1384
1343
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1385
1344
done | \
1390
1349
mkid -fID $$unique
1391
1350
tags: TAGS
1392
1351
1393
@@ -481,8 +488,8 @@
1352
@@ -482,8 +488,8 @@
1394
1353
unique=`for i in $$list; do \
1395
1354
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1396
1355
done | \
1401
1360
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1402
1361
test -n "$$unique" || unique=$$empty_fix; \
1403
1362
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1404
@@ -492,13 +499,12 @@
1363
@@ -493,13 +499,12 @@
1405
1364
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1406
1365
$(TAGS_FILES) $(LISP)
1407
1366
tags=; \
1417
1376
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1418
1377
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1419
1378
$$tags $$unique
1420
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/Makefile.in evince-2.22.1.new/backend/Makefile.in
1421
--- evince-2.22.1/backend/Makefile.in 2008-04-07 18:42:48.000000000 +0200
1422
+++ evince-2.22.1.new/backend/Makefile.in 2008-04-07 22:46:11.000000000 +0200
1379
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/Makefile.in evince-2.22.1.1.new/backend/Makefile.in
1380
--- evince-2.22.1.1/backend/Makefile.in 2008-04-08 21:18:59.000000000 +0200
1381
+++ evince-2.22.1.1.new/backend/Makefile.in 2008-04-08 23:59:13.000000000 +0200
1423
1382
@@ -1,8 +1,8 @@
1424
1383
-# Makefile.in generated by automake 1.10 from Makefile.am.
1425
1384
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1454
1413
HTML_DIR = @HTML_DIR@
1455
1414
INSTALL = @INSTALL@
1456
1415
INSTALL_DATA = @INSTALL_DATA@
1457
@@ -178,9 +183,11 @@
1458
MKINSTALLDIRS = @MKINSTALLDIRS@
1459
MSGFMT = @MSGFMT@
1460
MSGFMT_OPTS = @MSGFMT_OPTS@
1461
+MSGMERGE = @MSGMERGE@
1416
@@ -182,6 +187,7 @@
1462
1417
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1463
1418
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1464
1419
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1466
1421
OBJEXT = @OBJEXT@
1467
1422
OMF_DIR = @OMF_DIR@
1468
1423
PACKAGE = @PACKAGE@
1469
@@ -381,8 +388,8 @@
1424
@@ -382,8 +388,8 @@
1470
1425
unique=`for i in $$list; do \
1471
1426
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1472
1427
done | \
1477
1432
mkid -fID $$unique
1478
1433
tags: TAGS
1479
1434
1480
@@ -407,8 +414,8 @@
1435
@@ -408,8 +414,8 @@
1481
1436
unique=`for i in $$list; do \
1482
1437
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1483
1438
done | \
1488
1443
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1489
1444
test -n "$$unique" || unique=$$empty_fix; \
1490
1445
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1491
@@ -418,13 +425,12 @@
1446
@@ -419,13 +425,12 @@
1492
1447
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1493
1448
$(TAGS_FILES) $(LISP)
1494
1449
tags=; \
1504
1459
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1505
1460
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1506
1461
$$tags $$unique
1507
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/pdf/Makefile.in evince-2.22.1.new/backend/pdf/Makefile.in
1508
--- evince-2.22.1/backend/pdf/Makefile.in 2008-04-07 18:42:52.000000000 +0200
1509
+++ evince-2.22.1.new/backend/pdf/Makefile.in 2008-04-07 22:46:12.000000000 +0200
1462
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/pdf/Makefile.in evince-2.22.1.1.new/backend/pdf/Makefile.in
1463
--- evince-2.22.1.1/backend/pdf/Makefile.in 2008-04-08 21:19:02.000000000 +0200
1464
+++ evince-2.22.1.1.new/backend/pdf/Makefile.in 2008-04-08 23:59:13.000000000 +0200
1510
1465
@@ -1,8 +1,8 @@
1511
1466
-# Makefile.in generated by automake 1.10 from Makefile.am.
1512
1467
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1550
1505
HTML_DIR = @HTML_DIR@
1551
1506
INSTALL = @INSTALL@
1552
1507
INSTALL_DATA = @INSTALL_DATA@
1553
@@ -202,9 +207,11 @@
1554
MKINSTALLDIRS = @MKINSTALLDIRS@
1555
MSGFMT = @MSGFMT@
1556
MSGFMT_OPTS = @MSGFMT_OPTS@
1557
+MSGMERGE = @MSGMERGE@
1508
@@ -206,6 +211,7 @@
1558
1509
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1559
1510
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1560
1511
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1562
1513
OBJEXT = @OBJEXT@
1563
1514
OMF_DIR = @OMF_DIR@
1564
1515
PACKAGE = @PACKAGE@
1565
@@ -354,8 +361,8 @@
1516
@@ -355,8 +361,8 @@
1566
1517
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1567
1518
if test -f $$p; then \
1568
1519
f=$(am__strip_dir) \
1573
1524
else :; fi; \
1574
1525
done
1575
1526
1576
@@ -363,8 +370,8 @@
1527
@@ -364,8 +370,8 @@
1577
1528
@$(NORMAL_UNINSTALL)
1578
1529
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1579
1530
p=$(am__strip_dir) \
1584
1535
done
1585
1536
1586
1537
clean-backendLTLIBRARIES:
1587
@@ -435,8 +442,8 @@
1538
@@ -436,8 +442,8 @@
1588
1539
unique=`for i in $$list; do \
1589
1540
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1590
1541
done | \
1595
1546
mkid -fID $$unique
1596
1547
tags: TAGS
1597
1548
1598
@@ -448,8 +455,8 @@
1549
@@ -449,8 +455,8 @@
1599
1550
unique=`for i in $$list; do \
1600
1551
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1601
1552
done | \
1606
1557
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1607
1558
test -n "$$unique" || unique=$$empty_fix; \
1608
1559
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1609
@@ -459,13 +466,12 @@
1560
@@ -460,13 +466,12 @@
1610
1561
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1611
1562
$(TAGS_FILES) $(LISP)
1612
1563
tags=; \
1622
1573
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1623
1574
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1624
1575
$$tags $$unique
1625
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/pixbuf/Makefile.in evince-2.22.1.new/backend/pixbuf/Makefile.in
1626
--- evince-2.22.1/backend/pixbuf/Makefile.in 2008-04-07 18:42:52.000000000 +0200
1627
+++ evince-2.22.1.new/backend/pixbuf/Makefile.in 2008-04-07 22:46:12.000000000 +0200
1576
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/pixbuf/Makefile.in evince-2.22.1.1.new/backend/pixbuf/Makefile.in
1577
--- evince-2.22.1.1/backend/pixbuf/Makefile.in 2008-04-08 21:19:02.000000000 +0200
1578
+++ evince-2.22.1.1.new/backend/pixbuf/Makefile.in 2008-04-08 23:59:13.000000000 +0200
1628
1579
@@ -1,8 +1,8 @@
1629
1580
-# Makefile.in generated by automake 1.10 from Makefile.am.
1630
1581
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1668
1619
HTML_DIR = @HTML_DIR@
1669
1620
INSTALL = @INSTALL@
1670
1621
INSTALL_DATA = @INSTALL_DATA@
1671
@@ -192,9 +197,11 @@
1672
MKINSTALLDIRS = @MKINSTALLDIRS@
1673
MSGFMT = @MSGFMT@
1674
MSGFMT_OPTS = @MSGFMT_OPTS@
1675
+MSGMERGE = @MSGMERGE@
1622
@@ -196,6 +201,7 @@
1676
1623
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1677
1624
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1678
1625
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1680
1627
OBJEXT = @OBJEXT@
1681
1628
OMF_DIR = @OMF_DIR@
1682
1629
PACKAGE = @PACKAGE@
1683
@@ -340,8 +347,8 @@
1630
@@ -341,8 +347,8 @@
1684
1631
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1685
1632
if test -f $$p; then \
1686
1633
f=$(am__strip_dir) \
1691
1638
else :; fi; \
1692
1639
done
1693
1640
1694
@@ -349,8 +356,8 @@
1641
@@ -350,8 +356,8 @@
1695
1642
@$(NORMAL_UNINSTALL)
1696
1643
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1697
1644
p=$(am__strip_dir) \
1702
1649
done
1703
1650
1704
1651
clean-backendLTLIBRARIES:
1705
@@ -421,8 +428,8 @@
1652
@@ -422,8 +428,8 @@
1706
1653
unique=`for i in $$list; do \
1707
1654
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1708
1655
done | \
1713
1660
mkid -fID $$unique
1714
1661
tags: TAGS
1715
1662
1716
@@ -434,8 +441,8 @@
1663
@@ -435,8 +441,8 @@
1717
1664
unique=`for i in $$list; do \
1718
1665
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1719
1666
done | \
1724
1671
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1725
1672
test -n "$$unique" || unique=$$empty_fix; \
1726
1673
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1727
@@ -445,13 +452,12 @@
1674
@@ -446,13 +452,12 @@
1728
1675
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1729
1676
$(TAGS_FILES) $(LISP)
1730
1677
tags=; \
1740
1687
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1741
1688
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1742
1689
$$tags $$unique
1743
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/ps/Makefile.in evince-2.22.1.new/backend/ps/Makefile.in
1744
--- evince-2.22.1/backend/ps/Makefile.in 2008-04-07 18:42:53.000000000 +0200
1745
+++ evince-2.22.1.new/backend/ps/Makefile.in 2008-04-07 22:46:12.000000000 +0200
1690
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/ps/Makefile.in evince-2.22.1.1.new/backend/ps/Makefile.in
1691
--- evince-2.22.1.1/backend/ps/Makefile.in 2008-04-08 21:19:02.000000000 +0200
1692
+++ evince-2.22.1.1.new/backend/ps/Makefile.in 2008-04-08 23:59:13.000000000 +0200
1746
1693
@@ -1,8 +1,8 @@
1747
1694
-# Makefile.in generated by automake 1.10 from Makefile.am.
1748
1695
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1786
1733
HTML_DIR = @HTML_DIR@
1787
1734
INSTALL = @INSTALL@
1788
1735
INSTALL_DATA = @INSTALL_DATA@
1789
@@ -201,9 +206,11 @@
1790
MKINSTALLDIRS = @MKINSTALLDIRS@
1791
MSGFMT = @MSGFMT@
1792
MSGFMT_OPTS = @MSGFMT_OPTS@
1793
+MSGMERGE = @MSGMERGE@
1736
@@ -205,6 +210,7 @@
1794
1737
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1795
1738
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1796
1739
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1798
1741
OBJEXT = @OBJEXT@
1799
1742
OMF_DIR = @OMF_DIR@
1800
1743
PACKAGE = @PACKAGE@
1801
@@ -355,8 +362,8 @@
1744
@@ -356,8 +362,8 @@
1802
1745
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1803
1746
if test -f $$p; then \
1804
1747
f=$(am__strip_dir) \
1809
1752
else :; fi; \
1810
1753
done
1811
1754
1812
@@ -364,8 +371,8 @@
1755
@@ -365,8 +371,8 @@
1813
1756
@$(NORMAL_UNINSTALL)
1814
1757
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1815
1758
p=$(am__strip_dir) \
1820
1763
done
1821
1764
1822
1765
clean-backendLTLIBRARIES:
1823
@@ -441,8 +448,8 @@
1766
@@ -442,8 +448,8 @@
1824
1767
unique=`for i in $$list; do \
1825
1768
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1826
1769
done | \
1831
1774
mkid -fID $$unique
1832
1775
tags: TAGS
1833
1776
1834
@@ -454,8 +461,8 @@
1777
@@ -455,8 +461,8 @@
1835
1778
unique=`for i in $$list; do \
1836
1779
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1837
1780
done | \
1842
1785
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1843
1786
test -n "$$unique" || unique=$$empty_fix; \
1844
1787
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1845
@@ -465,13 +472,12 @@
1788
@@ -466,13 +472,12 @@
1846
1789
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1847
1790
$(TAGS_FILES) $(LISP)
1848
1791
tags=; \
1858
1801
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1859
1802
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1860
1803
$$tags $$unique
1861
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/backend/tiff/Makefile.in evince-2.22.1.new/backend/tiff/Makefile.in
1862
--- evince-2.22.1/backend/tiff/Makefile.in 2008-04-07 18:42:53.000000000 +0200
1863
+++ evince-2.22.1.new/backend/tiff/Makefile.in 2008-04-07 22:46:12.000000000 +0200
1804
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/backend/tiff/Makefile.in evince-2.22.1.1.new/backend/tiff/Makefile.in
1805
--- evince-2.22.1.1/backend/tiff/Makefile.in 2008-04-08 21:19:02.000000000 +0200
1806
+++ evince-2.22.1.1.new/backend/tiff/Makefile.in 2008-04-08 23:59:14.000000000 +0200
1864
1807
@@ -1,8 +1,8 @@
1865
1808
-# Makefile.in generated by automake 1.10 from Makefile.am.
1866
1809
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1904
1847
HTML_DIR = @HTML_DIR@
1905
1848
INSTALL = @INSTALL@
1906
1849
INSTALL_DATA = @INSTALL_DATA@
1907
@@ -190,9 +195,11 @@
1908
MKINSTALLDIRS = @MKINSTALLDIRS@
1909
MSGFMT = @MSGFMT@
1910
MSGFMT_OPTS = @MSGFMT_OPTS@
1911
+MSGMERGE = @MSGMERGE@
1850
@@ -194,6 +199,7 @@
1912
1851
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
1913
1852
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
1914
1853
NAUTILUS_LIBS = @NAUTILUS_LIBS@
1916
1855
OBJEXT = @OBJEXT@
1917
1856
OMF_DIR = @OMF_DIR@
1918
1857
PACKAGE = @PACKAGE@
1919
@@ -340,8 +347,8 @@
1858
@@ -341,8 +347,8 @@
1920
1859
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1921
1860
if test -f $$p; then \
1922
1861
f=$(am__strip_dir) \
1927
1866
else :; fi; \
1928
1867
done
1929
1868
1930
@@ -349,8 +356,8 @@
1869
@@ -350,8 +356,8 @@
1931
1870
@$(NORMAL_UNINSTALL)
1932
1871
@list='$(backend_LTLIBRARIES)'; for p in $$list; do \
1933
1872
p=$(am__strip_dir) \
1938
1877
done
1939
1878
1940
1879
clean-backendLTLIBRARIES:
1941
@@ -422,8 +429,8 @@
1880
@@ -423,8 +429,8 @@
1942
1881
unique=`for i in $$list; do \
1943
1882
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1944
1883
done | \
1949
1888
mkid -fID $$unique
1950
1889
tags: TAGS
1951
1890
1952
@@ -435,8 +442,8 @@
1891
@@ -436,8 +442,8 @@
1953
1892
unique=`for i in $$list; do \
1954
1893
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1955
1894
done | \
1960
1899
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1961
1900
test -n "$$unique" || unique=$$empty_fix; \
1962
1901
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1963
@@ -446,13 +453,12 @@
1902
@@ -447,13 +453,12 @@
1964
1903
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1965
1904
$(TAGS_FILES) $(LISP)
1966
1905
tags=; \
1976
1915
test -z "$(CTAGS_ARGS)$$tags$$unique" \
1977
1916
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1978
1917
$$tags $$unique
1979
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/config.h.in evince-2.22.1.new/config.h.in
1980
--- evince-2.22.1/config.h.in 2008-04-07 18:42:46.000000000 +0200
1981
+++ evince-2.22.1.new/config.h.in 2008-04-07 22:46:11.000000000 +0200
1918
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/config.h.in evince-2.22.1.1.new/config.h.in
1919
--- evince-2.22.1.1/config.h.in 2008-04-08 21:18:57.000000000 +0200
1920
+++ evince-2.22.1.1.new/config.h.in 2008-04-08 23:59:12.000000000 +0200
1982
1921
@@ -156,6 +156,9 @@
1983
1922
/* Define to 1 if you have the ANSI C header files. */
1984
1923
#undef STDC_HEADERS
1989
1928
/* Version number of package */
1990
1929
#undef VERSION
1991
1930
1992
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/configure evince-2.22.1.new/configure
1993
--- evince-2.22.1/configure 2008-04-07 18:32:03.000000000 +0200
1994
+++ evince-2.22.1.new/configure 2008-04-07 22:46:09.000000000 +0200
1931
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/configure evince-2.22.1.1.new/configure
1932
--- evince-2.22.1.1/configure 2008-04-08 21:18:56.000000000 +0200
1933
+++ evince-2.22.1.1.new/configure 2008-04-08 23:59:10.000000000 +0200
1995
1934
@@ -862,6 +862,8 @@
1996
1935
ECHO
1997
1936
AR
2001
1940
CPP
2002
1941
CXX
2003
1942
CXXFLAGS
2004
@@ -893,6 +895,9 @@
2005
INTLTOOL_THEME_RULE
2006
INTLTOOL_SERVICE_RULE
2007
INTLTOOL_POLICY_RULE
2008
+XGETTEXT
2009
+MSGMERGE
2010
+MSGFMT
2011
INTLTOOL_EXTRACT
2012
INTLTOOL_MERGE
2013
INTLTOOL_UPDATE
2014
@@ -908,22 +913,22 @@
1943
@@ -911,12 +913,14 @@
2015
1944
DOC_USER_FORMATS
2016
1945
ENABLE_SK_TRUE
2017
1946
ENABLE_SK_FALSE
2026
1955
ENABLE_GTK_DOC_TRUE
2027
1956
ENABLE_GTK_DOC_FALSE
2028
1957
GTK_DOC_USE_LIBTOOL_TRUE
2029
GTK_DOC_USE_LIBTOOL_FALSE
2030
GETTEXT_PACKAGE
2031
USE_NLS
2032
-MSGFMT
2033
MSGFMT_OPTS
2034
GMSGFMT
2035
-XGETTEXT
2036
CATALOGS
2037
CATOBJEXT
2038
GMOFILES
2039
@@ -947,6 +952,10 @@
1958
@@ -948,6 +952,10 @@
2040
1959
WITH_KEYRING_FALSE
2041
1960
KEYRING_CFLAGS
2042
1961
KEYRING_LIBS
2047
1966
WITH_GNOME_TRUE
2048
1967
WITH_GNOME_FALSE
2049
1968
GNOME_CFLAGS
2050
@@ -1036,6 +1045,8 @@
1969
@@ -1037,6 +1045,8 @@
2051
1970
SHELL_CORE_LIBS
2052
1971
KEYRING_CFLAGS
2053
1972
KEYRING_LIBS
2056
1975
GNOME_CFLAGS
2057
1976
GNOME_LIBS
2058
1977
GNOMEUI_CFLAGS
2059
@@ -1651,7 +1662,8 @@
1978
@@ -1652,7 +1662,8 @@
2060
1979
2061
1980
--enable-iso-cxx Try to warn if code is not ISO C++
2062
1981
--enable-debug turn on debugging
2066
1985
--enable-dbus Compile with support for dbus
2067
1986
--enable-nautilus compile the nautilus plugin
2068
1987
--disable-thumbnailer disable the GNOME thumbnailer
2069
@@ -1717,6 +1729,9 @@
1988
@@ -1718,6 +1729,9 @@
2070
1989
C compiler flags for KEYRING, overriding pkg-config
2071
1990
KEYRING_LIBS
2072
1991
linker flags for KEYRING, overriding pkg-config
2076
1995
GNOME_CFLAGS
2077
1996
C compiler flags for GNOME, overriding pkg-config
2078
1997
GNOME_LIBS linker flags for GNOME, overriding pkg-config
2079
@@ -4374,7 +4389,7 @@
1998
@@ -4375,7 +4389,7 @@
2080
1999
# whether `pass_all' will *always* work, you probably want this one.
2081
2000
2082
2001
case $host_os in
2085
2004
lt_cv_deplibs_check_method=pass_all
2086
2005
;;
2087
2006
2088
@@ -4469,7 +4484,7 @@
2007
@@ -4470,7 +4484,7 @@
2089
2008
lt_cv_deplibs_check_method=pass_all
2090
2009
;;
2091
2010
2094
2013
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
2095
2014
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
2096
2015
else
2097
@@ -4590,7 +4605,7 @@
2016
@@ -4591,7 +4605,7 @@
2098
2017
;;
2099
2018
*-*-irix6*)
2100
2019
# Find out which ABI we are using.
2101
- echo '#line 4593 "configure"' > conftest.$ac_ext
2020
- echo '#line 4594 "configure"' > conftest.$ac_ext
2102
2021
+ echo '#line 4608 "configure"' > conftest.$ac_ext
2103
2022
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2104
2023
(eval $ac_compile) 2>&5
2105
2024
ac_status=$?
2106
@@ -4655,7 +4670,6 @@
2025
@@ -4656,7 +4670,6 @@
2107
2026
esac
2108
2027
;;
2109
2028
*64-bit*)
2111
2030
case $host in
2112
2031
x86_64-*kfreebsd*-gnu)
2113
2032
LD="${LD-ld} -m elf_x86_64_fbsd"
2114
@@ -4763,7 +4777,11 @@
2033
@@ -4764,7 +4777,11 @@
2115
2034
*64-bit*)
2116
2035
case $lt_cv_prog_gnu_ld in
2117
2036
yes*) LD="${LD-ld} -m elf64_sparc" ;;
2124
2043
esac
2125
2044
;;
2126
2045
esac
2127
@@ -6365,7 +6383,6 @@
2046
@@ -6366,7 +6383,6 @@
2128
2047
2129
2048
2130
2049
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
2132
2051
# find the maximum length of command line arguments
2133
2052
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
2134
2053
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
2135
@@ -6680,7 +6697,7 @@
2054
@@ -6681,7 +6697,7 @@
2136
2055
echo "$progname: failed program was:" >&5
2137
2056
cat conftest.$ac_ext >&5
2138
2057
fi
2141
2060
2142
2061
# Do not use the global_symbol_pipe unless it works.
2143
2062
if test "$pipe_works" = yes; then
2144
@@ -7240,6 +7257,318 @@
2063
@@ -7241,6 +7257,318 @@
2145
2064
;;
2146
2065
esac
2147
2066
2460
2379
enable_dlopen=no
2461
2380
enable_win32_dll=no
2462
2381
2463
@@ -7305,7 +7634,7 @@
2382
@@ -7306,7 +7634,7 @@
2464
2383
echo "$lt_simple_link_test_code" >conftest.$ac_ext
2465
2384
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2466
2385
_lt_linker_boilerplate=`cat conftest.err`
2469
2388
2470
2389
2471
2390
2472
@@ -7333,11 +7662,11 @@
2391
@@ -7334,11 +7662,11 @@
2473
2392
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2474
2393
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2475
2394
-e 's:$: $lt_compiler_flag:'`
2476
- (eval echo "\"\$as_me:7336: $lt_compile\"" >&5)
2395
- (eval echo "\"\$as_me:7337: $lt_compile\"" >&5)
2477
2396
+ (eval echo "\"\$as_me:7665: $lt_compile\"" >&5)
2478
2397
(eval "$lt_compile" 2>conftest.err)
2479
2398
ac_status=$?
2480
2399
cat conftest.err >&5
2481
- echo "$as_me:7340: \$? = $ac_status" >&5
2400
- echo "$as_me:7341: \$? = $ac_status" >&5
2482
2401
+ echo "$as_me:7669: \$? = $ac_status" >&5
2483
2402
if (exit $ac_status) && test -s "$ac_outfile"; then
2484
2403
# The compiler can only warn and ignore the option if not recognized
2485
2404
# So say no if there are warnings other than the usual output.
2486
@@ -7607,10 +7936,10 @@
2405
@@ -7608,10 +7936,10 @@
2487
2406
2488
2407
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
2489
2408
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
2496
2415
ac_outfile=conftest.$ac_objext
2497
2416
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2498
2417
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
2499
@@ -7623,27 +7952,27 @@
2418
@@ -7624,27 +7952,27 @@
2500
2419
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2501
2420
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2502
2421
-e 's:$: $lt_compiler_flag:'`
2503
- (eval echo "\"\$as_me:7626: $lt_compile\"" >&5)
2422
- (eval echo "\"\$as_me:7627: $lt_compile\"" >&5)
2504
2423
+ (eval echo "\"\$as_me:7955: $lt_compile\"" >&5)
2505
2424
(eval "$lt_compile" 2>conftest.err)
2506
2425
ac_status=$?
2507
2426
cat conftest.err >&5
2508
- echo "$as_me:7630: \$? = $ac_status" >&5
2427
- echo "$as_me:7631: \$? = $ac_status" >&5
2509
2428
+ echo "$as_me:7959: \$? = $ac_status" >&5
2510
2429
if (exit $ac_status) && test -s "$ac_outfile"; then
2511
2430
# The compiler can only warn and ignore the option if not recognized
2530
2449
case $lt_prog_compiler_pic in
2531
2450
"" | " "*) ;;
2532
2451
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
2533
@@ -7670,10 +7999,10 @@
2452
@@ -7671,10 +7999,10 @@
2534
2453
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
2535
2454
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
2536
2455
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
2543
2462
save_LDFLAGS="$LDFLAGS"
2544
2463
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
2545
2464
echo "$lt_simple_link_test_code" > conftest.$ac_ext
2546
@@ -7686,20 +8015,20 @@
2465
@@ -7687,20 +8015,20 @@
2547
2466
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
2548
2467
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2549
2468
if diff conftest.exp conftest.er2 >/dev/null; then
2570
2489
:
2571
2490
else
2572
2491
lt_prog_compiler_static=
2573
@@ -7727,11 +8056,11 @@
2492
@@ -7728,11 +8056,11 @@
2574
2493
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2575
2494
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2576
2495
-e 's:$: $lt_compiler_flag:'`
2577
- (eval echo "\"\$as_me:7730: $lt_compile\"" >&5)
2496
- (eval echo "\"\$as_me:7731: $lt_compile\"" >&5)
2578
2497
+ (eval echo "\"\$as_me:8059: $lt_compile\"" >&5)
2579
2498
(eval "$lt_compile" 2>out/conftest.err)
2580
2499
ac_status=$?
2581
2500
cat out/conftest.err >&5
2582
- echo "$as_me:7734: \$? = $ac_status" >&5
2501
- echo "$as_me:7735: \$? = $ac_status" >&5
2583
2502
+ echo "$as_me:8063: \$? = $ac_status" >&5
2584
2503
if (exit $ac_status) && test -s out/conftest2.$ac_objext
2585
2504
then
2586
2505
# The compiler can only warn and ignore the option if not recognized
2587
@@ -7811,12 +8140,13 @@
2506
@@ -7812,12 +8140,13 @@
2588
2507
# it will be wrapped by ` (' and `)$', so one must not match beginning or
2589
2508
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
2590
2509
# as well as any symbol that contains `d'.
2599
2518
extract_expsyms_cmds=
2600
2519
# Just being paranoid about ensuring that cc_basename is set.
2601
2520
for cc_temp in $compiler""; do
2602
@@ -7875,7 +8205,7 @@
2521
@@ -7876,7 +8205,7 @@
2603
2522
2604
2523
# See if GNU ld supports shared libraries.
2605
2524
case $host_os in
2608
2527
# On AIX/PPC, the GNU linker is very broken
2609
2528
if test "$host_cpu" != ia64; then
2610
2529
ld_shlibs=no
2611
@@ -7991,12 +8321,13 @@
2530
@@ -7992,12 +8321,13 @@
2612
2531
$echo "local: *; };" >> $output_objdir/$libname.ver~
2613
2532
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
2614
2533
fi
2623
2542
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
2624
2543
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2625
2544
wlarc=
2626
@@ -8094,7 +8425,7 @@
2545
@@ -8095,7 +8425,7 @@
2627
2546
fi
2628
2547
;;
2629
2548
2632
2551
if test "$host_cpu" = ia64; then
2633
2552
# On IA64, the linker does run time linking by default, so we don't
2634
2553
# have to do anything special.
2635
@@ -8114,7 +8445,7 @@
2554
@@ -8115,7 +8445,7 @@
2636
2555
# Test if we are trying to use run time linking or normal
2637
2556
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
2638
2557
# need to do runtime linking.
2641
2560
for ld_flag in $LDFLAGS; do
2642
2561
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
2643
2562
aix_use_runtimelinking=yes
2644
@@ -8386,11 +8717,10 @@
2563
@@ -8387,11 +8717,10 @@
2645
2564
link_all_deplibs=yes
2646
2565
if test "$GCC" = yes ; then
2647
2566
output_verbose_link_cmd='echo'
2657
2576
else
2658
2577
case $cc_basename in
2659
2578
xlc*)
2660
@@ -8540,7 +8870,7 @@
2579
@@ -8541,7 +8870,7 @@
2661
2580
link_all_deplibs=yes
2662
2581
;;
2663
2582
2666
2585
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
2667
2586
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
2668
2587
else
2669
@@ -8910,7 +9240,7 @@
2588
@@ -8911,7 +9240,7 @@
2670
2589
soname_spec='${libname}${release}${shared_ext}$major'
2671
2590
;;
2672
2591
2675
2594
version_type=linux
2676
2595
need_lib_prefix=no
2677
2596
need_version=no
2678
@@ -9235,13 +9565,11 @@
2597
@@ -9236,13 +9565,11 @@
2679
2598
# Some rework will be needed to allow for fast_install
2680
2599
# before this can be enabled.
2681
2600
hardcode_into_libs=yes
2690
2609
fi
2691
2610
2692
2611
# We used to test for /lib/ld.so.1 and disable shared libraries on
2693
@@ -9253,6 +9581,18 @@
2612
@@ -9254,6 +9581,18 @@
2694
2613
dynamic_linker='GNU/Linux ld.so'
2695
2614
;;
2696
2615
2709
2628
netbsd*)
2710
2629
version_type=sunos
2711
2630
need_lib_prefix=no
2712
@@ -9434,6 +9774,21 @@
2631
@@ -9435,6 +9774,21 @@
2713
2632
echo "${ECHO_T}$dynamic_linker" >&6; }
2714
2633
test "$dynamic_linker" = no && can_build_shared=no
2715
2634
2731
2650
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
2732
2651
if test "$GCC" = yes; then
2733
2652
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
2734
@@ -9753,7 +10108,7 @@
2653
@@ -9754,7 +10108,7 @@
2735
2654
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
2736
2655
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
2737
2656
if test $ac_cv_lib_dld_shl_load = yes; then
2740
2659
else
2741
2660
{ echo "$as_me:$LINENO: checking for dlopen" >&5
2742
2661
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
2743
@@ -10029,7 +10384,7 @@
2662
@@ -10030,7 +10384,7 @@
2744
2663
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
2745
2664
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
2746
2665
if test $ac_cv_lib_dld_dld_link = yes; then
2749
2668
fi
2750
2669
2751
2670
2752
@@ -10078,7 +10433,7 @@
2671
@@ -10079,7 +10433,7 @@
2753
2672
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2754
2673
lt_status=$lt_dlunknown
2755
2674
cat > conftest.$ac_ext <<EOF
2756
-#line 10081 "configure"
2675
-#line 10082 "configure"
2757
2676
+#line 10436 "configure"
2758
2677
#include "confdefs.h"
2759
2678
2760
2679
#if HAVE_DLFCN_H
2761
@@ -10178,7 +10533,7 @@
2680
@@ -10179,7 +10533,7 @@
2762
2681
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2763
2682
lt_status=$lt_dlunknown
2764
2683
cat > conftest.$ac_ext <<EOF
2765
-#line 10181 "configure"
2684
-#line 10182 "configure"
2766
2685
+#line 10536 "configure"
2767
2686
#include "confdefs.h"
2768
2687
2769
2688
#if HAVE_DLFCN_H
2770
@@ -10305,7 +10660,7 @@
2689
@@ -10306,7 +10660,7 @@
2771
2690
fi
2772
2691
;;
2773
2692
2776
2695
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2777
2696
test "$enable_shared" = yes && enable_static=no
2778
2697
fi
2779
@@ -10361,6 +10716,7 @@
2698
@@ -10362,6 +10716,7 @@
2780
2699
predeps \
2781
2700
postdeps \
2782
2701
compiler_lib_search_path \
2784
2703
archive_cmds \
2785
2704
archive_expsym_cmds \
2786
2705
postinstall_cmds \
2787
@@ -10421,7 +10777,7 @@
2706
@@ -10422,7 +10777,7 @@
2788
2707
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
2789
2708
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
2790
2709
#
2793
2712
# Free Software Foundation, Inc.
2794
2713
#
2795
2714
# This file is part of GNU Libtool:
2796
@@ -10657,6 +11013,10 @@
2715
@@ -10658,6 +11013,10 @@
2797
2716
# shared library.
2798
2717
postdeps=$lt_postdeps
2799
2718
2804
2723
# The library search path used internally by the compiler when linking
2805
2724
# a shared library.
2806
2725
compiler_lib_search_path=$lt_compiler_lib_search_path
2807
@@ -10905,6 +11265,7 @@
2726
@@ -10906,6 +11265,7 @@
2808
2727
predeps_CXX=
2809
2728
postdeps_CXX=
2810
2729
compiler_lib_search_path_CXX=
2812
2731
2813
2732
# Source file extension for C++ test sources.
2814
2733
ac_ext=cpp
2815
@@ -10942,7 +11303,7 @@
2734
@@ -10943,7 +11303,7 @@
2816
2735
echo "$lt_simple_link_test_code" >conftest.$ac_ext
2817
2736
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2818
2737
_lt_linker_boilerplate=`cat conftest.err`
2821
2740
2822
2741
2823
2742
# Allow CC to be a program name with arguments.
2824
@@ -11149,7 +11510,7 @@
2743
@@ -11150,7 +11510,7 @@
2825
2744
# FIXME: insert proper C++ library support
2826
2745
ld_shlibs_CXX=no
2827
2746
;;
2830
2749
if test "$host_cpu" = ia64; then
2831
2750
# On IA64, the linker does run time linking by default, so we don't
2832
2751
# have to do anything special.
2833
@@ -11162,7 +11523,7 @@
2752
@@ -11163,7 +11523,7 @@
2834
2753
# Test if we are trying to use run time linking or normal
2835
2754
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
2836
2755
# need to do runtime linking.
2839
2758
for ld_flag in $LDFLAGS; do
2840
2759
case $ld_flag in
2841
2760
*-brtl*)
2842
@@ -11420,51 +11781,23 @@
2761
@@ -11421,51 +11781,23 @@
2843
2762
fi
2844
2763
;;
2845
2764
darwin* | rhapsody*)
2900
2819
else
2901
2820
case $cc_basename in
2902
2821
xlc*)
2903
@@ -11715,7 +12048,7 @@
2822
@@ -11716,7 +12048,7 @@
2904
2823
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
2905
2824
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2906
2825
;;
2909
2828
# Portland Group C++ compiler
2910
2829
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2911
2830
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2912
@@ -11788,7 +12121,7 @@
2831
@@ -11789,7 +12121,7 @@
2913
2832
;;
2914
2833
esac
2915
2834
;;
2918
2837
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
2919
2838
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
2920
2839
wlarc=
2921
@@ -12122,7 +12455,6 @@
2840
@@ -12123,7 +12455,6 @@
2922
2841
GCC_CXX="$GXX"
2923
2842
LD_CXX="$LD"
2924
2843
2926
2845
cat > conftest.$ac_ext <<EOF
2927
2846
class Foo
2928
2847
{
2929
@@ -12224,6 +12556,11 @@
2848
@@ -12225,6 +12556,11 @@
2930
2849
2931
2850
$rm -f confest.$objext
2932
2851
2938
2857
# PORTME: override above test on systems where it is broken
2939
2858
case $host_os in
2940
2859
interix[3-9]*)
2941
@@ -12279,7 +12616,6 @@
2860
@@ -12280,7 +12616,6 @@
2942
2861
;;
2943
2862
esac
2944
2863
2946
2865
case " $postdeps_CXX " in
2947
2866
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
2948
2867
esac
2949
@@ -12355,7 +12691,7 @@
2868
@@ -12356,7 +12691,7 @@
2950
2869
esac
2951
2870
else
2952
2871
case $host_os in
2955
2874
# All AIX code is PIC.
2956
2875
if test "$host_cpu" = ia64; then
2957
2876
# AIX 5 now supports IA64 processor
2958
@@ -12451,7 +12787,7 @@
2877
@@ -12452,7 +12787,7 @@
2959
2878
lt_prog_compiler_pic_CXX='-KPIC'
2960
2879
lt_prog_compiler_static_CXX='-static'
2961
2880
;;
2964
2883
# Portland Group C++ compiler.
2965
2884
lt_prog_compiler_wl_CXX='-Wl,'
2966
2885
lt_prog_compiler_pic_CXX='-fpic'
2967
@@ -12489,7 +12825,7 @@
2886
@@ -12490,7 +12825,7 @@
2968
2887
;;
2969
2888
esac
2970
2889
;;
2973
2892
;;
2974
2893
osf3* | osf4* | osf5*)
2975
2894
case $cc_basename in
2976
@@ -12582,10 +12918,10 @@
2895
@@ -12583,10 +12918,10 @@
2977
2896
2978
2897
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
2979
2898
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
2986
2905
ac_outfile=conftest.$ac_objext
2987
2906
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2988
2907
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
2989
@@ -12598,27 +12934,27 @@
2908
@@ -12599,27 +12934,27 @@
2990
2909
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2991
2910
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2992
2911
-e 's:$: $lt_compiler_flag:'`
2993
- (eval echo "\"\$as_me:12601: $lt_compile\"" >&5)
2912
- (eval echo "\"\$as_me:12602: $lt_compile\"" >&5)
2994
2913
+ (eval echo "\"\$as_me:12937: $lt_compile\"" >&5)
2995
2914
(eval "$lt_compile" 2>conftest.err)
2996
2915
ac_status=$?
2997
2916
cat conftest.err >&5
2998
- echo "$as_me:12605: \$? = $ac_status" >&5
2917
- echo "$as_me:12606: \$? = $ac_status" >&5
2999
2918
+ echo "$as_me:12941: \$? = $ac_status" >&5
3000
2919
if (exit $ac_status) && test -s "$ac_outfile"; then
3001
2920
# The compiler can only warn and ignore the option if not recognized
3020
2939
case $lt_prog_compiler_pic_CXX in
3021
2940
"" | " "*) ;;
3022
2941
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
3023
@@ -12645,10 +12981,10 @@
2942
@@ -12646,10 +12981,10 @@
3024
2943
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
3025
2944
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
3026
2945
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
3033
2952
save_LDFLAGS="$LDFLAGS"
3034
2953
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
3035
2954
echo "$lt_simple_link_test_code" > conftest.$ac_ext
3036
@@ -12661,20 +12997,20 @@
2955
@@ -12662,20 +12997,20 @@
3037
2956
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
3038
2957
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3039
2958
if diff conftest.exp conftest.er2 >/dev/null; then
3060
2979
:
3061
2980
else
3062
2981
lt_prog_compiler_static_CXX=
3063
@@ -12702,11 +13038,11 @@
2982
@@ -12703,11 +13038,11 @@
3064
2983
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3065
2984
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3066
2985
-e 's:$: $lt_compiler_flag:'`
3067
- (eval echo "\"\$as_me:12705: $lt_compile\"" >&5)
2986
- (eval echo "\"\$as_me:12706: $lt_compile\"" >&5)
3068
2987
+ (eval echo "\"\$as_me:13041: $lt_compile\"" >&5)
3069
2988
(eval "$lt_compile" 2>out/conftest.err)
3070
2989
ac_status=$?
3071
2990
cat out/conftest.err >&5
3072
- echo "$as_me:12709: \$? = $ac_status" >&5
2991
- echo "$as_me:12710: \$? = $ac_status" >&5
3073
2992
+ echo "$as_me:13045: \$? = $ac_status" >&5
3074
2993
if (exit $ac_status) && test -s out/conftest2.$ac_objext
3075
2994
then
3076
2995
# The compiler can only warn and ignore the option if not recognized
3077
@@ -12759,7 +13095,7 @@
2996
@@ -12760,7 +13095,7 @@
3078
2997
3079
2998
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
3080
2999
case $host_os in
3083
3002
# If we're using GNU nm, then we don't want the "-C" option.
3084
3003
# -C means demangle to AIX nm, but means don't demangle with GNU nm
3085
3004
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
3086
@@ -12774,10 +13110,14 @@
3005
@@ -12775,10 +13110,14 @@
3087
3006
cygwin* | mingw*)
3088
3007
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
3089
3008
;;
3098
3017
3099
3018
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
3100
3019
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
3101
@@ -12879,7 +13219,7 @@
3020
@@ -12880,7 +13219,7 @@
3102
3021
soname_spec='${libname}${release}${shared_ext}$major'
3103
3022
;;
3104
3023
3107
3026
version_type=linux
3108
3027
need_lib_prefix=no
3109
3028
need_version=no
3110
@@ -13203,13 +13543,11 @@
3029
@@ -13204,13 +13543,11 @@
3111
3030
# Some rework will be needed to allow for fast_install
3112
3031
# before this can be enabled.
3113
3032
hardcode_into_libs=yes
3122
3041
fi
3123
3042
3124
3043
# We used to test for /lib/ld.so.1 and disable shared libraries on
3125
@@ -13221,6 +13559,18 @@
3044
@@ -13222,6 +13559,18 @@
3126
3045
dynamic_linker='GNU/Linux ld.so'
3127
3046
;;
3128
3047
3141
3060
netbsd*)
3142
3061
version_type=sunos
3143
3062
need_lib_prefix=no
3144
@@ -13402,6 +13752,21 @@
3063
@@ -13403,6 +13752,21 @@
3145
3064
echo "${ECHO_T}$dynamic_linker" >&6; }
3146
3065
test "$dynamic_linker" = no && can_build_shared=no
3147
3066
3163
3082
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
3164
3083
if test "$GCC" = yes; then
3165
3084
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
3166
@@ -13485,6 +13850,7 @@
3085
@@ -13486,6 +13850,7 @@
3167
3086
predeps_CXX \
3168
3087
postdeps_CXX \
3169
3088
compiler_lib_search_path_CXX \
3171
3090
archive_cmds_CXX \
3172
3091
archive_expsym_cmds_CXX \
3173
3092
postinstall_cmds_CXX \
3174
@@ -13733,6 +14099,10 @@
3093
@@ -13734,6 +14099,10 @@
3175
3094
# shared library.
3176
3095
postdeps=$lt_postdeps_CXX
3177
3096
3182
3101
# The library search path used internally by the compiler when linking
3183
3102
# a shared library.
3184
3103
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
3185
@@ -13947,7 +14317,7 @@
3104
@@ -13948,7 +14317,7 @@
3186
3105
echo "$lt_simple_link_test_code" >conftest.$ac_ext
3187
3106
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3188
3107
_lt_linker_boilerplate=`cat conftest.err`
3191
3110
3192
3111
3193
3112
# Allow CC to be a program name with arguments.
3194
@@ -13985,7 +14355,7 @@
3113
@@ -13986,7 +14355,7 @@
3195
3114
postinstall_cmds='$RANLIB $lib'
3196
3115
fi
3197
3116
;;
3200
3119
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
3201
3120
test "$enable_shared" = yes && enable_static=no
3202
3121
fi
3203
@@ -14250,10 +14620,10 @@
3122
@@ -14251,10 +14620,10 @@
3204
3123
3205
3124
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
3206
3125
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
3213
3132
ac_outfile=conftest.$ac_objext
3214
3133
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
3215
3134
lt_compiler_flag="$lt_prog_compiler_pic_F77"
3216
@@ -14266,27 +14636,27 @@
3135
@@ -14267,27 +14636,27 @@
3217
3136
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3218
3137
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3219
3138
-e 's:$: $lt_compiler_flag:'`
3220
- (eval echo "\"\$as_me:14269: $lt_compile\"" >&5)
3139
- (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
3221
3140
+ (eval echo "\"\$as_me:14639: $lt_compile\"" >&5)
3222
3141
(eval "$lt_compile" 2>conftest.err)
3223
3142
ac_status=$?
3224
3143
cat conftest.err >&5
3225
- echo "$as_me:14273: \$? = $ac_status" >&5
3144
- echo "$as_me:14274: \$? = $ac_status" >&5
3226
3145
+ echo "$as_me:14643: \$? = $ac_status" >&5
3227
3146
if (exit $ac_status) && test -s "$ac_outfile"; then
3228
3147
# The compiler can only warn and ignore the option if not recognized
3247
3166
case $lt_prog_compiler_pic_F77 in
3248
3167
"" | " "*) ;;
3249
3168
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
3250
@@ -14313,10 +14683,10 @@
3169
@@ -14314,10 +14683,10 @@
3251
3170
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
3252
3171
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
3253
3172
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
3260
3179
save_LDFLAGS="$LDFLAGS"
3261
3180
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
3262
3181
echo "$lt_simple_link_test_code" > conftest.$ac_ext
3263
@@ -14329,20 +14699,20 @@
3182
@@ -14330,20 +14699,20 @@
3264
3183
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
3265
3184
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3266
3185
if diff conftest.exp conftest.er2 >/dev/null; then
3287
3206
:
3288
3207
else
3289
3208
lt_prog_compiler_static_F77=
3290
@@ -14370,11 +14740,11 @@
3209
@@ -14371,11 +14740,11 @@
3291
3210
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3292
3211
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3293
3212
-e 's:$: $lt_compiler_flag:'`
3294
- (eval echo "\"\$as_me:14373: $lt_compile\"" >&5)
3213
- (eval echo "\"\$as_me:14374: $lt_compile\"" >&5)
3295
3214
+ (eval echo "\"\$as_me:14743: $lt_compile\"" >&5)
3296
3215
(eval "$lt_compile" 2>out/conftest.err)
3297
3216
ac_status=$?
3298
3217
cat out/conftest.err >&5
3299
- echo "$as_me:14377: \$? = $ac_status" >&5
3218
- echo "$as_me:14378: \$? = $ac_status" >&5
3300
3219
+ echo "$as_me:14747: \$? = $ac_status" >&5
3301
3220
if (exit $ac_status) && test -s out/conftest2.$ac_objext
3302
3221
then
3303
3222
# The compiler can only warn and ignore the option if not recognized
3304
@@ -14454,12 +14824,13 @@
3223
@@ -14455,12 +14824,13 @@
3305
3224
# it will be wrapped by ` (' and `)$', so one must not match beginning or
3306
3225
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
3307
3226
# as well as any symbol that contains `d'.
3316
3235
extract_expsyms_cmds=
3317
3236
# Just being paranoid about ensuring that cc_basename is set.
3318
3237
for cc_temp in $compiler""; do
3319
@@ -14518,7 +14889,7 @@
3238
@@ -14519,7 +14889,7 @@
3320
3239
3321
3240
# See if GNU ld supports shared libraries.
3322
3241
case $host_os in
3325
3244
# On AIX/PPC, the GNU linker is very broken
3326
3245
if test "$host_cpu" != ia64; then
3327
3246
ld_shlibs_F77=no
3328
@@ -14634,12 +15005,13 @@
3247
@@ -14635,12 +15005,13 @@
3329
3248
$echo "local: *; };" >> $output_objdir/$libname.ver~
3330
3249
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
3331
3250
fi
3340
3259
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
3341
3260
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
3342
3261
wlarc=
3343
@@ -14737,7 +15109,7 @@
3262
@@ -14738,7 +15109,7 @@
3344
3263
fi
3345
3264
;;
3346
3265
3349
3268
if test "$host_cpu" = ia64; then
3350
3269
# On IA64, the linker does run time linking by default, so we don't
3351
3270
# have to do anything special.
3352
@@ -14757,7 +15129,7 @@
3271
@@ -14758,7 +15129,7 @@
3353
3272
# Test if we are trying to use run time linking or normal
3354
3273
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
3355
3274
# need to do runtime linking.
3358
3277
for ld_flag in $LDFLAGS; do
3359
3278
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
3360
3279
aix_use_runtimelinking=yes
3361
@@ -15009,11 +15381,10 @@
3280
@@ -15010,11 +15381,10 @@
3362
3281
link_all_deplibs_F77=yes
3363
3282
if test "$GCC" = yes ; then
3364
3283
output_verbose_link_cmd='echo'
3374
3293
else
3375
3294
case $cc_basename in
3376
3295
xlc*)
3377
@@ -15163,7 +15534,7 @@
3296
@@ -15164,7 +15534,7 @@
3378
3297
link_all_deplibs_F77=yes
3379
3298
;;
3380
3299
3383
3302
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
3384
3303
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
3385
3304
else
3386
@@ -15482,7 +15853,7 @@
3305
@@ -15483,7 +15853,7 @@
3387
3306
soname_spec='${libname}${release}${shared_ext}$major'
3388
3307
;;
3389
3308
3392
3311
version_type=linux
3393
3312
need_lib_prefix=no
3394
3313
need_version=no
3395
@@ -15806,13 +16177,11 @@
3314
@@ -15807,13 +16177,11 @@
3396
3315
# Some rework will be needed to allow for fast_install
3397
3316
# before this can be enabled.
3398
3317
hardcode_into_libs=yes
3407
3326
fi
3408
3327
3409
3328
# We used to test for /lib/ld.so.1 and disable shared libraries on
3410
@@ -15824,6 +16193,18 @@
3329
@@ -15825,6 +16193,18 @@
3411
3330
dynamic_linker='GNU/Linux ld.so'
3412
3331
;;
3413
3332
3426
3345
netbsd*)
3427
3346
version_type=sunos
3428
3347
need_lib_prefix=no
3429
@@ -16005,6 +16386,21 @@
3348
@@ -16006,6 +16386,21 @@
3430
3349
echo "${ECHO_T}$dynamic_linker" >&6; }
3431
3350
test "$dynamic_linker" = no && can_build_shared=no
3432
3351
3448
3367
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
3449
3368
if test "$GCC" = yes; then
3450
3369
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
3451
@@ -16088,6 +16484,7 @@
3370
@@ -16089,6 +16484,7 @@
3452
3371
predeps_F77 \
3453
3372
postdeps_F77 \
3454
3373
compiler_lib_search_path_F77 \
3456
3375
archive_cmds_F77 \
3457
3376
archive_expsym_cmds_F77 \
3458
3377
postinstall_cmds_F77 \
3459
@@ -16336,6 +16733,10 @@
3378
@@ -16337,6 +16733,10 @@
3460
3379
# shared library.
3461
3380
postdeps=$lt_postdeps_F77
3462
3381
3467
3386
# The library search path used internally by the compiler when linking
3468
3387
# a shared library.
3469
3388
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
3470
@@ -16510,7 +16911,7 @@
3389
@@ -16511,7 +16911,7 @@
3471
3390
echo "$lt_simple_link_test_code" >conftest.$ac_ext
3472
3391
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3473
3392
_lt_linker_boilerplate=`cat conftest.err`
3476
3395
3477
3396
3478
3397
# Allow CC to be a program name with arguments.
3479
@@ -16559,11 +16960,11 @@
3398
@@ -16560,11 +16960,11 @@
3480
3399
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3481
3400
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3482
3401
-e 's:$: $lt_compiler_flag:'`
3483
- (eval echo "\"\$as_me:16562: $lt_compile\"" >&5)
3402
- (eval echo "\"\$as_me:16563: $lt_compile\"" >&5)
3484
3403
+ (eval echo "\"\$as_me:16963: $lt_compile\"" >&5)
3485
3404
(eval "$lt_compile" 2>conftest.err)
3486
3405
ac_status=$?
3487
3406
cat conftest.err >&5
3488
- echo "$as_me:16566: \$? = $ac_status" >&5
3407
- echo "$as_me:16567: \$? = $ac_status" >&5
3489
3408
+ echo "$as_me:16967: \$? = $ac_status" >&5
3490
3409
if (exit $ac_status) && test -s "$ac_outfile"; then
3491
3410
# The compiler can only warn and ignore the option if not recognized
3492
3411
# So say no if there are warnings other than the usual output.
3493
@@ -16623,7 +17024,7 @@
3412
@@ -16624,7 +17024,7 @@
3494
3413
# built for inclusion in a dll (and should export symbols for example).
3495
3414
# Although the cygwin gcc ignores -fPIC, still need this for old-style
3496
3415
# (--disable-auto-import) libraries
3499
3418
;;
3500
3419
3501
3420
darwin* | rhapsody*)
3502
@@ -16693,7 +17094,7 @@
3421
@@ -16694,7 +17094,7 @@
3503
3422
mingw* | cygwin* | pw32* | os2*)
3504
3423
# This hack is so that the source file can tell whether it is being
3505
3424
# built for inclusion in a dll (and should export symbols for example).
3508
3427
;;
3509
3428
3510
3429
hpux9* | hpux10* | hpux11*)
3511
@@ -16833,10 +17234,10 @@
3430
@@ -16834,10 +17234,10 @@
3512
3431
3513
3432
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
3514
3433
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
3521
3440
ac_outfile=conftest.$ac_objext
3522
3441
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
3523
3442
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
3524
@@ -16849,27 +17250,27 @@
3443
@@ -16850,27 +17250,27 @@
3525
3444
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3526
3445
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3527
3446
-e 's:$: $lt_compiler_flag:'`
3528
- (eval echo "\"\$as_me:16852: $lt_compile\"" >&5)
3447
- (eval echo "\"\$as_me:16853: $lt_compile\"" >&5)
3529
3448
+ (eval echo "\"\$as_me:17253: $lt_compile\"" >&5)
3530
3449
(eval "$lt_compile" 2>conftest.err)
3531
3450
ac_status=$?
3532
3451
cat conftest.err >&5
3533
- echo "$as_me:16856: \$? = $ac_status" >&5
3452
- echo "$as_me:16857: \$? = $ac_status" >&5
3534
3453
+ echo "$as_me:17257: \$? = $ac_status" >&5
3535
3454
if (exit $ac_status) && test -s "$ac_outfile"; then
3536
3455
# The compiler can only warn and ignore the option if not recognized
3555
3474
case $lt_prog_compiler_pic_GCJ in
3556
3475
"" | " "*) ;;
3557
3476
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
3558
@@ -16896,10 +17297,10 @@
3477
@@ -16897,10 +17297,10 @@
3559
3478
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
3560
3479
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
3561
3480
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
3568
3487
save_LDFLAGS="$LDFLAGS"
3569
3488
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
3570
3489
echo "$lt_simple_link_test_code" > conftest.$ac_ext
3571
@@ -16912,20 +17313,20 @@
3490
@@ -16913,20 +17313,20 @@
3572
3491
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
3573
3492
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3574
3493
if diff conftest.exp conftest.er2 >/dev/null; then
3595
3514
:
3596
3515
else
3597
3516
lt_prog_compiler_static_GCJ=
3598
@@ -16953,11 +17354,11 @@
3517
@@ -16954,11 +17354,11 @@
3599
3518
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3600
3519
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3601
3520
-e 's:$: $lt_compiler_flag:'`
3602
- (eval echo "\"\$as_me:16956: $lt_compile\"" >&5)
3521
- (eval echo "\"\$as_me:16957: $lt_compile\"" >&5)
3603
3522
+ (eval echo "\"\$as_me:17357: $lt_compile\"" >&5)
3604
3523
(eval "$lt_compile" 2>out/conftest.err)
3605
3524
ac_status=$?
3606
3525
cat out/conftest.err >&5
3607
- echo "$as_me:16960: \$? = $ac_status" >&5
3526
- echo "$as_me:16961: \$? = $ac_status" >&5
3608
3527
+ echo "$as_me:17361: \$? = $ac_status" >&5
3609
3528
if (exit $ac_status) && test -s out/conftest2.$ac_objext
3610
3529
then
3611
3530
# The compiler can only warn and ignore the option if not recognized
3612
@@ -17037,12 +17438,13 @@
3531
@@ -17038,12 +17438,13 @@
3613
3532
# it will be wrapped by ` (' and `)$', so one must not match beginning or
3614
3533
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
3615
3534
# as well as any symbol that contains `d'.
3624
3543
extract_expsyms_cmds=
3625
3544
# Just being paranoid about ensuring that cc_basename is set.
3626
3545
for cc_temp in $compiler""; do
3627
@@ -17101,7 +17503,7 @@
3546
@@ -17102,7 +17503,7 @@
3628
3547
3629
3548
# See if GNU ld supports shared libraries.
3630
3549
case $host_os in
3633
3552
# On AIX/PPC, the GNU linker is very broken
3634
3553
if test "$host_cpu" != ia64; then
3635
3554
ld_shlibs_GCJ=no
3636
@@ -17217,12 +17619,13 @@
3555
@@ -17218,12 +17619,13 @@
3637
3556
$echo "local: *; };" >> $output_objdir/$libname.ver~
3638
3557
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
3639
3558
fi
3648
3567
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
3649
3568
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
3650
3569
wlarc=
3651
@@ -17320,7 +17723,7 @@
3570
@@ -17321,7 +17723,7 @@
3652
3571
fi
3653
3572
;;
3654
3573
3657
3576
if test "$host_cpu" = ia64; then
3658
3577
# On IA64, the linker does run time linking by default, so we don't
3659
3578
# have to do anything special.
3660
@@ -17340,7 +17743,7 @@
3579
@@ -17341,7 +17743,7 @@
3661
3580
# Test if we are trying to use run time linking or normal
3662
3581
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
3663
3582
# need to do runtime linking.
3666
3585
for ld_flag in $LDFLAGS; do
3667
3586
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
3668
3587
aix_use_runtimelinking=yes
3669
@@ -17612,11 +18015,10 @@
3588
@@ -17613,11 +18015,10 @@
3670
3589
link_all_deplibs_GCJ=yes
3671
3590
if test "$GCC" = yes ; then
3672
3591
output_verbose_link_cmd='echo'
3682
3601
else
3683
3602
case $cc_basename in
3684
3603
xlc*)
3685
@@ -17766,7 +18168,7 @@
3604
@@ -17767,7 +18168,7 @@
3686
3605
link_all_deplibs_GCJ=yes
3687
3606
;;
3688
3607
3691
3610
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
3692
3611
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
3693
3612
else
3694
@@ -18085,7 +18487,7 @@
3613
@@ -18086,7 +18487,7 @@
3695
3614
soname_spec='${libname}${release}${shared_ext}$major'
3696
3615
;;
3697
3616
3700
3619
version_type=linux
3701
3620
need_lib_prefix=no
3702
3621
need_version=no
3703
@@ -18409,13 +18811,11 @@
3622
@@ -18410,13 +18811,11 @@
3704
3623
# Some rework will be needed to allow for fast_install
3705
3624
# before this can be enabled.
3706
3625
hardcode_into_libs=yes
3715
3634
fi
3716
3635
3717
3636
# We used to test for /lib/ld.so.1 and disable shared libraries on
3718
@@ -18427,6 +18827,18 @@
3637
@@ -18428,6 +18827,18 @@
3719
3638
dynamic_linker='GNU/Linux ld.so'
3720
3639
;;
3721
3640
3734
3653
netbsd*)
3735
3654
version_type=sunos
3736
3655
need_lib_prefix=no
3737
@@ -18608,6 +19020,21 @@
3656
@@ -18609,6 +19020,21 @@
3738
3657
echo "${ECHO_T}$dynamic_linker" >&6; }
3739
3658
test "$dynamic_linker" = no && can_build_shared=no
3740
3659
3756
3675
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
3757
3676
if test "$GCC" = yes; then
3758
3677
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
3759
@@ -18691,6 +19118,7 @@
3678
@@ -18692,6 +19118,7 @@
3760
3679
predeps_GCJ \
3761
3680
postdeps_GCJ \
3762
3681
compiler_lib_search_path_GCJ \
3764
3683
archive_cmds_GCJ \
3765
3684
archive_expsym_cmds_GCJ \
3766
3685
postinstall_cmds_GCJ \
3767
@@ -18939,6 +19367,10 @@
3686
@@ -18940,6 +19367,10 @@
3768
3687
# shared library.
3769
3688
postdeps=$lt_postdeps_GCJ
3770
3689
3775
3694
# The library search path used internally by the compiler when linking
3776
3695
# a shared library.
3777
3696
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
3778
@@ -19112,7 +19544,7 @@
3697
@@ -19113,7 +19544,7 @@
3779
3698
echo "$lt_simple_link_test_code" >conftest.$ac_ext
3780
3699
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3781
3700
_lt_linker_boilerplate=`cat conftest.err`
3784
3703
3785
3704
3786
3705
# Allow CC to be a program name with arguments.
3787
@@ -19172,6 +19604,7 @@
3706
@@ -19173,6 +19604,7 @@
3788
3707
predeps_RC \
3789
3708
postdeps_RC \
3790
3709
compiler_lib_search_path_RC \
3792
3711
archive_cmds_RC \
3793
3712
archive_expsym_cmds_RC \
3794
3713
postinstall_cmds_RC \
3795
@@ -19420,6 +19853,10 @@
3714
@@ -19421,6 +19853,10 @@
3796
3715
# shared library.
3797
3716
postdeps=$lt_postdeps_RC
3798
3717
3803
3722
# The library search path used internally by the compiler when linking
3804
3723
# a shared library.
3805
3724
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
3806
@@ -21975,6 +22412,141 @@
3807
3808
3809
3810
+# Check the gettext tools to make sure they are GNU
3811
+# Extract the first word of "xgettext", so it can be a program name with args.
3812
+set dummy xgettext; ac_word=$2
3813
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3814
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3815
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
3816
+ echo $ECHO_N "(cached) $ECHO_C" >&6
3817
+else
3818
+ case $XGETTEXT in
3819
+ [\\/]* | ?:[\\/]*)
3820
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
3821
+ ;;
3822
+ *)
3823
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3824
+for as_dir in $PATH
3825
+do
3826
+ IFS=$as_save_IFS
3827
+ test -z "$as_dir" && as_dir=.
3828
+ for ac_exec_ext in '' $ac_executable_extensions; do
3829
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3830
+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
3831
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3832
+ break 2
3833
+ fi
3834
+done
3835
+done
3836
+IFS=$as_save_IFS
3837
+
3838
+ ;;
3839
+esac
3840
+fi
3841
+XGETTEXT=$ac_cv_path_XGETTEXT
3842
+if test -n "$XGETTEXT"; then
3843
+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
3844
+echo "${ECHO_T}$XGETTEXT" >&6; }
3845
+else
3846
+ { echo "$as_me:$LINENO: result: no" >&5
3847
+echo "${ECHO_T}no" >&6; }
3848
+fi
3849
+
3850
+
3851
+# Extract the first word of "msgmerge", so it can be a program name with args.
3852
+set dummy msgmerge; ac_word=$2
3853
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3854
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3855
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
3856
+ echo $ECHO_N "(cached) $ECHO_C" >&6
3857
+else
3858
+ case $MSGMERGE in
3859
+ [\\/]* | ?:[\\/]*)
3860
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
3861
+ ;;
3862
+ *)
3863
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3864
+for as_dir in $PATH
3865
+do
3866
+ IFS=$as_save_IFS
3867
+ test -z "$as_dir" && as_dir=.
3868
+ for ac_exec_ext in '' $ac_executable_extensions; do
3869
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3870
+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
3871
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3872
+ break 2
3873
+ fi
3874
+done
3875
+done
3876
+IFS=$as_save_IFS
3877
+
3878
+ ;;
3879
+esac
3880
+fi
3881
+MSGMERGE=$ac_cv_path_MSGMERGE
3882
+if test -n "$MSGMERGE"; then
3883
+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
3884
+echo "${ECHO_T}$MSGMERGE" >&6; }
3885
+else
3886
+ { echo "$as_me:$LINENO: result: no" >&5
3887
+echo "${ECHO_T}no" >&6; }
3888
+fi
3889
+
3890
+
3891
+# Extract the first word of "msgfmt", so it can be a program name with args.
3892
+set dummy msgfmt; ac_word=$2
3893
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3894
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3895
+if test "${ac_cv_path_MSGFMT+set}" = set; then
3896
+ echo $ECHO_N "(cached) $ECHO_C" >&6
3897
+else
3898
+ case $MSGFMT in
3899
+ [\\/]* | ?:[\\/]*)
3900
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
3901
+ ;;
3902
+ *)
3903
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3904
+for as_dir in $PATH
3905
+do
3906
+ IFS=$as_save_IFS
3907
+ test -z "$as_dir" && as_dir=.
3908
+ for ac_exec_ext in '' $ac_executable_extensions; do
3909
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3910
+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
3911
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3912
+ break 2
3913
+ fi
3914
+done
3915
+done
3916
+IFS=$as_save_IFS
3917
+
3918
+ ;;
3919
+esac
3920
+fi
3921
+MSGFMT=$ac_cv_path_MSGFMT
3922
+if test -n "$MSGFMT"; then
3923
+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
3924
+echo "${ECHO_T}$MSGFMT" >&6; }
3925
+else
3926
+ { echo "$as_me:$LINENO: result: no" >&5
3927
+echo "${ECHO_T}no" >&6; }
3928
+fi
3929
+
3930
+
3931
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
3932
+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
3933
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
3934
+ { (exit 1); exit 1; }; }
3935
+fi
3936
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
3937
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
3938
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
3939
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
3940
+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
3941
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
3942
+ { (exit 1); exit 1; }; }
3943
+fi
3944
+
3945
# Use the tools built into the package, not the ones that are installed.
3946
INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
3947
3948
@@ -22482,6 +23054,9 @@
3725
@@ -22618,6 +23054,9 @@
3949
3726
fi
3950
3727
3951
3728
3955
3732
if test "$gdu_cv_have_gdu" = "yes"; then
3956
3733
HAVE_GNOME_DOC_UTILS_TRUE=
3957
3734
HAVE_GNOME_DOC_UTILS_FALSE='#'
3958
@@ -22496,7 +23071,7 @@
3735
@@ -22632,7 +23071,7 @@
3959
3736
3960
3737
3961
3738
if test $USE_MAINTAINER_MODE = yes; then
3964
3741
else
3965
3742
DISABLE_DEPRECATED=""
3966
3743
fi
3967
@@ -22646,11 +23221,11 @@
3744
@@ -22782,11 +23221,11 @@
3968
3745
{ echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5
3969
3746
echo $ECHO_N "checking what warning flags to pass to the C++ compiler... $ECHO_C" >&6; }
3970
3747
warnCXXFLAGS=
3979
3756
case " $CXXFLAGS " in
3980
3757
*\ \ -Wall\ \ *) ;;
3981
3758
*) warnCXXFLAGS="-Wall -Wno-unused" ;;
3982
@@ -22678,7 +23253,7 @@
3759
@@ -22814,7 +23253,7 @@
3983
3760
echo $ECHO_N "checking what language compliance flags to pass to the C++ compiler... $ECHO_C" >&6; }
3984
3761
complCXXFLAGS=
3985
3762
if test "x$enable_iso_cxx" != "xno"; then
3988
3765
case " $CXXFLAGS " in
3989
3766
*\ \ -ansi\ \ *) ;;
3990
3767
*) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
3991
@@ -22734,19 +23309,38 @@
3768
@@ -22870,19 +23309,38 @@
3992
3769
fi
3993
3770
3994
3771
4034
3811
;;
4035
3812
*)
4036
3813
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4037
@@ -22756,7 +23350,7 @@
3814
@@ -22892,7 +23350,7 @@
4038
3815
test -z "$as_dir" && as_dir=.
4039
3816
for ac_exec_ext in '' $ac_executable_extensions; do
4040
3817
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4043
3820
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4044
3821
break 2
4045
3822
fi
4046
@@ -22764,43 +23358,22 @@
3823
@@ -22900,43 +23358,22 @@
4047
3824
done
4048
3825
IFS=$as_save_IFS
4049
3826
4093
3870
4094
3871
if test x$enable_gtk_doc = xyes; then
4095
3872
ENABLE_GTK_DOC_TRUE=
4096
@@ -24715,12 +25288,12 @@
3873
@@ -24851,12 +25288,12 @@
4097
3874
pkg_cv_SHELL_CORE_CFLAGS="$SHELL_CORE_CFLAGS"
4098
3875
else
4099
3876
if test -n "$PKG_CONFIG" && \
4109
3886
else
4110
3887
pkg_failed=yes
4111
3888
fi
4112
@@ -24733,12 +25306,12 @@
3889
@@ -24869,12 +25306,12 @@
4113
3890
pkg_cv_SHELL_CORE_LIBS="$SHELL_CORE_LIBS"
4114
3891
else
4115
3892
if test -n "$PKG_CONFIG" && \
4125
3902
else
4126
3903
pkg_failed=yes
4127
3904
fi
4128
@@ -24757,14 +25330,14 @@
3905
@@ -24893,14 +25330,14 @@
4129
3906
_pkg_short_errors_supported=no
4130
3907
fi
4131
3908
if test $_pkg_short_errors_supported = yes; then
4143
3920
4144
3921
$SHELL_CORE_PKG_ERRORS
4145
3922
4146
@@ -24775,7 +25348,7 @@
3923
@@ -24911,7 +25348,7 @@
4147
3924
and SHELL_CORE_LIBS to avoid the need to call pkg-config.
4148
3925
See the pkg-config man page for more details.
4149
3926
" >&5
4152
3929
4153
3930
$SHELL_CORE_PKG_ERRORS
4154
3931
4155
@@ -25060,6 +25633,111 @@
3932
@@ -25196,6 +25633,111 @@
4156
3933
fi
4157
3934
4158
3935
4264
4041
# Check whether --with-libgnome was given.
4265
4042
if test "${with_libgnome+set}" = set; then
4266
4043
withval=$with_libgnome; case "${withval}" in
4267
@@ -29417,6 +30095,13 @@
4044
@@ -29554,6 +30096,13 @@
4268
4045
Usually this means the macro was only invoked conditionally." >&2;}
4269
4046
{ (exit 1); exit 1; }; }
4270
4047
fi
4278
4055
if test -z "${WITH_GNOME_TRUE}" && test -z "${WITH_GNOME_FALSE}"; then
4279
4056
{ { echo "$as_me:$LINENO: error: conditional \"WITH_GNOME\" was never defined.
4280
4057
Usually this means the macro was only invoked conditionally." >&5
4281
@@ -30205,9 +30890,9 @@
4058
@@ -30342,9 +30891,9 @@
4282
4059
ECHO!$ECHO$ac_delim
4283
4060
AR!$AR$ac_delim
4284
4061
RANLIB!$RANLIB$ac_delim
4290
4067
_ACEOF
4291
4068
4292
4069
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
4293
@@ -30249,6 +30934,8 @@
4070
@@ -30386,6 +30935,8 @@
4294
4071
ac_delim='%!_!# '
4295
4072
for ac_last_try in false false false false false :; do
4296
4073
cat >conf$$subs.sed <<_ACEOF
4299
4076
ac_ct_CXX!$ac_ct_CXX$ac_delim
4300
4077
CXXDEPMODE!$CXXDEPMODE$ac_delim
4301
4078
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
4302
@@ -30277,6 +30964,9 @@
4303
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
4304
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
4305
INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
4306
+XGETTEXT!$XGETTEXT$ac_delim
4307
+MSGMERGE!$MSGMERGE$ac_delim
4308
+MSGFMT!$MSGFMT$ac_delim
4309
INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
4310
INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
4311
INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
4312
@@ -30292,22 +30982,22 @@
4079
@@ -30432,12 +30983,14 @@
4313
4080
DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
4314
4081
ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
4315
4082
ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
4324
4091
ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
4325
4092
ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
4326
4093
GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
4327
GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
4328
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
4329
USE_NLS!$USE_NLS$ac_delim
4330
-MSGFMT!$MSGFMT$ac_delim
4331
MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
4332
GMSGFMT!$GMSGFMT$ac_delim
4333
-XGETTEXT!$XGETTEXT$ac_delim
4334
CATALOGS!$CATALOGS$ac_delim
4335
CATOBJEXT!$CATOBJEXT$ac_delim
4336
GMOFILES!$GMOFILES$ac_delim
4337
@@ -30331,21 +31021,16 @@
4094
@@ -30469,20 +31022,16 @@
4338
4095
WITH_KEYRING_FALSE!$WITH_KEYRING_FALSE$ac_delim
4339
4096
KEYRING_CFLAGS!$KEYRING_CFLAGS$ac_delim
4340
4097
KEYRING_LIBS!$KEYRING_LIBS$ac_delim
4356
4113
-FRONTEND_CFLAGS!$FRONTEND_CFLAGS$ac_delim
4357
4114
-FRONTEND_LIBS!$FRONTEND_LIBS$ac_delim
4358
4115
-ENABLE_DBUS_TRUE!$ENABLE_DBUS_TRUE$ac_delim
4359
-ENABLE_DBUS_FALSE!$ENABLE_DBUS_FALSE$ac_delim
4360
4116
_ACEOF
4361
4117
4362
4118
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
4363
@@ -30387,6 +31072,15 @@
4119
@@ -30524,6 +31073,14 @@
4364
4120
ac_delim='%!_!# '
4365
4121
for ac_last_try in false false false false false :; do
4366
4122
cat >conf$$subs.sed <<_ACEOF
4372
4128
+FRONTEND_CFLAGS!$FRONTEND_CFLAGS$ac_delim
4373
4129
+FRONTEND_LIBS!$FRONTEND_LIBS$ac_delim
4374
4130
+ENABLE_DBUS_TRUE!$ENABLE_DBUS_TRUE$ac_delim
4375
+ENABLE_DBUS_FALSE!$ENABLE_DBUS_FALSE$ac_delim
4131
ENABLE_DBUS_FALSE!$ENABLE_DBUS_FALSE$ac_delim
4376
4132
DBUS_TOOL_NO_PREFIX_TRUE!$DBUS_TOOL_NO_PREFIX_TRUE$ac_delim
4377
4133
DBUS_TOOL_NO_PREFIX_FALSE!$DBUS_TOOL_NO_PREFIX_FALSE$ac_delim
4378
NAUTILUS_CFLAGS!$NAUTILUS_CFLAGS$ac_delim
4379
@@ -30436,7 +31130,7 @@
4134
@@ -30574,7 +31131,7 @@
4380
4135
LTLIBOBJS!$LTLIBOBJS$ac_delim
4381
4136
_ACEOF
4382
4137
4383
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
4138
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
4384
4139
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
4385
4140
break
4386
4141
elif $ac_last_try; then
4387
4142
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
4388
@@ -30837,21 +31531,22 @@
4143
@@ -30975,21 +31532,22 @@
4389
4144
fi
4390
4145
rm -f "$tmp/out12"
4391
4146
# Compute $ac_file's index in $config_headers.
4415
4170
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4416
4171
s//\1/
4417
4172
q
4418
@@ -30888,7 +31583,7 @@
4173
@@ -31026,7 +31584,7 @@
4419
4174
# each Makefile.in and add a new line on top of each file to say so.
4420
4175
# Grep'ing the whole file is not good either: AIX grep has a line
4421
4176
# limit of 2048, but all sed's we know have understand at least 4000.
4424
4179
dirpart=`$as_dirname -- "$mf" ||
4425
4180
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4426
4181
X"$mf" : 'X\(//\)[^/]' \| \
4427
@@ -31081,6 +31776,7 @@
4182
@@ -31219,6 +31777,7 @@
4428
4183
echo "
4429
4184
Configure summary:
4430
4185
GNOME Support......: $WITH_GNOME
4432
4187
Keyring Support....: $WITH_KEYRING
4433
4188
DBUS Support.......: $enable_dbus
4434
4189
Nautilus Plugin....: $HAVE_NAUTILUS
4435
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/cut-n-paste/gedit-message-area/Makefile.in evince-2.22.1.new/cut-n-paste/gedit-message-area/Makefile.in
4436
--- evince-2.22.1/cut-n-paste/gedit-message-area/Makefile.in 2008-04-07 18:42:54.000000000 +0200
4437
+++ evince-2.22.1.new/cut-n-paste/gedit-message-area/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4190
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/cut-n-paste/gedit-message-area/Makefile.in evince-2.22.1.1.new/cut-n-paste/gedit-message-area/Makefile.in
4191
--- evince-2.22.1.1/cut-n-paste/gedit-message-area/Makefile.in 2008-04-08 21:19:03.000000000 +0200
4192
+++ evince-2.22.1.1.new/cut-n-paste/gedit-message-area/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4438
4193
@@ -1,8 +1,8 @@
4439
4194
-# Makefile.in generated by automake 1.10 from Makefile.am.
4440
4195
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4478
4233
HTML_DIR = @HTML_DIR@
4479
4234
INSTALL = @INSTALL@
4480
4235
INSTALL_DATA = @INSTALL_DATA@
4481
@@ -180,9 +185,11 @@
4482
MKINSTALLDIRS = @MKINSTALLDIRS@
4483
MSGFMT = @MSGFMT@
4484
MSGFMT_OPTS = @MSGFMT_OPTS@
4485
+MSGMERGE = @MSGMERGE@
4236
@@ -184,6 +189,7 @@
4486
4237
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4487
4238
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4488
4239
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4490
4241
OBJEXT = @OBJEXT@
4491
4242
OMF_DIR = @OMF_DIR@
4492
4243
PACKAGE = @PACKAGE@
4493
@@ -369,8 +376,8 @@
4244
@@ -370,8 +376,8 @@
4494
4245
unique=`for i in $$list; do \
4495
4246
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4496
4247
done | \
4501
4252
mkid -fID $$unique
4502
4253
tags: TAGS
4503
4254
4504
@@ -382,8 +389,8 @@
4255
@@ -383,8 +389,8 @@
4505
4256
unique=`for i in $$list; do \
4506
4257
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4507
4258
done | \
4512
4263
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4513
4264
test -n "$$unique" || unique=$$empty_fix; \
4514
4265
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4515
@@ -393,13 +400,12 @@
4266
@@ -394,13 +400,12 @@
4516
4267
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4517
4268
$(TAGS_FILES) $(LISP)
4518
4269
tags=; \
4528
4279
test -z "$(CTAGS_ARGS)$$tags$$unique" \
4529
4280
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4530
4281
$$tags $$unique
4531
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/cut-n-paste/Makefile.in evince-2.22.1.new/cut-n-paste/Makefile.in
4532
--- evince-2.22.1/cut-n-paste/Makefile.in 2008-04-07 18:42:53.000000000 +0200
4533
+++ evince-2.22.1.new/cut-n-paste/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4282
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/cut-n-paste/Makefile.in evince-2.22.1.1.new/cut-n-paste/Makefile.in
4283
--- evince-2.22.1.1/cut-n-paste/Makefile.in 2008-04-08 21:19:03.000000000 +0200
4284
+++ evince-2.22.1.1.new/cut-n-paste/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4534
4285
@@ -1,8 +1,8 @@
4535
4286
-# Makefile.in generated by automake 1.10 from Makefile.am.
4536
4287
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4565
4316
HTML_DIR = @HTML_DIR@
4566
4317
INSTALL = @INSTALL@
4567
4318
INSTALL_DATA = @INSTALL_DATA@
4568
@@ -168,9 +173,11 @@
4569
MKINSTALLDIRS = @MKINSTALLDIRS@
4570
MSGFMT = @MSGFMT@
4571
MSGFMT_OPTS = @MSGFMT_OPTS@
4572
+MSGMERGE = @MSGMERGE@
4319
@@ -172,6 +177,7 @@
4573
4320
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4574
4321
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4575
4322
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4577
4324
OBJEXT = @OBJEXT@
4578
4325
OMF_DIR = @OMF_DIR@
4579
4326
PACKAGE = @PACKAGE@
4580
@@ -369,8 +376,8 @@
4327
@@ -370,8 +376,8 @@
4581
4328
unique=`for i in $$list; do \
4582
4329
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4583
4330
done | \
4588
4335
mkid -fID $$unique
4589
4336
tags: TAGS
4590
4337
4591
@@ -395,8 +402,8 @@
4338
@@ -396,8 +402,8 @@
4592
4339
unique=`for i in $$list; do \
4593
4340
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4594
4341
done | \
4599
4346
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4600
4347
test -n "$$unique" || unique=$$empty_fix; \
4601
4348
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4602
@@ -406,13 +413,12 @@
4349
@@ -407,13 +413,12 @@
4603
4350
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4604
4351
$(TAGS_FILES) $(LISP)
4605
4352
tags=; \
4615
4362
test -z "$(CTAGS_ARGS)$$tags$$unique" \
4616
4363
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4617
4364
$$tags $$unique
4618
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/cut-n-paste/toolbar-editor/Makefile.in evince-2.22.1.new/cut-n-paste/toolbar-editor/Makefile.in
4619
--- evince-2.22.1/cut-n-paste/toolbar-editor/Makefile.in 2008-04-07 18:42:54.000000000 +0200
4620
+++ evince-2.22.1.new/cut-n-paste/toolbar-editor/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4365
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/cut-n-paste/toolbar-editor/Makefile.in evince-2.22.1.1.new/cut-n-paste/toolbar-editor/Makefile.in
4366
--- evince-2.22.1.1/cut-n-paste/toolbar-editor/Makefile.in 2008-04-08 21:19:03.000000000 +0200
4367
+++ evince-2.22.1.1.new/cut-n-paste/toolbar-editor/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4621
4368
@@ -1,8 +1,8 @@
4622
4369
-# Makefile.in generated by automake 1.10 from Makefile.am.
4623
4370
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4661
4408
HTML_DIR = @HTML_DIR@
4662
4409
INSTALL = @INSTALL@
4663
4410
INSTALL_DATA = @INSTALL_DATA@
4664
@@ -189,9 +194,11 @@
4665
MKINSTALLDIRS = @MKINSTALLDIRS@
4666
MSGFMT = @MSGFMT@
4667
MSGFMT_OPTS = @MSGFMT_OPTS@
4668
+MSGMERGE = @MSGMERGE@
4411
@@ -193,6 +198,7 @@
4669
4412
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4670
4413
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4671
4414
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4673
4416
OBJEXT = @OBJEXT@
4674
4417
OMF_DIR = @OMF_DIR@
4675
4418
PACKAGE = @PACKAGE@
4676
@@ -451,8 +458,8 @@
4419
@@ -452,8 +458,8 @@
4677
4420
unique=`for i in $$list; do \
4678
4421
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4679
4422
done | \
4684
4427
mkid -fID $$unique
4685
4428
tags: TAGS
4686
4429
4687
@@ -464,8 +471,8 @@
4430
@@ -465,8 +471,8 @@
4688
4431
unique=`for i in $$list; do \
4689
4432
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4690
4433
done | \
4695
4438
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4696
4439
test -n "$$unique" || unique=$$empty_fix; \
4697
4440
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4698
@@ -475,13 +482,12 @@
4441
@@ -476,13 +482,12 @@
4699
4442
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4700
4443
$(TAGS_FILES) $(LISP)
4701
4444
tags=; \
4711
4454
test -z "$(CTAGS_ARGS)$$tags$$unique" \
4712
4455
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4713
4456
$$tags $$unique
4714
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/cut-n-paste/totem-screensaver/Makefile.in evince-2.22.1.new/cut-n-paste/totem-screensaver/Makefile.in
4715
--- evince-2.22.1/cut-n-paste/totem-screensaver/Makefile.in 2008-04-07 18:42:55.000000000 +0200
4716
+++ evince-2.22.1.new/cut-n-paste/totem-screensaver/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4457
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/cut-n-paste/totem-screensaver/Makefile.in evince-2.22.1.1.new/cut-n-paste/totem-screensaver/Makefile.in
4458
--- evince-2.22.1.1/cut-n-paste/totem-screensaver/Makefile.in 2008-04-08 21:19:04.000000000 +0200
4459
+++ evince-2.22.1.1.new/cut-n-paste/totem-screensaver/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4717
4460
@@ -1,8 +1,8 @@
4718
4461
-# Makefile.in generated by automake 1.10 from Makefile.am.
4719
4462
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4757
4500
HTML_DIR = @HTML_DIR@
4758
4501
INSTALL = @INSTALL@
4759
4502
INSTALL_DATA = @INSTALL_DATA@
4760
@@ -180,9 +185,11 @@
4761
MKINSTALLDIRS = @MKINSTALLDIRS@
4762
MSGFMT = @MSGFMT@
4763
MSGFMT_OPTS = @MSGFMT_OPTS@
4764
+MSGMERGE = @MSGMERGE@
4503
@@ -184,6 +189,7 @@
4765
4504
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4766
4505
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4767
4506
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4769
4508
OBJEXT = @OBJEXT@
4770
4509
OMF_DIR = @OMF_DIR@
4771
4510
PACKAGE = @PACKAGE@
4772
@@ -370,8 +377,8 @@
4511
@@ -371,8 +377,8 @@
4773
4512
unique=`for i in $$list; do \
4774
4513
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4775
4514
done | \
4780
4519
mkid -fID $$unique
4781
4520
tags: TAGS
4782
4521
4783
@@ -383,8 +390,8 @@
4522
@@ -384,8 +390,8 @@
4784
4523
unique=`for i in $$list; do \
4785
4524
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4786
4525
done | \
4791
4530
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4792
4531
test -n "$$unique" || unique=$$empty_fix; \
4793
4532
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4794
@@ -394,13 +401,12 @@
4533
@@ -395,13 +401,12 @@
4795
4534
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4796
4535
$(TAGS_FILES) $(LISP)
4797
4536
tags=; \
4807
4546
test -z "$(CTAGS_ARGS)$$tags$$unique" \
4808
4547
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4809
4548
$$tags $$unique
4810
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/cut-n-paste/zoom-control/Makefile.in evince-2.22.1.new/cut-n-paste/zoom-control/Makefile.in
4811
--- evince-2.22.1/cut-n-paste/zoom-control/Makefile.in 2008-04-07 18:42:55.000000000 +0200
4812
+++ evince-2.22.1.new/cut-n-paste/zoom-control/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4549
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/cut-n-paste/zoom-control/Makefile.in evince-2.22.1.1.new/cut-n-paste/zoom-control/Makefile.in
4550
--- evince-2.22.1.1/cut-n-paste/zoom-control/Makefile.in 2008-04-08 21:19:04.000000000 +0200
4551
+++ evince-2.22.1.1.new/cut-n-paste/zoom-control/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4813
4552
@@ -1,8 +1,8 @@
4814
4553
-# Makefile.in generated by automake 1.10 from Makefile.am.
4815
4554
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4853
4592
HTML_DIR = @HTML_DIR@
4854
4593
INSTALL = @INSTALL@
4855
4594
INSTALL_DATA = @INSTALL_DATA@
4856
@@ -180,9 +185,11 @@
4857
MKINSTALLDIRS = @MKINSTALLDIRS@
4858
MSGFMT = @MSGFMT@
4859
MSGFMT_OPTS = @MSGFMT_OPTS@
4860
+MSGMERGE = @MSGMERGE@
4595
@@ -184,6 +189,7 @@
4861
4596
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4862
4597
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4863
4598
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4865
4600
OBJEXT = @OBJEXT@
4866
4601
OMF_DIR = @OMF_DIR@
4867
4602
PACKAGE = @PACKAGE@
4868
@@ -389,8 +396,8 @@
4603
@@ -390,8 +396,8 @@
4869
4604
unique=`for i in $$list; do \
4870
4605
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4871
4606
done | \
4876
4611
mkid -fID $$unique
4877
4612
tags: TAGS
4878
4613
4879
@@ -402,8 +409,8 @@
4614
@@ -403,8 +409,8 @@
4880
4615
unique=`for i in $$list; do \
4881
4616
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4882
4617
done | \
4887
4622
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4888
4623
test -n "$$unique" || unique=$$empty_fix; \
4889
4624
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4890
@@ -413,13 +420,12 @@
4625
@@ -414,13 +420,12 @@
4891
4626
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4892
4627
$(TAGS_FILES) $(LISP)
4893
4628
tags=; \
4903
4638
test -z "$(CTAGS_ARGS)$$tags$$unique" \
4904
4639
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4905
4640
$$tags $$unique
4906
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/16x16/actions/Makefile.in evince-2.22.1.new/data/icons/16x16/actions/Makefile.in
4907
--- evince-2.22.1/data/icons/16x16/actions/Makefile.in 2008-04-07 18:42:56.000000000 +0200
4908
+++ evince-2.22.1.new/data/icons/16x16/actions/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4909
@@ -1,8 +1,8 @@
4910
-# Makefile.in generated by automake 1.10 from Makefile.am.
4911
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4912
# @configure_input@
4913
4914
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4915
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4916
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4917
# This Makefile.in is free software; the Free Software Foundation
4918
# gives unlimited permission to copy and/or distribute it,
4919
# with or without modifications, as long as this notice is preserved.
4920
@@ -88,9 +88,11 @@
4921
DEFS = @DEFS@
4922
DEPDIR = @DEPDIR@
4923
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4924
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4925
DJVU_CFLAGS = @DJVU_CFLAGS@
4926
DJVU_LIBS = @DJVU_LIBS@
4927
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4928
+DSYMUTIL = @DSYMUTIL@
4929
ECHO = @ECHO@
4930
ECHO_C = @ECHO_C@
4931
ECHO_N = @ECHO_N@
4932
@@ -118,7 +120,10 @@
4933
GNOME_CFLAGS = @GNOME_CFLAGS@
4934
GNOME_LIBS = @GNOME_LIBS@
4935
GREP = @GREP@
4936
+GTKDOC_CHECK = @GTKDOC_CHECK@
4937
HELP_DIR = @HELP_DIR@
4938
+HILDON_CFLAGS = @HILDON_CFLAGS@
4939
+HILDON_LIBS = @HILDON_LIBS@
4940
HTML_DIR = @HTML_DIR@
4941
INSTALL = @INSTALL@
4942
INSTALL_DATA = @INSTALL_DATA@
4943
@@ -166,9 +171,11 @@
4944
MKINSTALLDIRS = @MKINSTALLDIRS@
4945
MSGFMT = @MSGFMT@
4946
MSGFMT_OPTS = @MSGFMT_OPTS@
4947
+MSGMERGE = @MSGMERGE@
4948
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4949
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4950
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4951
+NMEDIT = @NMEDIT@
4952
OBJEXT = @OBJEXT@
4953
OMF_DIR = @OMF_DIR@
4954
PACKAGE = @PACKAGE@
4955
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/16x16/apps/Makefile.in evince-2.22.1.new/data/icons/16x16/apps/Makefile.in
4956
--- evince-2.22.1/data/icons/16x16/apps/Makefile.in 2008-04-07 18:42:56.000000000 +0200
4957
+++ evince-2.22.1.new/data/icons/16x16/apps/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4958
@@ -1,8 +1,8 @@
4959
-# Makefile.in generated by automake 1.10 from Makefile.am.
4960
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4961
# @configure_input@
4962
4963
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4964
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4965
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4966
# This Makefile.in is free software; the Free Software Foundation
4967
# gives unlimited permission to copy and/or distribute it,
4968
# with or without modifications, as long as this notice is preserved.
4969
@@ -88,9 +88,11 @@
4970
DEFS = @DEFS@
4971
DEPDIR = @DEPDIR@
4972
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4973
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4974
DJVU_CFLAGS = @DJVU_CFLAGS@
4975
DJVU_LIBS = @DJVU_LIBS@
4976
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4977
+DSYMUTIL = @DSYMUTIL@
4978
ECHO = @ECHO@
4979
ECHO_C = @ECHO_C@
4980
ECHO_N = @ECHO_N@
4981
@@ -118,7 +120,10 @@
4982
GNOME_CFLAGS = @GNOME_CFLAGS@
4983
GNOME_LIBS = @GNOME_LIBS@
4984
GREP = @GREP@
4985
+GTKDOC_CHECK = @GTKDOC_CHECK@
4986
HELP_DIR = @HELP_DIR@
4987
+HILDON_CFLAGS = @HILDON_CFLAGS@
4988
+HILDON_LIBS = @HILDON_LIBS@
4989
HTML_DIR = @HTML_DIR@
4990
INSTALL = @INSTALL@
4991
INSTALL_DATA = @INSTALL_DATA@
4992
@@ -166,9 +171,11 @@
4993
MKINSTALLDIRS = @MKINSTALLDIRS@
4994
MSGFMT = @MSGFMT@
4995
MSGFMT_OPTS = @MSGFMT_OPTS@
4996
+MSGMERGE = @MSGMERGE@
4997
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4998
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4999
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5000
+NMEDIT = @NMEDIT@
5001
OBJEXT = @OBJEXT@
5002
OMF_DIR = @OMF_DIR@
5003
PACKAGE = @PACKAGE@
5004
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/16x16/Makefile.in evince-2.22.1.new/data/icons/16x16/Makefile.in
5005
--- evince-2.22.1/data/icons/16x16/Makefile.in 2008-04-07 18:42:56.000000000 +0200
5006
+++ evince-2.22.1.new/data/icons/16x16/Makefile.in 2008-04-07 22:46:12.000000000 +0200
5007
@@ -1,8 +1,8 @@
5008
-# Makefile.in generated by automake 1.10 from Makefile.am.
5009
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5010
# @configure_input@
5011
5012
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5013
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5014
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5015
# This Makefile.in is free software; the Free Software Foundation
5016
# gives unlimited permission to copy and/or distribute it,
5017
# with or without modifications, as long as this notice is preserved.
5018
@@ -90,9 +90,11 @@
5019
DEFS = @DEFS@
5020
DEPDIR = @DEPDIR@
5021
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5022
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5023
DJVU_CFLAGS = @DJVU_CFLAGS@
5024
DJVU_LIBS = @DJVU_LIBS@
5025
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5026
+DSYMUTIL = @DSYMUTIL@
5027
ECHO = @ECHO@
5028
ECHO_C = @ECHO_C@
5029
ECHO_N = @ECHO_N@
5030
@@ -120,7 +122,10 @@
5031
GNOME_CFLAGS = @GNOME_CFLAGS@
5032
GNOME_LIBS = @GNOME_LIBS@
5033
GREP = @GREP@
5034
+GTKDOC_CHECK = @GTKDOC_CHECK@
5035
HELP_DIR = @HELP_DIR@
5036
+HILDON_CFLAGS = @HILDON_CFLAGS@
5037
+HILDON_LIBS = @HILDON_LIBS@
5038
HTML_DIR = @HTML_DIR@
5039
INSTALL = @INSTALL@
5040
INSTALL_DATA = @INSTALL_DATA@
5041
@@ -168,9 +173,11 @@
5042
MKINSTALLDIRS = @MKINSTALLDIRS@
5043
MSGFMT = @MSGFMT@
5044
MSGFMT_OPTS = @MSGFMT_OPTS@
5045
+MSGMERGE = @MSGMERGE@
5046
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5047
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5048
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5049
+NMEDIT = @NMEDIT@
5050
OBJEXT = @OBJEXT@
5051
OMF_DIR = @OMF_DIR@
5052
PACKAGE = @PACKAGE@
5053
@@ -369,8 +376,8 @@
5054
unique=`for i in $$list; do \
5055
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5056
done | \
5057
- $(AWK) ' { files[$$0] = 1; } \
5058
- END { for (i in files) print i; }'`; \
5059
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5060
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5061
mkid -fID $$unique
5062
tags: TAGS
5063
5064
@@ -395,8 +402,8 @@
5065
unique=`for i in $$list; do \
5066
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5067
done | \
5068
- $(AWK) ' { files[$$0] = 1; } \
5069
- END { for (i in files) print i; }'`; \
5070
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5071
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5072
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5073
test -n "$$unique" || unique=$$empty_fix; \
5074
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5075
@@ -406,13 +413,12 @@
5076
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5077
$(TAGS_FILES) $(LISP)
5078
tags=; \
5079
- here=`pwd`; \
5080
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5081
unique=`for i in $$list; do \
5082
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5083
done | \
5084
- $(AWK) ' { files[$$0] = 1; } \
5085
- END { for (i in files) print i; }'`; \
5086
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5087
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5088
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5089
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5090
$$tags $$unique
5091
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/22x22/actions/Makefile.in evince-2.22.1.new/data/icons/22x22/actions/Makefile.in
5092
--- evince-2.22.1/data/icons/22x22/actions/Makefile.in 2008-04-07 18:42:57.000000000 +0200
5093
+++ evince-2.22.1.new/data/icons/22x22/actions/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5094
@@ -1,8 +1,8 @@
5095
-# Makefile.in generated by automake 1.10 from Makefile.am.
5096
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5097
# @configure_input@
5098
5099
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5100
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5101
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5102
# This Makefile.in is free software; the Free Software Foundation
5103
# gives unlimited permission to copy and/or distribute it,
5104
# with or without modifications, as long as this notice is preserved.
5105
@@ -88,9 +88,11 @@
5106
DEFS = @DEFS@
5107
DEPDIR = @DEPDIR@
5108
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5109
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5110
DJVU_CFLAGS = @DJVU_CFLAGS@
5111
DJVU_LIBS = @DJVU_LIBS@
5112
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5113
+DSYMUTIL = @DSYMUTIL@
5114
ECHO = @ECHO@
5115
ECHO_C = @ECHO_C@
5116
ECHO_N = @ECHO_N@
5117
@@ -118,7 +120,10 @@
5118
GNOME_CFLAGS = @GNOME_CFLAGS@
5119
GNOME_LIBS = @GNOME_LIBS@
5120
GREP = @GREP@
5121
+GTKDOC_CHECK = @GTKDOC_CHECK@
5122
HELP_DIR = @HELP_DIR@
5123
+HILDON_CFLAGS = @HILDON_CFLAGS@
5124
+HILDON_LIBS = @HILDON_LIBS@
5125
HTML_DIR = @HTML_DIR@
5126
INSTALL = @INSTALL@
5127
INSTALL_DATA = @INSTALL_DATA@
5128
@@ -166,9 +171,11 @@
5129
MKINSTALLDIRS = @MKINSTALLDIRS@
5130
MSGFMT = @MSGFMT@
5131
MSGFMT_OPTS = @MSGFMT_OPTS@
5132
+MSGMERGE = @MSGMERGE@
5133
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5134
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5135
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5136
+NMEDIT = @NMEDIT@
5137
OBJEXT = @OBJEXT@
5138
OMF_DIR = @OMF_DIR@
5139
PACKAGE = @PACKAGE@
5140
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/22x22/apps/Makefile.in evince-2.22.1.new/data/icons/22x22/apps/Makefile.in
5141
--- evince-2.22.1/data/icons/22x22/apps/Makefile.in 2008-04-07 18:42:58.000000000 +0200
5142
+++ evince-2.22.1.new/data/icons/22x22/apps/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5143
@@ -1,8 +1,8 @@
5144
-# Makefile.in generated by automake 1.10 from Makefile.am.
5145
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5146
# @configure_input@
5147
5148
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5149
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5150
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5151
# This Makefile.in is free software; the Free Software Foundation
5152
# gives unlimited permission to copy and/or distribute it,
5153
# with or without modifications, as long as this notice is preserved.
5154
@@ -88,9 +88,11 @@
5155
DEFS = @DEFS@
5156
DEPDIR = @DEPDIR@
5157
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5158
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5159
DJVU_CFLAGS = @DJVU_CFLAGS@
5160
DJVU_LIBS = @DJVU_LIBS@
5161
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5162
+DSYMUTIL = @DSYMUTIL@
5163
ECHO = @ECHO@
5164
ECHO_C = @ECHO_C@
5165
ECHO_N = @ECHO_N@
5166
@@ -118,7 +120,10 @@
5167
GNOME_CFLAGS = @GNOME_CFLAGS@
5168
GNOME_LIBS = @GNOME_LIBS@
5169
GREP = @GREP@
5170
+GTKDOC_CHECK = @GTKDOC_CHECK@
5171
HELP_DIR = @HELP_DIR@
5172
+HILDON_CFLAGS = @HILDON_CFLAGS@
5173
+HILDON_LIBS = @HILDON_LIBS@
5174
HTML_DIR = @HTML_DIR@
5175
INSTALL = @INSTALL@
5176
INSTALL_DATA = @INSTALL_DATA@
5177
@@ -166,9 +171,11 @@
5178
MKINSTALLDIRS = @MKINSTALLDIRS@
5179
MSGFMT = @MSGFMT@
5180
MSGFMT_OPTS = @MSGFMT_OPTS@
5181
+MSGMERGE = @MSGMERGE@
5182
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5183
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5184
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5185
+NMEDIT = @NMEDIT@
5186
OBJEXT = @OBJEXT@
5187
OMF_DIR = @OMF_DIR@
5188
PACKAGE = @PACKAGE@
5189
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/22x22/Makefile.in evince-2.22.1.new/data/icons/22x22/Makefile.in
5190
--- evince-2.22.1/data/icons/22x22/Makefile.in 2008-04-07 18:42:57.000000000 +0200
5191
+++ evince-2.22.1.new/data/icons/22x22/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5192
@@ -1,8 +1,8 @@
5193
-# Makefile.in generated by automake 1.10 from Makefile.am.
5194
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5195
# @configure_input@
5196
5197
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5198
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5199
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5200
# This Makefile.in is free software; the Free Software Foundation
5201
# gives unlimited permission to copy and/or distribute it,
5202
# with or without modifications, as long as this notice is preserved.
5203
@@ -90,9 +90,11 @@
5204
DEFS = @DEFS@
5205
DEPDIR = @DEPDIR@
5206
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5207
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5208
DJVU_CFLAGS = @DJVU_CFLAGS@
5209
DJVU_LIBS = @DJVU_LIBS@
5210
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5211
+DSYMUTIL = @DSYMUTIL@
5212
ECHO = @ECHO@
5213
ECHO_C = @ECHO_C@
5214
ECHO_N = @ECHO_N@
5215
@@ -120,7 +122,10 @@
5216
GNOME_CFLAGS = @GNOME_CFLAGS@
5217
GNOME_LIBS = @GNOME_LIBS@
5218
GREP = @GREP@
5219
+GTKDOC_CHECK = @GTKDOC_CHECK@
5220
HELP_DIR = @HELP_DIR@
5221
+HILDON_CFLAGS = @HILDON_CFLAGS@
5222
+HILDON_LIBS = @HILDON_LIBS@
5223
HTML_DIR = @HTML_DIR@
5224
INSTALL = @INSTALL@
5225
INSTALL_DATA = @INSTALL_DATA@
5226
@@ -168,9 +173,11 @@
5227
MKINSTALLDIRS = @MKINSTALLDIRS@
5228
MSGFMT = @MSGFMT@
5229
MSGFMT_OPTS = @MSGFMT_OPTS@
5230
+MSGMERGE = @MSGMERGE@
5231
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5232
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5233
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5234
+NMEDIT = @NMEDIT@
5235
OBJEXT = @OBJEXT@
5236
OMF_DIR = @OMF_DIR@
5237
PACKAGE = @PACKAGE@
5238
@@ -369,8 +376,8 @@
5239
unique=`for i in $$list; do \
5240
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5241
done | \
5242
- $(AWK) ' { files[$$0] = 1; } \
5243
- END { for (i in files) print i; }'`; \
5244
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5245
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5246
mkid -fID $$unique
5247
tags: TAGS
5248
5249
@@ -395,8 +402,8 @@
5250
unique=`for i in $$list; do \
5251
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5252
done | \
5253
- $(AWK) ' { files[$$0] = 1; } \
5254
- END { for (i in files) print i; }'`; \
5255
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5256
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5257
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5258
test -n "$$unique" || unique=$$empty_fix; \
5259
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5260
@@ -406,13 +413,12 @@
5261
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5262
$(TAGS_FILES) $(LISP)
5263
tags=; \
5264
- here=`pwd`; \
5265
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5266
unique=`for i in $$list; do \
5267
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5268
done | \
5269
- $(AWK) ' { files[$$0] = 1; } \
5270
- END { for (i in files) print i; }'`; \
5271
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5272
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5273
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5274
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5275
$$tags $$unique
5276
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/24x24/actions/Makefile.in evince-2.22.1.new/data/icons/24x24/actions/Makefile.in
5277
--- evince-2.22.1/data/icons/24x24/actions/Makefile.in 2008-04-07 18:42:59.000000000 +0200
5278
+++ evince-2.22.1.new/data/icons/24x24/actions/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5279
@@ -1,8 +1,8 @@
5280
-# Makefile.in generated by automake 1.10 from Makefile.am.
5281
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5282
# @configure_input@
5283
5284
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5285
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5286
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5287
# This Makefile.in is free software; the Free Software Foundation
5288
# gives unlimited permission to copy and/or distribute it,
5289
# with or without modifications, as long as this notice is preserved.
5290
@@ -88,9 +88,11 @@
5291
DEFS = @DEFS@
5292
DEPDIR = @DEPDIR@
5293
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5294
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5295
DJVU_CFLAGS = @DJVU_CFLAGS@
5296
DJVU_LIBS = @DJVU_LIBS@
5297
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5298
+DSYMUTIL = @DSYMUTIL@
5299
ECHO = @ECHO@
5300
ECHO_C = @ECHO_C@
5301
ECHO_N = @ECHO_N@
5302
@@ -118,7 +120,10 @@
5303
GNOME_CFLAGS = @GNOME_CFLAGS@
5304
GNOME_LIBS = @GNOME_LIBS@
5305
GREP = @GREP@
5306
+GTKDOC_CHECK = @GTKDOC_CHECK@
5307
HELP_DIR = @HELP_DIR@
5308
+HILDON_CFLAGS = @HILDON_CFLAGS@
5309
+HILDON_LIBS = @HILDON_LIBS@
5310
HTML_DIR = @HTML_DIR@
5311
INSTALL = @INSTALL@
5312
INSTALL_DATA = @INSTALL_DATA@
5313
@@ -166,9 +171,11 @@
5314
MKINSTALLDIRS = @MKINSTALLDIRS@
5315
MSGFMT = @MSGFMT@
5316
MSGFMT_OPTS = @MSGFMT_OPTS@
5317
+MSGMERGE = @MSGMERGE@
5318
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5319
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5320
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5321
+NMEDIT = @NMEDIT@
5322
OBJEXT = @OBJEXT@
5323
OMF_DIR = @OMF_DIR@
5324
PACKAGE = @PACKAGE@
5325
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/24x24/apps/Makefile.in evince-2.22.1.new/data/icons/24x24/apps/Makefile.in
5326
--- evince-2.22.1/data/icons/24x24/apps/Makefile.in 2008-04-07 18:42:59.000000000 +0200
5327
+++ evince-2.22.1.new/data/icons/24x24/apps/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5328
@@ -1,8 +1,8 @@
5329
-# Makefile.in generated by automake 1.10 from Makefile.am.
5330
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5331
# @configure_input@
5332
5333
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5334
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5335
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5336
# This Makefile.in is free software; the Free Software Foundation
5337
# gives unlimited permission to copy and/or distribute it,
5338
# with or without modifications, as long as this notice is preserved.
5339
@@ -88,9 +88,11 @@
5340
DEFS = @DEFS@
5341
DEPDIR = @DEPDIR@
5342
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5343
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5344
DJVU_CFLAGS = @DJVU_CFLAGS@
5345
DJVU_LIBS = @DJVU_LIBS@
5346
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5347
+DSYMUTIL = @DSYMUTIL@
5348
ECHO = @ECHO@
5349
ECHO_C = @ECHO_C@
5350
ECHO_N = @ECHO_N@
5351
@@ -118,7 +120,10 @@
5352
GNOME_CFLAGS = @GNOME_CFLAGS@
5353
GNOME_LIBS = @GNOME_LIBS@
5354
GREP = @GREP@
5355
+GTKDOC_CHECK = @GTKDOC_CHECK@
5356
HELP_DIR = @HELP_DIR@
5357
+HILDON_CFLAGS = @HILDON_CFLAGS@
5358
+HILDON_LIBS = @HILDON_LIBS@
5359
HTML_DIR = @HTML_DIR@
5360
INSTALL = @INSTALL@
5361
INSTALL_DATA = @INSTALL_DATA@
5362
@@ -166,9 +171,11 @@
5363
MKINSTALLDIRS = @MKINSTALLDIRS@
5364
MSGFMT = @MSGFMT@
5365
MSGFMT_OPTS = @MSGFMT_OPTS@
5366
+MSGMERGE = @MSGMERGE@
5367
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5368
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5369
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5370
+NMEDIT = @NMEDIT@
5371
OBJEXT = @OBJEXT@
5372
OMF_DIR = @OMF_DIR@
5373
PACKAGE = @PACKAGE@
5374
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/24x24/Makefile.in evince-2.22.1.new/data/icons/24x24/Makefile.in
5375
--- evince-2.22.1/data/icons/24x24/Makefile.in 2008-04-07 18:42:58.000000000 +0200
5376
+++ evince-2.22.1.new/data/icons/24x24/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5377
@@ -1,8 +1,8 @@
5378
-# Makefile.in generated by automake 1.10 from Makefile.am.
5379
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5380
# @configure_input@
5381
5382
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5383
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5384
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5385
# This Makefile.in is free software; the Free Software Foundation
5386
# gives unlimited permission to copy and/or distribute it,
5387
# with or without modifications, as long as this notice is preserved.
5388
@@ -90,9 +90,11 @@
5389
DEFS = @DEFS@
5390
DEPDIR = @DEPDIR@
5391
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5392
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5393
DJVU_CFLAGS = @DJVU_CFLAGS@
5394
DJVU_LIBS = @DJVU_LIBS@
5395
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5396
+DSYMUTIL = @DSYMUTIL@
5397
ECHO = @ECHO@
5398
ECHO_C = @ECHO_C@
5399
ECHO_N = @ECHO_N@
5400
@@ -120,7 +122,10 @@
5401
GNOME_CFLAGS = @GNOME_CFLAGS@
5402
GNOME_LIBS = @GNOME_LIBS@
5403
GREP = @GREP@
5404
+GTKDOC_CHECK = @GTKDOC_CHECK@
5405
HELP_DIR = @HELP_DIR@
5406
+HILDON_CFLAGS = @HILDON_CFLAGS@
5407
+HILDON_LIBS = @HILDON_LIBS@
5408
HTML_DIR = @HTML_DIR@
5409
INSTALL = @INSTALL@
5410
INSTALL_DATA = @INSTALL_DATA@
5411
@@ -168,9 +173,11 @@
5412
MKINSTALLDIRS = @MKINSTALLDIRS@
5413
MSGFMT = @MSGFMT@
5414
MSGFMT_OPTS = @MSGFMT_OPTS@
5415
+MSGMERGE = @MSGMERGE@
5416
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5417
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5418
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5419
+NMEDIT = @NMEDIT@
5420
OBJEXT = @OBJEXT@
5421
OMF_DIR = @OMF_DIR@
5422
PACKAGE = @PACKAGE@
5423
@@ -369,8 +376,8 @@
5424
unique=`for i in $$list; do \
5425
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5426
done | \
5427
- $(AWK) ' { files[$$0] = 1; } \
5428
- END { for (i in files) print i; }'`; \
5429
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5430
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5431
mkid -fID $$unique
5432
tags: TAGS
5433
5434
@@ -395,8 +402,8 @@
5435
unique=`for i in $$list; do \
5436
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5437
done | \
5438
- $(AWK) ' { files[$$0] = 1; } \
5439
- END { for (i in files) print i; }'`; \
5440
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5441
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5442
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5443
test -n "$$unique" || unique=$$empty_fix; \
5444
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5445
@@ -406,13 +413,12 @@
5446
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5447
$(TAGS_FILES) $(LISP)
5448
tags=; \
5449
- here=`pwd`; \
5450
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5451
unique=`for i in $$list; do \
5452
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5453
done | \
5454
- $(AWK) ' { files[$$0] = 1; } \
5455
- END { for (i in files) print i; }'`; \
5456
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5457
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5458
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5459
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5460
$$tags $$unique
5461
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/32x32/actions/Makefile.in evince-2.22.1.new/data/icons/32x32/actions/Makefile.in
5462
--- evince-2.22.1/data/icons/32x32/actions/Makefile.in 2008-04-07 18:43:00.000000000 +0200
5463
+++ evince-2.22.1.new/data/icons/32x32/actions/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5464
@@ -1,8 +1,8 @@
5465
-# Makefile.in generated by automake 1.10 from Makefile.am.
5466
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5467
# @configure_input@
5468
5469
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5470
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5471
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5472
# This Makefile.in is free software; the Free Software Foundation
5473
# gives unlimited permission to copy and/or distribute it,
5474
# with or without modifications, as long as this notice is preserved.
5475
@@ -88,9 +88,11 @@
5476
DEFS = @DEFS@
5477
DEPDIR = @DEPDIR@
5478
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5479
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5480
DJVU_CFLAGS = @DJVU_CFLAGS@
5481
DJVU_LIBS = @DJVU_LIBS@
5482
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5483
+DSYMUTIL = @DSYMUTIL@
5484
ECHO = @ECHO@
5485
ECHO_C = @ECHO_C@
5486
ECHO_N = @ECHO_N@
5487
@@ -118,7 +120,10 @@
5488
GNOME_CFLAGS = @GNOME_CFLAGS@
5489
GNOME_LIBS = @GNOME_LIBS@
5490
GREP = @GREP@
5491
+GTKDOC_CHECK = @GTKDOC_CHECK@
5492
HELP_DIR = @HELP_DIR@
5493
+HILDON_CFLAGS = @HILDON_CFLAGS@
5494
+HILDON_LIBS = @HILDON_LIBS@
5495
HTML_DIR = @HTML_DIR@
5496
INSTALL = @INSTALL@
5497
INSTALL_DATA = @INSTALL_DATA@
5498
@@ -166,9 +171,11 @@
5499
MKINSTALLDIRS = @MKINSTALLDIRS@
5500
MSGFMT = @MSGFMT@
5501
MSGFMT_OPTS = @MSGFMT_OPTS@
5502
+MSGMERGE = @MSGMERGE@
5503
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5504
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5505
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5506
+NMEDIT = @NMEDIT@
5507
OBJEXT = @OBJEXT@
5508
OMF_DIR = @OMF_DIR@
5509
PACKAGE = @PACKAGE@
5510
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/32x32/Makefile.in evince-2.22.1.new/data/icons/32x32/Makefile.in
5511
--- evince-2.22.1/data/icons/32x32/Makefile.in 2008-04-07 18:43:00.000000000 +0200
5512
+++ evince-2.22.1.new/data/icons/32x32/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5513
@@ -1,8 +1,8 @@
5514
-# Makefile.in generated by automake 1.10 from Makefile.am.
5515
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5516
# @configure_input@
5517
5518
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5519
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5520
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5521
# This Makefile.in is free software; the Free Software Foundation
5522
# gives unlimited permission to copy and/or distribute it,
5523
# with or without modifications, as long as this notice is preserved.
5524
@@ -90,9 +90,11 @@
5525
DEFS = @DEFS@
5526
DEPDIR = @DEPDIR@
5527
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5528
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5529
DJVU_CFLAGS = @DJVU_CFLAGS@
5530
DJVU_LIBS = @DJVU_LIBS@
5531
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5532
+DSYMUTIL = @DSYMUTIL@
5533
ECHO = @ECHO@
5534
ECHO_C = @ECHO_C@
5535
ECHO_N = @ECHO_N@
5536
@@ -120,7 +122,10 @@
5537
GNOME_CFLAGS = @GNOME_CFLAGS@
5538
GNOME_LIBS = @GNOME_LIBS@
5539
GREP = @GREP@
5540
+GTKDOC_CHECK = @GTKDOC_CHECK@
5541
HELP_DIR = @HELP_DIR@
5542
+HILDON_CFLAGS = @HILDON_CFLAGS@
5543
+HILDON_LIBS = @HILDON_LIBS@
5544
HTML_DIR = @HTML_DIR@
5545
INSTALL = @INSTALL@
5546
INSTALL_DATA = @INSTALL_DATA@
5547
@@ -168,9 +173,11 @@
5548
MKINSTALLDIRS = @MKINSTALLDIRS@
5549
MSGFMT = @MSGFMT@
5550
MSGFMT_OPTS = @MSGFMT_OPTS@
5551
+MSGMERGE = @MSGMERGE@
5552
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5553
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5554
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5555
+NMEDIT = @NMEDIT@
5556
OBJEXT = @OBJEXT@
5557
OMF_DIR = @OMF_DIR@
5558
PACKAGE = @PACKAGE@
5559
@@ -369,8 +376,8 @@
5560
unique=`for i in $$list; do \
5561
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5562
done | \
5563
- $(AWK) ' { files[$$0] = 1; } \
5564
- END { for (i in files) print i; }'`; \
5565
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5566
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5567
mkid -fID $$unique
5568
tags: TAGS
5569
5570
@@ -395,8 +402,8 @@
5571
unique=`for i in $$list; do \
5572
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5573
done | \
5574
- $(AWK) ' { files[$$0] = 1; } \
5575
- END { for (i in files) print i; }'`; \
5576
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5577
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5578
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5579
test -n "$$unique" || unique=$$empty_fix; \
5580
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5581
@@ -406,13 +413,12 @@
5582
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5583
$(TAGS_FILES) $(LISP)
5584
tags=; \
5585
- here=`pwd`; \
5586
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5587
unique=`for i in $$list; do \
5588
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5589
done | \
5590
- $(AWK) ' { files[$$0] = 1; } \
5591
- END { for (i in files) print i; }'`; \
5592
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5593
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5594
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5595
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5596
$$tags $$unique
5597
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/48x48/actions/Makefile.in evince-2.22.1.new/data/icons/48x48/actions/Makefile.in
5598
--- evince-2.22.1/data/icons/48x48/actions/Makefile.in 2008-04-07 18:43:01.000000000 +0200
5599
+++ evince-2.22.1.new/data/icons/48x48/actions/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5600
@@ -1,8 +1,8 @@
5601
-# Makefile.in generated by automake 1.10 from Makefile.am.
5602
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5603
# @configure_input@
5604
5605
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5606
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5607
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5608
# This Makefile.in is free software; the Free Software Foundation
5609
# gives unlimited permission to copy and/or distribute it,
5610
# with or without modifications, as long as this notice is preserved.
5611
@@ -88,9 +88,11 @@
5612
DEFS = @DEFS@
5613
DEPDIR = @DEPDIR@
5614
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5615
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5616
DJVU_CFLAGS = @DJVU_CFLAGS@
5617
DJVU_LIBS = @DJVU_LIBS@
5618
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5619
+DSYMUTIL = @DSYMUTIL@
5620
ECHO = @ECHO@
5621
ECHO_C = @ECHO_C@
5622
ECHO_N = @ECHO_N@
5623
@@ -118,7 +120,10 @@
5624
GNOME_CFLAGS = @GNOME_CFLAGS@
5625
GNOME_LIBS = @GNOME_LIBS@
5626
GREP = @GREP@
5627
+GTKDOC_CHECK = @GTKDOC_CHECK@
5628
HELP_DIR = @HELP_DIR@
5629
+HILDON_CFLAGS = @HILDON_CFLAGS@
5630
+HILDON_LIBS = @HILDON_LIBS@
5631
HTML_DIR = @HTML_DIR@
5632
INSTALL = @INSTALL@
5633
INSTALL_DATA = @INSTALL_DATA@
5634
@@ -166,9 +171,11 @@
5635
MKINSTALLDIRS = @MKINSTALLDIRS@
5636
MSGFMT = @MSGFMT@
5637
MSGFMT_OPTS = @MSGFMT_OPTS@
5638
+MSGMERGE = @MSGMERGE@
5639
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5640
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5641
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5642
+NMEDIT = @NMEDIT@
5643
OBJEXT = @OBJEXT@
5644
OMF_DIR = @OMF_DIR@
5645
PACKAGE = @PACKAGE@
5646
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/48x48/apps/Makefile.in evince-2.22.1.new/data/icons/48x48/apps/Makefile.in
5647
--- evince-2.22.1/data/icons/48x48/apps/Makefile.in 2008-04-07 18:43:01.000000000 +0200
5648
+++ evince-2.22.1.new/data/icons/48x48/apps/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5649
@@ -1,8 +1,8 @@
5650
-# Makefile.in generated by automake 1.10 from Makefile.am.
5651
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5652
# @configure_input@
5653
5654
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5655
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5656
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5657
# This Makefile.in is free software; the Free Software Foundation
5658
# gives unlimited permission to copy and/or distribute it,
5659
# with or without modifications, as long as this notice is preserved.
5660
@@ -88,9 +88,11 @@
5661
DEFS = @DEFS@
5662
DEPDIR = @DEPDIR@
5663
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5664
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5665
DJVU_CFLAGS = @DJVU_CFLAGS@
5666
DJVU_LIBS = @DJVU_LIBS@
5667
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5668
+DSYMUTIL = @DSYMUTIL@
5669
ECHO = @ECHO@
5670
ECHO_C = @ECHO_C@
5671
ECHO_N = @ECHO_N@
5672
@@ -118,7 +120,10 @@
5673
GNOME_CFLAGS = @GNOME_CFLAGS@
5674
GNOME_LIBS = @GNOME_LIBS@
5675
GREP = @GREP@
5676
+GTKDOC_CHECK = @GTKDOC_CHECK@
5677
HELP_DIR = @HELP_DIR@
5678
+HILDON_CFLAGS = @HILDON_CFLAGS@
5679
+HILDON_LIBS = @HILDON_LIBS@
5680
HTML_DIR = @HTML_DIR@
5681
INSTALL = @INSTALL@
5682
INSTALL_DATA = @INSTALL_DATA@
5683
@@ -166,9 +171,11 @@
5684
MKINSTALLDIRS = @MKINSTALLDIRS@
5685
MSGFMT = @MSGFMT@
5686
MSGFMT_OPTS = @MSGFMT_OPTS@
5687
+MSGMERGE = @MSGMERGE@
5688
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5689
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5690
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5691
+NMEDIT = @NMEDIT@
5692
OBJEXT = @OBJEXT@
5693
OMF_DIR = @OMF_DIR@
5694
PACKAGE = @PACKAGE@
5695
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/48x48/Makefile.in evince-2.22.1.new/data/icons/48x48/Makefile.in
5696
--- evince-2.22.1/data/icons/48x48/Makefile.in 2008-04-07 18:43:00.000000000 +0200
5697
+++ evince-2.22.1.new/data/icons/48x48/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5698
@@ -1,8 +1,8 @@
5699
-# Makefile.in generated by automake 1.10 from Makefile.am.
5700
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5701
# @configure_input@
5702
5703
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5704
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5705
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5706
# This Makefile.in is free software; the Free Software Foundation
5707
# gives unlimited permission to copy and/or distribute it,
5708
# with or without modifications, as long as this notice is preserved.
5709
@@ -90,9 +90,11 @@
5710
DEFS = @DEFS@
5711
DEPDIR = @DEPDIR@
5712
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5713
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5714
DJVU_CFLAGS = @DJVU_CFLAGS@
5715
DJVU_LIBS = @DJVU_LIBS@
5716
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5717
+DSYMUTIL = @DSYMUTIL@
5718
ECHO = @ECHO@
5719
ECHO_C = @ECHO_C@
5720
ECHO_N = @ECHO_N@
5721
@@ -120,7 +122,10 @@
5722
GNOME_CFLAGS = @GNOME_CFLAGS@
5723
GNOME_LIBS = @GNOME_LIBS@
5724
GREP = @GREP@
5725
+GTKDOC_CHECK = @GTKDOC_CHECK@
5726
HELP_DIR = @HELP_DIR@
5727
+HILDON_CFLAGS = @HILDON_CFLAGS@
5728
+HILDON_LIBS = @HILDON_LIBS@
5729
HTML_DIR = @HTML_DIR@
5730
INSTALL = @INSTALL@
5731
INSTALL_DATA = @INSTALL_DATA@
5732
@@ -168,9 +173,11 @@
5733
MKINSTALLDIRS = @MKINSTALLDIRS@
5734
MSGFMT = @MSGFMT@
5735
MSGFMT_OPTS = @MSGFMT_OPTS@
5736
+MSGMERGE = @MSGMERGE@
5737
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5738
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5739
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5740
+NMEDIT = @NMEDIT@
5741
OBJEXT = @OBJEXT@
5742
OMF_DIR = @OMF_DIR@
5743
PACKAGE = @PACKAGE@
5744
@@ -369,8 +376,8 @@
5745
unique=`for i in $$list; do \
5746
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5747
done | \
5748
- $(AWK) ' { files[$$0] = 1; } \
5749
- END { for (i in files) print i; }'`; \
5750
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5751
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5752
mkid -fID $$unique
5753
tags: TAGS
5754
5755
@@ -395,8 +402,8 @@
5756
unique=`for i in $$list; do \
5757
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5758
done | \
5759
- $(AWK) ' { files[$$0] = 1; } \
5760
- END { for (i in files) print i; }'`; \
5761
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5762
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5763
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5764
test -n "$$unique" || unique=$$empty_fix; \
5765
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5766
@@ -406,13 +413,12 @@
5767
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5768
$(TAGS_FILES) $(LISP)
5769
tags=; \
5770
- here=`pwd`; \
5771
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5772
unique=`for i in $$list; do \
5773
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5774
done | \
5775
- $(AWK) ' { files[$$0] = 1; } \
5776
- END { for (i in files) print i; }'`; \
5777
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5778
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5779
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5780
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5781
$$tags $$unique
5782
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/Makefile.in evince-2.22.1.new/data/icons/Makefile.in
5783
--- evince-2.22.1/data/icons/Makefile.in 2008-04-07 18:43:02.000000000 +0200
5784
+++ evince-2.22.1.new/data/icons/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5785
@@ -1,8 +1,8 @@
5786
-# Makefile.in generated by automake 1.10 from Makefile.am.
5787
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5788
# @configure_input@
5789
5790
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5791
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5792
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5793
# This Makefile.in is free software; the Free Software Foundation
5794
# gives unlimited permission to copy and/or distribute it,
5795
# with or without modifications, as long as this notice is preserved.
5796
@@ -90,9 +90,11 @@
5797
DEFS = @DEFS@
5798
DEPDIR = @DEPDIR@
5799
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5800
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5801
DJVU_CFLAGS = @DJVU_CFLAGS@
5802
DJVU_LIBS = @DJVU_LIBS@
5803
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5804
+DSYMUTIL = @DSYMUTIL@
5805
ECHO = @ECHO@
5806
ECHO_C = @ECHO_C@
5807
ECHO_N = @ECHO_N@
5808
@@ -120,7 +122,10 @@
5809
GNOME_CFLAGS = @GNOME_CFLAGS@
5810
GNOME_LIBS = @GNOME_LIBS@
5811
GREP = @GREP@
5812
+GTKDOC_CHECK = @GTKDOC_CHECK@
5813
HELP_DIR = @HELP_DIR@
5814
+HILDON_CFLAGS = @HILDON_CFLAGS@
5815
+HILDON_LIBS = @HILDON_LIBS@
5816
HTML_DIR = @HTML_DIR@
5817
INSTALL = @INSTALL@
5818
INSTALL_DATA = @INSTALL_DATA@
5819
@@ -168,9 +173,11 @@
5820
MKINSTALLDIRS = @MKINSTALLDIRS@
5821
MSGFMT = @MSGFMT@
5822
MSGFMT_OPTS = @MSGFMT_OPTS@
5823
+MSGMERGE = @MSGMERGE@
5824
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5825
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5826
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5827
+NMEDIT = @NMEDIT@
5828
OBJEXT = @OBJEXT@
5829
OMF_DIR = @OMF_DIR@
5830
PACKAGE = @PACKAGE@
5831
@@ -369,8 +376,8 @@
5832
unique=`for i in $$list; do \
5833
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5834
done | \
5835
- $(AWK) ' { files[$$0] = 1; } \
5836
- END { for (i in files) print i; }'`; \
5837
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5838
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5839
mkid -fID $$unique
5840
tags: TAGS
5841
5842
@@ -395,8 +402,8 @@
5843
unique=`for i in $$list; do \
5844
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5845
done | \
5846
- $(AWK) ' { files[$$0] = 1; } \
5847
- END { for (i in files) print i; }'`; \
5848
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5849
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5850
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5851
test -n "$$unique" || unique=$$empty_fix; \
5852
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5853
@@ -406,13 +413,12 @@
5854
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5855
$(TAGS_FILES) $(LISP)
5856
tags=; \
5857
- here=`pwd`; \
5858
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5859
unique=`for i in $$list; do \
5860
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5861
done | \
5862
- $(AWK) ' { files[$$0] = 1; } \
5863
- END { for (i in files) print i; }'`; \
5864
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5865
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5866
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5867
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5868
$$tags $$unique
5869
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/scalable/apps/Makefile.in evince-2.22.1.new/data/icons/scalable/apps/Makefile.in
5870
--- evince-2.22.1/data/icons/scalable/apps/Makefile.in 2008-04-07 18:43:02.000000000 +0200
5871
+++ evince-2.22.1.new/data/icons/scalable/apps/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5872
@@ -1,8 +1,8 @@
5873
-# Makefile.in generated by automake 1.10 from Makefile.am.
5874
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5875
# @configure_input@
5876
5877
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5878
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5879
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5880
# This Makefile.in is free software; the Free Software Foundation
5881
# gives unlimited permission to copy and/or distribute it,
5882
# with or without modifications, as long as this notice is preserved.
5883
@@ -88,9 +88,11 @@
5884
DEFS = @DEFS@
5885
DEPDIR = @DEPDIR@
5886
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5887
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5888
DJVU_CFLAGS = @DJVU_CFLAGS@
5889
DJVU_LIBS = @DJVU_LIBS@
5890
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5891
+DSYMUTIL = @DSYMUTIL@
5892
ECHO = @ECHO@
5893
ECHO_C = @ECHO_C@
5894
ECHO_N = @ECHO_N@
5895
@@ -118,7 +120,10 @@
5896
GNOME_CFLAGS = @GNOME_CFLAGS@
5897
GNOME_LIBS = @GNOME_LIBS@
5898
GREP = @GREP@
5899
+GTKDOC_CHECK = @GTKDOC_CHECK@
5900
HELP_DIR = @HELP_DIR@
5901
+HILDON_CFLAGS = @HILDON_CFLAGS@
5902
+HILDON_LIBS = @HILDON_LIBS@
5903
HTML_DIR = @HTML_DIR@
5904
INSTALL = @INSTALL@
5905
INSTALL_DATA = @INSTALL_DATA@
5906
@@ -166,9 +171,11 @@
5907
MKINSTALLDIRS = @MKINSTALLDIRS@
5908
MSGFMT = @MSGFMT@
5909
MSGFMT_OPTS = @MSGFMT_OPTS@
5910
+MSGMERGE = @MSGMERGE@
5911
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5912
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5913
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5914
+NMEDIT = @NMEDIT@
5915
OBJEXT = @OBJEXT@
5916
OMF_DIR = @OMF_DIR@
5917
PACKAGE = @PACKAGE@
5918
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/icons/scalable/Makefile.in evince-2.22.1.new/data/icons/scalable/Makefile.in
5919
--- evince-2.22.1/data/icons/scalable/Makefile.in 2008-04-07 18:43:02.000000000 +0200
5920
+++ evince-2.22.1.new/data/icons/scalable/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5921
@@ -1,8 +1,8 @@
5922
-# Makefile.in generated by automake 1.10 from Makefile.am.
5923
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5924
# @configure_input@
5925
5926
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5927
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5928
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5929
# This Makefile.in is free software; the Free Software Foundation
5930
# gives unlimited permission to copy and/or distribute it,
5931
# with or without modifications, as long as this notice is preserved.
5932
@@ -90,9 +90,11 @@
5933
DEFS = @DEFS@
5934
DEPDIR = @DEPDIR@
5935
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5936
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5937
DJVU_CFLAGS = @DJVU_CFLAGS@
5938
DJVU_LIBS = @DJVU_LIBS@
5939
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5940
+DSYMUTIL = @DSYMUTIL@
5941
ECHO = @ECHO@
5942
ECHO_C = @ECHO_C@
5943
ECHO_N = @ECHO_N@
5944
@@ -120,7 +122,10 @@
5945
GNOME_CFLAGS = @GNOME_CFLAGS@
5946
GNOME_LIBS = @GNOME_LIBS@
5947
GREP = @GREP@
5948
+GTKDOC_CHECK = @GTKDOC_CHECK@
5949
HELP_DIR = @HELP_DIR@
5950
+HILDON_CFLAGS = @HILDON_CFLAGS@
5951
+HILDON_LIBS = @HILDON_LIBS@
5952
HTML_DIR = @HTML_DIR@
5953
INSTALL = @INSTALL@
5954
INSTALL_DATA = @INSTALL_DATA@
5955
@@ -168,9 +173,11 @@
5956
MKINSTALLDIRS = @MKINSTALLDIRS@
5957
MSGFMT = @MSGFMT@
5958
MSGFMT_OPTS = @MSGFMT_OPTS@
5959
+MSGMERGE = @MSGMERGE@
5960
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5961
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5962
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5963
+NMEDIT = @NMEDIT@
5964
OBJEXT = @OBJEXT@
5965
OMF_DIR = @OMF_DIR@
5966
PACKAGE = @PACKAGE@
5967
@@ -369,8 +376,8 @@
5968
unique=`for i in $$list; do \
5969
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5970
done | \
5971
- $(AWK) ' { files[$$0] = 1; } \
5972
- END { for (i in files) print i; }'`; \
5973
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5974
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5975
mkid -fID $$unique
5976
tags: TAGS
5977
5978
@@ -395,8 +402,8 @@
5979
unique=`for i in $$list; do \
5980
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5981
done | \
5982
- $(AWK) ' { files[$$0] = 1; } \
5983
- END { for (i in files) print i; }'`; \
5984
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5985
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5986
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5987
test -n "$$unique" || unique=$$empty_fix; \
5988
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5989
@@ -406,13 +413,12 @@
5990
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5991
$(TAGS_FILES) $(LISP)
5992
tags=; \
5993
- here=`pwd`; \
5994
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5995
unique=`for i in $$list; do \
5996
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5997
done | \
5998
- $(AWK) ' { files[$$0] = 1; } \
5999
- END { for (i in files) print i; }'`; \
6000
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
6001
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
6002
test -z "$(CTAGS_ARGS)$$tags$$unique" \
6003
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6004
$$tags $$unique
6005
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/data/Makefile.in evince-2.22.1.new/data/Makefile.in
6006
--- evince-2.22.1/data/Makefile.in 2008-04-07 18:42:55.000000000 +0200
6007
+++ evince-2.22.1.new/data/Makefile.in 2008-04-07 22:46:12.000000000 +0200
4641
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/16x16/actions/Makefile.in evince-2.22.1.1.new/data/icons/16x16/actions/Makefile.in
4642
--- evince-2.22.1.1/data/icons/16x16/actions/Makefile.in 2008-04-08 21:19:05.000000000 +0200
4643
+++ evince-2.22.1.1.new/data/icons/16x16/actions/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4644
@@ -1,8 +1,8 @@
4645
-# Makefile.in generated by automake 1.10 from Makefile.am.
4646
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4647
# @configure_input@
4648
4649
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4650
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4651
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4652
# This Makefile.in is free software; the Free Software Foundation
4653
# gives unlimited permission to copy and/or distribute it,
4654
# with or without modifications, as long as this notice is preserved.
4655
@@ -88,9 +88,11 @@
4656
DEFS = @DEFS@
4657
DEPDIR = @DEPDIR@
4658
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4659
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4660
DJVU_CFLAGS = @DJVU_CFLAGS@
4661
DJVU_LIBS = @DJVU_LIBS@
4662
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4663
+DSYMUTIL = @DSYMUTIL@
4664
ECHO = @ECHO@
4665
ECHO_C = @ECHO_C@
4666
ECHO_N = @ECHO_N@
4667
@@ -118,7 +120,10 @@
4668
GNOME_CFLAGS = @GNOME_CFLAGS@
4669
GNOME_LIBS = @GNOME_LIBS@
4670
GREP = @GREP@
4671
+GTKDOC_CHECK = @GTKDOC_CHECK@
4672
HELP_DIR = @HELP_DIR@
4673
+HILDON_CFLAGS = @HILDON_CFLAGS@
4674
+HILDON_LIBS = @HILDON_LIBS@
4675
HTML_DIR = @HTML_DIR@
4676
INSTALL = @INSTALL@
4677
INSTALL_DATA = @INSTALL_DATA@
4678
@@ -170,6 +175,7 @@
4679
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4680
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4681
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4682
+NMEDIT = @NMEDIT@
4683
OBJEXT = @OBJEXT@
4684
OMF_DIR = @OMF_DIR@
4685
PACKAGE = @PACKAGE@
4686
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/16x16/apps/Makefile.in evince-2.22.1.1.new/data/icons/16x16/apps/Makefile.in
4687
--- evince-2.22.1.1/data/icons/16x16/apps/Makefile.in 2008-04-08 21:19:05.000000000 +0200
4688
+++ evince-2.22.1.1.new/data/icons/16x16/apps/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4689
@@ -1,8 +1,8 @@
4690
-# Makefile.in generated by automake 1.10 from Makefile.am.
4691
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4692
# @configure_input@
4693
4694
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4695
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4696
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4697
# This Makefile.in is free software; the Free Software Foundation
4698
# gives unlimited permission to copy and/or distribute it,
4699
# with or without modifications, as long as this notice is preserved.
4700
@@ -88,9 +88,11 @@
4701
DEFS = @DEFS@
4702
DEPDIR = @DEPDIR@
4703
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4704
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4705
DJVU_CFLAGS = @DJVU_CFLAGS@
4706
DJVU_LIBS = @DJVU_LIBS@
4707
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4708
+DSYMUTIL = @DSYMUTIL@
4709
ECHO = @ECHO@
4710
ECHO_C = @ECHO_C@
4711
ECHO_N = @ECHO_N@
4712
@@ -118,7 +120,10 @@
4713
GNOME_CFLAGS = @GNOME_CFLAGS@
4714
GNOME_LIBS = @GNOME_LIBS@
4715
GREP = @GREP@
4716
+GTKDOC_CHECK = @GTKDOC_CHECK@
4717
HELP_DIR = @HELP_DIR@
4718
+HILDON_CFLAGS = @HILDON_CFLAGS@
4719
+HILDON_LIBS = @HILDON_LIBS@
4720
HTML_DIR = @HTML_DIR@
4721
INSTALL = @INSTALL@
4722
INSTALL_DATA = @INSTALL_DATA@
4723
@@ -170,6 +175,7 @@
4724
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4725
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4726
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4727
+NMEDIT = @NMEDIT@
4728
OBJEXT = @OBJEXT@
4729
OMF_DIR = @OMF_DIR@
4730
PACKAGE = @PACKAGE@
4731
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/16x16/Makefile.in evince-2.22.1.1.new/data/icons/16x16/Makefile.in
4732
--- evince-2.22.1.1/data/icons/16x16/Makefile.in 2008-04-08 21:19:05.000000000 +0200
4733
+++ evince-2.22.1.1.new/data/icons/16x16/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4734
@@ -1,8 +1,8 @@
4735
-# Makefile.in generated by automake 1.10 from Makefile.am.
4736
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4737
# @configure_input@
4738
4739
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4740
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4741
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4742
# This Makefile.in is free software; the Free Software Foundation
4743
# gives unlimited permission to copy and/or distribute it,
4744
# with or without modifications, as long as this notice is preserved.
4745
@@ -90,9 +90,11 @@
4746
DEFS = @DEFS@
4747
DEPDIR = @DEPDIR@
4748
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4749
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4750
DJVU_CFLAGS = @DJVU_CFLAGS@
4751
DJVU_LIBS = @DJVU_LIBS@
4752
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4753
+DSYMUTIL = @DSYMUTIL@
4754
ECHO = @ECHO@
4755
ECHO_C = @ECHO_C@
4756
ECHO_N = @ECHO_N@
4757
@@ -120,7 +122,10 @@
4758
GNOME_CFLAGS = @GNOME_CFLAGS@
4759
GNOME_LIBS = @GNOME_LIBS@
4760
GREP = @GREP@
4761
+GTKDOC_CHECK = @GTKDOC_CHECK@
4762
HELP_DIR = @HELP_DIR@
4763
+HILDON_CFLAGS = @HILDON_CFLAGS@
4764
+HILDON_LIBS = @HILDON_LIBS@
4765
HTML_DIR = @HTML_DIR@
4766
INSTALL = @INSTALL@
4767
INSTALL_DATA = @INSTALL_DATA@
4768
@@ -172,6 +177,7 @@
4769
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4770
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4771
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4772
+NMEDIT = @NMEDIT@
4773
OBJEXT = @OBJEXT@
4774
OMF_DIR = @OMF_DIR@
4775
PACKAGE = @PACKAGE@
4776
@@ -370,8 +376,8 @@
4777
unique=`for i in $$list; do \
4778
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4779
done | \
4780
- $(AWK) ' { files[$$0] = 1; } \
4781
- END { for (i in files) print i; }'`; \
4782
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
4783
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
4784
mkid -fID $$unique
4785
tags: TAGS
4786
4787
@@ -396,8 +402,8 @@
4788
unique=`for i in $$list; do \
4789
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4790
done | \
4791
- $(AWK) ' { files[$$0] = 1; } \
4792
- END { for (i in files) print i; }'`; \
4793
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4794
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
4795
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4796
test -n "$$unique" || unique=$$empty_fix; \
4797
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4798
@@ -407,13 +413,12 @@
4799
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4800
$(TAGS_FILES) $(LISP)
4801
tags=; \
4802
- here=`pwd`; \
4803
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4804
unique=`for i in $$list; do \
4805
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4806
done | \
4807
- $(AWK) ' { files[$$0] = 1; } \
4808
- END { for (i in files) print i; }'`; \
4809
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4810
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
4811
test -z "$(CTAGS_ARGS)$$tags$$unique" \
4812
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4813
$$tags $$unique
4814
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/22x22/actions/Makefile.in evince-2.22.1.1.new/data/icons/22x22/actions/Makefile.in
4815
--- evince-2.22.1.1/data/icons/22x22/actions/Makefile.in 2008-04-08 21:19:05.000000000 +0200
4816
+++ evince-2.22.1.1.new/data/icons/22x22/actions/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4817
@@ -1,8 +1,8 @@
4818
-# Makefile.in generated by automake 1.10 from Makefile.am.
4819
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4820
# @configure_input@
4821
4822
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4823
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4824
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4825
# This Makefile.in is free software; the Free Software Foundation
4826
# gives unlimited permission to copy and/or distribute it,
4827
# with or without modifications, as long as this notice is preserved.
4828
@@ -88,9 +88,11 @@
4829
DEFS = @DEFS@
4830
DEPDIR = @DEPDIR@
4831
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4832
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4833
DJVU_CFLAGS = @DJVU_CFLAGS@
4834
DJVU_LIBS = @DJVU_LIBS@
4835
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4836
+DSYMUTIL = @DSYMUTIL@
4837
ECHO = @ECHO@
4838
ECHO_C = @ECHO_C@
4839
ECHO_N = @ECHO_N@
4840
@@ -118,7 +120,10 @@
4841
GNOME_CFLAGS = @GNOME_CFLAGS@
4842
GNOME_LIBS = @GNOME_LIBS@
4843
GREP = @GREP@
4844
+GTKDOC_CHECK = @GTKDOC_CHECK@
4845
HELP_DIR = @HELP_DIR@
4846
+HILDON_CFLAGS = @HILDON_CFLAGS@
4847
+HILDON_LIBS = @HILDON_LIBS@
4848
HTML_DIR = @HTML_DIR@
4849
INSTALL = @INSTALL@
4850
INSTALL_DATA = @INSTALL_DATA@
4851
@@ -170,6 +175,7 @@
4852
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4853
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4854
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4855
+NMEDIT = @NMEDIT@
4856
OBJEXT = @OBJEXT@
4857
OMF_DIR = @OMF_DIR@
4858
PACKAGE = @PACKAGE@
4859
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/22x22/apps/Makefile.in evince-2.22.1.1.new/data/icons/22x22/apps/Makefile.in
4860
--- evince-2.22.1.1/data/icons/22x22/apps/Makefile.in 2008-04-08 21:19:06.000000000 +0200
4861
+++ evince-2.22.1.1.new/data/icons/22x22/apps/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4862
@@ -1,8 +1,8 @@
4863
-# Makefile.in generated by automake 1.10 from Makefile.am.
4864
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4865
# @configure_input@
4866
4867
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4868
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4869
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4870
# This Makefile.in is free software; the Free Software Foundation
4871
# gives unlimited permission to copy and/or distribute it,
4872
# with or without modifications, as long as this notice is preserved.
4873
@@ -88,9 +88,11 @@
4874
DEFS = @DEFS@
4875
DEPDIR = @DEPDIR@
4876
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4877
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4878
DJVU_CFLAGS = @DJVU_CFLAGS@
4879
DJVU_LIBS = @DJVU_LIBS@
4880
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4881
+DSYMUTIL = @DSYMUTIL@
4882
ECHO = @ECHO@
4883
ECHO_C = @ECHO_C@
4884
ECHO_N = @ECHO_N@
4885
@@ -118,7 +120,10 @@
4886
GNOME_CFLAGS = @GNOME_CFLAGS@
4887
GNOME_LIBS = @GNOME_LIBS@
4888
GREP = @GREP@
4889
+GTKDOC_CHECK = @GTKDOC_CHECK@
4890
HELP_DIR = @HELP_DIR@
4891
+HILDON_CFLAGS = @HILDON_CFLAGS@
4892
+HILDON_LIBS = @HILDON_LIBS@
4893
HTML_DIR = @HTML_DIR@
4894
INSTALL = @INSTALL@
4895
INSTALL_DATA = @INSTALL_DATA@
4896
@@ -170,6 +175,7 @@
4897
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4898
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4899
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4900
+NMEDIT = @NMEDIT@
4901
OBJEXT = @OBJEXT@
4902
OMF_DIR = @OMF_DIR@
4903
PACKAGE = @PACKAGE@
4904
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/22x22/Makefile.in evince-2.22.1.1.new/data/icons/22x22/Makefile.in
4905
--- evince-2.22.1.1/data/icons/22x22/Makefile.in 2008-04-08 21:19:05.000000000 +0200
4906
+++ evince-2.22.1.1.new/data/icons/22x22/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4907
@@ -1,8 +1,8 @@
4908
-# Makefile.in generated by automake 1.10 from Makefile.am.
4909
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4910
# @configure_input@
4911
4912
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4913
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4914
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4915
# This Makefile.in is free software; the Free Software Foundation
4916
# gives unlimited permission to copy and/or distribute it,
4917
# with or without modifications, as long as this notice is preserved.
4918
@@ -90,9 +90,11 @@
4919
DEFS = @DEFS@
4920
DEPDIR = @DEPDIR@
4921
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
4922
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
4923
DJVU_CFLAGS = @DJVU_CFLAGS@
4924
DJVU_LIBS = @DJVU_LIBS@
4925
DOC_USER_FORMATS = @DOC_USER_FORMATS@
4926
+DSYMUTIL = @DSYMUTIL@
4927
ECHO = @ECHO@
4928
ECHO_C = @ECHO_C@
4929
ECHO_N = @ECHO_N@
4930
@@ -120,7 +122,10 @@
4931
GNOME_CFLAGS = @GNOME_CFLAGS@
4932
GNOME_LIBS = @GNOME_LIBS@
4933
GREP = @GREP@
4934
+GTKDOC_CHECK = @GTKDOC_CHECK@
4935
HELP_DIR = @HELP_DIR@
4936
+HILDON_CFLAGS = @HILDON_CFLAGS@
4937
+HILDON_LIBS = @HILDON_LIBS@
4938
HTML_DIR = @HTML_DIR@
4939
INSTALL = @INSTALL@
4940
INSTALL_DATA = @INSTALL_DATA@
4941
@@ -172,6 +177,7 @@
4942
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
4943
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
4944
NAUTILUS_LIBS = @NAUTILUS_LIBS@
4945
+NMEDIT = @NMEDIT@
4946
OBJEXT = @OBJEXT@
4947
OMF_DIR = @OMF_DIR@
4948
PACKAGE = @PACKAGE@
4949
@@ -370,8 +376,8 @@
4950
unique=`for i in $$list; do \
4951
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4952
done | \
4953
- $(AWK) ' { files[$$0] = 1; } \
4954
- END { for (i in files) print i; }'`; \
4955
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
4956
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
4957
mkid -fID $$unique
4958
tags: TAGS
4959
4960
@@ -396,8 +402,8 @@
4961
unique=`for i in $$list; do \
4962
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4963
done | \
4964
- $(AWK) ' { files[$$0] = 1; } \
4965
- END { for (i in files) print i; }'`; \
4966
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4967
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
4968
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4969
test -n "$$unique" || unique=$$empty_fix; \
4970
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4971
@@ -407,13 +413,12 @@
4972
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4973
$(TAGS_FILES) $(LISP)
4974
tags=; \
4975
- here=`pwd`; \
4976
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4977
unique=`for i in $$list; do \
4978
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4979
done | \
4980
- $(AWK) ' { files[$$0] = 1; } \
4981
- END { for (i in files) print i; }'`; \
4982
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4983
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
4984
test -z "$(CTAGS_ARGS)$$tags$$unique" \
4985
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4986
$$tags $$unique
4987
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/24x24/actions/Makefile.in evince-2.22.1.1.new/data/icons/24x24/actions/Makefile.in
4988
--- evince-2.22.1.1/data/icons/24x24/actions/Makefile.in 2008-04-08 21:19:06.000000000 +0200
4989
+++ evince-2.22.1.1.new/data/icons/24x24/actions/Makefile.in 2008-04-08 23:59:14.000000000 +0200
4990
@@ -1,8 +1,8 @@
4991
-# Makefile.in generated by automake 1.10 from Makefile.am.
4992
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
4993
# @configure_input@
4994
4995
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4996
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4997
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4998
# This Makefile.in is free software; the Free Software Foundation
4999
# gives unlimited permission to copy and/or distribute it,
5000
# with or without modifications, as long as this notice is preserved.
5001
@@ -88,9 +88,11 @@
5002
DEFS = @DEFS@
5003
DEPDIR = @DEPDIR@
5004
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5005
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5006
DJVU_CFLAGS = @DJVU_CFLAGS@
5007
DJVU_LIBS = @DJVU_LIBS@
5008
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5009
+DSYMUTIL = @DSYMUTIL@
5010
ECHO = @ECHO@
5011
ECHO_C = @ECHO_C@
5012
ECHO_N = @ECHO_N@
5013
@@ -118,7 +120,10 @@
5014
GNOME_CFLAGS = @GNOME_CFLAGS@
5015
GNOME_LIBS = @GNOME_LIBS@
5016
GREP = @GREP@
5017
+GTKDOC_CHECK = @GTKDOC_CHECK@
5018
HELP_DIR = @HELP_DIR@
5019
+HILDON_CFLAGS = @HILDON_CFLAGS@
5020
+HILDON_LIBS = @HILDON_LIBS@
5021
HTML_DIR = @HTML_DIR@
5022
INSTALL = @INSTALL@
5023
INSTALL_DATA = @INSTALL_DATA@
5024
@@ -170,6 +175,7 @@
5025
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5026
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5027
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5028
+NMEDIT = @NMEDIT@
5029
OBJEXT = @OBJEXT@
5030
OMF_DIR = @OMF_DIR@
5031
PACKAGE = @PACKAGE@
5032
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/24x24/apps/Makefile.in evince-2.22.1.1.new/data/icons/24x24/apps/Makefile.in
5033
--- evince-2.22.1.1/data/icons/24x24/apps/Makefile.in 2008-04-08 21:19:06.000000000 +0200
5034
+++ evince-2.22.1.1.new/data/icons/24x24/apps/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5035
@@ -1,8 +1,8 @@
5036
-# Makefile.in generated by automake 1.10 from Makefile.am.
5037
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5038
# @configure_input@
5039
5040
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5041
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5042
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5043
# This Makefile.in is free software; the Free Software Foundation
5044
# gives unlimited permission to copy and/or distribute it,
5045
# with or without modifications, as long as this notice is preserved.
5046
@@ -88,9 +88,11 @@
5047
DEFS = @DEFS@
5048
DEPDIR = @DEPDIR@
5049
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5050
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5051
DJVU_CFLAGS = @DJVU_CFLAGS@
5052
DJVU_LIBS = @DJVU_LIBS@
5053
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5054
+DSYMUTIL = @DSYMUTIL@
5055
ECHO = @ECHO@
5056
ECHO_C = @ECHO_C@
5057
ECHO_N = @ECHO_N@
5058
@@ -118,7 +120,10 @@
5059
GNOME_CFLAGS = @GNOME_CFLAGS@
5060
GNOME_LIBS = @GNOME_LIBS@
5061
GREP = @GREP@
5062
+GTKDOC_CHECK = @GTKDOC_CHECK@
5063
HELP_DIR = @HELP_DIR@
5064
+HILDON_CFLAGS = @HILDON_CFLAGS@
5065
+HILDON_LIBS = @HILDON_LIBS@
5066
HTML_DIR = @HTML_DIR@
5067
INSTALL = @INSTALL@
5068
INSTALL_DATA = @INSTALL_DATA@
5069
@@ -170,6 +175,7 @@
5070
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5071
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5072
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5073
+NMEDIT = @NMEDIT@
5074
OBJEXT = @OBJEXT@
5075
OMF_DIR = @OMF_DIR@
5076
PACKAGE = @PACKAGE@
5077
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/24x24/Makefile.in evince-2.22.1.1.new/data/icons/24x24/Makefile.in
5078
--- evince-2.22.1.1/data/icons/24x24/Makefile.in 2008-04-08 21:19:06.000000000 +0200
5079
+++ evince-2.22.1.1.new/data/icons/24x24/Makefile.in 2008-04-08 23:59:14.000000000 +0200
5080
@@ -1,8 +1,8 @@
5081
-# Makefile.in generated by automake 1.10 from Makefile.am.
5082
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5083
# @configure_input@
5084
5085
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5086
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5087
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5088
# This Makefile.in is free software; the Free Software Foundation
5089
# gives unlimited permission to copy and/or distribute it,
5090
# with or without modifications, as long as this notice is preserved.
5091
@@ -90,9 +90,11 @@
5092
DEFS = @DEFS@
5093
DEPDIR = @DEPDIR@
5094
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5095
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5096
DJVU_CFLAGS = @DJVU_CFLAGS@
5097
DJVU_LIBS = @DJVU_LIBS@
5098
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5099
+DSYMUTIL = @DSYMUTIL@
5100
ECHO = @ECHO@
5101
ECHO_C = @ECHO_C@
5102
ECHO_N = @ECHO_N@
5103
@@ -120,7 +122,10 @@
5104
GNOME_CFLAGS = @GNOME_CFLAGS@
5105
GNOME_LIBS = @GNOME_LIBS@
5106
GREP = @GREP@
5107
+GTKDOC_CHECK = @GTKDOC_CHECK@
5108
HELP_DIR = @HELP_DIR@
5109
+HILDON_CFLAGS = @HILDON_CFLAGS@
5110
+HILDON_LIBS = @HILDON_LIBS@
5111
HTML_DIR = @HTML_DIR@
5112
INSTALL = @INSTALL@
5113
INSTALL_DATA = @INSTALL_DATA@
5114
@@ -172,6 +177,7 @@
5115
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5116
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5117
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5118
+NMEDIT = @NMEDIT@
5119
OBJEXT = @OBJEXT@
5120
OMF_DIR = @OMF_DIR@
5121
PACKAGE = @PACKAGE@
5122
@@ -370,8 +376,8 @@
5123
unique=`for i in $$list; do \
5124
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5125
done | \
5126
- $(AWK) ' { files[$$0] = 1; } \
5127
- END { for (i in files) print i; }'`; \
5128
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5129
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5130
mkid -fID $$unique
5131
tags: TAGS
5132
5133
@@ -396,8 +402,8 @@
5134
unique=`for i in $$list; do \
5135
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5136
done | \
5137
- $(AWK) ' { files[$$0] = 1; } \
5138
- END { for (i in files) print i; }'`; \
5139
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5140
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5141
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5142
test -n "$$unique" || unique=$$empty_fix; \
5143
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5144
@@ -407,13 +413,12 @@
5145
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5146
$(TAGS_FILES) $(LISP)
5147
tags=; \
5148
- here=`pwd`; \
5149
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5150
unique=`for i in $$list; do \
5151
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5152
done | \
5153
- $(AWK) ' { files[$$0] = 1; } \
5154
- END { for (i in files) print i; }'`; \
5155
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5156
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5157
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5158
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5159
$$tags $$unique
5160
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/32x32/actions/Makefile.in evince-2.22.1.1.new/data/icons/32x32/actions/Makefile.in
5161
--- evince-2.22.1.1/data/icons/32x32/actions/Makefile.in 2008-04-08 21:19:07.000000000 +0200
5162
+++ evince-2.22.1.1.new/data/icons/32x32/actions/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5163
@@ -1,8 +1,8 @@
5164
-# Makefile.in generated by automake 1.10 from Makefile.am.
5165
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5166
# @configure_input@
5167
5168
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5169
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5170
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5171
# This Makefile.in is free software; the Free Software Foundation
5172
# gives unlimited permission to copy and/or distribute it,
5173
# with or without modifications, as long as this notice is preserved.
5174
@@ -88,9 +88,11 @@
5175
DEFS = @DEFS@
5176
DEPDIR = @DEPDIR@
5177
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5178
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5179
DJVU_CFLAGS = @DJVU_CFLAGS@
5180
DJVU_LIBS = @DJVU_LIBS@
5181
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5182
+DSYMUTIL = @DSYMUTIL@
5183
ECHO = @ECHO@
5184
ECHO_C = @ECHO_C@
5185
ECHO_N = @ECHO_N@
5186
@@ -118,7 +120,10 @@
5187
GNOME_CFLAGS = @GNOME_CFLAGS@
5188
GNOME_LIBS = @GNOME_LIBS@
5189
GREP = @GREP@
5190
+GTKDOC_CHECK = @GTKDOC_CHECK@
5191
HELP_DIR = @HELP_DIR@
5192
+HILDON_CFLAGS = @HILDON_CFLAGS@
5193
+HILDON_LIBS = @HILDON_LIBS@
5194
HTML_DIR = @HTML_DIR@
5195
INSTALL = @INSTALL@
5196
INSTALL_DATA = @INSTALL_DATA@
5197
@@ -170,6 +175,7 @@
5198
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5199
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5200
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5201
+NMEDIT = @NMEDIT@
5202
OBJEXT = @OBJEXT@
5203
OMF_DIR = @OMF_DIR@
5204
PACKAGE = @PACKAGE@
5205
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/32x32/Makefile.in evince-2.22.1.1.new/data/icons/32x32/Makefile.in
5206
--- evince-2.22.1.1/data/icons/32x32/Makefile.in 2008-04-08 21:19:07.000000000 +0200
5207
+++ evince-2.22.1.1.new/data/icons/32x32/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5208
@@ -1,8 +1,8 @@
5209
-# Makefile.in generated by automake 1.10 from Makefile.am.
5210
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5211
# @configure_input@
5212
5213
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5214
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5215
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5216
# This Makefile.in is free software; the Free Software Foundation
5217
# gives unlimited permission to copy and/or distribute it,
5218
# with or without modifications, as long as this notice is preserved.
5219
@@ -90,9 +90,11 @@
5220
DEFS = @DEFS@
5221
DEPDIR = @DEPDIR@
5222
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5223
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5224
DJVU_CFLAGS = @DJVU_CFLAGS@
5225
DJVU_LIBS = @DJVU_LIBS@
5226
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5227
+DSYMUTIL = @DSYMUTIL@
5228
ECHO = @ECHO@
5229
ECHO_C = @ECHO_C@
5230
ECHO_N = @ECHO_N@
5231
@@ -120,7 +122,10 @@
5232
GNOME_CFLAGS = @GNOME_CFLAGS@
5233
GNOME_LIBS = @GNOME_LIBS@
5234
GREP = @GREP@
5235
+GTKDOC_CHECK = @GTKDOC_CHECK@
5236
HELP_DIR = @HELP_DIR@
5237
+HILDON_CFLAGS = @HILDON_CFLAGS@
5238
+HILDON_LIBS = @HILDON_LIBS@
5239
HTML_DIR = @HTML_DIR@
5240
INSTALL = @INSTALL@
5241
INSTALL_DATA = @INSTALL_DATA@
5242
@@ -172,6 +177,7 @@
5243
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5244
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5245
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5246
+NMEDIT = @NMEDIT@
5247
OBJEXT = @OBJEXT@
5248
OMF_DIR = @OMF_DIR@
5249
PACKAGE = @PACKAGE@
5250
@@ -370,8 +376,8 @@
5251
unique=`for i in $$list; do \
5252
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5253
done | \
5254
- $(AWK) ' { files[$$0] = 1; } \
5255
- END { for (i in files) print i; }'`; \
5256
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5257
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5258
mkid -fID $$unique
5259
tags: TAGS
5260
5261
@@ -396,8 +402,8 @@
5262
unique=`for i in $$list; do \
5263
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5264
done | \
5265
- $(AWK) ' { files[$$0] = 1; } \
5266
- END { for (i in files) print i; }'`; \
5267
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5268
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5269
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5270
test -n "$$unique" || unique=$$empty_fix; \
5271
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5272
@@ -407,13 +413,12 @@
5273
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5274
$(TAGS_FILES) $(LISP)
5275
tags=; \
5276
- here=`pwd`; \
5277
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5278
unique=`for i in $$list; do \
5279
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5280
done | \
5281
- $(AWK) ' { files[$$0] = 1; } \
5282
- END { for (i in files) print i; }'`; \
5283
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5284
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5285
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5286
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5287
$$tags $$unique
5288
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/48x48/actions/Makefile.in evince-2.22.1.1.new/data/icons/48x48/actions/Makefile.in
5289
--- evince-2.22.1.1/data/icons/48x48/actions/Makefile.in 2008-04-08 21:19:07.000000000 +0200
5290
+++ evince-2.22.1.1.new/data/icons/48x48/actions/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5291
@@ -1,8 +1,8 @@
5292
-# Makefile.in generated by automake 1.10 from Makefile.am.
5293
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5294
# @configure_input@
5295
5296
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5297
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5298
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5299
# This Makefile.in is free software; the Free Software Foundation
5300
# gives unlimited permission to copy and/or distribute it,
5301
# with or without modifications, as long as this notice is preserved.
5302
@@ -88,9 +88,11 @@
5303
DEFS = @DEFS@
5304
DEPDIR = @DEPDIR@
5305
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5306
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5307
DJVU_CFLAGS = @DJVU_CFLAGS@
5308
DJVU_LIBS = @DJVU_LIBS@
5309
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5310
+DSYMUTIL = @DSYMUTIL@
5311
ECHO = @ECHO@
5312
ECHO_C = @ECHO_C@
5313
ECHO_N = @ECHO_N@
5314
@@ -118,7 +120,10 @@
5315
GNOME_CFLAGS = @GNOME_CFLAGS@
5316
GNOME_LIBS = @GNOME_LIBS@
5317
GREP = @GREP@
5318
+GTKDOC_CHECK = @GTKDOC_CHECK@
5319
HELP_DIR = @HELP_DIR@
5320
+HILDON_CFLAGS = @HILDON_CFLAGS@
5321
+HILDON_LIBS = @HILDON_LIBS@
5322
HTML_DIR = @HTML_DIR@
5323
INSTALL = @INSTALL@
5324
INSTALL_DATA = @INSTALL_DATA@
5325
@@ -170,6 +175,7 @@
5326
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5327
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5328
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5329
+NMEDIT = @NMEDIT@
5330
OBJEXT = @OBJEXT@
5331
OMF_DIR = @OMF_DIR@
5332
PACKAGE = @PACKAGE@
5333
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/48x48/apps/Makefile.in evince-2.22.1.1.new/data/icons/48x48/apps/Makefile.in
5334
--- evince-2.22.1.1/data/icons/48x48/apps/Makefile.in 2008-04-08 21:19:07.000000000 +0200
5335
+++ evince-2.22.1.1.new/data/icons/48x48/apps/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5336
@@ -1,8 +1,8 @@
5337
-# Makefile.in generated by automake 1.10 from Makefile.am.
5338
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5339
# @configure_input@
5340
5341
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5342
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5343
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5344
# This Makefile.in is free software; the Free Software Foundation
5345
# gives unlimited permission to copy and/or distribute it,
5346
# with or without modifications, as long as this notice is preserved.
5347
@@ -88,9 +88,11 @@
5348
DEFS = @DEFS@
5349
DEPDIR = @DEPDIR@
5350
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5351
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5352
DJVU_CFLAGS = @DJVU_CFLAGS@
5353
DJVU_LIBS = @DJVU_LIBS@
5354
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5355
+DSYMUTIL = @DSYMUTIL@
5356
ECHO = @ECHO@
5357
ECHO_C = @ECHO_C@
5358
ECHO_N = @ECHO_N@
5359
@@ -118,7 +120,10 @@
5360
GNOME_CFLAGS = @GNOME_CFLAGS@
5361
GNOME_LIBS = @GNOME_LIBS@
5362
GREP = @GREP@
5363
+GTKDOC_CHECK = @GTKDOC_CHECK@
5364
HELP_DIR = @HELP_DIR@
5365
+HILDON_CFLAGS = @HILDON_CFLAGS@
5366
+HILDON_LIBS = @HILDON_LIBS@
5367
HTML_DIR = @HTML_DIR@
5368
INSTALL = @INSTALL@
5369
INSTALL_DATA = @INSTALL_DATA@
5370
@@ -170,6 +175,7 @@
5371
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5372
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5373
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5374
+NMEDIT = @NMEDIT@
5375
OBJEXT = @OBJEXT@
5376
OMF_DIR = @OMF_DIR@
5377
PACKAGE = @PACKAGE@
5378
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/48x48/Makefile.in evince-2.22.1.1.new/data/icons/48x48/Makefile.in
5379
--- evince-2.22.1.1/data/icons/48x48/Makefile.in 2008-04-08 21:19:07.000000000 +0200
5380
+++ evince-2.22.1.1.new/data/icons/48x48/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5381
@@ -1,8 +1,8 @@
5382
-# Makefile.in generated by automake 1.10 from Makefile.am.
5383
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5384
# @configure_input@
5385
5386
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5387
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5388
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5389
# This Makefile.in is free software; the Free Software Foundation
5390
# gives unlimited permission to copy and/or distribute it,
5391
# with or without modifications, as long as this notice is preserved.
5392
@@ -90,9 +90,11 @@
5393
DEFS = @DEFS@
5394
DEPDIR = @DEPDIR@
5395
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5396
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5397
DJVU_CFLAGS = @DJVU_CFLAGS@
5398
DJVU_LIBS = @DJVU_LIBS@
5399
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5400
+DSYMUTIL = @DSYMUTIL@
5401
ECHO = @ECHO@
5402
ECHO_C = @ECHO_C@
5403
ECHO_N = @ECHO_N@
5404
@@ -120,7 +122,10 @@
5405
GNOME_CFLAGS = @GNOME_CFLAGS@
5406
GNOME_LIBS = @GNOME_LIBS@
5407
GREP = @GREP@
5408
+GTKDOC_CHECK = @GTKDOC_CHECK@
5409
HELP_DIR = @HELP_DIR@
5410
+HILDON_CFLAGS = @HILDON_CFLAGS@
5411
+HILDON_LIBS = @HILDON_LIBS@
5412
HTML_DIR = @HTML_DIR@
5413
INSTALL = @INSTALL@
5414
INSTALL_DATA = @INSTALL_DATA@
5415
@@ -172,6 +177,7 @@
5416
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5417
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5418
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5419
+NMEDIT = @NMEDIT@
5420
OBJEXT = @OBJEXT@
5421
OMF_DIR = @OMF_DIR@
5422
PACKAGE = @PACKAGE@
5423
@@ -370,8 +376,8 @@
5424
unique=`for i in $$list; do \
5425
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5426
done | \
5427
- $(AWK) ' { files[$$0] = 1; } \
5428
- END { for (i in files) print i; }'`; \
5429
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5430
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5431
mkid -fID $$unique
5432
tags: TAGS
5433
5434
@@ -396,8 +402,8 @@
5435
unique=`for i in $$list; do \
5436
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5437
done | \
5438
- $(AWK) ' { files[$$0] = 1; } \
5439
- END { for (i in files) print i; }'`; \
5440
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5441
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5442
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5443
test -n "$$unique" || unique=$$empty_fix; \
5444
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5445
@@ -407,13 +413,12 @@
5446
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5447
$(TAGS_FILES) $(LISP)
5448
tags=; \
5449
- here=`pwd`; \
5450
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5451
unique=`for i in $$list; do \
5452
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5453
done | \
5454
- $(AWK) ' { files[$$0] = 1; } \
5455
- END { for (i in files) print i; }'`; \
5456
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5457
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5458
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5459
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5460
$$tags $$unique
5461
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/Makefile.in evince-2.22.1.1.new/data/icons/Makefile.in
5462
--- evince-2.22.1.1/data/icons/Makefile.in 2008-04-08 21:19:08.000000000 +0200
5463
+++ evince-2.22.1.1.new/data/icons/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5464
@@ -1,8 +1,8 @@
5465
-# Makefile.in generated by automake 1.10 from Makefile.am.
5466
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5467
# @configure_input@
5468
5469
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5470
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5471
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5472
# This Makefile.in is free software; the Free Software Foundation
5473
# gives unlimited permission to copy and/or distribute it,
5474
# with or without modifications, as long as this notice is preserved.
5475
@@ -90,9 +90,11 @@
5476
DEFS = @DEFS@
5477
DEPDIR = @DEPDIR@
5478
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5479
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5480
DJVU_CFLAGS = @DJVU_CFLAGS@
5481
DJVU_LIBS = @DJVU_LIBS@
5482
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5483
+DSYMUTIL = @DSYMUTIL@
5484
ECHO = @ECHO@
5485
ECHO_C = @ECHO_C@
5486
ECHO_N = @ECHO_N@
5487
@@ -120,7 +122,10 @@
5488
GNOME_CFLAGS = @GNOME_CFLAGS@
5489
GNOME_LIBS = @GNOME_LIBS@
5490
GREP = @GREP@
5491
+GTKDOC_CHECK = @GTKDOC_CHECK@
5492
HELP_DIR = @HELP_DIR@
5493
+HILDON_CFLAGS = @HILDON_CFLAGS@
5494
+HILDON_LIBS = @HILDON_LIBS@
5495
HTML_DIR = @HTML_DIR@
5496
INSTALL = @INSTALL@
5497
INSTALL_DATA = @INSTALL_DATA@
5498
@@ -172,6 +177,7 @@
5499
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5500
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5501
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5502
+NMEDIT = @NMEDIT@
5503
OBJEXT = @OBJEXT@
5504
OMF_DIR = @OMF_DIR@
5505
PACKAGE = @PACKAGE@
5506
@@ -370,8 +376,8 @@
5507
unique=`for i in $$list; do \
5508
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5509
done | \
5510
- $(AWK) ' { files[$$0] = 1; } \
5511
- END { for (i in files) print i; }'`; \
5512
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5513
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5514
mkid -fID $$unique
5515
tags: TAGS
5516
5517
@@ -396,8 +402,8 @@
5518
unique=`for i in $$list; do \
5519
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5520
done | \
5521
- $(AWK) ' { files[$$0] = 1; } \
5522
- END { for (i in files) print i; }'`; \
5523
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5524
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5525
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5526
test -n "$$unique" || unique=$$empty_fix; \
5527
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5528
@@ -407,13 +413,12 @@
5529
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5530
$(TAGS_FILES) $(LISP)
5531
tags=; \
5532
- here=`pwd`; \
5533
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5534
unique=`for i in $$list; do \
5535
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5536
done | \
5537
- $(AWK) ' { files[$$0] = 1; } \
5538
- END { for (i in files) print i; }'`; \
5539
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5540
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5541
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5542
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5543
$$tags $$unique
5544
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/scalable/apps/Makefile.in evince-2.22.1.1.new/data/icons/scalable/apps/Makefile.in
5545
--- evince-2.22.1.1/data/icons/scalable/apps/Makefile.in 2008-04-08 21:19:08.000000000 +0200
5546
+++ evince-2.22.1.1.new/data/icons/scalable/apps/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5547
@@ -1,8 +1,8 @@
5548
-# Makefile.in generated by automake 1.10 from Makefile.am.
5549
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5550
# @configure_input@
5551
5552
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5553
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5554
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5555
# This Makefile.in is free software; the Free Software Foundation
5556
# gives unlimited permission to copy and/or distribute it,
5557
# with or without modifications, as long as this notice is preserved.
5558
@@ -88,9 +88,11 @@
5559
DEFS = @DEFS@
5560
DEPDIR = @DEPDIR@
5561
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5562
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5563
DJVU_CFLAGS = @DJVU_CFLAGS@
5564
DJVU_LIBS = @DJVU_LIBS@
5565
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5566
+DSYMUTIL = @DSYMUTIL@
5567
ECHO = @ECHO@
5568
ECHO_C = @ECHO_C@
5569
ECHO_N = @ECHO_N@
5570
@@ -118,7 +120,10 @@
5571
GNOME_CFLAGS = @GNOME_CFLAGS@
5572
GNOME_LIBS = @GNOME_LIBS@
5573
GREP = @GREP@
5574
+GTKDOC_CHECK = @GTKDOC_CHECK@
5575
HELP_DIR = @HELP_DIR@
5576
+HILDON_CFLAGS = @HILDON_CFLAGS@
5577
+HILDON_LIBS = @HILDON_LIBS@
5578
HTML_DIR = @HTML_DIR@
5579
INSTALL = @INSTALL@
5580
INSTALL_DATA = @INSTALL_DATA@
5581
@@ -170,6 +175,7 @@
5582
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5583
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5584
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5585
+NMEDIT = @NMEDIT@
5586
OBJEXT = @OBJEXT@
5587
OMF_DIR = @OMF_DIR@
5588
PACKAGE = @PACKAGE@
5589
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/icons/scalable/Makefile.in evince-2.22.1.1.new/data/icons/scalable/Makefile.in
5590
--- evince-2.22.1.1/data/icons/scalable/Makefile.in 2008-04-08 21:19:08.000000000 +0200
5591
+++ evince-2.22.1.1.new/data/icons/scalable/Makefile.in 2008-04-08 23:59:15.000000000 +0200
5592
@@ -1,8 +1,8 @@
5593
-# Makefile.in generated by automake 1.10 from Makefile.am.
5594
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5595
# @configure_input@
5596
5597
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5598
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5599
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5600
# This Makefile.in is free software; the Free Software Foundation
5601
# gives unlimited permission to copy and/or distribute it,
5602
# with or without modifications, as long as this notice is preserved.
5603
@@ -90,9 +90,11 @@
5604
DEFS = @DEFS@
5605
DEPDIR = @DEPDIR@
5606
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
5607
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
5608
DJVU_CFLAGS = @DJVU_CFLAGS@
5609
DJVU_LIBS = @DJVU_LIBS@
5610
DOC_USER_FORMATS = @DOC_USER_FORMATS@
5611
+DSYMUTIL = @DSYMUTIL@
5612
ECHO = @ECHO@
5613
ECHO_C = @ECHO_C@
5614
ECHO_N = @ECHO_N@
5615
@@ -120,7 +122,10 @@
5616
GNOME_CFLAGS = @GNOME_CFLAGS@
5617
GNOME_LIBS = @GNOME_LIBS@
5618
GREP = @GREP@
5619
+GTKDOC_CHECK = @GTKDOC_CHECK@
5620
HELP_DIR = @HELP_DIR@
5621
+HILDON_CFLAGS = @HILDON_CFLAGS@
5622
+HILDON_LIBS = @HILDON_LIBS@
5623
HTML_DIR = @HTML_DIR@
5624
INSTALL = @INSTALL@
5625
INSTALL_DATA = @INSTALL_DATA@
5626
@@ -172,6 +177,7 @@
5627
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
5628
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
5629
NAUTILUS_LIBS = @NAUTILUS_LIBS@
5630
+NMEDIT = @NMEDIT@
5631
OBJEXT = @OBJEXT@
5632
OMF_DIR = @OMF_DIR@
5633
PACKAGE = @PACKAGE@
5634
@@ -370,8 +376,8 @@
5635
unique=`for i in $$list; do \
5636
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5637
done | \
5638
- $(AWK) ' { files[$$0] = 1; } \
5639
- END { for (i in files) print i; }'`; \
5640
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5641
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5642
mkid -fID $$unique
5643
tags: TAGS
5644
5645
@@ -396,8 +402,8 @@
5646
unique=`for i in $$list; do \
5647
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5648
done | \
5649
- $(AWK) ' { files[$$0] = 1; } \
5650
- END { for (i in files) print i; }'`; \
5651
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5652
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5653
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
5654
test -n "$$unique" || unique=$$empty_fix; \
5655
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
5656
@@ -407,13 +413,12 @@
5657
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5658
$(TAGS_FILES) $(LISP)
5659
tags=; \
5660
- here=`pwd`; \
5661
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5662
unique=`for i in $$list; do \
5663
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5664
done | \
5665
- $(AWK) ' { files[$$0] = 1; } \
5666
- END { for (i in files) print i; }'`; \
5667
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5668
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
5669
test -z "$(CTAGS_ARGS)$$tags$$unique" \
5670
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5671
$$tags $$unique
5672
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/data/Makefile.in evince-2.22.1.1.new/data/Makefile.in
5673
--- evince-2.22.1.1/data/Makefile.in 2008-04-08 21:19:04.000000000 +0200
5674
+++ evince-2.22.1.1.new/data/Makefile.in 2008-04-08 23:59:14.000000000 +0200
6008
5675
@@ -1,8 +1,8 @@
6009
5676
-# Makefile.in generated by automake 1.10 from Makefile.am.
6010
5677
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6064
5731
HTML_DIR = @HTML_DIR@
6065
5732
INSTALL = @INSTALL@
6066
5733
INSTALL_DATA = @INSTALL_DATA@
6067
@@ -187,9 +195,11 @@
6068
MKINSTALLDIRS = @MKINSTALLDIRS@
6069
MSGFMT = @MSGFMT@
6070
MSGFMT_OPTS = @MSGFMT_OPTS@
6071
+MSGMERGE = @MSGMERGE@
5734
@@ -191,6 +199,7 @@
6072
5735
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6073
5736
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6074
5737
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6076
5739
OBJEXT = @OBJEXT@
6077
5740
OMF_DIR = @OMF_DIR@
6078
5741
PACKAGE = @PACKAGE@
6079
@@ -285,11 +295,17 @@
5742
@@ -286,11 +295,17 @@
6080
5743
# UI descriptions
6081
5744
#
6082
5745
uidir = $(pkgdatadir)
6099
5762
6100
5763
6101
5764
#
6102
@@ -302,9 +318,15 @@
5765
@@ -303,9 +318,15 @@
6103
5766
$(NULL)
6104
5767
6105
5768
DESKTOP_IN_FILES = evince.desktop.in.in
6116
5779
schema_in_files = evince.schemas.in
6117
5780
schemadir = $(GCONF_SCHEMA_FILE_DIR)
6118
5781
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
6119
@@ -323,6 +345,7 @@
5782
@@ -324,6 +345,7 @@
6120
5783
$(DESKTOP_IN_FILES) \
6121
5784
$(schema_in_files) \
6122
5785
$(man_MANS) \
6124
5787
$(NULL)
6125
5788
6126
5789
6127
@@ -418,6 +441,23 @@
5790
@@ -419,6 +441,23 @@
6128
5791
echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
6129
5792
rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
6130
5793
done
6148
5811
install-desktopDATA: $(desktop_DATA)
6149
5812
@$(NORMAL_INSTALL)
6150
5813
test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
6151
@@ -562,8 +602,8 @@
5814
@@ -563,8 +602,8 @@
6152
5815
unique=`for i in $$list; do \
6153
5816
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6154
5817
done | \
6159
5822
mkid -fID $$unique
6160
5823
tags: TAGS
6161
5824
6162
@@ -588,8 +628,8 @@
5825
@@ -589,8 +628,8 @@
6163
5826
unique=`for i in $$list; do \
6164
5827
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6165
5828
done | \
6170
5833
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
6171
5834
test -n "$$unique" || unique=$$empty_fix; \
6172
5835
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
6173
@@ -599,13 +639,12 @@
5836
@@ -600,13 +639,12 @@
6174
5837
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
6175
5838
$(TAGS_FILES) $(LISP)
6176
5839
tags=; \
6186
5849
test -z "$(CTAGS_ARGS)$$tags$$unique" \
6187
5850
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6188
5851
$$tags $$unique
6189
@@ -666,7 +705,7 @@
5852
@@ -667,7 +705,7 @@
6190
5853
all-am: Makefile $(MANS) $(DATA)
6191
5854
installdirs: installdirs-recursive
6192
5855
installdirs-am:
6195
5858
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
6196
5859
done
6197
5860
install: install-recursive
6198
@@ -712,9 +751,9 @@
5861
@@ -713,9 +751,9 @@
6199
5862
6200
5863
info-am:
6201
5864
6208
5871
@$(NORMAL_INSTALL)
6209
5872
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
6210
5873
6211
@@ -750,9 +789,9 @@
5874
@@ -751,9 +789,9 @@
6212
5875
6213
5876
ps-am:
6214
5877
6221
5884
@$(NORMAL_INSTALL)
6222
5885
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
6223
5886
6224
@@ -767,15 +806,16 @@
5887
@@ -768,15 +806,16 @@
6225
5888
distclean-libtool distclean-tags distdir dvi dvi-am html \
6226
5889
html-am info info-am install install-am install-data \
6227
5890
install-data-am install-data-hook install-data-local \
6247
5910
uninstall-gladeDATA uninstall-hook uninstall-local \
6248
5911
uninstall-man uninstall-man1 uninstall-schemaDATA \
6249
5912
uninstall-uiDATA
6250
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/help/Makefile.in evince-2.22.1.new/help/Makefile.in
6251
--- evince-2.22.1/help/Makefile.in 2008-04-07 18:43:03.000000000 +0200
6252
+++ evince-2.22.1.new/help/Makefile.in 2008-04-07 22:46:13.000000000 +0200
5913
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/help/Makefile.in evince-2.22.1.1.new/help/Makefile.in
5914
--- evince-2.22.1.1/help/Makefile.in 2008-04-08 21:19:08.000000000 +0200
5915
+++ evince-2.22.1.1.new/help/Makefile.in 2008-04-08 23:59:15.000000000 +0200
6253
5916
@@ -1,8 +1,8 @@
6254
5917
-# Makefile.in generated by automake 1.10 from Makefile.am.
6255
5918
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6284
5947
HTML_DIR = @HTML_DIR@
6285
5948
INSTALL = @INSTALL@
6286
5949
INSTALL_DATA = @INSTALL_DATA@
6287
@@ -193,9 +198,11 @@
6288
MKINSTALLDIRS = @MKINSTALLDIRS@
6289
MSGFMT = @MSGFMT@
6290
MSGFMT_OPTS = @MSGFMT_OPTS@
6291
+MSGMERGE = @MSGMERGE@
5950
@@ -197,6 +202,7 @@
6292
5951
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6293
5952
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6294
5953
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6296
5955
OBJEXT = @OBJEXT@
6297
5956
OMF_DIR = @OMF_DIR@
6298
5957
PACKAGE = @PACKAGE@
6299
@@ -500,8 +507,8 @@
5958
@@ -501,8 +507,8 @@
6300
5959
unique=`for i in $$list; do \
6301
5960
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6302
5961
done | \
6307
5966
mkid -fID $$unique
6308
5967
tags: TAGS
6309
5968
6310
@@ -526,8 +533,8 @@
5969
@@ -527,8 +533,8 @@
6311
5970
unique=`for i in $$list; do \
6312
5971
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6313
5972
done | \
6318
5977
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
6319
5978
test -n "$$unique" || unique=$$empty_fix; \
6320
5979
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
6321
@@ -537,13 +544,12 @@
5980
@@ -538,13 +544,12 @@
6322
5981
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
6323
5982
$(TAGS_FILES) $(LISP)
6324
5983
tags=; \
6334
5993
test -z "$(CTAGS_ARGS)$$tags$$unique" \
6335
5994
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6336
5995
$$tags $$unique
6337
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/help/reference/Makefile.in evince-2.22.1.new/help/reference/Makefile.in
6338
--- evince-2.22.1/help/reference/Makefile.in 2008-04-07 18:43:03.000000000 +0200
6339
+++ evince-2.22.1.new/help/reference/Makefile.in 2008-04-07 22:46:14.000000000 +0200
5996
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/help/reference/Makefile.in evince-2.22.1.1.new/help/reference/Makefile.in
5997
--- evince-2.22.1.1/help/reference/Makefile.in 2008-04-08 21:19:09.000000000 +0200
5998
+++ evince-2.22.1.1.new/help/reference/Makefile.in 2008-04-08 23:59:15.000000000 +0200
6340
5999
@@ -1,8 +1,8 @@
6341
6000
-# Makefile.in generated by automake 1.10 from Makefile.am.
6342
6001
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6371
6030
HTML_DIR = @HTML_DIR@
6372
6031
INSTALL = @INSTALL@
6373
6032
INSTALL_DATA = @INSTALL_DATA@
6374
@@ -166,9 +171,11 @@
6375
MKINSTALLDIRS = @MKINSTALLDIRS@
6376
MSGFMT = @MSGFMT@
6377
MSGFMT_OPTS = @MSGFMT_OPTS@
6378
+MSGMERGE = @MSGMERGE@
6033
@@ -170,6 +175,7 @@
6379
6034
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6380
6035
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6381
6036
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6383
6038
OBJEXT = @OBJEXT@
6384
6039
OMF_DIR = @OMF_DIR@
6385
6040
PACKAGE = @PACKAGE@
6386
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/libdocument/Makefile.in evince-2.22.1.new/libdocument/Makefile.in
6387
--- evince-2.22.1/libdocument/Makefile.in 2008-04-07 18:43:04.000000000 +0200
6388
+++ evince-2.22.1.new/libdocument/Makefile.in 2008-04-07 22:46:14.000000000 +0200
6041
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/libdocument/Makefile.in evince-2.22.1.1.new/libdocument/Makefile.in
6042
--- evince-2.22.1.1/libdocument/Makefile.in 2008-04-08 21:19:09.000000000 +0200
6043
+++ evince-2.22.1.1.new/libdocument/Makefile.in 2008-04-08 23:59:15.000000000 +0200
6389
6044
@@ -1,8 +1,8 @@
6390
6045
-# Makefile.in generated by automake 1.10 from Makefile.am.
6391
6046
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6429
6084
HTML_DIR = @HTML_DIR@
6430
6085
INSTALL = @INSTALL@
6431
6086
INSTALL_DATA = @INSTALL_DATA@
6432
@@ -201,9 +206,11 @@
6433
MKINSTALLDIRS = @MKINSTALLDIRS@
6434
MSGFMT = @MSGFMT@
6435
MSGFMT_OPTS = @MSGFMT_OPTS@
6436
+MSGMERGE = @MSGMERGE@
6087
@@ -205,6 +210,7 @@
6437
6088
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6438
6089
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6439
6090
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6441
6092
OBJEXT = @OBJEXT@
6442
6093
OMF_DIR = @OMF_DIR@
6443
6094
PACKAGE = @PACKAGE@
6444
@@ -409,8 +416,8 @@
6095
@@ -410,8 +416,8 @@
6445
6096
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
6446
6097
if test -f $$p; then \
6447
6098
f=$(am__strip_dir) \
6452
6103
else :; fi; \
6453
6104
done
6454
6105
6455
@@ -418,8 +425,8 @@
6106
@@ -419,8 +425,8 @@
6456
6107
@$(NORMAL_UNINSTALL)
6457
6108
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
6458
6109
p=$(am__strip_dir) \
6463
6114
done
6464
6115
6465
6116
clean-libLTLIBRARIES:
6466
@@ -515,8 +522,8 @@
6117
@@ -516,8 +522,8 @@
6467
6118
unique=`for i in $$list; do \
6468
6119
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6469
6120
done | \
6474
6125
mkid -fID $$unique
6475
6126
tags: TAGS
6476
6127
6477
@@ -528,8 +535,8 @@
6128
@@ -529,8 +535,8 @@
6478
6129
unique=`for i in $$list; do \
6479
6130
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6480
6131
done | \
6485
6136
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
6486
6137
test -n "$$unique" || unique=$$empty_fix; \
6487
6138
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
6488
@@ -539,13 +546,12 @@
6139
@@ -540,13 +546,12 @@
6489
6140
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
6490
6141
$(TAGS_FILES) $(LISP)
6491
6142
tags=; \
6501
6152
test -z "$(CTAGS_ARGS)$$tags$$unique" \
6502
6153
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6503
6154
$$tags $$unique
6504
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/Makefile.in evince-2.22.1.new/Makefile.in
6505
--- evince-2.22.1/Makefile.in 2008-04-07 18:43:06.000000000 +0200
6506
+++ evince-2.22.1.new/Makefile.in 2008-04-07 22:46:14.000000000 +0200
6155
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/Makefile.in evince-2.22.1.1.new/Makefile.in
6156
--- evince-2.22.1.1/Makefile.in 2008-04-08 21:19:10.000000000 +0200
6157
+++ evince-2.22.1.1.new/Makefile.in 2008-04-08 23:59:16.000000000 +0200
6507
6158
@@ -1,8 +1,8 @@
6508
6159
-# Makefile.in generated by automake 1.10 from Makefile.am.
6509
6160
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6538
6189
HTML_DIR = @HTML_DIR@
6539
6190
INSTALL = @INSTALL@
6540
6191
INSTALL_DATA = @INSTALL_DATA@
6541
@@ -185,9 +190,11 @@
6542
MKINSTALLDIRS = @MKINSTALLDIRS@
6543
MSGFMT = @MSGFMT@
6544
MSGFMT_OPTS = @MSGFMT_OPTS@
6545
+MSGMERGE = @MSGMERGE@
6192
@@ -189,6 +194,7 @@
6546
6193
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6547
6194
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6548
6195
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6550
6197
OBJEXT = @OBJEXT@
6551
6198
OMF_DIR = @OMF_DIR@
6552
6199
PACKAGE = @PACKAGE@
6553
@@ -283,7 +290,6 @@
6200
@@ -284,7 +290,6 @@
6554
6201
intltool-merge \
6555
6202
intltool-update
6556
6203
6558
6205
6559
6206
# Ignore scrollkeeper issues for now. @#*$& scrollkeeper
6560
6207
distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
6561
@@ -426,8 +432,8 @@
6208
@@ -427,8 +432,8 @@
6562
6209
unique=`for i in $$list; do \
6563
6210
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6564
6211
done | \
6569
6216
mkid -fID $$unique
6570
6217
tags: TAGS
6571
6218
6572
@@ -452,8 +458,8 @@
6219
@@ -453,8 +458,8 @@
6573
6220
unique=`for i in $$list; do \
6574
6221
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6575
6222
done | \
6580
6227
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
6581
6228
test -n "$$unique" || unique=$$empty_fix; \
6582
6229
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
6583
@@ -463,13 +469,12 @@
6230
@@ -464,13 +469,12 @@
6584
6231
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
6585
6232
$(TAGS_FILES) $(LISP)
6586
6233
tags=; \
6596
6243
test -z "$(CTAGS_ARGS)$$tags$$unique" \
6597
6244
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6598
6245
$$tags $$unique
6599
@@ -539,6 +544,10 @@
6246
@@ -540,6 +544,10 @@
6600
6247
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
6601
6248
$(am__remove_distdir)
6602
6249
6607
6254
dist-tarZ: distdir
6608
6255
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
6609
6256
$(am__remove_distdir)
6610
@@ -565,6 +574,8 @@
6257
@@ -566,6 +574,8 @@
6611
6258
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
6612
6259
*.tar.bz2*) \
6613
6260
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
6616
6263
*.tar.Z*) \
6617
6264
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
6618
6265
*.shar.gz*) \
6619
@@ -717,8 +728,8 @@
6266
@@ -718,8 +728,8 @@
6620
6267
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
6621
6268
all all-am am--refresh check check-am clean clean-generic \
6622
6269
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
6627
6274
distclean-tags distcleancheck distdir distuninstallcheck dvi \
6628
6275
dvi-am html html-am info info-am install install-am \
6629
6276
install-data install-data-am install-dvi install-dvi-am \
6630
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/properties/Makefile.in evince-2.22.1.new/properties/Makefile.in
6631
--- evince-2.22.1/properties/Makefile.in 2008-04-07 18:43:04.000000000 +0200
6632
+++ evince-2.22.1.new/properties/Makefile.in 2008-04-07 22:46:14.000000000 +0200
6277
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/properties/Makefile.in evince-2.22.1.1.new/properties/Makefile.in
6278
--- evince-2.22.1.1/properties/Makefile.in 2008-04-08 21:19:09.000000000 +0200
6279
+++ evince-2.22.1.1.new/properties/Makefile.in 2008-04-08 23:59:15.000000000 +0200
6633
6280
@@ -1,8 +1,8 @@
6634
6281
-# Makefile.in generated by automake 1.10 from Makefile.am.
6635
6282
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6673
6320
HTML_DIR = @HTML_DIR@
6674
6321
INSTALL = @INSTALL@
6675
6322
INSTALL_DATA = @INSTALL_DATA@
6676
@@ -199,9 +204,11 @@
6677
MKINSTALLDIRS = @MKINSTALLDIRS@
6678
MSGFMT = @MSGFMT@
6679
MSGFMT_OPTS = @MSGFMT_OPTS@
6680
+MSGMERGE = @MSGMERGE@
6323
@@ -203,6 +208,7 @@
6681
6324
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6682
6325
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6683
6326
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6685
6328
OBJEXT = @OBJEXT@
6686
6329
OMF_DIR = @OMF_DIR@
6687
6330
PACKAGE = @PACKAGE@
6688
@@ -353,8 +360,8 @@
6331
@@ -354,8 +360,8 @@
6689
6332
@list='$(nautilus_LTLIBRARIES)'; for p in $$list; do \
6690
6333
if test -f $$p; then \
6691
6334
f=$(am__strip_dir) \
6696
6339
else :; fi; \
6697
6340
done
6698
6341
6699
@@ -362,8 +369,8 @@
6342
@@ -363,8 +369,8 @@
6700
6343
@$(NORMAL_UNINSTALL)
6701
6344
@list='$(nautilus_LTLIBRARIES)'; for p in $$list; do \
6702
6345
p=$(am__strip_dir) \
6707
6350
done
6708
6351
6709
6352
clean-nautilusLTLIBRARIES:
6710
@@ -436,8 +443,8 @@
6353
@@ -437,8 +443,8 @@
6711
6354
unique=`for i in $$list; do \
6712
6355
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6713
6356
done | \
6718
6361
mkid -fID $$unique
6719
6362
tags: TAGS
6720
6363
6721
@@ -449,8 +456,8 @@
6364
@@ -450,8 +456,8 @@
6722
6365
unique=`for i in $$list; do \
6723
6366
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6724
6367
done | \
6729
6372
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
6730
6373
test -n "$$unique" || unique=$$empty_fix; \
6731
6374
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
6732
@@ -460,13 +467,12 @@
6375
@@ -461,13 +467,12 @@
6733
6376
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
6734
6377
$(TAGS_FILES) $(LISP)
6735
6378
tags=; \
6745
6388
test -z "$(CTAGS_ARGS)$$tags$$unique" \
6746
6389
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6747
6390
$$tags $$unique
6748
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/shell/Makefile.in evince-2.22.1.new/shell/Makefile.in
6749
--- evince-2.22.1/shell/Makefile.in 2008-04-07 18:43:05.000000000 +0200
6750
+++ evince-2.22.1.new/shell/Makefile.in 2008-04-07 22:46:14.000000000 +0200
6391
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/shell/Makefile.in evince-2.22.1.1.new/shell/Makefile.in
6392
--- evince-2.22.1.1/shell/Makefile.in 2008-04-08 21:19:09.000000000 +0200
6393
+++ evince-2.22.1.1.new/shell/Makefile.in 2008-04-08 23:59:15.000000000 +0200
6751
6394
@@ -1,8 +1,8 @@
6752
6395
-# Makefile.in generated by automake 1.10 from Makefile.am.
6753
6396
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6793
6436
HTML_DIR = @HTML_DIR@
6794
6437
INSTALL = @INSTALL@
6795
6438
INSTALL_DATA = @INSTALL_DATA@
6796
@@ -203,9 +208,11 @@
6797
MKINSTALLDIRS = @MKINSTALLDIRS@
6798
MSGFMT = @MSGFMT@
6799
MSGFMT_OPTS = @MSGFMT_OPTS@
6800
+MSGMERGE = @MSGMERGE@
6439
@@ -207,6 +212,7 @@
6801
6440
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6802
6441
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6803
6442
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6805
6444
OBJEXT = @OBJEXT@
6806
6445
OMF_DIR = @OMF_DIR@
6807
6446
PACKAGE = @PACKAGE@
6808
@@ -302,7 +309,8 @@
6447
@@ -303,7 +309,8 @@
6809
6448
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
6810
6449
$(SHELL_CFLAGS) \
6811
6450
$(WARN_CFLAGS) \
6815
6454
6816
6455
evince_SOURCES = \
6817
6456
eggfindbar.c \
6818
@@ -381,7 +389,8 @@
6457
@@ -382,7 +389,8 @@
6819
6458
$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la \
6820
6459
$(top_builddir)/properties/libevproperties.la \
6821
6460
$(top_builddir)/libdocument/libevbackend.la \
6825
6464
6826
6465
BUILT_SOURCES = ev-marshal.h ev-marshal.c $(am__append_1)
6827
6466
EXTRA_DIST = ev-marshal.list \
6828
@@ -433,8 +442,8 @@
6467
@@ -434,8 +442,8 @@
6829
6468
|| test -f $$p1 \
6830
6469
; then \
6831
6470
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
6836
6475
else :; fi; \
6837
6476
done
6838
6477
6839
@@ -529,8 +538,8 @@
6478
@@ -530,8 +538,8 @@
6840
6479
unique=`for i in $$list; do \
6841
6480
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6842
6481
done | \
6847
6486
mkid -fID $$unique
6848
6487
tags: TAGS
6849
6488
6850
@@ -542,8 +551,8 @@
6489
@@ -543,8 +551,8 @@
6851
6490
unique=`for i in $$list; do \
6852
6491
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6853
6492
done | \
6858
6497
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
6859
6498
test -n "$$unique" || unique=$$empty_fix; \
6860
6499
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
6861
@@ -553,13 +562,12 @@
6500
@@ -554,13 +562,12 @@
6862
6501
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
6863
6502
$(TAGS_FILES) $(LISP)
6864
6503
tags=; \
6874
6513
test -z "$(CTAGS_ARGS)$$tags$$unique" \
6875
6514
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6876
6515
$$tags $$unique
6877
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/test/Makefile.in evince-2.22.1.new/test/Makefile.in
6878
--- evince-2.22.1/test/Makefile.in 2008-04-07 18:43:05.000000000 +0200
6879
+++ evince-2.22.1.new/test/Makefile.in 2008-04-07 22:46:14.000000000 +0200
6516
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/test/Makefile.in evince-2.22.1.1.new/test/Makefile.in
6517
--- evince-2.22.1.1/test/Makefile.in 2008-04-08 21:19:10.000000000 +0200
6518
+++ evince-2.22.1.1.new/test/Makefile.in 2008-04-08 23:59:15.000000000 +0200
6880
6519
@@ -1,8 +1,8 @@
6881
6520
-# Makefile.in generated by automake 1.10 from Makefile.am.
6882
6521
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6911
6550
HTML_DIR = @HTML_DIR@
6912
6551
INSTALL = @INSTALL@
6913
6552
INSTALL_DATA = @INSTALL_DATA@
6914
@@ -157,9 +162,11 @@
6915
MKINSTALLDIRS = @MKINSTALLDIRS@
6916
MSGFMT = @MSGFMT@
6917
MSGFMT_OPTS = @MSGFMT_OPTS@
6918
+MSGMERGE = @MSGMERGE@
6553
@@ -161,6 +166,7 @@
6919
6554
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6920
6555
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6921
6556
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6923
6558
OBJEXT = @OBJEXT@
6924
6559
OMF_DIR = @OMF_DIR@
6925
6560
PACKAGE = @PACKAGE@
6926
diff -Nur -x '*.orig' -x '*~' evince-2.22.1/thumbnailer/Makefile.in evince-2.22.1.new/thumbnailer/Makefile.in
6927
--- evince-2.22.1/thumbnailer/Makefile.in 2008-04-07 18:43:06.000000000 +0200
6928
+++ evince-2.22.1.new/thumbnailer/Makefile.in 2008-04-07 22:46:14.000000000 +0200
6561
diff -Nur -x '*.orig' -x '*~' evince-2.22.1.1/thumbnailer/Makefile.in evince-2.22.1.1.new/thumbnailer/Makefile.in
6562
--- evince-2.22.1.1/thumbnailer/Makefile.in 2008-04-08 21:19:10.000000000 +0200
6563
+++ evince-2.22.1.1.new/thumbnailer/Makefile.in 2008-04-08 23:59:16.000000000 +0200
6929
6564
@@ -1,8 +1,8 @@
6930
6565
-# Makefile.in generated by automake 1.10 from Makefile.am.
6931
6566
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
6969
6604
HTML_DIR = @HTML_DIR@
6970
6605
INSTALL = @INSTALL@
6971
6606
INSTALL_DATA = @INSTALL_DATA@
6972
@@ -195,9 +200,11 @@
6973
MKINSTALLDIRS = @MKINSTALLDIRS@
6974
MSGFMT = @MSGFMT@
6975
MSGFMT_OPTS = @MSGFMT_OPTS@
6976
+MSGMERGE = @MSGMERGE@
6607
@@ -199,6 +204,7 @@
6977
6608
NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
6978
6609
NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
6979
6610
NAUTILUS_LIBS = @NAUTILUS_LIBS@
6981
6612
OBJEXT = @OBJEXT@
6982
6613
OMF_DIR = @OMF_DIR@
6983
6614
PACKAGE = @PACKAGE@
6984
@@ -355,8 +362,8 @@
6615
@@ -356,8 +362,8 @@
6985
6616
|| test -f $$p1 \
6986
6617
; then \
6987
6618
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
6992
6623
else :; fi; \
6993
6624
done
6994
6625
6995
@@ -435,8 +442,8 @@
6626
@@ -436,8 +442,8 @@
6996
6627
unique=`for i in $$list; do \
6997
6628
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6998
6629
done | \
7003
6634
mkid -fID $$unique
7004
6635
tags: TAGS
7005
6636
7006
@@ -448,8 +455,8 @@
6637
@@ -449,8 +455,8 @@
7007
6638
unique=`for i in $$list; do \
7008
6639
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7009
6640
done | \
7014
6645
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
7015
6646
test -n "$$unique" || unique=$$empty_fix; \
7016
6647
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
7017
@@ -459,13 +466,12 @@
6648
@@ -460,13 +466,12 @@
7018
6649
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7019
6650
$(TAGS_FILES) $(LISP)
7020
6651
tags=; \
Loggerhead is a web-based interface for Breezy
Version: 2.0.1