~ubuntu-branches/ubuntu/hardy/evince/hardy-security
» Revision
45
: debian/patches/99_autoreconf.patch
« back to all changes in this revision
Viewing changes to debian/patches/99_autoreconf.patch
- browse files at revision 45
- compare with another revision
- download diff
- download tarball
- view history from revision 45
- Committer: Bazaar Package Importer
- Author(s): Sebastien Bacher
- Date: 2007-12-04 23:44:28 UTC
- mfrom: (1.1.23 upstream)
- Revision ID: james.westby@ubuntu.com-20071204234428-qc1n30y3fa0w4hpu
Tags: 2.21.1-0ubuntu1
* New upstream version
New Features and UI Improvements:
- Use message area for notification about errors
- Some print settings for documents are stored in metadata
- Added command line option for search
- Expander with a recent documents is added to toolbar
- Egg-recent code dropped
- Djvu, dvi and comics are enabled by default
- Support for links with URI's like mailto
- Removed the shadow of the fullscreen toolbar
Bug fixes:
- A lot of bug fixes from a stable branch
* debian/patches/01_launchpad.patch:
- updated
* debian/patches/03_hildon_interface.patch:
- updated
* debian/patches/99_autoreconf.patch:
- updated
New Features and UI Improvements:
- Use message area for notification about errors
- Some print settings for documents are stored in metadata
- Added command line option for search
- Expander with a recent documents is added to toolbar
- Egg-recent code dropped
- Djvu, dvi and comics are enabled by default
- Support for links with URI's like mailto
- Removed the shadow of the fullscreen toolbar
Bug fixes:
- A lot of bug fixes from a stable branch
* debian/patches/01_launchpad.patch:
- updated
* debian/patches/03_hildon_interface.patch:
- updated
* debian/patches/99_autoreconf.patch:
- updated
- files added:
- cut-n-paste/gedit-message-area
- files removed:
- cut-n-paste/recent-files
- files modified:
- ChangeLog
added
removed
debian/patches/99_autoreconf.patch
1
1
# Description: autotools update changes
2
2
# UbuntuSpecific: update autotools due to launchpad and hildon changes
3
3
#
4
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/aclocal.m4 evince-2.20.2.new/aclocal.m4
5
--- evince-2.20.2/aclocal.m4 2007-11-26 22:55:22.000000000 +0100
6
+++ evince-2.20.2.new/aclocal.m4 2007-11-27 22:51:54.000000000 +0100
4
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/aclocal.m4 evince-2.21.1.new/aclocal.m4
5
--- evince-2.21.1/aclocal.m4 2007-12-03 22:57:53.000000000 +0100
6
+++ evince-2.21.1.new/aclocal.m4 2007-12-05 00:07:24.000000000 +0100
7
7
@@ -1,7 +1,7 @@
8
8
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
9
9
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
1823
1823
# Check how to create a tarball. -*- Autoconf -*-
1824
1824
1825
1825
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
1826
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/comics/Makefile.in evince-2.20.2.new/backend/comics/Makefile.in
1827
--- evince-2.20.2/backend/comics/Makefile.in 2007-11-26 22:55:44.000000000 +0100
1828
+++ evince-2.20.2.new/backend/comics/Makefile.in 2007-11-27 22:51:54.000000000 +0100
1826
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/comics/Makefile.in evince-2.21.1.new/backend/comics/Makefile.in
1827
--- evince-2.21.1/backend/comics/Makefile.in 2007-12-03 22:58:13.000000000 +0100
1828
+++ evince-2.21.1.new/backend/comics/Makefile.in 2007-12-05 00:07:24.000000000 +0100
1829
1829
@@ -1,8 +1,8 @@
1830
1830
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
1831
1831
+# Makefile.in generated by automake 1.10 from Makefile.am.
1936
1936
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
1937
1937
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
1938
1938
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1939
@@ -159,20 +126,17 @@
1939
@@ -159,16 +126,15 @@
1940
1940
GNOME_LIBS = @GNOME_LIBS@
1941
1941
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
1942
1942
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
1946
1946
+GTKDOC_CHECK = @GTKDOC_CHECK@
1947
1947
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
1948
1948
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
1949
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
1950
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
1951
1949
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
1952
1950
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
1953
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
1954
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
1955
1951
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
1956
1952
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
1957
1953
HELP_DIR = @HELP_DIR@
1962
1958
INSTALL_DATA = @INSTALL_DATA@
1963
1959
INSTALL_PROGRAM = @INSTALL_PROGRAM@
1964
1960
INSTALL_SCRIPT = @INSTALL_SCRIPT@
1965
@@ -183,14 +147,12 @@
1961
@@ -179,14 +145,12 @@
1966
1962
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
1967
1963
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
1968
1964
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
1978
1974
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
1979
1975
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
1980
1976
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
1981
@@ -202,7 +164,6 @@
1977
@@ -198,7 +162,6 @@
1982
1978
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
1983
1979
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1984
1980
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
1986
1982
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
1987
1983
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
1988
1984
LDFLAGS = @LDFLAGS@
1989
@@ -214,9 +175,8 @@
1985
@@ -210,9 +173,8 @@
1990
1986
LN_S = @LN_S@
1991
1987
LTLIBOBJS = @LTLIBOBJS@
1992
1988
MAINT = @MAINT@
1997
1993
MKINSTALLDIRS = @MKINSTALLDIRS@
1998
1994
MSGFMT = @MSGFMT@
1999
1995
MSGFMT_OPTS = @MSGFMT_OPTS@
2000
@@ -251,26 +211,14 @@
1996
@@ -247,26 +209,14 @@
2001
1997
VERSION = @VERSION@
2002
1998
WARN_CFLAGS = @WARN_CFLAGS@
2003
1999
WARN_CXXFLAGS = @WARN_CXXFLAGS@
2028
2024
am__include = @am__include@
2029
2025
am__leading_dot = @am__leading_dot@
2030
2026
am__quote = @am__quote@
2031
@@ -282,28 +230,39 @@
2027
@@ -278,28 +228,39 @@
2032
2028
build_cpu = @build_cpu@
2033
2029
build_os = @build_os@
2034
2030
build_vendor = @build_vendor@
2068
2064
INCLUDES = \
2069
2065
-I$(top_srcdir) \
2070
2066
-I$(top_srcdir)/libdocument \
2071
@@ -357,7 +316,7 @@
2067
@@ -353,7 +314,7 @@
2072
2068
rm -f "$${dir}/so_locations"; \
2073
2069
done
2074
2070
libcomicsdocument.la: $(libcomicsdocument_la_OBJECTS) $(libcomicsdocument_la_DEPENDENCIES)
2077
2073
2078
2074
mostlyclean-compile:
2079
2075
-rm -f *.$(OBJEXT)
2080
@@ -368,22 +327,22 @@
2076
@@ -364,22 +325,22 @@
2081
2077
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comics-document.Plo@am__quote@
2082
2078
2083
2079
.c.o:
2106
2102
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2107
2103
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2108
2104
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
2109
@@ -394,10 +353,6 @@
2105
@@ -390,10 +351,6 @@
2110
2106
clean-libtool:
2111
2107
-rm -rf .libs _libs
2112
2108
2117
2113
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
2118
2114
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
2119
2115
unique=`for i in $$list; do \
2120
@@ -447,22 +402,21 @@
2116
@@ -443,22 +400,21 @@
2121
2117
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
2122
2118
2123
2119
distdir: $(DISTFILES)
2153
2149
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2154
2150
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2155
2151
fi; \
2156
@@ -510,7 +464,7 @@
2152
@@ -506,7 +462,7 @@
2157
2153
-rm -rf ./$(DEPDIR)
2158
2154
-rm -f Makefile
2159
2155
distclean-am: clean-am distclean-compile distclean-generic \
2162
2158
2163
2159
dvi: dvi-am
2164
2160
2165
@@ -524,12 +478,20 @@
2161
@@ -520,12 +476,20 @@
2166
2162
2167
2163
install-data-am:
2168
2164
2183
2179
installcheck-am:
2184
2180
2185
2181
maintainer-clean: maintainer-clean-am
2186
@@ -550,19 +512,22 @@
2182
@@ -546,19 +510,22 @@
2187
2183
2188
2184
ps-am:
2189
2185
2211
2207
2212
2208
# Tell versions [3.59,3.63) of GNU make to not export all variables.
2213
2209
# Otherwise a system limit (for SysV at least) may be exceeded.
2214
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/djvu/Makefile.in evince-2.20.2.new/backend/djvu/Makefile.in
2215
--- evince-2.20.2/backend/djvu/Makefile.in 2007-11-26 22:55:45.000000000 +0100
2216
+++ evince-2.20.2.new/backend/djvu/Makefile.in 2007-11-27 22:51:54.000000000 +0100
2210
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/djvu/Makefile.in evince-2.21.1.new/backend/djvu/Makefile.in
2211
--- evince-2.21.1/backend/djvu/Makefile.in 2007-12-03 22:58:13.000000000 +0100
2212
+++ evince-2.21.1.new/backend/djvu/Makefile.in 2007-12-05 00:07:24.000000000 +0100
2217
2213
@@ -1,8 +1,8 @@
2218
2214
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
2219
2215
+# Makefile.in generated by automake 1.10 from Makefile.am.
2324
2320
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
2325
2321
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
2326
2322
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2327
@@ -160,20 +127,17 @@
2323
@@ -160,16 +127,15 @@
2328
2324
GNOME_LIBS = @GNOME_LIBS@
2329
2325
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
2330
2326
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
2334
2330
+GTKDOC_CHECK = @GTKDOC_CHECK@
2335
2331
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
2336
2332
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
2337
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
2338
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
2339
2333
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
2340
2334
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
2341
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
2342
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
2343
2335
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
2344
2336
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
2345
2337
HELP_DIR = @HELP_DIR@
2350
2342
INSTALL_DATA = @INSTALL_DATA@
2351
2343
INSTALL_PROGRAM = @INSTALL_PROGRAM@
2352
2344
INSTALL_SCRIPT = @INSTALL_SCRIPT@
2353
@@ -184,14 +148,12 @@
2345
@@ -180,14 +146,12 @@
2354
2346
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
2355
2347
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
2356
2348
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
2366
2358
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
2367
2359
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
2368
2360
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
2369
@@ -203,7 +165,6 @@
2361
@@ -199,7 +163,6 @@
2370
2362
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
2371
2363
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2372
2364
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
2374
2366
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
2375
2367
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
2376
2368
LDFLAGS = @LDFLAGS@
2377
@@ -215,9 +176,8 @@
2369
@@ -211,9 +174,8 @@
2378
2370
LN_S = @LN_S@
2379
2371
LTLIBOBJS = @LTLIBOBJS@
2380
2372
MAINT = @MAINT@
2385
2377
MKINSTALLDIRS = @MKINSTALLDIRS@
2386
2378
MSGFMT = @MSGFMT@
2387
2379
MSGFMT_OPTS = @MSGFMT_OPTS@
2388
@@ -252,26 +212,14 @@
2380
@@ -248,26 +210,14 @@
2389
2381
VERSION = @VERSION@
2390
2382
WARN_CFLAGS = @WARN_CFLAGS@
2391
2383
WARN_CXXFLAGS = @WARN_CXXFLAGS@
2416
2408
am__include = @am__include@
2417
2409
am__leading_dot = @am__leading_dot@
2418
2410
am__quote = @am__quote@
2419
@@ -283,28 +231,39 @@
2411
@@ -279,28 +229,39 @@
2420
2412
build_cpu = @build_cpu@
2421
2413
build_os = @build_os@
2422
2414
build_vendor = @build_vendor@
2456
2448
INCLUDES = \
2457
2449
-I$(top_srcdir) \
2458
2450
-I$(top_srcdir)/libdocument \
2459
@@ -367,7 +326,7 @@
2451
@@ -363,7 +324,7 @@
2460
2452
rm -f "$${dir}/so_locations"; \
2461
2453
done
2462
2454
libgtkdjvu.la: $(libgtkdjvu_la_OBJECTS) $(libgtkdjvu_la_DEPENDENCIES)
2465
2457
2466
2458
mostlyclean-compile:
2467
2459
-rm -f *.$(OBJEXT)
2468
@@ -381,22 +340,22 @@
2460
@@ -377,22 +338,22 @@
2469
2461
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvu-text.Plo@am__quote@
2470
2462
2471
2463
.c.o:
2494
2486
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2495
2487
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2496
2488
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
2497
@@ -407,10 +366,6 @@
2489
@@ -403,10 +364,6 @@
2498
2490
clean-libtool:
2499
2491
-rm -rf .libs _libs
2500
2492
2505
2497
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
2506
2498
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
2507
2499
unique=`for i in $$list; do \
2508
@@ -460,22 +415,21 @@
2500
@@ -456,22 +413,21 @@
2509
2501
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
2510
2502
2511
2503
distdir: $(DISTFILES)
2541
2533
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2542
2534
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2543
2535
fi; \
2544
@@ -523,7 +477,7 @@
2536
@@ -519,7 +475,7 @@
2545
2537
-rm -rf ./$(DEPDIR)
2546
2538
-rm -f Makefile
2547
2539
distclean-am: clean-am distclean-compile distclean-generic \
2550
2542
2551
2543
dvi: dvi-am
2552
2544
2553
@@ -537,12 +491,20 @@
2545
@@ -533,12 +489,20 @@
2554
2546
2555
2547
install-data-am:
2556
2548
2571
2563
installcheck-am:
2572
2564
2573
2565
maintainer-clean: maintainer-clean-am
2574
@@ -563,19 +525,22 @@
2566
@@ -559,19 +523,22 @@
2575
2567
2576
2568
ps-am:
2577
2569
2599
2591
2600
2592
# Tell versions [3.59,3.63) of GNU make to not export all variables.
2601
2593
# Otherwise a system limit (for SysV at least) may be exceeded.
2602
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/dvi/Makefile.in evince-2.20.2.new/backend/dvi/Makefile.in
2603
--- evince-2.20.2/backend/dvi/Makefile.in 2007-11-26 22:55:45.000000000 +0100
2604
+++ evince-2.20.2.new/backend/dvi/Makefile.in 2007-11-27 22:51:54.000000000 +0100
2594
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/dvi/Makefile.in evince-2.21.1.new/backend/dvi/Makefile.in
2595
--- evince-2.21.1/backend/dvi/Makefile.in 2007-12-03 22:58:14.000000000 +0100
2596
+++ evince-2.21.1.new/backend/dvi/Makefile.in 2007-12-05 00:07:24.000000000 +0100
2605
2597
@@ -1,8 +1,8 @@
2606
2598
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
2607
2599
+# Makefile.in generated by automake 1.10 from Makefile.am.
2727
2719
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
2728
2720
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
2729
2721
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2730
@@ -166,20 +136,17 @@
2722
@@ -166,16 +136,15 @@
2731
2723
GNOME_LIBS = @GNOME_LIBS@
2732
2724
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
2733
2725
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
2737
2729
+GTKDOC_CHECK = @GTKDOC_CHECK@
2738
2730
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
2739
2731
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
2740
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
2741
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
2742
2732
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
2743
2733
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
2744
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
2745
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
2746
2734
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
2747
2735
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
2748
2736
HELP_DIR = @HELP_DIR@
2753
2741
INSTALL_DATA = @INSTALL_DATA@
2754
2742
INSTALL_PROGRAM = @INSTALL_PROGRAM@
2755
2743
INSTALL_SCRIPT = @INSTALL_SCRIPT@
2756
@@ -190,14 +157,12 @@
2744
@@ -186,14 +155,12 @@
2757
2745
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
2758
2746
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
2759
2747
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
2769
2757
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
2770
2758
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
2771
2759
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
2772
@@ -209,7 +174,6 @@
2760
@@ -205,7 +172,6 @@
2773
2761
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
2774
2762
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2775
2763
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
2777
2765
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
2778
2766
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
2779
2767
LDFLAGS = @LDFLAGS@
2780
@@ -221,9 +185,8 @@
2768
@@ -217,9 +183,8 @@
2781
2769
LN_S = @LN_S@
2782
2770
LTLIBOBJS = @LTLIBOBJS@
2783
2771
MAINT = @MAINT@
2788
2776
MKINSTALLDIRS = @MKINSTALLDIRS@
2789
2777
MSGFMT = @MSGFMT@
2790
2778
MSGFMT_OPTS = @MSGFMT_OPTS@
2791
@@ -258,26 +221,14 @@
2779
@@ -254,26 +219,14 @@
2792
2780
VERSION = @VERSION@
2793
2781
WARN_CFLAGS = @WARN_CFLAGS@
2794
2782
WARN_CXXFLAGS = @WARN_CXXFLAGS@
2819
2807
am__include = @am__include@
2820
2808
am__leading_dot = @am__leading_dot@
2821
2809
am__quote = @am__quote@
2822
@@ -289,28 +240,39 @@
2810
@@ -285,28 +238,39 @@
2823
2811
build_cpu = @build_cpu@
2824
2812
build_os = @build_os@
2825
2813
build_vendor = @build_vendor@
2859
2847
SUBDIRS = mdvi-lib
2860
2848
INCLUDES = \
2861
2849
-I$(top_srcdir) \
2862
@@ -371,7 +333,7 @@
2850
@@ -367,7 +331,7 @@
2863
2851
rm -f "$${dir}/so_locations"; \
2864
2852
done
2865
2853
libgtkdvi.la: $(libgtkdvi_la_OBJECTS) $(libgtkdvi_la_DEPENDENCIES)
2868
2856
2869
2857
mostlyclean-compile:
2870
2858
-rm -f *.$(OBJEXT)
2871
@@ -384,22 +346,22 @@
2859
@@ -380,22 +344,22 @@
2872
2860
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonts.Plo@am__quote@
2873
2861
2874
2862
.c.o:
2897
2885
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2898
2886
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2899
2887
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
2900
@@ -410,10 +372,6 @@
2888
@@ -406,10 +370,6 @@
2901
2889
clean-libtool:
2902
2890
-rm -rf .libs _libs
2903
2891
2908
2896
# This directory's subdirectories are mostly independent; you can cd
2909
2897
# into them and run `make' without going through this Makefile.
2910
2898
# To change the values of `make' variables: instead of editing Makefiles,
2911
@@ -445,8 +403,7 @@
2899
@@ -441,8 +401,7 @@
2912
2900
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
2913
2901
fi; test -z "$$fail"
2914
2902
2918
2906
@failcom='exit 1'; \
2919
2907
for f in x $$MAKEFLAGS; do \
2920
2908
case $$f in \
2921
@@ -547,22 +504,21 @@
2909
@@ -543,22 +502,21 @@
2922
2910
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
2923
2911
2924
2912
distdir: $(DISTFILES)
2954
2942
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2955
2943
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2956
2944
fi; \
2957
@@ -576,7 +532,7 @@
2945
@@ -572,7 +530,7 @@
2958
2946
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
2959
2947
if test "$$subdir" = .; then :; else \
2960
2948
test -d "$(distdir)/$$subdir" \
2963
2951
|| exit 1; \
2964
2952
distdir=`$(am__cd) $(distdir) && pwd`; \
2965
2953
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
2966
@@ -584,6 +540,8 @@
2954
@@ -580,6 +538,8 @@
2967
2955
$(MAKE) $(AM_MAKEFLAGS) \
2968
2956
top_distdir="$$top_distdir" \
2969
2957
distdir="$$distdir/$$subdir" \
2972
2960
distdir) \
2973
2961
|| exit 1; \
2974
2962
fi; \
2975
@@ -626,7 +584,7 @@
2963
@@ -622,7 +582,7 @@
2976
2964
-rm -rf ./$(DEPDIR)
2977
2965
-rm -f Makefile
2978
2966
distclean-am: clean-am distclean-compile distclean-generic \
2981
2969
2982
2970
dvi: dvi-recursive
2983
2971
2984
@@ -640,12 +598,20 @@
2972
@@ -636,12 +596,20 @@
2985
2973
2986
2974
install-data-am:
2987
2975
3002
2990
installcheck-am:
3003
2991
3004
2992
maintainer-clean: maintainer-clean-recursive
3005
@@ -666,23 +632,25 @@
2993
@@ -662,23 +630,25 @@
3006
2994
3007
2995
ps-am:
3008
2996
3041
3029
3042
3030
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3043
3031
# Otherwise a system limit (for SysV at least) may be exceeded.
3044
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/dvi/mdvi-lib/Makefile.in evince-2.20.2.new/backend/dvi/mdvi-lib/Makefile.in
3045
--- evince-2.20.2/backend/dvi/mdvi-lib/Makefile.in 2007-11-26 22:55:45.000000000 +0100
3046
+++ evince-2.20.2.new/backend/dvi/mdvi-lib/Makefile.in 2007-11-27 22:51:54.000000000 +0100
3032
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/dvi/mdvi-lib/Makefile.in evince-2.21.1.new/backend/dvi/mdvi-lib/Makefile.in
3033
--- evince-2.21.1/backend/dvi/mdvi-lib/Makefile.in 2007-12-03 22:58:14.000000000 +0100
3034
+++ evince-2.21.1.new/backend/dvi/mdvi-lib/Makefile.in 2007-12-05 00:07:24.000000000 +0100
3047
3035
@@ -1,8 +1,8 @@
3048
3036
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
3049
3037
+# Makefile.in generated by automake 1.10 from Makefile.am.
3154
3142
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
3155
3143
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
3156
3144
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
3157
@@ -162,20 +129,17 @@
3145
@@ -162,16 +129,15 @@
3158
3146
GNOME_LIBS = @GNOME_LIBS@
3159
3147
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
3160
3148
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
3164
3152
+GTKDOC_CHECK = @GTKDOC_CHECK@
3165
3153
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
3166
3154
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
3167
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
3168
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
3169
3155
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
3170
3156
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
3171
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
3172
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
3173
3157
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
3174
3158
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
3175
3159
HELP_DIR = @HELP_DIR@
3180
3164
INSTALL_DATA = @INSTALL_DATA@
3181
3165
INSTALL_PROGRAM = @INSTALL_PROGRAM@
3182
3166
INSTALL_SCRIPT = @INSTALL_SCRIPT@
3183
@@ -186,14 +150,12 @@
3167
@@ -182,14 +148,12 @@
3184
3168
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
3185
3169
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
3186
3170
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
3196
3180
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
3197
3181
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
3198
3182
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
3199
@@ -205,7 +167,6 @@
3183
@@ -201,7 +165,6 @@
3200
3184
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
3201
3185
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
3202
3186
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
3204
3188
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
3205
3189
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
3206
3190
LDFLAGS = @LDFLAGS@
3207
@@ -217,9 +178,8 @@
3191
@@ -213,9 +176,8 @@
3208
3192
LN_S = @LN_S@
3209
3193
LTLIBOBJS = @LTLIBOBJS@
3210
3194
MAINT = @MAINT@
3215
3199
MKINSTALLDIRS = @MKINSTALLDIRS@
3216
3200
MSGFMT = @MSGFMT@
3217
3201
MSGFMT_OPTS = @MSGFMT_OPTS@
3218
@@ -254,26 +214,14 @@
3202
@@ -250,26 +212,14 @@
3219
3203
VERSION = @VERSION@
3220
3204
WARN_CFLAGS = @WARN_CFLAGS@
3221
3205
WARN_CXXFLAGS = @WARN_CXXFLAGS@
3246
3230
am__include = @am__include@
3247
3231
am__leading_dot = @am__leading_dot@
3248
3232
am__quote = @am__quote@
3249
@@ -285,28 +233,39 @@
3233
@@ -281,28 +231,39 @@
3250
3234
build_cpu = @build_cpu@
3251
3235
build_os = @build_os@
3252
3236
build_vendor = @build_vendor@
3286
3270
noinst_LTLIBRARIES = libmdvi.la
3287
3271
libmdvi_la_SOURCES = \
3288
3272
afmparse.c \
3289
@@ -389,7 +348,7 @@
3273
@@ -385,7 +346,7 @@
3290
3274
rm -f "$${dir}/so_locations"; \
3291
3275
done
3292
3276
libmdvi.la: $(libmdvi_la_OBJECTS) $(libmdvi_la_DEPENDENCIES)
3295
3279
3296
3280
mostlyclean-compile:
3297
3281
-rm -f *.$(OBJEXT)
3298
@@ -423,22 +382,22 @@
3282
@@ -419,22 +380,22 @@
3299
3283
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vf.Plo@am__quote@
3300
3284
3301
3285
.c.o:
3324
3308
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
3325
3309
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3326
3310
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
3327
@@ -449,10 +408,6 @@
3311
@@ -445,10 +406,6 @@
3328
3312
clean-libtool:
3329
3313
-rm -rf .libs _libs
3330
3314
3335
3319
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
3336
3320
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
3337
3321
unique=`for i in $$list; do \
3338
@@ -502,22 +457,21 @@
3322
@@ -498,22 +455,21 @@
3339
3323
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
3340
3324
3341
3325
distdir: $(DISTFILES)
3371
3355
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
3372
3356
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
3373
3357
fi; \
3374
@@ -565,7 +519,7 @@
3358
@@ -561,7 +517,7 @@
3375
3359
-rm -rf ./$(DEPDIR)
3376
3360
-rm -f Makefile
3377
3361
distclean-am: clean-am distclean-compile distclean-generic \
3380
3364
3381
3365
dvi: dvi-am
3382
3366
3383
@@ -579,12 +533,20 @@
3367
@@ -575,12 +531,20 @@
3384
3368
3385
3369
install-data-am:
3386
3370
3401
3385
installcheck-am:
3402
3386
3403
3387
maintainer-clean: maintainer-clean-am
3404
@@ -605,19 +567,22 @@
3388
@@ -601,19 +565,22 @@
3405
3389
3406
3390
ps-am:
3407
3391
3429
3413
3430
3414
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3431
3415
# Otherwise a system limit (for SysV at least) may be exceeded.
3432
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/impress/Makefile.in evince-2.20.2.new/backend/impress/Makefile.in
3433
--- evince-2.20.2/backend/impress/Makefile.in 2007-11-26 22:55:46.000000000 +0100
3434
+++ evince-2.20.2.new/backend/impress/Makefile.in 2007-11-27 22:51:54.000000000 +0100
3416
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/impress/Makefile.in evince-2.21.1.new/backend/impress/Makefile.in
3417
--- evince-2.21.1/backend/impress/Makefile.in 2007-12-03 22:58:15.000000000 +0100
3418
+++ evince-2.21.1.new/backend/impress/Makefile.in 2007-12-05 00:07:24.000000000 +0100
3435
3419
@@ -1,8 +1,8 @@
3436
3420
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
3437
3421
+# Makefile.in generated by automake 1.10 from Makefile.am.
3542
3526
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
3543
3527
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
3544
3528
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
3545
@@ -164,20 +131,17 @@
3529
@@ -164,16 +131,15 @@
3546
3530
GNOME_LIBS = @GNOME_LIBS@
3547
3531
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
3548
3532
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
3552
3536
+GTKDOC_CHECK = @GTKDOC_CHECK@
3553
3537
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
3554
3538
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
3555
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
3556
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
3557
3539
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
3558
3540
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
3559
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
3560
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
3561
3541
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
3562
3542
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
3563
3543
HELP_DIR = @HELP_DIR@
3568
3548
INSTALL_DATA = @INSTALL_DATA@
3569
3549
INSTALL_PROGRAM = @INSTALL_PROGRAM@
3570
3550
INSTALL_SCRIPT = @INSTALL_SCRIPT@
3571
@@ -188,14 +152,12 @@
3551
@@ -184,14 +150,12 @@
3572
3552
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
3573
3553
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
3574
3554
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
3584
3564
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
3585
3565
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
3586
3566
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
3587
@@ -207,7 +169,6 @@
3567
@@ -203,7 +167,6 @@
3588
3568
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
3589
3569
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
3590
3570
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
3592
3572
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
3593
3573
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
3594
3574
LDFLAGS = @LDFLAGS@
3595
@@ -219,9 +180,8 @@
3575
@@ -215,9 +178,8 @@
3596
3576
LN_S = @LN_S@
3597
3577
LTLIBOBJS = @LTLIBOBJS@
3598
3578
MAINT = @MAINT@
3603
3583
MKINSTALLDIRS = @MKINSTALLDIRS@
3604
3584
MSGFMT = @MSGFMT@
3605
3585
MSGFMT_OPTS = @MSGFMT_OPTS@
3606
@@ -256,26 +216,14 @@
3586
@@ -252,26 +214,14 @@
3607
3587
VERSION = @VERSION@
3608
3588
WARN_CFLAGS = @WARN_CFLAGS@
3609
3589
WARN_CXXFLAGS = @WARN_CXXFLAGS@
3634
3614
am__include = @am__include@
3635
3615
am__leading_dot = @am__leading_dot@
3636
3616
am__quote = @am__quote@
3637
@@ -287,28 +235,39 @@
3617
@@ -283,28 +233,39 @@
3638
3618
build_cpu = @build_cpu@
3639
3619
build_os = @build_os@
3640
3620
build_vendor = @build_vendor@
3674
3654
INCLUDES = \
3675
3655
-I$(top_srcdir) \
3676
3656
-I$(top_srcdir)/libdocument \
3677
@@ -392,7 +351,7 @@
3657
@@ -388,7 +349,7 @@
3678
3658
rm -f "$${dir}/so_locations"; \
3679
3659
done
3680
3660
libimpressdocument.la: $(libimpressdocument_la_OBJECTS) $(libimpressdocument_la_DEPENDENCIES)
3683
3663
3684
3664
mostlyclean-compile:
3685
3665
-rm -f *.$(OBJEXT)
3686
@@ -415,22 +374,22 @@
3666
@@ -411,22 +372,22 @@
3687
3667
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zip.Plo@am__quote@
3688
3668
3689
3669
.c.o:
3712
3692
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
3713
3693
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3714
3694
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
3715
@@ -441,10 +400,6 @@
3695
@@ -437,10 +398,6 @@
3716
3696
clean-libtool:
3717
3697
-rm -rf .libs _libs
3718
3698
3723
3703
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
3724
3704
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
3725
3705
unique=`for i in $$list; do \
3726
@@ -494,22 +449,21 @@
3706
@@ -490,22 +447,21 @@
3727
3707
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
3728
3708
3729
3709
distdir: $(DISTFILES)
3759
3739
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
3760
3740
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
3761
3741
fi; \
3762
@@ -557,7 +511,7 @@
3742
@@ -553,7 +509,7 @@
3763
3743
-rm -rf ./$(DEPDIR)
3764
3744
-rm -f Makefile
3765
3745
distclean-am: clean-am distclean-compile distclean-generic \
3768
3748
3769
3749
dvi: dvi-am
3770
3750
3771
@@ -571,12 +525,20 @@
3751
@@ -567,12 +523,20 @@
3772
3752
3773
3753
install-data-am:
3774
3754
3789
3769
installcheck-am:
3790
3770
3791
3771
maintainer-clean: maintainer-clean-am
3792
@@ -597,19 +559,22 @@
3772
@@ -593,19 +557,22 @@
3793
3773
3794
3774
ps-am:
3795
3775
3817
3797
3818
3798
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3819
3799
# Otherwise a system limit (for SysV at least) may be exceeded.
3820
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/Makefile.in evince-2.20.2.new/backend/Makefile.in
3821
--- evince-2.20.2/backend/Makefile.in 2007-11-26 22:55:43.000000000 +0100
3822
+++ evince-2.20.2.new/backend/Makefile.in 2007-11-27 22:51:54.000000000 +0100
3800
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/Makefile.in evince-2.21.1.new/backend/Makefile.in
3801
--- evince-2.21.1/backend/Makefile.in 2007-12-03 22:58:11.000000000 +0100
3802
+++ evince-2.21.1.new/backend/Makefile.in 2007-12-05 00:07:24.000000000 +0100
3823
3803
@@ -1,8 +1,8 @@
3824
3804
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
3825
3805
+# Makefile.in generated by automake 1.10 from Makefile.am.
3923
3903
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
3924
3904
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
3925
3905
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
3926
@@ -160,20 +129,17 @@
3906
@@ -160,16 +129,15 @@
3927
3907
GNOME_LIBS = @GNOME_LIBS@
3928
3908
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
3929
3909
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
3933
3913
+GTKDOC_CHECK = @GTKDOC_CHECK@
3934
3914
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
3935
3915
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
3936
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
3937
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
3938
3916
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
3939
3917
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
3940
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
3941
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
3942
3918
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
3943
3919
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
3944
3920
HELP_DIR = @HELP_DIR@
3949
3925
INSTALL_DATA = @INSTALL_DATA@
3950
3926
INSTALL_PROGRAM = @INSTALL_PROGRAM@
3951
3927
INSTALL_SCRIPT = @INSTALL_SCRIPT@
3952
@@ -184,14 +150,12 @@
3928
@@ -180,14 +148,12 @@
3953
3929
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
3954
3930
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
3955
3931
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
3965
3941
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
3966
3942
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
3967
3943
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
3968
@@ -203,7 +167,6 @@
3944
@@ -199,7 +165,6 @@
3969
3945
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
3970
3946
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
3971
3947
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
3973
3949
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
3974
3950
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
3975
3951
LDFLAGS = @LDFLAGS@
3976
@@ -215,9 +178,8 @@
3952
@@ -211,9 +176,8 @@
3977
3953
LN_S = @LN_S@
3978
3954
LTLIBOBJS = @LTLIBOBJS@
3979
3955
MAINT = @MAINT@
3984
3960
MKINSTALLDIRS = @MKINSTALLDIRS@
3985
3961
MSGFMT = @MSGFMT@
3986
3962
MSGFMT_OPTS = @MSGFMT_OPTS@
3987
@@ -252,26 +214,14 @@
3963
@@ -248,26 +212,14 @@
3988
3964
VERSION = @VERSION@
3989
3965
WARN_CFLAGS = @WARN_CFLAGS@
3990
3966
WARN_CXXFLAGS = @WARN_CXXFLAGS@
4015
3991
am__include = @am__include@
4016
3992
am__leading_dot = @am__leading_dot@
4017
3993
am__quote = @am__quote@
4018
@@ -283,28 +233,39 @@
3994
@@ -279,28 +231,39 @@
4019
3995
build_cpu = @build_cpu@
4020
3996
build_os = @build_os@
4021
3997
build_vendor = @build_vendor@
4055
4031
SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
4056
4032
$(am__append_4) $(am__append_5) $(am__append_6) \
4057
4033
$(am__append_7) $(am__append_8)
4058
@@ -347,10 +308,6 @@
4034
@@ -343,10 +306,6 @@
4059
4035
clean-libtool:
4060
4036
-rm -rf .libs _libs
4061
4037
4066
4042
# This directory's subdirectories are mostly independent; you can cd
4067
4043
# into them and run `make' without going through this Makefile.
4068
4044
# To change the values of `make' variables: instead of editing Makefiles,
4069
@@ -382,8 +339,7 @@
4045
@@ -378,8 +337,7 @@
4070
4046
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
4071
4047
fi; test -z "$$fail"
4072
4048
4076
4052
@failcom='exit 1'; \
4077
4053
for f in x $$MAKEFLAGS; do \
4078
4054
case $$f in \
4079
@@ -484,22 +440,21 @@
4055
@@ -480,22 +438,21 @@
4080
4056
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
4081
4057
4082
4058
distdir: $(DISTFILES)
4112
4088
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
4113
4089
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
4114
4090
fi; \
4115
@@ -513,7 +468,7 @@
4091
@@ -509,7 +466,7 @@
4116
4092
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
4117
4093
if test "$$subdir" = .; then :; else \
4118
4094
test -d "$(distdir)/$$subdir" \
4121
4097
|| exit 1; \
4122
4098
distdir=`$(am__cd) $(distdir) && pwd`; \
4123
4099
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
4124
@@ -521,6 +476,8 @@
4100
@@ -517,6 +474,8 @@
4125
4101
$(MAKE) $(AM_MAKEFLAGS) \
4126
4102
top_distdir="$$top_distdir" \
4127
4103
distdir="$$distdir/$$subdir" \
4130
4106
distdir) \
4131
4107
|| exit 1; \
4132
4108
fi; \
4133
@@ -560,8 +517,7 @@
4109
@@ -556,8 +515,7 @@
4134
4110
4135
4111
distclean: distclean-recursive
4136
4112
-rm -f Makefile
4140
4116
4141
4117
dvi: dvi-recursive
4142
4118
4143
@@ -575,12 +531,20 @@
4119
@@ -571,12 +529,20 @@
4144
4120
4145
4121
install-data-am:
4146
4122
4161
4137
installcheck-am:
4162
4138
4163
4139
maintainer-clean: maintainer-clean-recursive
4164
@@ -599,22 +563,24 @@
4140
@@ -595,22 +561,24 @@
4165
4141
4166
4142
ps-am:
4167
4143
4198
4174
4199
4175
# Tell versions [3.59,3.63) of GNU make to not export all variables.
4200
4176
# Otherwise a system limit (for SysV at least) may be exceeded.
4201
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/pdf/Makefile.in evince-2.20.2.new/backend/pdf/Makefile.in
4202
--- evince-2.20.2/backend/pdf/Makefile.in 2007-11-26 22:55:46.000000000 +0100
4203
+++ evince-2.20.2.new/backend/pdf/Makefile.in 2007-11-27 22:51:54.000000000 +0100
4177
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/pdf/Makefile.in evince-2.21.1.new/backend/pdf/Makefile.in
4178
--- evince-2.21.1/backend/pdf/Makefile.in 2007-12-03 22:58:15.000000000 +0100
4179
+++ evince-2.21.1.new/backend/pdf/Makefile.in 2007-12-05 00:07:24.000000000 +0100
4204
4180
@@ -1,8 +1,8 @@
4205
4181
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
4206
4182
+# Makefile.in generated by automake 1.10 from Makefile.am.
4325
4301
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
4326
4302
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
4327
4303
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
4328
@@ -167,20 +135,17 @@
4304
@@ -167,16 +135,15 @@
4329
4305
GNOME_LIBS = @GNOME_LIBS@
4330
4306
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
4331
4307
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
4335
4311
+GTKDOC_CHECK = @GTKDOC_CHECK@
4336
4312
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
4337
4313
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
4338
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
4339
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
4340
4314
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
4341
4315
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
4342
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
4343
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
4344
4316
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
4345
4317
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
4346
4318
HELP_DIR = @HELP_DIR@
4351
4323
INSTALL_DATA = @INSTALL_DATA@
4352
4324
INSTALL_PROGRAM = @INSTALL_PROGRAM@
4353
4325
INSTALL_SCRIPT = @INSTALL_SCRIPT@
4354
@@ -191,14 +156,12 @@
4326
@@ -187,14 +154,12 @@
4355
4327
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
4356
4328
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
4357
4329
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
4367
4339
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
4368
4340
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
4369
4341
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
4370
@@ -210,7 +173,6 @@
4342
@@ -206,7 +171,6 @@
4371
4343
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
4372
4344
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
4373
4345
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
4375
4347
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
4376
4348
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
4377
4349
LDFLAGS = @LDFLAGS@
4378
@@ -222,9 +184,8 @@
4350
@@ -218,9 +182,8 @@
4379
4351
LN_S = @LN_S@
4380
4352
LTLIBOBJS = @LTLIBOBJS@
4381
4353
MAINT = @MAINT@
4386
4358
MKINSTALLDIRS = @MKINSTALLDIRS@
4387
4359
MSGFMT = @MSGFMT@
4388
4360
MSGFMT_OPTS = @MSGFMT_OPTS@
4389
@@ -259,26 +220,14 @@
4361
@@ -255,26 +218,14 @@
4390
4362
VERSION = @VERSION@
4391
4363
WARN_CFLAGS = @WARN_CFLAGS@
4392
4364
WARN_CXXFLAGS = @WARN_CXXFLAGS@
4417
4389
am__include = @am__include@
4418
4390
am__leading_dot = @am__leading_dot@
4419
4391
am__quote = @am__quote@
4420
@@ -290,28 +239,39 @@
4392
@@ -286,28 +237,39 @@
4421
4393
build_cpu = @build_cpu@
4422
4394
build_os = @build_os@
4423
4395
build_vendor = @build_vendor@
4457
4429
INCLUDES = \
4458
4430
-I$(top_srcdir) \
4459
4431
-I$(top_srcdir)/libdocument \
4460
@@ -368,7 +328,7 @@
4432
@@ -364,7 +326,7 @@
4461
4433
rm -f "$${dir}/so_locations"; \
4462
4434
done
4463
4435
libpdfdocument.la: $(libpdfdocument_la_OBJECTS) $(libpdfdocument_la_DEPENDENCIES)
4466
4438
4467
4439
mostlyclean-compile:
4468
4440
-rm -f *.$(OBJEXT)
4469
@@ -379,22 +339,22 @@
4441
@@ -375,22 +337,22 @@
4470
4442
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ev-poppler.Plo@am__quote@
4471
4443
4472
4444
.cc.o:
4495
4467
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
4496
4468
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4497
4469
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
4498
@@ -405,10 +365,6 @@
4470
@@ -401,10 +363,6 @@
4499
4471
clean-libtool:
4500
4472
-rm -rf .libs _libs
4501
4473
4506
4478
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
4507
4479
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4508
4480
unique=`for i in $$list; do \
4509
@@ -458,22 +414,21 @@
4481
@@ -454,22 +412,21 @@
4510
4482
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
4511
4483
4512
4484
distdir: $(DISTFILES)
4542
4514
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
4543
4515
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
4544
4516
fi; \
4545
@@ -521,7 +476,7 @@
4517
@@ -517,7 +474,7 @@
4546
4518
-rm -rf ./$(DEPDIR)
4547
4519
-rm -f Makefile
4548
4520
distclean-am: clean-am distclean-compile distclean-generic \
4551
4523
4552
4524
dvi: dvi-am
4553
4525
4554
@@ -535,12 +490,20 @@
4526
@@ -531,12 +488,20 @@
4555
4527
4556
4528
install-data-am:
4557
4529
4572
4544
installcheck-am:
4573
4545
4574
4546
maintainer-clean: maintainer-clean-am
4575
@@ -561,19 +524,22 @@
4547
@@ -557,19 +522,22 @@
4576
4548
4577
4549
ps-am:
4578
4550
4600
4572
4601
4573
# Tell versions [3.59,3.63) of GNU make to not export all variables.
4602
4574
# Otherwise a system limit (for SysV at least) may be exceeded.
4603
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/pixbuf/Makefile.in evince-2.20.2.new/backend/pixbuf/Makefile.in
4604
--- evince-2.20.2/backend/pixbuf/Makefile.in 2007-11-26 22:55:47.000000000 +0100
4605
+++ evince-2.20.2.new/backend/pixbuf/Makefile.in 2007-11-27 22:51:54.000000000 +0100
4575
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/pixbuf/Makefile.in evince-2.21.1.new/backend/pixbuf/Makefile.in
4576
--- evince-2.21.1/backend/pixbuf/Makefile.in 2007-12-03 22:58:16.000000000 +0100
4577
+++ evince-2.21.1.new/backend/pixbuf/Makefile.in 2007-12-05 00:07:24.000000000 +0100
4606
4578
@@ -1,8 +1,8 @@
4607
4579
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
4608
4580
+# Makefile.in generated by automake 1.10 from Makefile.am.
4713
4685
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
4714
4686
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
4715
4687
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
4716
@@ -159,20 +126,17 @@
4688
@@ -159,16 +126,15 @@
4717
4689
GNOME_LIBS = @GNOME_LIBS@
4718
4690
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
4719
4691
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
4723
4695
+GTKDOC_CHECK = @GTKDOC_CHECK@
4724
4696
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
4725
4697
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
4726
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
4727
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
4728
4698
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
4729
4699
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
4730
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
4731
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
4732
4700
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
4733
4701
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
4734
4702
HELP_DIR = @HELP_DIR@
4739
4707
INSTALL_DATA = @INSTALL_DATA@
4740
4708
INSTALL_PROGRAM = @INSTALL_PROGRAM@
4741
4709
INSTALL_SCRIPT = @INSTALL_SCRIPT@
4742
@@ -183,14 +147,12 @@
4710
@@ -179,14 +145,12 @@
4743
4711
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
4744
4712
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
4745
4713
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
4755
4723
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
4756
4724
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
4757
4725
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
4758
@@ -202,7 +164,6 @@
4726
@@ -198,7 +162,6 @@
4759
4727
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
4760
4728
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
4761
4729
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
4763
4731
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
4764
4732
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
4765
4733
LDFLAGS = @LDFLAGS@
4766
@@ -214,9 +175,8 @@
4734
@@ -210,9 +173,8 @@
4767
4735
LN_S = @LN_S@
4768
4736
LTLIBOBJS = @LTLIBOBJS@
4769
4737
MAINT = @MAINT@
4774
4742
MKINSTALLDIRS = @MKINSTALLDIRS@
4775
4743
MSGFMT = @MSGFMT@
4776
4744
MSGFMT_OPTS = @MSGFMT_OPTS@
4777
@@ -251,26 +211,14 @@
4745
@@ -247,26 +209,14 @@
4778
4746
VERSION = @VERSION@
4779
4747
WARN_CFLAGS = @WARN_CFLAGS@
4780
4748
WARN_CXXFLAGS = @WARN_CXXFLAGS@
4805
4773
am__include = @am__include@
4806
4774
am__leading_dot = @am__leading_dot@
4807
4775
am__quote = @am__quote@
4808
@@ -282,28 +230,39 @@
4776
@@ -278,28 +228,39 @@
4809
4777
build_cpu = @build_cpu@
4810
4778
build_os = @build_os@
4811
4779
build_vendor = @build_vendor@
4845
4813
INCLUDES = \
4846
4814
-I$(top_srcdir) \
4847
4815
-I$(top_srcdir)/libdocument \
4848
@@ -357,7 +316,7 @@
4816
@@ -353,7 +314,7 @@
4849
4817
rm -f "$${dir}/so_locations"; \
4850
4818
done
4851
4819
libpixbufdocument.la: $(libpixbufdocument_la_OBJECTS) $(libpixbufdocument_la_DEPENDENCIES)
4854
4822
4855
4823
mostlyclean-compile:
4856
4824
-rm -f *.$(OBJEXT)
4857
@@ -368,22 +327,22 @@
4825
@@ -364,22 +325,22 @@
4858
4826
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-document.Plo@am__quote@
4859
4827
4860
4828
.c.o:
4883
4851
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
4884
4852
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4885
4853
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
4886
@@ -394,10 +353,6 @@
4854
@@ -390,10 +351,6 @@
4887
4855
clean-libtool:
4888
4856
-rm -rf .libs _libs
4889
4857
4894
4862
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
4895
4863
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4896
4864
unique=`for i in $$list; do \
4897
@@ -447,22 +402,21 @@
4865
@@ -443,22 +400,21 @@
4898
4866
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
4899
4867
4900
4868
distdir: $(DISTFILES)
4930
4898
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
4931
4899
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
4932
4900
fi; \
4933
@@ -510,7 +464,7 @@
4901
@@ -506,7 +462,7 @@
4934
4902
-rm -rf ./$(DEPDIR)
4935
4903
-rm -f Makefile
4936
4904
distclean-am: clean-am distclean-compile distclean-generic \
4939
4907
4940
4908
dvi: dvi-am
4941
4909
4942
@@ -524,12 +478,20 @@
4910
@@ -520,12 +476,20 @@
4943
4911
4944
4912
install-data-am:
4945
4913
4960
4928
installcheck-am:
4961
4929
4962
4930
maintainer-clean: maintainer-clean-am
4963
@@ -550,19 +512,22 @@
4931
@@ -546,19 +510,22 @@
4964
4932
4965
4933
ps-am:
4966
4934
4988
4956
4989
4957
# Tell versions [3.59,3.63) of GNU make to not export all variables.
4990
4958
# Otherwise a system limit (for SysV at least) may be exceeded.
4991
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/ps/Makefile.in evince-2.20.2.new/backend/ps/Makefile.in
4992
--- evince-2.20.2/backend/ps/Makefile.in 2007-11-26 22:55:47.000000000 +0100
4993
+++ evince-2.20.2.new/backend/ps/Makefile.in 2007-11-27 22:51:54.000000000 +0100
4959
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/ps/Makefile.in evince-2.21.1.new/backend/ps/Makefile.in
4960
--- evince-2.21.1/backend/ps/Makefile.in 2007-12-03 22:58:16.000000000 +0100
4961
+++ evince-2.21.1.new/backend/ps/Makefile.in 2007-12-05 00:07:24.000000000 +0100
4994
4962
@@ -1,8 +1,8 @@
4995
4963
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
4996
4964
+# Makefile.in generated by automake 1.10 from Makefile.am.
5101
5069
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
5102
5070
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
5103
5071
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
5104
@@ -160,20 +127,17 @@
5072
@@ -160,16 +127,15 @@
5105
5073
GNOME_LIBS = @GNOME_LIBS@
5106
5074
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
5107
5075
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
5111
5079
+GTKDOC_CHECK = @GTKDOC_CHECK@
5112
5080
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
5113
5081
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
5114
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
5115
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
5116
5082
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
5117
5083
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
5118
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
5119
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
5120
5084
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
5121
5085
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
5122
5086
HELP_DIR = @HELP_DIR@
5127
5091
INSTALL_DATA = @INSTALL_DATA@
5128
5092
INSTALL_PROGRAM = @INSTALL_PROGRAM@
5129
5093
INSTALL_SCRIPT = @INSTALL_SCRIPT@
5130
@@ -184,14 +148,12 @@
5094
@@ -180,14 +146,12 @@
5131
5095
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
5132
5096
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
5133
5097
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
5143
5107
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
5144
5108
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
5145
5109
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
5146
@@ -203,7 +165,6 @@
5110
@@ -199,7 +163,6 @@
5147
5111
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
5148
5112
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
5149
5113
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
5151
5115
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
5152
5116
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
5153
5117
LDFLAGS = @LDFLAGS@
5154
@@ -215,9 +176,8 @@
5118
@@ -211,9 +174,8 @@
5155
5119
LN_S = @LN_S@
5156
5120
LTLIBOBJS = @LTLIBOBJS@
5157
5121
MAINT = @MAINT@
5162
5126
MKINSTALLDIRS = @MKINSTALLDIRS@
5163
5127
MSGFMT = @MSGFMT@
5164
5128
MSGFMT_OPTS = @MSGFMT_OPTS@
5165
@@ -252,26 +212,14 @@
5129
@@ -248,26 +210,14 @@
5166
5130
VERSION = @VERSION@
5167
5131
WARN_CFLAGS = @WARN_CFLAGS@
5168
5132
WARN_CXXFLAGS = @WARN_CXXFLAGS@
5193
5157
am__include = @am__include@
5194
5158
am__leading_dot = @am__leading_dot@
5195
5159
am__quote = @am__quote@
5196
@@ -283,28 +231,39 @@
5160
@@ -279,28 +229,39 @@
5197
5161
build_cpu = @build_cpu@
5198
5162
build_os = @build_os@
5199
5163
build_vendor = @build_vendor@
5233
5197
INCLUDES = \
5234
5198
-I$(top_srcdir) \
5235
5199
-I$(top_srcdir)/libdocument \
5236
@@ -369,7 +328,7 @@
5200
@@ -365,7 +326,7 @@
5237
5201
rm -f "$${dir}/so_locations"; \
5238
5202
done
5239
5203
libpsdocument.la: $(libpsdocument_la_OBJECTS) $(libpsdocument_la_DEPENDENCIES)
5242
5206
5243
5207
mostlyclean-compile:
5244
5208
-rm -f *.$(OBJEXT)
5245
@@ -384,22 +343,22 @@
5209
@@ -380,22 +341,22 @@
5246
5210
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ps.Plo@am__quote@
5247
5211
5248
5212
.c.o:
5271
5235
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
5272
5236
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5273
5237
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
5274
@@ -410,10 +369,6 @@
5238
@@ -406,10 +367,6 @@
5275
5239
clean-libtool:
5276
5240
-rm -rf .libs _libs
5277
5241
5282
5246
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
5283
5247
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5284
5248
unique=`for i in $$list; do \
5285
@@ -463,22 +418,21 @@
5249
@@ -459,22 +416,21 @@
5286
5250
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
5287
5251
5288
5252
distdir: $(DISTFILES)
5318
5282
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5319
5283
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5320
5284
fi; \
5321
@@ -526,7 +480,7 @@
5285
@@ -522,7 +478,7 @@
5322
5286
-rm -rf ./$(DEPDIR)
5323
5287
-rm -f Makefile
5324
5288
distclean-am: clean-am distclean-compile distclean-generic \
5327
5291
5328
5292
dvi: dvi-am
5329
5293
5330
@@ -540,12 +494,20 @@
5294
@@ -536,12 +492,20 @@
5331
5295
5332
5296
install-data-am:
5333
5297
5348
5312
installcheck-am:
5349
5313
5350
5314
maintainer-clean: maintainer-clean-am
5351
@@ -566,19 +528,22 @@
5315
@@ -562,19 +526,22 @@
5352
5316
5353
5317
ps-am:
5354
5318
5376
5340
5377
5341
# Tell versions [3.59,3.63) of GNU make to not export all variables.
5378
5342
# Otherwise a system limit (for SysV at least) may be exceeded.
5379
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/backend/tiff/Makefile.in evince-2.20.2.new/backend/tiff/Makefile.in
5380
--- evince-2.20.2/backend/tiff/Makefile.in 2007-11-26 22:55:47.000000000 +0100
5381
+++ evince-2.20.2.new/backend/tiff/Makefile.in 2007-11-27 22:51:54.000000000 +0100
5343
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/backend/tiff/Makefile.in evince-2.21.1.new/backend/tiff/Makefile.in
5344
--- evince-2.21.1/backend/tiff/Makefile.in 2007-12-03 22:58:17.000000000 +0100
5345
+++ evince-2.21.1.new/backend/tiff/Makefile.in 2007-12-05 00:07:24.000000000 +0100
5382
5346
@@ -1,8 +1,8 @@
5383
5347
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
5384
5348
+# Makefile.in generated by automake 1.10 from Makefile.am.
5489
5453
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
5490
5454
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
5491
5455
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
5492
@@ -159,20 +126,17 @@
5456
@@ -159,16 +126,15 @@
5493
5457
GNOME_LIBS = @GNOME_LIBS@
5494
5458
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
5495
5459
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
5499
5463
+GTKDOC_CHECK = @GTKDOC_CHECK@
5500
5464
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
5501
5465
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
5502
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
5503
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
5504
5466
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
5505
5467
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
5506
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
5507
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
5508
5468
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
5509
5469
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
5510
5470
HELP_DIR = @HELP_DIR@
5515
5475
INSTALL_DATA = @INSTALL_DATA@
5516
5476
INSTALL_PROGRAM = @INSTALL_PROGRAM@
5517
5477
INSTALL_SCRIPT = @INSTALL_SCRIPT@
5518
@@ -183,14 +147,12 @@
5478
@@ -179,14 +145,12 @@
5519
5479
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
5520
5480
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
5521
5481
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
5531
5491
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
5532
5492
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
5533
5493
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
5534
@@ -202,7 +164,6 @@
5494
@@ -198,7 +162,6 @@
5535
5495
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
5536
5496
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
5537
5497
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
5539
5499
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
5540
5500
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
5541
5501
LDFLAGS = @LDFLAGS@
5542
@@ -214,9 +175,8 @@
5502
@@ -210,9 +173,8 @@
5543
5503
LN_S = @LN_S@
5544
5504
LTLIBOBJS = @LTLIBOBJS@
5545
5505
MAINT = @MAINT@
5550
5510
MKINSTALLDIRS = @MKINSTALLDIRS@
5551
5511
MSGFMT = @MSGFMT@
5552
5512
MSGFMT_OPTS = @MSGFMT_OPTS@
5553
@@ -251,26 +211,14 @@
5513
@@ -247,26 +209,14 @@
5554
5514
VERSION = @VERSION@
5555
5515
WARN_CFLAGS = @WARN_CFLAGS@
5556
5516
WARN_CXXFLAGS = @WARN_CXXFLAGS@
5581
5541
am__include = @am__include@
5582
5542
am__leading_dot = @am__leading_dot@
5583
5543
am__quote = @am__quote@
5584
@@ -282,28 +230,39 @@
5544
@@ -278,28 +228,39 @@
5585
5545
build_cpu = @build_cpu@
5586
5546
build_os = @build_os@
5587
5547
build_vendor = @build_vendor@
5621
5581
INCLUDES = \
5622
5582
-I$(top_srcdir) \
5623
5583
-I$(top_srcdir)/libdocument \
5624
@@ -359,7 +318,7 @@
5584
@@ -355,7 +316,7 @@
5625
5585
rm -f "$${dir}/so_locations"; \
5626
5586
done
5627
5587
libtiffdocument.la: $(libtiffdocument_la_OBJECTS) $(libtiffdocument_la_DEPENDENCIES)
5630
5590
5631
5591
mostlyclean-compile:
5632
5592
-rm -f *.$(OBJEXT)
5633
@@ -371,22 +330,22 @@
5593
@@ -367,22 +328,22 @@
5634
5594
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tiff2ps.Plo@am__quote@
5635
5595
5636
5596
.c.o:
5659
5619
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
5660
5620
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5661
5621
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
5662
@@ -397,10 +356,6 @@
5622
@@ -393,10 +354,6 @@
5663
5623
clean-libtool:
5664
5624
-rm -rf .libs _libs
5665
5625
5670
5630
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
5671
5631
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5672
5632
unique=`for i in $$list; do \
5673
@@ -450,22 +405,21 @@
5633
@@ -446,22 +403,21 @@
5674
5634
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
5675
5635
5676
5636
distdir: $(DISTFILES)
5706
5666
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5707
5667
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5708
5668
fi; \
5709
@@ -513,7 +467,7 @@
5669
@@ -509,7 +465,7 @@
5710
5670
-rm -rf ./$(DEPDIR)
5711
5671
-rm -f Makefile
5712
5672
distclean-am: clean-am distclean-compile distclean-generic \
5715
5675
5716
5676
dvi: dvi-am
5717
5677
5718
@@ -527,12 +481,20 @@
5678
@@ -523,12 +479,20 @@
5719
5679
5720
5680
install-data-am:
5721
5681
5736
5696
installcheck-am:
5737
5697
5738
5698
maintainer-clean: maintainer-clean-am
5739
@@ -553,19 +515,22 @@
5699
@@ -549,19 +513,22 @@
5740
5700
5741
5701
ps-am:
5742
5702
5764
5724
5765
5725
# Tell versions [3.59,3.63) of GNU make to not export all variables.
5766
5726
# Otherwise a system limit (for SysV at least) may be exceeded.
5767
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/config.h.in evince-2.20.2.new/config.h.in
5768
--- evince-2.20.2/config.h.in 2007-11-26 22:55:34.000000000 +0100
5769
+++ evince-2.20.2.new/config.h.in 2007-11-27 22:51:54.000000000 +0100
5770
@@ -129,21 +129,24 @@
5727
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/config.h.in evince-2.21.1.new/config.h.in
5728
--- evince-2.21.1/config.h.in 2007-12-03 22:58:02.000000000 +0100
5729
+++ evince-2.21.1.new/config.h.in 2007-12-05 00:07:24.000000000 +0100
5730
@@ -126,21 +126,24 @@
5771
5731
/* Define to the version of this package. */
5772
5732
#undef PACKAGE_VERSION
5773
5733
5796
5756
/* Version number of package */
5797
5757
#undef VERSION
5798
5758
5799
@@ -171,5 +174,5 @@
5759
@@ -168,5 +171,5 @@
5800
5760
#undef inline
5801
5761
#endif
5802
5762
5803
5763
-/* Define to `unsigned' if <sys/types.h> does not define. */
5804
5764
+/* Define to `unsigned int' if <sys/types.h> does not define. */
5805
5765
#undef size_t
5806
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/configure evince-2.20.2.new/configure
5807
--- evince-2.20.2/configure 2007-11-26 22:55:33.000000000 +0100
5808
+++ evince-2.20.2.new/configure 2007-11-27 22:51:54.000000000 +0100
5766
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/configure evince-2.21.1.new/configure
5767
--- evince-2.21.1/configure 2007-12-03 22:58:01.000000000 +0100
5768
+++ evince-2.21.1.new/configure 2007-12-05 00:07:24.000000000 +0100
5809
5769
@@ -1,27 +1,56 @@
5810
5770
#! /bin/sh
5811
5771
# Guess values for system-dependent variables and create Makefiles.
5812
-# Generated by GNU Autoconf 2.59 for Evince 2.20.2.
5813
+# Generated by GNU Autoconf 2.61 for Evince 2.20.2.
5772
-# Generated by GNU Autoconf 2.59 for Evince 2.21.1.
5773
+# Generated by GNU Autoconf 2.61 for Evince 2.21.1.
5814
5774
#
5815
5775
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=evince>.
5816
5776
#
6504
6464
# Identity of this package.
6505
6465
PACKAGE_NAME='Evince'
6506
6466
PACKAGE_TARNAME='evince'
6507
@@ -430,42 +735,336 @@
6467
@@ -430,42 +735,330 @@
6508
6468
# Factoring default headers for most tests.
6509
6469
ac_includes_default="\
6510
6470
#include <stdio.h>
6554
6514
# include <unistd.h>
6555
6515
#endif"
6556
6516
6557
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GLIB_GENMARSHAL GLIB_MKENUMS ACLOCAL_AMFLAGS PKG_CONFIG ac_pt_PKG_CONFIG HELP_DIR OMF_DIR DOC_USER_FORMATS ENABLE_SK_TRUE ENABLE_SK_FALSE HAVE_GNOME_DOC_UTILS_TRUE HAVE_GNOME_DOC_UTILS_FALSE DISABLE_DEPRECATED WARN_CFLAGS WARN_CXXFLAGS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIB_CFLAGS LIB_LIBS BACKEND_CFLAGS BACKEND_LIBS FRONTEND_CORE_CFLAGS FRONTEND_CORE_LIBS SHELL_CORE_CFLAGS SHELL_CORE_LIBS WITH_GNOME_TRUE WITH_GNOME_FALSE GNOME_CFLAGS GNOME_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS GNOME_PRINT_CFLAGS GNOME_PRINT_LIBS GTK_PRINT_CFLAGS GTK_PRINT_LIBS WITH_GNOME_PRINT_TRUE WITH_GNOME_PRINT_FALSE WITH_GTK_PRINT_TRUE WITH_GTK_PRINT_FALSE DBUS_CFLAGS DBUS_LIBS DBUS_BINDING_TOOL SHELL_CFLAGS SHELL_LIBS FRONTEND_CFLAGS FRONTEND_LIBS ENABLE_DBUS_TRUE ENABLE_DBUS_FALSE DBUS_TOOL_NO_PREFIX_TRUE DBUS_TOOL_NO_PREFIX_FALSE NAUTILUS_CFLAGS NAUTILUS_LIBS HAVE_NAUTILUS_TRUE HAVE_NAUTILUS_FALSE ENABLE_THUMBNAILER_TRUE ENABLE_THUMBNAILER_FALSE GTK_RECENT_CFLAGS GTK_RECENT_LIBS HAVE_GTK_RECENT_TRUE HAVE_GTK_RECENT_FALSE GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL POPPLER_CFLAGS POPPLER_LIBS CAIRO_PDF_CFLAGS CAIRO_PDF_LIBS CAIRO_PS_CFLAGS CAIRO_PS_LIBS ENABLE_PDF_TRUE ENABLE_PDF_FALSE ENABLE_PS_TRUE ENABLE_PS_FALSE ENABLE_TIFF_TRUE ENABLE_TIFF_FALSE DJVU_CFLAGS DJVU_LIBS ENABLE_DJVU_TRUE ENABLE_DJVU_FALSE ENABLE_DVI_TRUE ENABLE_DVI_FALSE WITH_TYPE1_FONTS_TRUE WITH_TYPE1_FONTS_FALSE ENABLE_PIXBUF_TRUE ENABLE_PIXBUF_FALSE ENABLE_COMICS_TRUE ENABLE_COMICS_FALSE ENABLE_IMPRESS_TRUE ENABLE_IMPRESS_FALSE EVINCE_MIME_TYPES LIBOBJS LTLIBOBJS'
6517
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GLIB_GENMARSHAL GLIB_MKENUMS ACLOCAL_AMFLAGS PKG_CONFIG ac_pt_PKG_CONFIG HELP_DIR OMF_DIR DOC_USER_FORMATS ENABLE_SK_TRUE ENABLE_SK_FALSE HAVE_GNOME_DOC_UTILS_TRUE HAVE_GNOME_DOC_UTILS_FALSE DISABLE_DEPRECATED WARN_CFLAGS WARN_CXXFLAGS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIB_CFLAGS LIB_LIBS BACKEND_CFLAGS BACKEND_LIBS FRONTEND_CORE_CFLAGS FRONTEND_CORE_LIBS SHELL_CORE_CFLAGS SHELL_CORE_LIBS WITH_GNOME_TRUE WITH_GNOME_FALSE GNOME_CFLAGS GNOME_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS GNOME_PRINT_CFLAGS GNOME_PRINT_LIBS GTK_PRINT_CFLAGS GTK_PRINT_LIBS WITH_GNOME_PRINT_TRUE WITH_GNOME_PRINT_FALSE WITH_GTK_PRINT_TRUE WITH_GTK_PRINT_FALSE DBUS_CFLAGS DBUS_LIBS DBUS_BINDING_TOOL SHELL_CFLAGS SHELL_LIBS FRONTEND_CFLAGS FRONTEND_LIBS ENABLE_DBUS_TRUE ENABLE_DBUS_FALSE DBUS_TOOL_NO_PREFIX_TRUE DBUS_TOOL_NO_PREFIX_FALSE NAUTILUS_CFLAGS NAUTILUS_LIBS HAVE_NAUTILUS_TRUE HAVE_NAUTILUS_FALSE ENABLE_THUMBNAILER_TRUE ENABLE_THUMBNAILER_FALSE GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL POPPLER_CFLAGS POPPLER_LIBS CAIRO_PDF_CFLAGS CAIRO_PDF_LIBS CAIRO_PS_CFLAGS CAIRO_PS_LIBS ENABLE_PDF_TRUE ENABLE_PDF_FALSE ENABLE_PS_TRUE ENABLE_PS_FALSE ENABLE_TIFF_TRUE ENABLE_TIFF_FALSE DJVU_CFLAGS DJVU_LIBS ENABLE_DJVU_TRUE ENABLE_DJVU_FALSE ENABLE_DVI_TRUE ENABLE_DVI_FALSE WITH_TYPE1_FONTS_TRUE WITH_TYPE1_FONTS_FALSE ENABLE_PIXBUF_TRUE ENABLE_PIXBUF_FALSE ENABLE_COMICS_TRUE ENABLE_COMICS_FALSE ENABLE_IMPRESS_TRUE ENABLE_IMPRESS_FALSE EVINCE_MIME_TYPES LIBOBJS LTLIBOBJS'
6558
6518
+ac_subst_vars='SHELL
6559
6519
+PATH_SEPARATOR
6560
6520
+PACKAGE_NAME
6764
6724
+HAVE_NAUTILUS_FALSE
6765
6725
+ENABLE_THUMBNAILER_TRUE
6766
6726
+ENABLE_THUMBNAILER_FALSE
6767
+GTK_RECENT_CFLAGS
6768
+GTK_RECENT_LIBS
6769
+HAVE_GTK_RECENT_TRUE
6770
+HAVE_GTK_RECENT_FALSE
6771
6727
+GCONF_SCHEMA_CONFIG_SOURCE
6772
6728
+GCONF_SCHEMA_FILE_DIR
6773
6729
+GCONF_SCHEMAS_INSTALL_TRUE
6841
6797
+DBUS_LIBS
6842
6798
+NAUTILUS_CFLAGS
6843
6799
+NAUTILUS_LIBS
6844
+GTK_RECENT_CFLAGS
6845
+GTK_RECENT_LIBS
6846
6800
+POPPLER_CFLAGS
6847
6801
+POPPLER_LIBS
6848
6802
+CAIRO_PDF_CFLAGS
6855
6809
6856
6810
# Initialize some variables set by options.
6857
6811
ac_init_help=
6858
@@ -492,34 +1091,48 @@
6812
@@ -492,34 +1085,48 @@
6859
6813
# and all the variables that are supposed to be based on exec_prefix
6860
6814
# by default will actually change.
6861
6815
# Use braces instead of parens because sh, perl, etc. also accept them.
6911
6865
6912
6866
-bindir | --bindir | --bindi | --bind | --bin | --bi)
6913
6867
ac_prev=bindir ;;
6914
@@ -541,33 +1154,45 @@
6868
@@ -541,33 +1148,45 @@
6915
6869
--config-cache | -C)
6916
6870
cache_file=config.cache ;;
6917
6871
6970
6924
6971
6925
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
6972
6926
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
6973
@@ -594,6 +1219,12 @@
6927
@@ -594,6 +1213,12 @@
6974
6928
-host=* | --host=* | --hos=* | --ho=*)
6975
6929
host_alias=$ac_optarg ;;
6976
6930
6983
6937
-includedir | --includedir | --includedi | --included | --include \
6984
6938
| --includ | --inclu | --incl | --inc)
6985
6939
ac_prev=includedir ;;
6986
@@ -618,13 +1249,16 @@
6940
@@ -618,13 +1243,16 @@
6987
6941
| --libexe=* | --libex=* | --libe=*)
6988
6942
libexecdir=$ac_optarg ;;
6989
6943
7004
6958
localstatedir=$ac_optarg ;;
7005
6959
7006
6960
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
7007
@@ -689,6 +1323,16 @@
6961
@@ -689,6 +1317,16 @@
7008
6962
| --progr-tra=* | --program-tr=* | --program-t=*)
7009
6963
program_transform_name=$ac_optarg ;;
7010
6964
7021
6975
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
7022
6976
| -silent | --silent | --silen | --sile | --sil)
7023
6977
silent=yes ;;
7024
@@ -741,24 +1385,20 @@
6978
@@ -741,24 +1379,20 @@
7025
6979
-with-* | --with-*)
7026
6980
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
7027
6981
# Reject names that are not valid shell variable names.
7052
7006
7053
7007
--x)
7054
7008
# Obsolete; use --with-x.
7055
@@ -789,8 +1429,7 @@
7009
@@ -789,8 +1423,7 @@
7056
7010
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
7057
7011
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
7058
7012
{ (exit 1); exit 1; }; }
7062
7016
export $ac_envvar ;;
7063
7017
7064
7018
*)
7065
@@ -810,27 +1449,19 @@
7019
@@ -810,27 +1443,19 @@
7066
7020
{ (exit 1); exit 1; }; }
7067
7021
fi
7068
7022
7100
7054
done
7101
7055
7102
7056
# There might be people who depend on the old broken behavior: `$host'
7103
@@ -857,218 +1488,76 @@
7057
@@ -857,210 +1482,76 @@
7104
7058
test "$silent" = yes && exec 6>/dev/null
7105
7059
7106
7060
7307
7261
-ac_env_NAUTILUS_LIBS_value=$NAUTILUS_LIBS
7308
7262
-ac_cv_env_NAUTILUS_LIBS_set=${NAUTILUS_LIBS+set}
7309
7263
-ac_cv_env_NAUTILUS_LIBS_value=$NAUTILUS_LIBS
7310
-ac_env_GTK_RECENT_CFLAGS_set=${GTK_RECENT_CFLAGS+set}
7311
-ac_env_GTK_RECENT_CFLAGS_value=$GTK_RECENT_CFLAGS
7312
-ac_cv_env_GTK_RECENT_CFLAGS_set=${GTK_RECENT_CFLAGS+set}
7313
-ac_cv_env_GTK_RECENT_CFLAGS_value=$GTK_RECENT_CFLAGS
7314
-ac_env_GTK_RECENT_LIBS_set=${GTK_RECENT_LIBS+set}
7315
-ac_env_GTK_RECENT_LIBS_value=$GTK_RECENT_LIBS
7316
-ac_cv_env_GTK_RECENT_LIBS_set=${GTK_RECENT_LIBS+set}
7317
-ac_cv_env_GTK_RECENT_LIBS_value=$GTK_RECENT_LIBS
7318
7264
-ac_env_POPPLER_CFLAGS_set=${POPPLER_CFLAGS+set}
7319
7265
-ac_env_POPPLER_CFLAGS_value=$POPPLER_CFLAGS
7320
7266
-ac_cv_env_POPPLER_CFLAGS_set=${POPPLER_CFLAGS+set}
7376
7322
7377
7323
#
7378
7324
# Report the --help message.
7379
@@ -1097,9 +1586,6 @@
7325
@@ -1089,9 +1580,6 @@
7380
7326
-n, --no-create do not create output files
7381
7327
--srcdir=DIR find the sources in DIR [configure dir or \`..']
7382
7328
7386
7332
Installation directories:
7387
7333
--prefix=PREFIX install architecture-independent files in PREFIX
7388
7334
[$ac_default_prefix]
7389
@@ -1117,15 +1603,22 @@
7335
@@ -1109,15 +1597,22 @@
7390
7336
--bindir=DIR user executables [EPREFIX/bin]
7391
7337
--sbindir=DIR system admin executables [EPREFIX/sbin]
7392
7338
--libexecdir=DIR program executables [EPREFIX/libexec]
7412
7358
_ACEOF
7413
7359
7414
7360
cat <<\_ACEOF
7415
@@ -1152,10 +1645,8 @@
7361
@@ -1144,10 +1639,8 @@
7416
7362
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
7417
7363
--enable-maintainer-mode enable make rules and dependencies not useful
7418
7364
(and sometimes confusing) to the casual installer
7425
7371
--enable-fast-install[=PKGS]
7426
7372
optimize for fast installation [default=yes]
7427
7373
--disable-dependency-tracking speeds up one-time build
7428
@@ -1170,7 +1661,8 @@
7374
@@ -1162,7 +1655,8 @@
7429
7375
7430
7376
--enable-iso-cxx Try to warn if code is not ISO C++
7431
7377
--enable-debug turn on debugging
7435
7381
--enable-nautilus compile the nautilus plugin
7436
7382
--disable-thumbnailer disable the GNOME thumbnailer
7437
7383
--disable-schemas-install Disable the schemas installation
7438
@@ -1190,8 +1682,7 @@
7384
@@ -1182,8 +1676,7 @@
7439
7385
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
7440
7386
--with-pic try to use only PIC/non-PIC objects [default=use
7441
7387
both]
7445
7391
--with-help-dir=DIR path to help docs
7446
7392
--with-omf-dir=DIR path to OMF files
7447
7393
--with-help-formats=FORMATS
7448
@@ -1209,8 +1700,9 @@
7394
@@ -1201,8 +1694,9 @@
7449
7395
CFLAGS C compiler flags
7450
7396
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
7451
7397
nonstandard directory <lib dir>
7457
7403
CPP C preprocessor
7458
7404
CXX C++ compiler command
7459
7405
CXXFLAGS C++ compiler flags
7460
@@ -1232,6 +1724,9 @@
7406
@@ -1224,6 +1718,9 @@
7461
7407
C compiler flags for SHELL_CORE, overriding pkg-config
7462
7408
SHELL_CORE_LIBS
7463
7409
linker flags for SHELL_CORE, overriding pkg-config
7467
7413
GNOME_CFLAGS
7468
7414
C compiler flags for GNOME, overriding pkg-config
7469
7415
GNOME_LIBS linker flags for GNOME, overriding pkg-config
7470
@@ -1277,120 +1772,86 @@
7416
@@ -1265,120 +1762,86 @@
7471
7417
7472
7418
Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=evince>.
7473
7419
_ACEOF
7603
7549
+test -n "$ac_init_help" && exit $ac_status
7604
7550
if $ac_init_version; then
7605
7551
cat <<\_ACEOF
7606
Evince configure 2.20.2
7552
Evince configure 2.21.1
7607
7553
-generated by GNU Autoconf 2.59
7608
7554
+generated by GNU Autoconf 2.61
7609
7555
7622
7568
This file contains any messages produced by compilers while
7623
7569
running configure, to aid debugging if configure makes a mistake.
7624
7570
7625
It was created by Evince $as_me 2.20.2, which was
7571
It was created by Evince $as_me 2.21.1, which was
7626
7572
-generated by GNU Autoconf 2.59. Invocation command line was
7627
7573
+generated by GNU Autoconf 2.61. Invocation command line was
7628
7574
7633
7579
{
7634
7580
cat <<_ASUNAME
7635
7581
## --------- ##
7636
@@ -1409,7 +1870,7 @@
7582
@@ -1397,7 +1860,7 @@
7637
7583
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
7638
7584
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
7639
7585
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
7642
7588
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
7643
7589
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
7644
7590
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
7645
@@ -1423,6 +1884,7 @@
7591
@@ -1411,6 +1874,7 @@
7646
7592
test -z "$as_dir" && as_dir=.
7647
7593
echo "PATH: $as_dir"
7648
7594
done
7650
7596
7651
7597
} >&5
7652
7598
7653
@@ -1444,7 +1906,6 @@
7599
@@ -1432,7 +1896,6 @@
7654
7600
ac_configure_args=
7655
7601
ac_configure_args0=
7656
7602
ac_configure_args1=
7658
7604
ac_must_keep_next=false
7659
7605
for ac_pass in 1 2
7660
7606
do
7661
@@ -1455,7 +1916,7 @@
7607
@@ -1443,7 +1906,7 @@
7662
7608
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
7663
7609
| -silent | --silent | --silen | --sile | --sil)
7664
7610
continue ;;
7667
7613
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
7668
7614
esac
7669
7615
case $ac_pass in
7670
@@ -1477,9 +1938,7 @@
7616
@@ -1465,9 +1928,7 @@
7671
7617
-* ) ac_must_keep_next=true ;;
7672
7618
esac
7673
7619
fi
7678
7624
;;
7679
7625
esac
7680
7626
done
7681
@@ -1490,8 +1949,8 @@
7627
@@ -1478,8 +1939,8 @@
7682
7628
# When interrupted or exit'd, cleanup temporary files, and complete
7683
7629
# config.log. We remove comments because anyway the quotes in there
7684
7630
# would cause problems or look ugly.
7689
7635
trap 'exit_status=$?
7690
7636
# Save into config.log some information that might help in debugging.
7691
7637
{
7692
@@ -1504,20 +1963,34 @@
7638
@@ -1492,20 +1953,34 @@
7693
7639
_ASBOX
7694
7640
echo
7695
7641
# The following way of writing the cache mishandles newlines in values,
7734
7680
echo
7735
7681
7736
7682
cat <<\_ASBOX
7737
@@ -1528,22 +2001,28 @@
7683
@@ -1516,22 +1991,28 @@
7738
7684
echo
7739
7685
for ac_var in $ac_subst_vars
7740
7686
do
7770
7716
done | sort
7771
7717
echo
7772
7718
fi
7773
@@ -1555,26 +2034,24 @@
7719
@@ -1543,26 +2024,24 @@
7774
7720
## ----------- ##
7775
7721
_ASBOX
7776
7722
echo
7802
7748
7803
7749
# Predefined preprocessor variables.
7804
7750
7805
@@ -1605,14 +2082,17 @@
7751
@@ -1593,14 +2072,17 @@
7806
7752
7807
7753
# Let the site file select an alternate cache file if it wants to.
7808
7754
# Prefer explicitly selected file to automatically selected ones.
7827
7773
if test -r "$ac_site_file"; then
7828
7774
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
7829
7775
echo "$as_me: loading site script $ac_site_file" >&6;}
7830
@@ -1628,8 +2108,8 @@
7776
@@ -1616,8 +2098,8 @@
7831
7777
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
7832
7778
echo "$as_me: loading cache $cache_file" >&6;}
7833
7779
case $cache_file in
7838
7784
esac
7839
7785
fi
7840
7786
else
7841
@@ -1641,12 +2121,11 @@
7787
@@ -1629,12 +2111,11 @@
7842
7788
# Check that the precious variables saved in the cache have kept the same
7843
7789
# value.
7844
7790
ac_cache_corrupted=false
7854
7800
case $ac_old_set,$ac_new_set in
7855
7801
set,)
7856
7802
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
7857
@@ -1671,8 +2150,7 @@
7803
@@ -1659,8 +2140,7 @@
7858
7804
# Pass precious variables to config.status.
7859
7805
if test "$ac_new_set" = set; then
7860
7806
case $ac_new_val in
7864
7810
*) ac_arg=$ac_var=$ac_new_val ;;
7865
7811
esac
7866
7812
case " $ac_configure_args " in
7867
@@ -1689,11 +2167,6 @@
7813
@@ -1677,11 +2157,6 @@
7868
7814
{ (exit 1); exit 1; }; }
7869
7815
fi
7870
7816
7876
7822
7877
7823
7878
7824
7879
@@ -1718,34 +2191,45 @@
7825
@@ -1706,34 +2181,45 @@
7880
7826
7881
7827
7882
7828
7932
7878
7933
7879
# Find a good install program. We prefer a C program (faster),
7934
7880
# so one script is as good as another. But avoid the broken or
7935
@@ -1760,8 +2244,8 @@
7881
@@ -1748,8 +2234,8 @@
7936
7882
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
7937
7883
# OS/2's system install, which has a completely different semantic
7938
7884
# ./install, which can be erroneously created by make from ./install.sh.
7943
7889
if test -z "$INSTALL"; then
7944
7890
if test "${ac_cv_path_install+set}" = set; then
7945
7891
echo $ECHO_N "(cached) $ECHO_C" >&6
7946
@@ -1783,7 +2267,7 @@
7892
@@ -1771,7 +2257,7 @@
7947
7893
# by default.
7948
7894
for ac_prog in ginstall scoinst install; do
7949
7895
for ac_exec_ext in '' $ac_executable_extensions; do
7952
7898
if test $ac_prog = install &&
7953
7899
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7954
7900
# AIX install. It has an incompatible calling convention.
7955
@@ -1802,21 +2286,22 @@
7901
@@ -1790,21 +2276,22 @@
7956
7902
;;
7957
7903
esac
7958
7904
done
7980
7926
7981
7927
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
7982
7928
# It thinks the first close brace ends the variable substitution.
7983
@@ -1826,8 +2311,8 @@
7929
@@ -1814,8 +2301,8 @@
7984
7930
7985
7931
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
7986
7932
7991
7937
# Just in case
7992
7938
sleep 1
7993
7939
echo timestamp > conftest.file
7994
@@ -1869,20 +2354,20 @@
7940
@@ -1857,20 +2344,20 @@
7995
7941
Check your system clock" >&2;}
7996
7942
{ (exit 1); exit 1; }; }
7997
7943
fi
8017
7963
8018
7964
# expand $ac_aux_dir to an absolute path
8019
7965
am_aux_dir=`cd $ac_aux_dir && pwd`
8020
@@ -1897,45 +2382,60 @@
7966
@@ -1885,45 +2372,60 @@
8021
7967
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
8022
7968
fi
8023
7969
8109
8055
if test "${ac_cv_prog_AWK+set}" = set; then
8110
8056
echo $ECHO_N "(cached) $ECHO_C" >&6
8111
8057
else
8112
@@ -1948,54 +2448,57 @@
8058
@@ -1936,54 +2438,57 @@
8113
8059
IFS=$as_save_IFS
8114
8060
test -z "$as_dir" && as_dir=.
8115
8061
for ac_exec_ext in '' $ac_executable_extensions; do
8188
8134
SET_MAKE="MAKE=${MAKE-make}"
8189
8135
fi
8190
8136
8191
@@ -2008,12 +2511,16 @@
8137
@@ -1996,12 +2501,16 @@
8192
8138
fi
8193
8139
rmdir .tst 2>/dev/null
8194
8140
8209
8155
fi
8210
8156
8211
8157
# test whether we have cygpath
8212
@@ -2056,7 +2563,7 @@
8158
@@ -2044,7 +2553,7 @@
8213
8159
8214
8160
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
8215
8161
8218
8164
8219
8165
# Installed binaries are usually stripped using `strip' when the user
8220
8166
# run `make install-strip'. However `strip' might not be the right
8221
@@ -2066,8 +2573,8 @@
8167
@@ -2054,8 +2563,8 @@
8222
8168
if test -n "$ac_tool_prefix"; then
8223
8169
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8224
8170
set dummy ${ac_tool_prefix}strip; ac_word=$2
8229
8175
if test "${ac_cv_prog_STRIP+set}" = set; then
8230
8176
echo $ECHO_N "(cached) $ECHO_C" >&6
8231
8177
else
8232
@@ -2080,32 +2587,34 @@
8178
@@ -2068,32 +2577,34 @@
8233
8179
IFS=$as_save_IFS
8234
8180
test -z "$as_dir" && as_dir=.
8235
8181
for ac_exec_ext in '' $ac_executable_extensions; do
8271
8217
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
8272
8218
echo $ECHO_N "(cached) $ECHO_C" >&6
8273
8219
else
8274
@@ -2118,33 +2627,47 @@
8220
@@ -2106,33 +2617,47 @@
8275
8221
IFS=$as_save_IFS
8276
8222
test -z "$as_dir" && as_dir=.
8277
8223
for ac_exec_ext in '' $ac_executable_extensions; do
8327
8273
8328
8274
# We need awk for the "check" target. The system "awk" is bad on
8329
8275
# some platforms.
8330
@@ -2159,23 +2682,21 @@
8276
@@ -2147,23 +2672,21 @@
8331
8277
8332
8278
8333
8279
8360
8306
MAINTAINER_MODE_TRUE=
8361
8307
MAINTAINER_MODE_FALSE='#'
8362
8308
else
8363
@@ -2187,10 +2708,9 @@
8309
@@ -2175,10 +2698,9 @@
8364
8310
8365
8311
8366
8312
8373
8319
case $enableval in
8374
8320
yes) enable_shared=yes ;;
8375
8321
no) enable_shared=no ;;
8376
@@ -2209,12 +2729,12 @@
8322
@@ -2197,12 +2719,12 @@
8377
8323
esac
8378
8324
else
8379
8325
enable_shared=yes
8390
8336
case $enableval in
8391
8337
yes) enable_static=yes ;;
8392
8338
no) enable_static=no ;;
8393
@@ -2233,12 +2753,12 @@
8339
@@ -2221,12 +2743,12 @@
8394
8340
esac
8395
8341
else
8396
8342
enable_static=yes
8407
8353
case $enableval in
8408
8354
yes) enable_fast_install=yes ;;
8409
8355
no) enable_fast_install=no ;;
8410
@@ -2257,65 +2777,95 @@
8356
@@ -2245,65 +2767,95 @@
8411
8357
esac
8412
8358
else
8413
8359
enable_fast_install=yes
8535
8481
8536
8482
8537
8483
am_make=${MAKE-make}
8538
@@ -2325,8 +2875,8 @@
8484
@@ -2313,8 +2865,8 @@
8539
8485
.PHONY: am__doit
8540
8486
END
8541
8487
# If we don't find an include directive, just comment out the code.
8546
8492
am__include="#"
8547
8493
am__quote=
8548
8494
_am_result=none
8549
@@ -2353,22 +2903,20 @@
8495
@@ -2341,22 +2893,20 @@
8550
8496
fi
8551
8497
8552
8498
8575
8521
AMDEP_TRUE=
8576
8522
AMDEP_FALSE='#'
8577
8523
else
8578
@@ -2377,7 +2925,6 @@
8524
@@ -2365,7 +2915,6 @@
8579
8525
fi
8580
8526
8581
8527
8583
8529
ac_ext=c
8584
8530
ac_cpp='$CPP $CPPFLAGS'
8585
8531
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8586
@@ -2386,8 +2933,8 @@
8532
@@ -2374,8 +2923,8 @@
8587
8533
if test -n "$ac_tool_prefix"; then
8588
8534
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
8589
8535
set dummy ${ac_tool_prefix}gcc; ac_word=$2
8594
8540
if test "${ac_cv_prog_CC+set}" = set; then
8595
8541
echo $ECHO_N "(cached) $ECHO_C" >&6
8596
8542
else
8597
@@ -2400,32 +2947,34 @@
8543
@@ -2388,32 +2937,34 @@
8598
8544
IFS=$as_save_IFS
8599
8545
test -z "$as_dir" && as_dir=.
8600
8546
for ac_exec_ext in '' $ac_executable_extensions; do
8636
8582
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
8637
8583
echo $ECHO_N "(cached) $ECHO_C" >&6
8638
8584
else
8639
@@ -2438,36 +2987,51 @@
8585
@@ -2426,36 +2977,51 @@
8640
8586
IFS=$as_save_IFS
8641
8587
test -z "$as_dir" && as_dir=.
8642
8588
for ac_exec_ext in '' $ac_executable_extensions; do
8698
8644
if test "${ac_cv_prog_CC+set}" = set; then
8699
8645
echo $ECHO_N "(cached) $ECHO_C" >&6
8700
8646
else
8701
@@ -2480,74 +3044,34 @@
8647
@@ -2468,74 +3034,34 @@
8702
8648
IFS=$as_save_IFS
8703
8649
test -z "$as_dir" && as_dir=.
8704
8650
for ac_exec_ext in '' $ac_executable_extensions; do
8782
8728
if test "${ac_cv_prog_CC+set}" = set; then
8783
8729
echo $ECHO_N "(cached) $ECHO_C" >&6
8784
8730
else
8785
@@ -2561,7 +3085,7 @@
8731
@@ -2549,7 +3075,7 @@
8786
8732
IFS=$as_save_IFS
8787
8733
test -z "$as_dir" && as_dir=.
8788
8734
for ac_exec_ext in '' $ac_executable_extensions; do
8791
8737
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
8792
8738
ac_prog_rejected=yes
8793
8739
continue
8794
@@ -2572,6 +3096,7 @@
8740
@@ -2560,6 +3086,7 @@
8795
8741
fi
8796
8742
done
8797
8743
done
8799
8745
8800
8746
if test $ac_prog_rejected = yes; then
8801
8747
# We found a bogon in the path, so make sure we never use it.
8802
@@ -2589,22 +3114,23 @@
8748
@@ -2577,22 +3104,23 @@
8803
8749
fi
8804
8750
CC=$ac_cv_prog_CC
8805
8751
if test -n "$CC"; then
8830
8776
if test "${ac_cv_prog_CC+set}" = set; then
8831
8777
echo $ECHO_N "(cached) $ECHO_C" >&6
8832
8778
else
8833
@@ -2617,36 +3143,38 @@
8779
@@ -2605,36 +3133,38 @@
8834
8780
IFS=$as_save_IFS
8835
8781
test -z "$as_dir" && as_dir=.
8836
8782
for ac_exec_ext in '' $ac_executable_extensions; do
8877
8823
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
8878
8824
echo $ECHO_N "(cached) $ECHO_C" >&6
8879
8825
else
8880
@@ -2659,29 +3187,45 @@
8826
@@ -2647,29 +3177,45 @@
8881
8827
IFS=$as_save_IFS
8882
8828
test -z "$as_dir" && as_dir=.
8883
8829
for ac_exec_ext in '' $ac_executable_extensions; do
8929
8875
fi
8930
8876
8931
8877
fi
8932
@@ -2694,21 +3238,35 @@
8878
@@ -2682,21 +3228,35 @@
8933
8879
{ (exit 1); exit 1; }; }
8934
8880
8935
8881
# Provide some information about the compiler.
8973
8919
ac_status=$?
8974
8920
echo "$as_me:$LINENO: \$? = $ac_status" >&5
8975
8921
(exit $ac_status); }
8976
@@ -2733,47 +3291,77 @@
8922
@@ -2721,47 +3281,77 @@
8977
8923
# Try to create an executable without -o first, disregard a.out.
8978
8924
# It will help us diagnose broken compilers, and finding out an intuition
8979
8925
# of exeext.
9073
9019
echo "$as_me: failed program was:" >&5
9074
9020
sed 's/^/| /' conftest.$ac_ext >&5
9075
9021
9076
@@ -2785,19 +3373,21 @@
9022
@@ -2773,19 +3363,21 @@
9077
9023
fi
9078
9024
9079
9025
ac_exeext=$ac_cv_exeext
9102
9048
ac_status=$?
9103
9049
echo "$as_me:$LINENO: \$? = $ac_status" >&5
9104
9050
(exit $ac_status); }; }; then
9105
@@ -2816,22 +3406,27 @@
9051
@@ -2804,22 +3396,27 @@
9106
9052
fi
9107
9053
fi
9108
9054
fi
9142
9088
ac_status=$?
9143
9089
echo "$as_me:$LINENO: \$? = $ac_status" >&5
9144
9090
(exit $ac_status); }; then
9145
@@ -2842,9 +3437,8 @@
9091
@@ -2830,9 +3427,8 @@
9146
9092
for ac_file in conftest.exe conftest conftest.*; do
9147
9093
test -f "$ac_file" || continue
9148
9094
case $ac_file in
9153
9099
break;;
9154
9100
* ) break;;
9155
9101
esac
9156
@@ -2858,14 +3452,14 @@
9102
@@ -2846,14 +3442,14 @@
9157
9103
fi
9158
9104
9159
9105
rm -f conftest$ac_cv_exeext
9172
9118
if test "${ac_cv_objext+set}" = set; then
9173
9119
echo $ECHO_N "(cached) $ECHO_C" >&6
9174
9120
else
9175
@@ -2885,14 +3479,20 @@
9121
@@ -2873,14 +3469,20 @@
9176
9122
}
9177
9123
_ACEOF
9178
9124
rm -f conftest.o conftest.obj
9197
9143
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
9198
9144
break;;
9199
9145
esac
9200
@@ -2910,12 +3510,12 @@
9146
@@ -2898,12 +3500,12 @@
9201
9147
9202
9148
rm -f conftest.$ac_cv_objext conftest.$ac_ext
9203
9149
fi
9214
9160
if test "${ac_cv_c_compiler_gnu+set}" = set; then
9215
9161
echo $ECHO_N "(cached) $ECHO_C" >&6
9216
9162
else
9217
@@ -2938,50 +3538,49 @@
9163
@@ -2926,50 +3528,49 @@
9218
9164
}
9219
9165
_ACEOF
9220
9166
rm -f conftest.$ac_objext
9288
9234
/* confdefs.h. */
9289
9235
_ACEOF
9290
9236
cat confdefs.h >>conftest.$ac_ext
9291
@@ -2997,311 +3596,248 @@
9237
@@ -2985,311 +3586,248 @@
9292
9238
}
9293
9239
_ACEOF
9294
9240
rm -f conftest.$ac_objext
9763
9709
ac_ext=c
9764
9710
ac_cpp='$CPP $CPPFLAGS'
9765
9711
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9766
@@ -3310,8 +3846,8 @@
9712
@@ -3298,8 +3836,8 @@
9767
9713
9768
9714
depcc="$CC" am_compiler_list=
9769
9715
9774
9720
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
9775
9721
echo $ECHO_N "(cached) $ECHO_C" >&6
9776
9722
else
9777
@@ -3375,6 +3911,7 @@
9723
@@ -3363,6 +3901,7 @@
9778
9724
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
9779
9725
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
9780
9726
>/dev/null 2>conftest.err &&
9782
9728
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
9783
9729
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
9784
9730
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
9785
@@ -3400,13 +3937,11 @@
9731
@@ -3388,13 +3927,11 @@
9786
9732
fi
9787
9733
9788
9734
fi
9799
9745
test "x$enable_dependency_tracking" != xno \
9800
9746
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
9801
9747
am__fastdepCC_TRUE=
9802
@@ -3417,8 +3952,8 @@
9748
@@ -3405,8 +3942,8 @@
9803
9749
fi
9804
9750
9805
9751
9810
9756
if test "${lt_cv_path_SED+set}" = set; then
9811
9757
echo $ECHO_N "(cached) $ECHO_C" >&6
9812
9758
else
9813
@@ -3431,7 +3966,7 @@
9759
@@ -3419,7 +3956,7 @@
9814
9760
test -z "$as_dir" && as_dir=.
9815
9761
for lt_ac_prog in sed gsed; do
9816
9762
for ac_exec_ext in '' $ac_executable_extensions; do
9819
9765
lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
9820
9766
fi
9821
9767
done
9822
@@ -3473,37 +4008,184 @@
9768
@@ -3461,37 +3998,184 @@
9823
9769
9824
9770
SED=$lt_cv_path_SED
9825
9771
10021
9967
case $host in
10022
9968
*-*-mingw*)
10023
9969
# gcc leaves a trailing carriage return which upsets mingw
10024
@@ -3532,11 +4214,11 @@
9970
@@ -3520,11 +4204,11 @@
10025
9971
;;
10026
9972
esac
10027
9973
elif test "$with_gnu_ld" = yes; then
10037
9983
fi
10038
9984
if test "${lt_cv_path_LD+set}" = set; then
10039
9985
echo $ECHO_N "(cached) $ECHO_C" >&6
10040
@@ -3569,17 +4251,17 @@
9986
@@ -3557,17 +4241,17 @@
10041
9987
10042
9988
LD="$lt_cv_path_LD"
10043
9989
if test -n "$LD"; then
10061
10007
if test "${lt_cv_prog_gnu_ld+set}" = set; then
10062
10008
echo $ECHO_N "(cached) $ECHO_C" >&6
10063
10009
else
10064
@@ -3593,20 +4275,20 @@
10010
@@ -3581,20 +4265,20 @@
10065
10011
;;
10066
10012
esac
10067
10013
fi
10088
10034
reload_flag=$lt_cv_ld_reload_flag
10089
10035
case $reload_flag in
10090
10036
"" | " "*) ;;
10091
@@ -3623,8 +4305,8 @@
10037
@@ -3611,8 +4295,8 @@
10092
10038
;;
10093
10039
esac
10094
10040
10099
10045
if test "${lt_cv_path_NM+set}" = set; then
10100
10046
echo $ECHO_N "(cached) $ECHO_C" >&6
10101
10047
else
10102
@@ -3672,23 +4354,23 @@
10048
@@ -3660,23 +4344,23 @@
10103
10049
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
10104
10050
fi
10105
10051
fi
10133
10079
if test "${lt_cv_deplibs_check_method+set}" = set; then
10134
10080
echo $ECHO_N "(cached) $ECHO_C" >&6
10135
10081
else
10136
@@ -3729,16 +4411,22 @@
10082
@@ -3717,16 +4401,22 @@
10137
10083
10138
10084
mingw* | pw32*)
10139
10085
# Base MSYS/MinGW do not provide the 'file' command needed by
10160
10106
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
10161
10107
case $host_cpu in
10162
10108
i*86 )
10163
@@ -3776,7 +4464,7 @@
10109
@@ -3764,7 +4454,7 @@
10164
10110
esac
10165
10111
;;
10166
10112
10169
10115
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
10170
10116
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
10171
10117
;;
10172
@@ -3792,11 +4480,11 @@
10118
@@ -3780,11 +4470,11 @@
10173
10119
;;
10174
10120
10175
10121
# This must be Linux ELF.
10183
10129
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
10184
10130
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
10185
10131
else
10186
@@ -3826,6 +4514,10 @@
10132
@@ -3814,6 +4504,10 @@
10187
10133
lt_cv_deplibs_check_method=pass_all
10188
10134
;;
10189
10135
10194
10140
solaris*)
10195
10141
lt_cv_deplibs_check_method=pass_all
10196
10142
;;
10197
@@ -3863,8 +4555,8 @@
10143
@@ -3851,8 +4545,8 @@
10198
10144
esac
10199
10145
10200
10146
fi
10205
10151
file_magic_cmd=$lt_cv_file_magic_cmd
10206
10152
deplibs_check_method=$lt_cv_deplibs_check_method
10207
10153
test -z "$deplibs_check_method" && deplibs_check_method=unknown
10208
@@ -3882,11 +4574,11 @@
10154
@@ -3870,11 +4564,11 @@
10209
10155
compiler=$CC
10210
10156
10211
10157
10220
10166
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
10221
10167
10222
10168
# Some flags need to be propagated to the compiler or linker for good
10223
@@ -3913,7 +4605,7 @@
10169
@@ -3901,7 +4595,7 @@
10224
10170
;;
10225
10171
*-*-irix6*)
10226
10172
# Find out which ABI we are using.
10227
- echo '#line 3916 "configure"' > conftest.$ac_ext
10228
+ echo '#line 4608 "configure"' > conftest.$ac_ext
10173
- echo '#line 3904 "configure"' > conftest.$ac_ext
10174
+ echo '#line 4598 "configure"' > conftest.$ac_ext
10229
10175
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10230
10176
(eval $ac_compile) 2>&5
10231
10177
ac_status=$?
10232
@@ -3948,7 +4640,8 @@
10178
@@ -3936,7 +4630,8 @@
10233
10179
rm -rf conftest*
10234
10180
;;
10235
10181
10239
10185
# Find out which ABI we are using.
10240
10186
echo 'int i;' > conftest.$ac_ext
10241
10187
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10242
@@ -3959,6 +4652,9 @@
10188
@@ -3947,6 +4642,9 @@
10243
10189
case `/usr/bin/file conftest.o` in
10244
10190
*32-bit*)
10245
10191
case $host in
10249
10195
x86_64-*linux*)
10250
10196
LD="${LD-ld} -m elf_i386"
10251
10197
;;
10252
@@ -3975,6 +4671,9 @@
10198
@@ -3963,6 +4661,9 @@
10253
10199
;;
10254
10200
*64-bit*)
10255
10201
case $host in
10259
10205
x86_64-*linux*)
10260
10206
LD="${LD-ld} -m elf_x86_64"
10261
10207
;;
10262
@@ -3998,8 +4697,8 @@
10208
@@ -3986,8 +4687,8 @@
10263
10209
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
10264
10210
SAVE_CFLAGS="$CFLAGS"
10265
10211
CFLAGS="$CFLAGS -belf"
10270
10216
if test "${lt_cv_cc_needs_belf+set}" = set; then
10271
10217
echo $ECHO_N "(cached) $ECHO_C" >&6
10272
10218
else
10273
@@ -4025,35 +4724,32 @@
10219
@@ -4013,35 +4714,32 @@
10274
10220
}
10275
10221
_ACEOF
10276
10222
rm -f conftest.$ac_objext conftest$ac_exeext
10321
10267
conftest$ac_exeext conftest.$ac_ext
10322
10268
ac_ext=c
10323
10269
ac_cpp='$CPP $CPPFLAGS'
10324
@@ -4062,8 +4758,8 @@
10270
@@ -4050,8 +4748,8 @@
10325
10271
ac_compiler_gnu=$ac_cv_c_compiler_gnu
10326
10272
10327
10273
fi
10332
10278
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
10333
10279
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
10334
10280
CFLAGS="$SAVE_CFLAGS"
10335
@@ -4100,8 +4796,8 @@
10281
@@ -4088,8 +4786,8 @@
10336
10282
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10337
10283
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10338
10284
ac_compiler_gnu=$ac_cv_c_compiler_gnu
10343
10289
# On Suns, sometimes $CPP names a directory.
10344
10290
if test -n "$CPP" && test -d "$CPP"; then
10345
10291
CPP=
10346
@@ -4135,24 +4831,22 @@
10292
@@ -4123,24 +4821,22 @@
10347
10293
#endif
10348
10294
Syntax error
10349
10295
_ACEOF
10379
10325
:
10380
10326
else
10381
10327
echo "$as_me: failed program was:" >&5
10382
@@ -4161,9 +4855,10 @@
10328
@@ -4149,9 +4845,10 @@
10383
10329
# Broken: fails on valid input.
10384
10330
continue
10385
10331
fi
10391
10337
# can be detected and how.
10392
10338
cat >conftest.$ac_ext <<_ACEOF
10393
10339
/* confdefs.h. */
10394
@@ -4173,24 +4868,22 @@
10340
@@ -4161,24 +4858,22 @@
10395
10341
/* end confdefs.h. */
10396
10342
#include <ac_nonexistent.h>
10397
10343
_ACEOF
10427
10373
# Broken: success on invalid input.
10428
10374
continue
10429
10375
else
10430
@@ -4201,6 +4894,7 @@
10376
@@ -4189,6 +4884,7 @@
10431
10377
ac_preproc_ok=:
10432
10378
break
10433
10379
fi
10435
10381
rm -f conftest.err conftest.$ac_ext
10436
10382
10437
10383
done
10438
@@ -4218,8 +4912,8 @@
10384
@@ -4206,8 +4902,8 @@
10439
10385
else
10440
10386
ac_cv_prog_CPP=$CPP
10441
10387
fi
10446
10392
ac_preproc_ok=false
10447
10393
for ac_c_preproc_warn_flag in '' yes
10448
10394
do
10449
@@ -4242,24 +4936,22 @@
10395
@@ -4230,24 +4926,22 @@
10450
10396
#endif
10451
10397
Syntax error
10452
10398
_ACEOF
10482
10428
:
10483
10429
else
10484
10430
echo "$as_me: failed program was:" >&5
10485
@@ -4268,9 +4960,10 @@
10431
@@ -4256,9 +4950,10 @@
10486
10432
# Broken: fails on valid input.
10487
10433
continue
10488
10434
fi
10494
10440
# can be detected and how.
10495
10441
cat >conftest.$ac_ext <<_ACEOF
10496
10442
/* confdefs.h. */
10497
@@ -4280,24 +4973,22 @@
10443
@@ -4268,24 +4963,22 @@
10498
10444
/* end confdefs.h. */
10499
10445
#include <ac_nonexistent.h>
10500
10446
_ACEOF
10530
10476
# Broken: success on invalid input.
10531
10477
continue
10532
10478
else
10533
@@ -4308,6 +4999,7 @@
10479
@@ -4296,6 +4989,7 @@
10534
10480
ac_preproc_ok=:
10535
10481
break
10536
10482
fi
10538
10484
rm -f conftest.err conftest.$ac_ext
10539
10485
10540
10486
done
10541
@@ -4330,8 +5022,8 @@
10487
@@ -4318,8 +5012,8 @@
10542
10488
ac_compiler_gnu=$ac_cv_c_compiler_gnu
10543
10489
10544
10490
10549
10495
if test "${ac_cv_header_stdc+set}" = set; then
10550
10496
echo $ECHO_N "(cached) $ECHO_C" >&6
10551
10497
else
10552
@@ -4355,35 +5047,31 @@
10498
@@ -4343,35 +5037,31 @@
10553
10499
}
10554
10500
_ACEOF
10555
10501
rm -f conftest.$ac_objext
10599
10545
10600
10546
if test $ac_cv_header_stdc = yes; then
10601
10547
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
10602
@@ -4439,6 +5127,7 @@
10548
@@ -4427,6 +5117,7 @@
10603
10549
cat >>conftest.$ac_ext <<_ACEOF
10604
10550
/* end confdefs.h. */
10605
10551
#include <ctype.h>
10607
10553
#if ((' ' & 0x0FF) == 0x020)
10608
10554
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
10609
10555
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
10610
@@ -4458,18 +5147,27 @@
10556
@@ -4446,18 +5137,27 @@
10611
10557
for (i = 0; i < 256; i++)
10612
10558
if (XOR (islower (i), ISLOWER (i))
10613
10559
|| toupper (i) != TOUPPER (i))
10641
10587
ac_status=$?
10642
10588
echo "$as_me:$LINENO: \$? = $ac_status" >&5
10643
10589
(exit $ac_status); }; }; then
10644
@@ -4482,12 +5180,14 @@
10590
@@ -4470,12 +5170,14 @@
10645
10591
( exit $ac_status )
10646
10592
ac_cv_header_stdc=no
10647
10593
fi
10659
10605
if test $ac_cv_header_stdc = yes; then
10660
10606
10661
10607
cat >>confdefs.h <<\_ACEOF
10662
@@ -4510,9 +5210,9 @@
10608
@@ -4498,9 +5200,9 @@
10663
10609
inttypes.h stdint.h unistd.h
10664
10610
do
10665
10611
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
10672
10618
echo $ECHO_N "(cached) $ECHO_C" >&6
10673
10619
else
10674
10620
cat >conftest.$ac_ext <<_ACEOF
10675
@@ -4526,38 +5226,35 @@
10621
@@ -4514,38 +5216,35 @@
10676
10622
#include <$ac_header>
10677
10623
_ACEOF
10678
10624
rm -f conftest.$ac_objext
10728
10674
if test `eval echo '${'$as_ac_Header'}'` = yes; then
10729
10675
cat >>confdefs.h <<_ACEOF
10730
10676
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
10731
@@ -4572,18 +5269,19 @@
10677
@@ -4560,18 +5259,19 @@
10732
10678
for ac_header in dlfcn.h
10733
10679
do
10734
10680
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
10756
10702
cat >conftest.$ac_ext <<_ACEOF
10757
10703
/* confdefs.h. */
10758
10704
_ACEOF
10759
@@ -4594,41 +5292,37 @@
10705
@@ -4582,41 +5282,37 @@
10760
10706
#include <$ac_header>
10761
10707
_ACEOF
10762
10708
rm -f conftest.$ac_objext
10816
10762
cat >conftest.$ac_ext <<_ACEOF
10817
10763
/* confdefs.h. */
10818
10764
_ACEOF
10819
@@ -4637,24 +5331,22 @@
10765
@@ -4625,24 +5321,22 @@
10820
10766
/* end confdefs.h. */
10821
10767
#include <$ac_header>
10822
10768
_ACEOF
10852
10798
ac_header_preproc=yes
10853
10799
else
10854
10800
echo "$as_me: failed program was:" >&5
10855
@@ -4662,9 +5354,10 @@
10801
@@ -4650,9 +5344,10 @@
10856
10802
10857
10803
ac_header_preproc=no
10858
10804
fi
10865
10811
10866
10812
# So? What about this header?
10867
10813
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
10868
@@ -4688,25 +5381,24 @@
10814
@@ -4676,25 +5371,24 @@
10869
10815
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
10870
10816
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
10871
10817
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
10899
10845
10900
10846
fi
10901
10847
if test `eval echo '${'$as_ac_Header'}'` = yes; then
10902
@@ -4718,18 +5410,22 @@
10848
@@ -4706,18 +5400,22 @@
10903
10849
10904
10850
done
10905
10851
10927
10873
if test "${ac_cv_prog_CXX+set}" = set; then
10928
10874
echo $ECHO_N "(cached) $ECHO_C" >&6
10929
10875
else
10930
@@ -4742,36 +5438,38 @@
10876
@@ -4730,36 +5428,38 @@
10931
10877
IFS=$as_save_IFS
10932
10878
test -z "$as_dir" && as_dir=.
10933
10879
for ac_exec_ext in '' $ac_executable_extensions; do
10974
10920
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
10975
10921
echo $ECHO_N "(cached) $ECHO_C" >&6
10976
10922
else
10977
@@ -4784,55 +5482,85 @@
10923
@@ -4772,55 +5472,85 @@
10978
10924
IFS=$as_save_IFS
10979
10925
test -z "$as_dir" && as_dir=.
10980
10926
for ac_exec_ext in '' $ac_executable_extensions; do
11078
11024
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
11079
11025
echo $ECHO_N "(cached) $ECHO_C" >&6
11080
11026
else
11081
@@ -4855,50 +5583,49 @@
11027
@@ -4843,50 +5573,49 @@
11082
11028
}
11083
11029
_ACEOF
11084
11030
rm -f conftest.$ac_objext
11152
11098
/* confdefs.h. */
11153
11099
_ACEOF
11154
11100
cat confdefs.h >>conftest.$ac_ext
11155
@@ -4914,160 +5641,134 @@
11101
@@ -4902,160 +5631,134 @@
11156
11102
}
11157
11103
_ACEOF
11158
11104
rm -f conftest.$ac_objext
11383
11329
ac_cpp='$CXXCPP $CPPFLAGS'
11384
11330
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11385
11331
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11386
@@ -5075,8 +5776,8 @@
11332
@@ -5063,8 +5766,8 @@
11387
11333
11388
11334
depcc="$CXX" am_compiler_list=
11389
11335
11394
11340
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
11395
11341
echo $ECHO_N "(cached) $ECHO_C" >&6
11396
11342
else
11397
@@ -5140,6 +5841,7 @@
11343
@@ -5128,6 +5831,7 @@
11398
11344
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
11399
11345
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
11400
11346
>/dev/null 2>conftest.err &&
11402
11348
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
11403
11349
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
11404
11350
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
11405
@@ -5165,13 +5867,11 @@
11351
@@ -5153,13 +5857,11 @@
11406
11352
fi
11407
11353
11408
11354
fi
11419
11365
test "x$enable_dependency_tracking" != xno \
11420
11366
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
11421
11367
am__fastdepCXX_TRUE=
11422
@@ -5187,13 +5887,13 @@
11368
@@ -5175,13 +5877,13 @@
11423
11369
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11424
11370
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11425
11371
(test "X$CXX" != "Xg++"))) ; then
11436
11382
if test -z "$CXXCPP"; then
11437
11383
if test "${ac_cv_prog_CXXCPP+set}" = set; then
11438
11384
echo $ECHO_N "(cached) $ECHO_C" >&6
11439
@@ -5223,24 +5923,22 @@
11385
@@ -5211,24 +5913,22 @@
11440
11386
#endif
11441
11387
Syntax error
11442
11388
_ACEOF
11472
11418
:
11473
11419
else
11474
11420
echo "$as_me: failed program was:" >&5
11475
@@ -5249,9 +5947,10 @@
11421
@@ -5237,9 +5937,10 @@
11476
11422
# Broken: fails on valid input.
11477
11423
continue
11478
11424
fi
11484
11430
# can be detected and how.
11485
11431
cat >conftest.$ac_ext <<_ACEOF
11486
11432
/* confdefs.h. */
11487
@@ -5261,24 +5960,22 @@
11433
@@ -5249,24 +5950,22 @@
11488
11434
/* end confdefs.h. */
11489
11435
#include <ac_nonexistent.h>
11490
11436
_ACEOF
11520
11466
# Broken: success on invalid input.
11521
11467
continue
11522
11468
else
11523
@@ -5289,6 +5986,7 @@
11469
@@ -5277,6 +5976,7 @@
11524
11470
ac_preproc_ok=:
11525
11471
break
11526
11472
fi
11528
11474
rm -f conftest.err conftest.$ac_ext
11529
11475
11530
11476
done
11531
@@ -5306,8 +6004,8 @@
11477
@@ -5294,8 +5994,8 @@
11532
11478
else
11533
11479
ac_cv_prog_CXXCPP=$CXXCPP
11534
11480
fi
11539
11485
ac_preproc_ok=false
11540
11486
for ac_cxx_preproc_warn_flag in '' yes
11541
11487
do
11542
@@ -5330,24 +6028,22 @@
11488
@@ -5318,24 +6018,22 @@
11543
11489
#endif
11544
11490
Syntax error
11545
11491
_ACEOF
11575
11521
:
11576
11522
else
11577
11523
echo "$as_me: failed program was:" >&5
11578
@@ -5356,9 +6052,10 @@
11524
@@ -5344,9 +6042,10 @@
11579
11525
# Broken: fails on valid input.
11580
11526
continue
11581
11527
fi
11587
11533
# can be detected and how.
11588
11534
cat >conftest.$ac_ext <<_ACEOF
11589
11535
/* confdefs.h. */
11590
@@ -5368,24 +6065,22 @@
11536
@@ -5356,24 +6055,22 @@
11591
11537
/* end confdefs.h. */
11592
11538
#include <ac_nonexistent.h>
11593
11539
_ACEOF
11623
11569
# Broken: success on invalid input.
11624
11570
continue
11625
11571
else
11626
@@ -5396,6 +6091,7 @@
11572
@@ -5384,6 +6081,7 @@
11627
11573
ac_preproc_ok=:
11628
11574
break
11629
11575
fi
11631
11577
rm -f conftest.err conftest.$ac_ext
11632
11578
11633
11579
done
11634
@@ -5411,7 +6107,7 @@
11580
@@ -5399,7 +6097,7 @@
11635
11581
{ (exit 1); exit 1; }; }
11636
11582
fi
11637
11583
11640
11586
ac_cpp='$CXXCPP $CPPFLAGS'
11641
11587
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11642
11588
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11643
@@ -5425,12 +6121,12 @@
11589
@@ -5413,12 +6111,12 @@
11644
11590
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11645
11591
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
11646
11592
if test -n "$ac_tool_prefix"; then
11656
11602
if test "${ac_cv_prog_F77+set}" = set; then
11657
11603
echo $ECHO_N "(cached) $ECHO_C" >&6
11658
11604
else
11659
@@ -5443,36 +6139,38 @@
11605
@@ -5431,36 +6129,38 @@
11660
11606
IFS=$as_save_IFS
11661
11607
test -z "$as_dir" && as_dir=.
11662
11608
for ac_exec_ext in '' $ac_executable_extensions; do
11703
11649
if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
11704
11650
echo $ECHO_N "(cached) $ECHO_C" >&6
11705
11651
else
11706
@@ -5485,48 +6183,78 @@
11652
@@ -5473,48 +6173,78 @@
11707
11653
IFS=$as_save_IFS
11708
11654
test -z "$as_dir" && as_dir=.
11709
11655
for ac_exec_ext in '' $ac_executable_extensions; do
11756
11702
11757
11703
11758
11704
# Provide some information about the compiler.
11759
-echo "$as_me:5515:" \
11705
-echo "$as_me:5503:" \
11760
11706
- "checking for Fortran 77 compiler version" >&5
11761
11707
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
11762
11708
ac_compiler=`set X $ac_compile; echo $2`
11796
11742
ac_status=$?
11797
11743
echo "$as_me:$LINENO: \$? = $ac_status" >&5
11798
11744
(exit $ac_status); }
11799
@@ -5536,8 +6264,8 @@
11745
@@ -5524,8 +6254,8 @@
11800
11746
# input file. (Note that this only needs to work for GNU compilers.)
11801
11747
ac_save_ext=$ac_ext
11802
11748
ac_ext=F
11807
11753
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
11808
11754
echo $ECHO_N "(cached) $ECHO_C" >&6
11809
11755
else
11810
@@ -5550,46 +6278,42 @@
11756
@@ -5538,46 +6268,42 @@
11811
11757
end
11812
11758
_ACEOF
11813
11759
rm -f conftest.$ac_objext
11872
11818
if test "${ac_cv_prog_f77_g+set}" = set; then
11873
11819
echo $ECHO_N "(cached) $ECHO_C" >&6
11874
11820
else
11875
@@ -5600,39 +6324,35 @@
11821
@@ -5588,39 +6314,35 @@
11876
11822
end
11877
11823
_ACEOF
11878
11824
rm -f conftest.$ac_objext
11928
11874
if test "$ac_test_FFLAGS" = set; then
11929
11875
FFLAGS=$ac_save_FFLAGS
11930
11876
elif test $ac_cv_prog_f77_g = yes; then
11931
@@ -5661,8 +6381,8 @@
11877
@@ -5649,8 +6371,8 @@
11932
11878
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
11933
11879
11934
11880
# find the maximum length of command line arguments
11939
11885
if test "${lt_cv_sys_max_cmd_len+set}" = set; then
11940
11886
echo $ECHO_N "(cached) $ECHO_C" >&6
11941
11887
else
11942
@@ -5746,43 +6466,47 @@
11888
@@ -5734,43 +6456,47 @@
11943
11889
fi
11944
11890
;;
11945
11891
*)
12010
11956
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
12011
11957
echo $ECHO_N "(cached) $ECHO_C" >&6
12012
11958
else
12013
@@ -5817,7 +6541,7 @@
11959
@@ -5805,7 +6531,7 @@
12014
11960
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12015
11961
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
12016
11962
;;
12019
11965
if test "$host_cpu" = ia64; then
12020
11966
symcode='[ABCDGIRSTW]'
12021
11967
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12022
@@ -5986,15 +6710,15 @@
11968
@@ -5974,15 +6700,15 @@
12023
11969
lt_cv_sys_global_symbol_to_cdecl=
12024
11970
fi
12025
11971
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
12041
11987
if test "${lt_cv_objdir+set}" = set; then
12042
11988
echo $ECHO_N "(cached) $ECHO_C" >&6
12043
11989
else
12044
@@ -6008,8 +6732,8 @@
11990
@@ -5996,8 +6722,8 @@
12045
11991
fi
12046
11992
rmdir .libs 2>/dev/null
12047
11993
fi
12052
11998
objdir=$lt_cv_objdir
12053
11999
12054
12000
12055
@@ -6060,8 +6784,8 @@
12001
@@ -6048,8 +6774,8 @@
12056
12002
if test -n "$ac_tool_prefix"; then
12057
12003
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
12058
12004
set dummy ${ac_tool_prefix}ar; ac_word=$2
12063
12009
if test "${ac_cv_prog_AR+set}" = set; then
12064
12010
echo $ECHO_N "(cached) $ECHO_C" >&6
12065
12011
else
12066
@@ -6074,32 +6798,34 @@
12012
@@ -6062,32 +6788,34 @@
12067
12013
IFS=$as_save_IFS
12068
12014
test -z "$as_dir" && as_dir=.
12069
12015
for ac_exec_ext in '' $ac_executable_extensions; do
12105
12051
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
12106
12052
echo $ECHO_N "(cached) $ECHO_C" >&6
12107
12053
else
12108
@@ -6112,27 +6838,41 @@
12054
@@ -6100,27 +6828,41 @@
12109
12055
IFS=$as_save_IFS
12110
12056
test -z "$as_dir" && as_dir=.
12111
12057
for ac_exec_ext in '' $ac_executable_extensions; do
12154
12100
else
12155
12101
AR="$ac_cv_prog_AR"
12156
12102
fi
12157
@@ -6140,8 +6880,8 @@
12103
@@ -6128,8 +6870,8 @@
12158
12104
if test -n "$ac_tool_prefix"; then
12159
12105
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
12160
12106
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
12165
12111
if test "${ac_cv_prog_RANLIB+set}" = set; then
12166
12112
echo $ECHO_N "(cached) $ECHO_C" >&6
12167
12113
else
12168
@@ -6154,32 +6894,34 @@
12114
@@ -6142,32 +6884,34 @@
12169
12115
IFS=$as_save_IFS
12170
12116
test -z "$as_dir" && as_dir=.
12171
12117
for ac_exec_ext in '' $ac_executable_extensions; do
12207
12153
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
12208
12154
echo $ECHO_N "(cached) $ECHO_C" >&6
12209
12155
else
12210
@@ -6192,27 +6934,41 @@
12156
@@ -6180,27 +6924,41 @@
12211
12157
IFS=$as_save_IFS
12212
12158
test -z "$as_dir" && as_dir=.
12213
12159
for ac_exec_ext in '' $ac_executable_extensions; do
12256
12202
else
12257
12203
RANLIB="$ac_cv_prog_RANLIB"
12258
12204
fi
12259
@@ -6220,8 +6976,8 @@
12205
@@ -6208,8 +6966,8 @@
12260
12206
if test -n "$ac_tool_prefix"; then
12261
12207
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
12262
12208
set dummy ${ac_tool_prefix}strip; ac_word=$2
12267
12213
if test "${ac_cv_prog_STRIP+set}" = set; then
12268
12214
echo $ECHO_N "(cached) $ECHO_C" >&6
12269
12215
else
12270
@@ -6234,32 +6990,34 @@
12216
@@ -6222,32 +6980,34 @@
12271
12217
IFS=$as_save_IFS
12272
12218
test -z "$as_dir" && as_dir=.
12273
12219
for ac_exec_ext in '' $ac_executable_extensions; do
12309
12255
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
12310
12256
echo $ECHO_N "(cached) $ECHO_C" >&6
12311
12257
else
12312
@@ -6272,27 +7030,41 @@
12258
@@ -6260,27 +7020,41 @@
12313
12259
IFS=$as_save_IFS
12314
12260
test -z "$as_dir" && as_dir=.
12315
12261
for ac_exec_ext in '' $ac_executable_extensions; do
12358
12304
else
12359
12305
STRIP="$ac_cv_prog_STRIP"
12360
12306
fi
12361
@@ -6320,7 +7092,7 @@
12307
@@ -6308,7 +7082,7 @@
12362
12308
test -z "$ac_objext" && ac_objext=o
12363
12309
12364
12310
# Determine commands to create old-style static archives.
12367
12313
old_postinstall_cmds='chmod 644 $oldlib'
12368
12314
old_postuninstall_cmds=
12369
12315
12370
@@ -6351,8 +7123,8 @@
12316
@@ -6339,8 +7113,8 @@
12371
12317
case $deplibs_check_method in
12372
12318
file_magic*)
12373
12319
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
12378
12324
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
12379
12325
echo $ECHO_N "(cached) $ECHO_C" >&6
12380
12326
else
12381
@@ -6404,17 +7176,17 @@
12327
@@ -6392,17 +7166,17 @@
12382
12328
12383
12329
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
12384
12330
if test -n "$MAGIC_CMD"; then
12402
12348
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
12403
12349
echo $ECHO_N "(cached) $ECHO_C" >&6
12404
12350
else
12405
@@ -6466,11 +7238,11 @@
12351
@@ -6454,11 +7228,11 @@
12406
12352
12407
12353
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
12408
12354
if test -n "$MAGIC_CMD"; then
12418
12364
fi
12419
12365
12420
12366
else
12421
@@ -6485,21 +7257,21 @@
12367
@@ -6473,21 +7247,21 @@
12422
12368
enable_dlopen=no
12423
12369
enable_win32_dll=no
12424
12370
12447
12393
test -z "$pic_mode" && pic_mode=default
12448
12394
12449
12395
# Use C for the default configuration in the libtool script
12450
@@ -6520,10 +7292,10 @@
12396
@@ -6508,10 +7282,10 @@
12451
12397
objext=$objext
12452
12398
12453
12399
# Code to be used in simple compile tests
12460
12406
12461
12407
12462
12408
# If no C compiler was specified, use CC.
12463
@@ -6538,13 +7310,13 @@
12409
@@ -6526,13 +7300,13 @@
12464
12410
12465
12411
# save warnings/boilerplate of simple test code
12466
12412
ac_outfile=conftest.$ac_objext
12476
12422
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
12477
12423
_lt_linker_boilerplate=`cat conftest.err`
12478
12424
$rm conftest*
12479
@@ -6557,14 +7329,14 @@
12425
@@ -6545,14 +7319,14 @@
12480
12426
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
12481
12427
12482
12428
12494
12440
lt_compiler_flag="-fno-rtti -fno-exceptions"
12495
12441
# Insert the option either (1) after the last *FLAGS variable, or
12496
12442
# (2) before a word containing "conftest.", or (3) at the end.
12497
@@ -6575,11 +7347,11 @@
12443
@@ -6563,11 +7337,11 @@
12498
12444
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12499
12445
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12500
12446
-e 's:$: $lt_compiler_flag:'`
12501
- (eval echo "\"\$as_me:6578: $lt_compile\"" >&5)
12502
+ (eval echo "\"\$as_me:7350: $lt_compile\"" >&5)
12447
- (eval echo "\"\$as_me:6566: $lt_compile\"" >&5)
12448
+ (eval echo "\"\$as_me:7340: $lt_compile\"" >&5)
12503
12449
(eval "$lt_compile" 2>conftest.err)
12504
12450
ac_status=$?
12505
12451
cat conftest.err >&5
12506
- echo "$as_me:6582: \$? = $ac_status" >&5
12507
+ echo "$as_me:7354: \$? = $ac_status" >&5
12452
- echo "$as_me:6570: \$? = $ac_status" >&5
12453
+ echo "$as_me:7344: \$? = $ac_status" >&5
12508
12454
if (exit $ac_status) && test -s "$ac_outfile"; then
12509
12455
# The compiler can only warn and ignore the option if not recognized
12510
12456
# So say no if there are warnings other than the usual output.
12511
@@ -6592,8 +7364,8 @@
12457
@@ -6580,8 +7354,8 @@
12512
12458
$rm conftest*
12513
12459
12514
12460
fi
12519
12465
12520
12466
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
12521
12467
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
12522
@@ -6607,8 +7379,8 @@
12468
@@ -6595,8 +7369,8 @@
12523
12469
lt_prog_compiler_pic=
12524
12470
lt_prog_compiler_static=
12525
12471
12530
12476
12531
12477
if test "$GCC" = yes; then
12532
12478
lt_prog_compiler_wl='-Wl,'
12533
@@ -6630,13 +7402,15 @@
12479
@@ -6618,13 +7392,15 @@
12534
12480
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
12535
12481
;;
12536
12482
12548
12494
lt_prog_compiler_pic='-DDLL_EXPORT'
12549
12495
;;
12550
12496
12551
@@ -6646,7 +7420,7 @@
12497
@@ -6634,7 +7410,7 @@
12552
12498
lt_prog_compiler_pic='-fno-common'
12553
12499
;;
12554
12500
12557
12503
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
12558
12504
# Instead, we relocate shared libraries at runtime.
12559
12505
;;
12560
@@ -6704,7 +7478,7 @@
12506
@@ -6692,7 +7468,7 @@
12561
12507
esac
12562
12508
;;
12563
12509
12566
12512
# This hack is so that the source file can tell whether it is being
12567
12513
# built for inclusion in a dll (and should export symbols for example).
12568
12514
lt_prog_compiler_pic='-DDLL_EXPORT'
12569
@@ -6737,7 +7511,7 @@
12515
@@ -6725,7 +7501,7 @@
12570
12516
lt_prog_compiler_static='-Bstatic'
12571
12517
;;
12572
12518
12575
12521
case $cc_basename in
12576
12522
icc* | ecc*)
12577
12523
lt_prog_compiler_wl='-Wl,'
12578
@@ -6756,6 +7530,22 @@
12524
@@ -6744,6 +7520,22 @@
12579
12525
# All Alpha code is PIC.
12580
12526
lt_prog_compiler_static='-non_shared'
12581
12527
;;
12598
12544
esac
12599
12545
;;
12600
12546
12601
@@ -6765,6 +7555,10 @@
12547
@@ -6753,6 +7545,10 @@
12602
12548
lt_prog_compiler_static='-non_shared'
12603
12549
;;
12604
12550
12609
12555
solaris*)
12610
12556
lt_prog_compiler_pic='-KPIC'
12611
12557
lt_prog_compiler_static='-Bstatic'
12612
@@ -6817,22 +7611,22 @@
12558
@@ -6805,22 +7601,22 @@
12613
12559
esac
12614
12560
fi
12615
12561
12637
12583
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
12638
12584
# Insert the option either (1) after the last *FLAGS variable, or
12639
12585
# (2) before a word containing "conftest.", or (3) at the end.
12640
@@ -6843,11 +7637,11 @@
12586
@@ -6831,11 +7627,11 @@
12641
12587
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12642
12588
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12643
12589
-e 's:$: $lt_compiler_flag:'`
12644
- (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
12645
+ (eval echo "\"\$as_me:7640: $lt_compile\"" >&5)
12590
- (eval echo "\"\$as_me:6834: $lt_compile\"" >&5)
12591
+ (eval echo "\"\$as_me:7630: $lt_compile\"" >&5)
12646
12592
(eval "$lt_compile" 2>conftest.err)
12647
12593
ac_status=$?
12648
12594
cat conftest.err >&5
12649
- echo "$as_me:6850: \$? = $ac_status" >&5
12650
+ echo "$as_me:7644: \$? = $ac_status" >&5
12595
- echo "$as_me:6838: \$? = $ac_status" >&5
12596
+ echo "$as_me:7634: \$? = $ac_status" >&5
12651
12597
if (exit $ac_status) && test -s "$ac_outfile"; then
12652
12598
# The compiler can only warn and ignore the option if not recognized
12653
12599
# So say no if there are warnings other than the usual output.
12654
@@ -6860,8 +7654,8 @@
12600
@@ -6848,8 +7644,8 @@
12655
12601
$rm conftest*
12656
12602
12657
12603
fi
12662
12608
12663
12609
if test x"$lt_prog_compiler_pic_works" = xyes; then
12664
12610
case $lt_prog_compiler_pic in
12665
@@ -6888,15 +7682,15 @@
12611
@@ -6876,15 +7672,15 @@
12666
12612
# Check to make sure the static flag actually works.
12667
12613
#
12668
12614
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
12681
12627
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
12682
12628
# The linker can only warn and ignore the option if not recognized
12683
12629
# So say no if there are warnings
12684
@@ -6916,8 +7710,8 @@
12630
@@ -6904,8 +7700,8 @@
12685
12631
LDFLAGS="$save_LDFLAGS"
12686
12632
12687
12633
fi
12692
12638
12693
12639
if test x"$lt_prog_compiler_static_works" = xyes; then
12694
12640
:
12695
@@ -6926,8 +7720,8 @@
12641
@@ -6914,8 +7710,8 @@
12696
12642
fi
12697
12643
12698
12644
12703
12649
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
12704
12650
echo $ECHO_N "(cached) $ECHO_C" >&6
12705
12651
else
12706
@@ -6936,7 +7730,7 @@
12652
@@ -6924,7 +7720,7 @@
12707
12653
mkdir conftest
12708
12654
cd conftest
12709
12655
mkdir out
12712
12658
12713
12659
lt_compiler_flag="-o out/conftest2.$ac_objext"
12714
12660
# Insert the option either (1) after the last *FLAGS variable, or
12715
@@ -6947,11 +7741,11 @@
12661
@@ -6935,11 +7731,11 @@
12716
12662
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12717
12663
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12718
12664
-e 's:$: $lt_compiler_flag:'`
12719
- (eval echo "\"\$as_me:6950: $lt_compile\"" >&5)
12720
+ (eval echo "\"\$as_me:7744: $lt_compile\"" >&5)
12665
- (eval echo "\"\$as_me:6938: $lt_compile\"" >&5)
12666
+ (eval echo "\"\$as_me:7734: $lt_compile\"" >&5)
12721
12667
(eval "$lt_compile" 2>out/conftest.err)
12722
12668
ac_status=$?
12723
12669
cat out/conftest.err >&5
12724
- echo "$as_me:6954: \$? = $ac_status" >&5
12725
+ echo "$as_me:7748: \$? = $ac_status" >&5
12670
- echo "$as_me:6942: \$? = $ac_status" >&5
12671
+ echo "$as_me:7738: \$? = $ac_status" >&5
12726
12672
if (exit $ac_status) && test -s out/conftest2.$ac_objext
12727
12673
then
12728
12674
# The compiler can only warn and ignore the option if not recognized
12729
@@ -6973,23 +7767,23 @@
12675
@@ -6961,23 +7757,23 @@
12730
12676
$rm conftest*
12731
12677
12732
12678
fi
12756
12702
if test "$hard_links" = no; then
12757
12703
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
12758
12704
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
12759
@@ -6999,8 +7793,8 @@
12705
@@ -6987,8 +7783,8 @@
12760
12706
need_locks=no
12761
12707
fi
12762
12708
12767
12713
12768
12714
runpath_var=
12769
12715
allow_undefined_flag=
12770
@@ -7143,7 +7937,7 @@
12716
@@ -7131,7 +7927,7 @@
12771
12717
allow_undefined_flag=unsupported
12772
12718
always_export_symbols=no
12773
12719
enable_shared_with_static_runtimes=yes
12776
12722
12777
12723
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
12778
12724
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
12779
@@ -7161,7 +7955,7 @@
12725
@@ -7149,7 +7945,7 @@
12780
12726
fi
12781
12727
;;
12782
12728
12785
12731
hardcode_direct=no
12786
12732
hardcode_shlibpath_var=no
12787
12733
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
12788
@@ -7176,7 +7970,7 @@
12734
@@ -7164,7 +7960,7 @@
12789
12735
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
12790
12736
;;
12791
12737
12794
12740
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
12795
12741
tmp_addflag=
12796
12742
case $cc_basename,$host_cpu in
12797
@@ -7194,20 +7988,30 @@
12743
@@ -7182,20 +7978,30 @@
12798
12744
ifc* | ifort*) # Intel Fortran compiler
12799
12745
tmp_addflag=' -nofor_main' ;;
12800
12746
esac
12828
12774
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
12829
12775
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
12830
12776
wlarc=
12831
@@ -7359,7 +8163,7 @@
12777
@@ -7347,7 +8153,7 @@
12832
12778
strings "$collect2name" | grep resolve_lib_name >/dev/null
12833
12779
then
12834
12780
# We have reworked collect2
12837
12783
else
12838
12784
# We have old collect2
12839
12785
hardcode_direct=unsupported
12840
@@ -7415,39 +8219,44 @@
12841
}
12842
_ACEOF
12843
rm -f conftest.$ac_objext conftest$ac_exeext
12844
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12845
- (eval $ac_link) 2>conftest.er1
12846
+if { (ac_try="$ac_link"
12847
+case "(($ac_try" in
12848
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12849
+ *) ac_try_echo=$ac_try;;
12850
+esac
12851
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12852
+ (eval "$ac_link") 2>conftest.er1
12853
ac_status=$?
12854
grep -v '^ *+' conftest.er1 >conftest.err
12855
rm -f conftest.er1
12856
cat conftest.err >&5
12857
echo "$as_me:$LINENO: \$? = $ac_status" >&5
12858
- (exit $ac_status); } &&
12859
- { ac_try='test -z "$ac_c_werror_flag"
12860
- || test ! -s conftest.err'
12861
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12862
- (eval $ac_try) 2>&5
12863
- ac_status=$?
12864
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12865
- (exit $ac_status); }; } &&
12866
- { ac_try='test -s conftest$ac_exeext'
12867
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12868
- (eval $ac_try) 2>&5
12869
- ac_status=$?
12870
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12871
- (exit $ac_status); }; }; then
12872
+ (exit $ac_status); } && {
12873
+ test -z "$ac_c_werror_flag" ||
12874
+ test ! -s conftest.err
12875
+ } && test -s conftest$ac_exeext &&
12876
+ $as_test_x conftest$ac_exeext; then
12877
12878
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12879
-}'`
12880
+lt_aix_libpath_sed='
12881
+ /Import File Strings/,/^$/ {
12882
+ /^0/ {
12883
+ s/^0 *\(.*\)$/\1/
12884
+ p
12885
+ }
12886
+ }'
12887
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12888
# Check for a 64-bit object if we didn't find anything.
12889
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12890
-}'`; fi
12891
+if test -z "$aix_libpath"; then
12892
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12893
+fi
12894
else
12895
echo "$as_me: failed program was:" >&5
12896
sed 's/^/| /' conftest.$ac_ext >&5
12897
12898
+
12899
fi
12900
-rm -f conftest.err conftest.$ac_objext \
12901
+
12902
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12903
conftest$ac_exeext conftest.$ac_ext
12904
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12905
12906
@@ -7476,39 +8285,44 @@
12907
}
12908
_ACEOF
12909
rm -f conftest.$ac_objext conftest$ac_exeext
12910
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12911
- (eval $ac_link) 2>conftest.er1
12912
+if { (ac_try="$ac_link"
12913
+case "(($ac_try" in
12914
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12915
+ *) ac_try_echo=$ac_try;;
12916
+esac
12917
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12918
+ (eval "$ac_link") 2>conftest.er1
12919
ac_status=$?
12920
grep -v '^ *+' conftest.er1 >conftest.err
12921
rm -f conftest.er1
12922
cat conftest.err >&5
12923
echo "$as_me:$LINENO: \$? = $ac_status" >&5
12924
- (exit $ac_status); } &&
12925
- { ac_try='test -z "$ac_c_werror_flag"
12926
- || test ! -s conftest.err'
12927
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12928
- (eval $ac_try) 2>&5
12929
- ac_status=$?
12930
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12931
- (exit $ac_status); }; } &&
12932
- { ac_try='test -s conftest$ac_exeext'
12933
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12934
- (eval $ac_try) 2>&5
12935
- ac_status=$?
12936
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12937
- (exit $ac_status); }; }; then
12938
+ (exit $ac_status); } && {
12939
+ test -z "$ac_c_werror_flag" ||
12940
+ test ! -s conftest.err
12941
+ } && test -s conftest$ac_exeext &&
12942
+ $as_test_x conftest$ac_exeext; then
12943
12944
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12945
-}'`
12946
+lt_aix_libpath_sed='
12947
+ /Import File Strings/,/^$/ {
12948
+ /^0/ {
12949
+ s/^0 *\(.*\)$/\1/
12950
+ p
12951
+ }
12952
+ }'
12953
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12954
# Check for a 64-bit object if we didn't find anything.
12955
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12956
-}'`; fi
12957
+if test -z "$aix_libpath"; then
12958
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12959
+fi
12960
else
12961
echo "$as_me: failed program was:" >&5
12962
sed 's/^/| /' conftest.$ac_ext >&5
12963
12964
+
12965
fi
12966
-rm -f conftest.err conftest.$ac_objext \
12967
+
12968
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12969
conftest$ac_exeext conftest.$ac_ext
12970
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12971
12972
@@ -7554,7 +8368,7 @@
12786
@@ -7403,39 +8209,44 @@
12787
}
12788
_ACEOF
12789
rm -f conftest.$ac_objext conftest$ac_exeext
12790
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12791
- (eval $ac_link) 2>conftest.er1
12792
+if { (ac_try="$ac_link"
12793
+case "(($ac_try" in
12794
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12795
+ *) ac_try_echo=$ac_try;;
12796
+esac
12797
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12798
+ (eval "$ac_link") 2>conftest.er1
12799
ac_status=$?
12800
grep -v '^ *+' conftest.er1 >conftest.err
12801
rm -f conftest.er1
12802
cat conftest.err >&5
12803
echo "$as_me:$LINENO: \$? = $ac_status" >&5
12804
- (exit $ac_status); } &&
12805
- { ac_try='test -z "$ac_c_werror_flag"
12806
- || test ! -s conftest.err'
12807
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12808
- (eval $ac_try) 2>&5
12809
- ac_status=$?
12810
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12811
- (exit $ac_status); }; } &&
12812
- { ac_try='test -s conftest$ac_exeext'
12813
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12814
- (eval $ac_try) 2>&5
12815
- ac_status=$?
12816
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12817
- (exit $ac_status); }; }; then
12818
+ (exit $ac_status); } && {
12819
+ test -z "$ac_c_werror_flag" ||
12820
+ test ! -s conftest.err
12821
+ } && test -s conftest$ac_exeext &&
12822
+ $as_test_x conftest$ac_exeext; then
12823
12824
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12825
-}'`
12826
+lt_aix_libpath_sed='
12827
+ /Import File Strings/,/^$/ {
12828
+ /^0/ {
12829
+ s/^0 *\(.*\)$/\1/
12830
+ p
12831
+ }
12832
+ }'
12833
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12834
# Check for a 64-bit object if we didn't find anything.
12835
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12836
-}'`; fi
12837
+if test -z "$aix_libpath"; then
12838
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12839
+fi
12840
else
12841
echo "$as_me: failed program was:" >&5
12842
sed 's/^/| /' conftest.$ac_ext >&5
12843
12844
+
12845
fi
12846
-rm -f conftest.err conftest.$ac_objext \
12847
+
12848
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12849
conftest$ac_exeext conftest.$ac_ext
12850
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12851
12852
@@ -7464,39 +8275,44 @@
12853
}
12854
_ACEOF
12855
rm -f conftest.$ac_objext conftest$ac_exeext
12856
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12857
- (eval $ac_link) 2>conftest.er1
12858
+if { (ac_try="$ac_link"
12859
+case "(($ac_try" in
12860
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12861
+ *) ac_try_echo=$ac_try;;
12862
+esac
12863
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12864
+ (eval "$ac_link") 2>conftest.er1
12865
ac_status=$?
12866
grep -v '^ *+' conftest.er1 >conftest.err
12867
rm -f conftest.er1
12868
cat conftest.err >&5
12869
echo "$as_me:$LINENO: \$? = $ac_status" >&5
12870
- (exit $ac_status); } &&
12871
- { ac_try='test -z "$ac_c_werror_flag"
12872
- || test ! -s conftest.err'
12873
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12874
- (eval $ac_try) 2>&5
12875
- ac_status=$?
12876
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12877
- (exit $ac_status); }; } &&
12878
- { ac_try='test -s conftest$ac_exeext'
12879
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12880
- (eval $ac_try) 2>&5
12881
- ac_status=$?
12882
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
12883
- (exit $ac_status); }; }; then
12884
+ (exit $ac_status); } && {
12885
+ test -z "$ac_c_werror_flag" ||
12886
+ test ! -s conftest.err
12887
+ } && test -s conftest$ac_exeext &&
12888
+ $as_test_x conftest$ac_exeext; then
12889
12890
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12891
-}'`
12892
+lt_aix_libpath_sed='
12893
+ /Import File Strings/,/^$/ {
12894
+ /^0/ {
12895
+ s/^0 *\(.*\)$/\1/
12896
+ p
12897
+ }
12898
+ }'
12899
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12900
# Check for a 64-bit object if we didn't find anything.
12901
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12902
-}'`; fi
12903
+if test -z "$aix_libpath"; then
12904
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
12905
+fi
12906
else
12907
echo "$as_me: failed program was:" >&5
12908
sed 's/^/| /' conftest.$ac_ext >&5
12909
12910
+
12911
fi
12912
-rm -f conftest.err conftest.$ac_objext \
12913
+
12914
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12915
conftest$ac_exeext conftest.$ac_ext
12916
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12917
12918
@@ -7542,7 +8358,7 @@
12973
12919
# The linker will automatically build a .lib file if we build a DLL.
12974
12920
old_archive_From_new_cmds='true'
12975
12921
# FIXME: Should let the user specify the lib program.
12978
12924
fix_srcfile_path='`cygpath -w "$srcfile"`'
12979
12925
enable_shared_with_static_runtimes=yes
12980
12926
;;
12981
@@ -7596,10 +8410,10 @@
12927
@@ -7584,10 +8400,10 @@
12982
12928
case $cc_basename in
12983
12929
xlc*)
12984
12930
output_verbose_link_cmd='echo'
12991
12937
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
12992
12938
;;
12993
12939
*)
12994
@@ -7639,7 +8453,7 @@
12940
@@ -7627,7 +8443,7 @@
12995
12941
;;
12996
12942
12997
12943
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
13000
12946
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
13001
12947
hardcode_libdir_flag_spec='-R$libdir'
13002
12948
hardcode_direct=yes
13003
@@ -7741,7 +8555,7 @@
12949
@@ -7729,7 +8545,7 @@
13004
12950
link_all_deplibs=yes
13005
12951
;;
13006
12952
13009
12955
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
13010
12956
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
13011
12957
else
13012
@@ -7761,24 +8575,28 @@
12958
@@ -7749,24 +8565,28 @@
13013
12959
;;
13014
12960
13015
12961
openbsd*)
13055
13001
fi
13056
13002
;;
13057
13003
13058
@@ -7837,17 +8655,16 @@
13004
@@ -7825,17 +8645,16 @@
13059
13005
case $host_os in
13060
13006
solaris2.[0-5] | solaris2.[0-5].*) ;;
13061
13007
*)
13082
13028
esac
13083
13029
link_all_deplibs=yes
13084
13030
;;
13085
@@ -7904,7 +8721,7 @@
13031
@@ -7892,7 +8711,7 @@
13086
13032
fi
13087
13033
;;
13088
13034
13091
13037
no_undefined_flag='${wl}-z,text'
13092
13038
archive_cmds_need_lc=no
13093
13039
hardcode_shlibpath_var=no
13094
@@ -7957,8 +8774,8 @@
13040
@@ -7945,8 +8764,8 @@
13095
13041
esac
13096
13042
fi
13097
13043
13102
13048
test "$ld_shlibs" = no && can_build_shared=no
13103
13049
13104
13050
#
13105
@@ -7978,10 +8795,10 @@
13051
@@ -7966,10 +8785,10 @@
13106
13052
# Test whether the compiler implicitly links with -lc since on some
13107
13053
# systems, -lgcc has to come before -lc. If gcc already passes -lc
13108
13054
# to ld, don't add -lc before -lgcc.
13116
13062
13117
13063
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13118
13064
(eval $ac_compile) 2>&5
13119
@@ -8016,16 +8833,16 @@
13065
@@ -8004,16 +8823,16 @@
13120
13066
cat conftest.err 1>&5
13121
13067
fi
13122
13068
$rm conftest*
13137
13083
library_names_spec=
13138
13084
libname_spec='lib$name'
13139
13085
soname_spec=
13140
@@ -8039,17 +8856,55 @@
13086
@@ -8027,17 +8846,55 @@
13141
13087
version_type=none
13142
13088
dynamic_linker="$host_os ld.so"
13143
13089
sys_lib_dlsearch_path_spec="/lib /usr/lib"
13197
13143
else
13198
13144
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
13199
13145
fi
13200
@@ -8209,12 +9064,8 @@
13146
@@ -8197,12 +9054,8 @@
13201
13147
shlibpath_overrides_runpath=yes
13202
13148
shlibpath_var=DYLD_LIBRARY_PATH
13203
13149
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
13212
13158
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
13213
13159
;;
13214
13160
13215
@@ -8231,18 +9082,6 @@
13161
@@ -8219,18 +9072,6 @@
13216
13162
dynamic_linker=no
13217
13163
;;
13218
13164
13231
13177
freebsd* | dragonfly*)
13232
13178
# DragonFly does not have aout. When/if they implement a new
13233
13179
# versioning mechanism, adjust this.
13234
@@ -8280,7 +9119,7 @@
13180
@@ -8268,7 +9109,7 @@
13235
13181
shlibpath_overrides_runpath=no
13236
13182
hardcode_into_libs=yes
13237
13183
;;
13240
13186
shlibpath_overrides_runpath=yes
13241
13187
hardcode_into_libs=yes
13242
13188
;;
13243
@@ -8343,7 +9182,7 @@
13189
@@ -8331,7 +9172,7 @@
13244
13190
postinstall_cmds='chmod 555 $lib'
13245
13191
;;
13246
13192
13249
13195
version_type=linux
13250
13196
need_lib_prefix=no
13251
13197
need_version=no
13252
@@ -8398,7 +9237,7 @@
13198
@@ -8386,7 +9227,7 @@
13253
13199
;;
13254
13200
13255
13201
# This must be Linux ELF.
13258
13204
version_type=linux
13259
13205
need_lib_prefix=no
13260
13206
need_version=no
13261
@@ -8412,31 +9251,10 @@
13207
@@ -8400,31 +9241,10 @@
13262
13208
# before this can be enabled.
13263
13209
hardcode_into_libs=yes
13264
13210
13266
13212
- libsuff=
13267
13213
- case "$host_cpu" in
13268
13214
- x86_64*|s390x*|powerpc64*)
13269
- echo '#line 8419 "configure"' > conftest.$ac_ext
13215
- echo '#line 8407 "configure"' > conftest.$ac_ext
13270
13216
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13271
13217
- (eval $ac_compile) 2>&5
13272
13218
- ac_status=$?
13292
13238
fi
13293
13239
13294
13240
# We used to test for /lib/ld.so.1 and disable shared libraries on
13295
@@ -8448,7 +9266,7 @@
13241
@@ -8436,7 +9256,7 @@
13296
13242
dynamic_linker='GNU/Linux ld.so'
13297
13243
;;
13298
13244
13301
13247
version_type=linux
13302
13248
need_lib_prefix=no
13303
13249
need_version=no
13304
@@ -8457,7 +9275,7 @@
13250
@@ -8445,7 +9265,7 @@
13305
13251
shlibpath_var=LD_LIBRARY_PATH
13306
13252
shlibpath_overrides_runpath=no
13307
13253
hardcode_into_libs=yes
13310
13256
;;
13311
13257
13312
13258
netbsd*)
13313
@@ -8541,6 +9359,10 @@
13259
@@ -8529,6 +9349,10 @@
13314
13260
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
13315
13261
;;
13316
13262
13321
13267
solaris*)
13322
13268
version_type=linux
13323
13269
need_lib_prefix=no
13324
@@ -8633,8 +9455,8 @@
13270
@@ -8621,8 +9445,8 @@
13325
13271
dynamic_linker=no
13326
13272
;;
13327
13273
esac
13332
13278
test "$dynamic_linker" = no && can_build_shared=no
13333
13279
13334
13280
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
13335
@@ -8642,8 +9464,8 @@
13281
@@ -8630,8 +9454,8 @@
13336
13282
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
13337
13283
fi
13338
13284
13343
13289
hardcode_action=
13344
13290
if test -n "$hardcode_libdir_flag_spec" || \
13345
13291
test -n "$runpath_var" || \
13346
@@ -8667,8 +9489,8 @@
13292
@@ -8655,8 +9479,8 @@
13347
13293
# directories.
13348
13294
hardcode_action=unsupported
13349
13295
fi
13354
13300
13355
13301
if test "$hardcode_action" = relink; then
13356
13302
# Fast installation is not supported
13357
@@ -8681,29 +9503,30 @@
13303
@@ -8669,29 +9493,30 @@
13358
13304
13359
13305
striplib=
13360
13306
old_striplib=
13395
13341
;;
13396
13342
esac
13397
13343
fi
13398
@@ -8735,8 +9558,8 @@
13344
@@ -8723,8 +9548,8 @@
13399
13345
13400
13346
darwin*)
13401
13347
# if libdl is installed we need to link against it
13406
13352
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
13407
13353
echo $ECHO_N "(cached) $ECHO_C" >&6
13408
13354
else
13409
@@ -8749,56 +9572,53 @@
13355
@@ -8737,56 +9562,53 @@
13410
13356
cat >>conftest.$ac_ext <<_ACEOF
13411
13357
/* end confdefs.h. */
13412
13358
13484
13430
if test $ac_cv_lib_dl_dlopen = yes; then
13485
13431
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
13486
13432
else
13487
@@ -8812,8 +9632,8 @@
13433
@@ -8800,8 +9622,8 @@
13488
13434
;;
13489
13435
13490
13436
*)
13495
13441
if test "${ac_cv_func_shl_load+set}" = set; then
13496
13442
echo $ECHO_N "(cached) $ECHO_C" >&6
13497
13443
else
13498
@@ -8840,73 +9660,64 @@
13444
@@ -8828,73 +9650,64 @@
13499
13445
13500
13446
#undef shl_load
13501
13447
13593
13539
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
13594
13540
echo $ECHO_N "(cached) $ECHO_C" >&6
13595
13541
else
13596
@@ -8919,61 +9730,58 @@
13542
@@ -8907,61 +9720,58 @@
13597
13543
cat >>conftest.$ac_ext <<_ACEOF
13598
13544
/* end confdefs.h. */
13599
13545
13678
13624
if test "${ac_cv_func_dlopen+set}" = set; then
13679
13625
echo $ECHO_N "(cached) $ECHO_C" >&6
13680
13626
else
13681
@@ -9000,73 +9808,64 @@
13627
@@ -8988,73 +9798,64 @@
13682
13628
13683
13629
#undef dlopen
13684
13630
13776
13722
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
13777
13723
echo $ECHO_N "(cached) $ECHO_C" >&6
13778
13724
else
13779
@@ -9079,61 +9878,58 @@
13725
@@ -9067,61 +9868,58 @@
13780
13726
cat >>conftest.$ac_ext <<_ACEOF
13781
13727
/* end confdefs.h. */
13782
13728
13861
13807
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
13862
13808
echo $ECHO_N "(cached) $ECHO_C" >&6
13863
13809
else
13864
@@ -9146,61 +9942,58 @@
13810
@@ -9134,61 +9932,58 @@
13865
13811
cat >>conftest.$ac_ext <<_ACEOF
13866
13812
/* end confdefs.h. */
13867
13813
13946
13892
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
13947
13893
echo $ECHO_N "(cached) $ECHO_C" >&6
13948
13894
else
13949
@@ -9213,56 +10006,53 @@
13895
@@ -9201,56 +9996,53 @@
13950
13896
cat >>conftest.$ac_ext <<_ACEOF
13951
13897
/* end confdefs.h. */
13952
13898
14024
13970
if test $ac_cv_lib_dld_dld_link = yes; then
14025
13971
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
14026
13972
fi
14027
@@ -9302,8 +10092,8 @@
13973
@@ -9290,8 +10082,8 @@
14028
13974
save_LIBS="$LIBS"
14029
13975
LIBS="$lt_cv_dlopen_libs $LIBS"
14030
13976
14035
13981
if test "${lt_cv_dlopen_self+set}" = set; then
14036
13982
echo $ECHO_N "(cached) $ECHO_C" >&6
14037
13983
else
14038
@@ -9313,7 +10103,7 @@
13984
@@ -9301,7 +10093,7 @@
14039
13985
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14040
13986
lt_status=$lt_dlunknown
14041
13987
cat > conftest.$ac_ext <<EOF
14042
-#line 9316 "configure"
14043
+#line 10106 "configure"
13988
-#line 9304 "configure"
13989
+#line 10096 "configure"
14044
13990
#include "confdefs.h"
14045
13991
14046
13992
#if HAVE_DLFCN_H
14047
@@ -9397,13 +10187,13 @@
13993
@@ -9385,13 +10177,13 @@
14048
13994
14049
13995
14050
13996
fi
14062
14008
if test "${lt_cv_dlopen_self_static+set}" = set; then
14063
14009
echo $ECHO_N "(cached) $ECHO_C" >&6
14064
14010
else
14065
@@ -9413,7 +10203,7 @@
14011
@@ -9401,7 +10193,7 @@
14066
14012
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
14067
14013
lt_status=$lt_dlunknown
14068
14014
cat > conftest.$ac_ext <<EOF
14069
-#line 9416 "configure"
14070
+#line 10206 "configure"
14015
-#line 9404 "configure"
14016
+#line 10196 "configure"
14071
14017
#include "confdefs.h"
14072
14018
14073
14019
#if HAVE_DLFCN_H
14074
@@ -9497,8 +10287,8 @@
14020
@@ -9485,8 +10277,8 @@
14075
14021
14076
14022
14077
14023
fi
14082
14028
fi
14083
14029
14084
14030
CPPFLAGS="$save_CPPFLAGS"
14085
@@ -9520,13 +10310,13 @@
14031
@@ -9508,13 +10300,13 @@
14086
14032
14087
14033
14088
14034
# Report which library types will actually be built
14102
14048
test "$can_build_shared" = "no" && enable_shared=no
14103
14049
14104
14050
# On AIX, shared libraries and static libraries use the same namespace, and
14105
@@ -9546,15 +10336,15 @@
14051
@@ -9534,15 +10326,15 @@
14106
14052
fi
14107
14053
;;
14108
14054
esac
14124
14070
14125
14071
# The else clause should only fire when bootstrapping the
14126
14072
# libtool distribution, otherwise you forgot to ship ltmain.sh
14127
@@ -9611,6 +10401,7 @@
14073
@@ -9599,6 +10391,7 @@
14128
14074
module_cmds \
14129
14075
module_expsym_cmds \
14130
14076
lt_cv_prog_compiler_c_o \
14132
14078
exclude_expsyms \
14133
14079
include_expsyms; do
14134
14080
14135
@@ -9655,7 +10446,7 @@
14081
@@ -9643,7 +10436,7 @@
14136
14082
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
14137
14083
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
14138
14084
#
14141
14087
# Free Software Foundation, Inc.
14142
14088
#
14143
14089
# This file is part of GNU Libtool:
14144
@@ -9744,9 +10535,6 @@
14090
@@ -9732,9 +10525,6 @@
14145
14091
# Is the compiler the GNU C compiler?
14146
14092
with_gcc=$GCC
14147
14093
14151
14097
# An ERE matcher.
14152
14098
EGREP=$lt_EGREP
14153
14099
14154
@@ -9880,11 +10668,11 @@
14100
@@ -9868,11 +10658,11 @@
14155
14101
14156
14102
# Dependencies to place before the objects being linked to create a
14157
14103
# shared library.
14165
14111
14166
14112
# Dependencies to place before the objects being linked to create a
14167
14113
# shared library.
14168
@@ -9896,7 +10684,7 @@
14114
@@ -9884,7 +10674,7 @@
14169
14115
14170
14116
# The library search path used internally by the compiler when linking
14171
14117
# a shared library.
14174
14120
14175
14121
# Method to check whether dependent libraries are shared objects.
14176
14122
deplibs_check_method=$lt_deplibs_check_method
14177
@@ -9976,13 +10764,13 @@
14123
@@ -9964,13 +10754,13 @@
14178
14124
link_all_deplibs=$link_all_deplibs
14179
14125
14180
14126
# Compile-time system search path for libraries
14190
14136
14191
14137
# Set to yes if exported symbols are required.
14192
14138
always_export_symbols=$always_export_symbols
14193
@@ -10049,11 +10837,11 @@
14139
@@ -10037,11 +10827,11 @@
14194
14140
CC="$lt_save_CC"
14195
14141
14196
14142
14206
14152
14207
14153
if test -f "$ltmain" && test -n "$tagnames"; then
14208
14154
if test ! -f "${ofile}"; then
14209
@@ -10107,7 +10895,7 @@
14155
@@ -10095,7 +10885,7 @@
14210
14156
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
14211
14157
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
14212
14158
(test "X$CXX" != "Xg++"))) ; then
14215
14161
ac_cpp='$CXXCPP $CPPFLAGS'
14216
14162
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
14217
14163
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
14218
@@ -10151,10 +10939,10 @@
14164
@@ -10139,10 +10929,10 @@
14219
14165
objext_CXX=$objext
14220
14166
14221
14167
# Code to be used in simple compile tests
14228
14174
14229
14175
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
14230
14176
14231
@@ -10170,13 +10958,13 @@
14177
@@ -10158,13 +10948,13 @@
14232
14178
14233
14179
# save warnings/boilerplate of simple test code
14234
14180
ac_outfile=conftest.$ac_objext
14244
14190
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
14245
14191
_lt_linker_boilerplate=`cat conftest.err`
14246
14192
$rm conftest*
14247
@@ -10226,18 +11014,18 @@
14193
@@ -10214,18 +11004,18 @@
14248
14194
# Set up default GNU C++ configuration
14249
14195
14250
14196
14269
14215
case $host in
14270
14216
*-*-mingw*)
14271
14217
# gcc leaves a trailing carriage return which upsets mingw
14272
@@ -10266,11 +11054,11 @@
14218
@@ -10254,11 +11044,11 @@
14273
14219
;;
14274
14220
esac
14275
14221
elif test "$with_gnu_ld" = yes; then
14285
14231
fi
14286
14232
if test "${lt_cv_path_LD+set}" = set; then
14287
14233
echo $ECHO_N "(cached) $ECHO_C" >&6
14288
@@ -10303,17 +11091,17 @@
14234
@@ -10291,17 +11081,17 @@
14289
14235
14290
14236
LD="$lt_cv_path_LD"
14291
14237
if test -n "$LD"; then
14309
14255
if test "${lt_cv_prog_gnu_ld+set}" = set; then
14310
14256
echo $ECHO_N "(cached) $ECHO_C" >&6
14311
14257
else
14312
@@ -10327,8 +11115,8 @@
14258
@@ -10315,8 +11105,8 @@
14313
14259
;;
14314
14260
esac
14315
14261
fi
14320
14266
with_gnu_ld=$lt_cv_prog_gnu_ld
14321
14267
14322
14268
14323
@@ -10378,8 +11166,8 @@
14269
@@ -10366,8 +11156,8 @@
14324
14270
fi
14325
14271
14326
14272
# PORTME: fill in a description of your system's C++ link characteristics
14331
14277
ld_shlibs_CXX=yes
14332
14278
case $host_os in
14333
14279
aix3*)
14334
@@ -10435,7 +11223,7 @@
14280
@@ -10423,7 +11213,7 @@
14335
14281
strings "$collect2name" | grep resolve_lib_name >/dev/null
14336
14282
then
14337
14283
# We have reworked collect2
14340
14286
else
14341
14287
# We have old collect2
14342
14288
hardcode_direct_CXX=unsupported
14343
@@ -10491,39 +11279,44 @@
14344
}
14345
_ACEOF
14346
rm -f conftest.$ac_objext conftest$ac_exeext
14347
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14348
- (eval $ac_link) 2>conftest.er1
14349
+if { (ac_try="$ac_link"
14350
+case "(($ac_try" in
14351
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14352
+ *) ac_try_echo=$ac_try;;
14353
+esac
14354
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14355
+ (eval "$ac_link") 2>conftest.er1
14356
ac_status=$?
14357
grep -v '^ *+' conftest.er1 >conftest.err
14358
rm -f conftest.er1
14359
cat conftest.err >&5
14360
echo "$as_me:$LINENO: \$? = $ac_status" >&5
14361
- (exit $ac_status); } &&
14362
- { ac_try='test -z "$ac_cxx_werror_flag"
14363
- || test ! -s conftest.err'
14364
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14365
- (eval $ac_try) 2>&5
14366
- ac_status=$?
14367
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14368
- (exit $ac_status); }; } &&
14369
- { ac_try='test -s conftest$ac_exeext'
14370
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14371
- (eval $ac_try) 2>&5
14372
- ac_status=$?
14373
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14374
- (exit $ac_status); }; }; then
14375
+ (exit $ac_status); } && {
14376
+ test -z "$ac_cxx_werror_flag" ||
14377
+ test ! -s conftest.err
14378
+ } && test -s conftest$ac_exeext &&
14379
+ $as_test_x conftest$ac_exeext; then
14380
14381
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14382
-}'`
14383
+lt_aix_libpath_sed='
14384
+ /Import File Strings/,/^$/ {
14385
+ /^0/ {
14386
+ s/^0 *\(.*\)$/\1/
14387
+ p
14388
+ }
14389
+ }'
14390
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14391
# Check for a 64-bit object if we didn't find anything.
14392
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14393
-}'`; fi
14394
+if test -z "$aix_libpath"; then
14395
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14396
+fi
14397
else
14398
echo "$as_me: failed program was:" >&5
14399
sed 's/^/| /' conftest.$ac_ext >&5
14400
14401
+
14402
fi
14403
-rm -f conftest.err conftest.$ac_objext \
14404
+
14405
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14406
conftest$ac_exeext conftest.$ac_ext
14407
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14408
14409
@@ -10553,39 +11346,44 @@
14410
}
14411
_ACEOF
14412
rm -f conftest.$ac_objext conftest$ac_exeext
14413
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14414
- (eval $ac_link) 2>conftest.er1
14415
+if { (ac_try="$ac_link"
14416
+case "(($ac_try" in
14417
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14418
+ *) ac_try_echo=$ac_try;;
14419
+esac
14420
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14421
+ (eval "$ac_link") 2>conftest.er1
14422
ac_status=$?
14423
grep -v '^ *+' conftest.er1 >conftest.err
14424
rm -f conftest.er1
14425
cat conftest.err >&5
14426
echo "$as_me:$LINENO: \$? = $ac_status" >&5
14427
- (exit $ac_status); } &&
14428
- { ac_try='test -z "$ac_cxx_werror_flag"
14429
- || test ! -s conftest.err'
14430
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14431
- (eval $ac_try) 2>&5
14432
- ac_status=$?
14433
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14434
- (exit $ac_status); }; } &&
14435
- { ac_try='test -s conftest$ac_exeext'
14436
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14437
- (eval $ac_try) 2>&5
14438
- ac_status=$?
14439
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14440
- (exit $ac_status); }; }; then
14441
+ (exit $ac_status); } && {
14442
+ test -z "$ac_cxx_werror_flag" ||
14443
+ test ! -s conftest.err
14444
+ } && test -s conftest$ac_exeext &&
14445
+ $as_test_x conftest$ac_exeext; then
14446
14447
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14448
-}'`
14449
+lt_aix_libpath_sed='
14450
+ /Import File Strings/,/^$/ {
14451
+ /^0/ {
14452
+ s/^0 *\(.*\)$/\1/
14453
+ p
14454
+ }
14455
+ }'
14456
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14457
# Check for a 64-bit object if we didn't find anything.
14458
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14459
-}'`; fi
14460
+if test -z "$aix_libpath"; then
14461
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14462
+fi
14463
else
14464
echo "$as_me: failed program was:" >&5
14465
sed 's/^/| /' conftest.$ac_ext >&5
14466
14467
+
14468
fi
14469
-rm -f conftest.err conftest.$ac_objext \
14470
+
14471
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14472
conftest$ac_exeext conftest.$ac_ext
14473
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14474
14475
@@ -10696,10 +11494,10 @@
14289
@@ -10479,39 +11269,44 @@
14290
}
14291
_ACEOF
14292
rm -f conftest.$ac_objext conftest$ac_exeext
14293
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14294
- (eval $ac_link) 2>conftest.er1
14295
+if { (ac_try="$ac_link"
14296
+case "(($ac_try" in
14297
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14298
+ *) ac_try_echo=$ac_try;;
14299
+esac
14300
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14301
+ (eval "$ac_link") 2>conftest.er1
14302
ac_status=$?
14303
grep -v '^ *+' conftest.er1 >conftest.err
14304
rm -f conftest.er1
14305
cat conftest.err >&5
14306
echo "$as_me:$LINENO: \$? = $ac_status" >&5
14307
- (exit $ac_status); } &&
14308
- { ac_try='test -z "$ac_cxx_werror_flag"
14309
- || test ! -s conftest.err'
14310
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14311
- (eval $ac_try) 2>&5
14312
- ac_status=$?
14313
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14314
- (exit $ac_status); }; } &&
14315
- { ac_try='test -s conftest$ac_exeext'
14316
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14317
- (eval $ac_try) 2>&5
14318
- ac_status=$?
14319
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14320
- (exit $ac_status); }; }; then
14321
+ (exit $ac_status); } && {
14322
+ test -z "$ac_cxx_werror_flag" ||
14323
+ test ! -s conftest.err
14324
+ } && test -s conftest$ac_exeext &&
14325
+ $as_test_x conftest$ac_exeext; then
14326
14327
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14328
-}'`
14329
+lt_aix_libpath_sed='
14330
+ /Import File Strings/,/^$/ {
14331
+ /^0/ {
14332
+ s/^0 *\(.*\)$/\1/
14333
+ p
14334
+ }
14335
+ }'
14336
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14337
# Check for a 64-bit object if we didn't find anything.
14338
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14339
-}'`; fi
14340
+if test -z "$aix_libpath"; then
14341
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14342
+fi
14343
else
14344
echo "$as_me: failed program was:" >&5
14345
sed 's/^/| /' conftest.$ac_ext >&5
14346
14347
+
14348
fi
14349
-rm -f conftest.err conftest.$ac_objext \
14350
+
14351
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14352
conftest$ac_exeext conftest.$ac_ext
14353
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14354
14355
@@ -10541,39 +11336,44 @@
14356
}
14357
_ACEOF
14358
rm -f conftest.$ac_objext conftest$ac_exeext
14359
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14360
- (eval $ac_link) 2>conftest.er1
14361
+if { (ac_try="$ac_link"
14362
+case "(($ac_try" in
14363
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14364
+ *) ac_try_echo=$ac_try;;
14365
+esac
14366
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14367
+ (eval "$ac_link") 2>conftest.er1
14368
ac_status=$?
14369
grep -v '^ *+' conftest.er1 >conftest.err
14370
rm -f conftest.er1
14371
cat conftest.err >&5
14372
echo "$as_me:$LINENO: \$? = $ac_status" >&5
14373
- (exit $ac_status); } &&
14374
- { ac_try='test -z "$ac_cxx_werror_flag"
14375
- || test ! -s conftest.err'
14376
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14377
- (eval $ac_try) 2>&5
14378
- ac_status=$?
14379
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14380
- (exit $ac_status); }; } &&
14381
- { ac_try='test -s conftest$ac_exeext'
14382
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14383
- (eval $ac_try) 2>&5
14384
- ac_status=$?
14385
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
14386
- (exit $ac_status); }; }; then
14387
+ (exit $ac_status); } && {
14388
+ test -z "$ac_cxx_werror_flag" ||
14389
+ test ! -s conftest.err
14390
+ } && test -s conftest$ac_exeext &&
14391
+ $as_test_x conftest$ac_exeext; then
14392
14393
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14394
-}'`
14395
+lt_aix_libpath_sed='
14396
+ /Import File Strings/,/^$/ {
14397
+ /^0/ {
14398
+ s/^0 *\(.*\)$/\1/
14399
+ p
14400
+ }
14401
+ }'
14402
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14403
# Check for a 64-bit object if we didn't find anything.
14404
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
14405
-}'`; fi
14406
+if test -z "$aix_libpath"; then
14407
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
14408
+fi
14409
else
14410
echo "$as_me: failed program was:" >&5
14411
sed 's/^/| /' conftest.$ac_ext >&5
14412
14413
+
14414
fi
14415
-rm -f conftest.err conftest.$ac_objext \
14416
+
14417
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14418
conftest$ac_exeext conftest.$ac_ext
14419
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14420
14421
@@ -10684,10 +11484,10 @@
14476
14422
case $cc_basename in
14477
14423
xlc*)
14478
14424
output_verbose_link_cmd='echo'
14485
14431
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
14486
14432
;;
14487
14433
*)
14488
@@ -10733,7 +11531,7 @@
14434
@@ -10721,7 +11521,7 @@
14489
14435
freebsd-elf*)
14490
14436
archive_cmds_need_lc_CXX=no
14491
14437
;;
14494
14440
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
14495
14441
# conventions
14496
14442
ld_shlibs_CXX=yes
14497
@@ -10782,9 +11580,7 @@
14443
@@ -10770,9 +11570,7 @@
14498
14444
hardcode_libdir_separator_CXX=:
14499
14445
14500
14446
case $host_cpu in
14505
14451
*)
14506
14452
export_dynamic_flag_spec_CXX='${wl}-E'
14507
14453
;;
14508
@@ -10852,7 +11648,7 @@
14454
@@ -10840,7 +11638,7 @@
14509
14455
;;
14510
14456
esac
14511
14457
;;
14514
14460
hardcode_direct_CXX=no
14515
14461
hardcode_shlibpath_var_CXX=no
14516
14462
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
14517
@@ -10892,7 +11688,7 @@
14463
@@ -10880,7 +11678,7 @@
14518
14464
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
14519
14465
hardcode_libdir_separator_CXX=:
14520
14466
;;
14523
14469
case $cc_basename in
14524
14470
KCC*)
14525
14471
# Kuck and Associates, Inc. (KAI) C++ Compiler
14526
@@ -10972,6 +11768,29 @@
14472
@@ -10960,6 +11758,29 @@
14527
14473
# dependencies.
14528
14474
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
14529
14475
;;
14553
14499
esac
14554
14500
;;
14555
14501
lynxos*)
14556
@@ -10994,7 +11813,7 @@
14502
@@ -10982,7 +11803,7 @@
14557
14503
;;
14558
14504
esac
14559
14505
;;
14562
14508
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
14563
14509
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
14564
14510
wlarc=
14565
@@ -11010,16 +11829,20 @@
14511
@@ -10998,16 +11819,20 @@
14566
14512
ld_shlibs_CXX=no
14567
14513
;;
14568
14514
openbsd*)
14592
14538
;;
14593
14539
osf3*)
14594
14540
case $cc_basename in
14595
@@ -11181,15 +12004,10 @@
14541
@@ -11169,15 +11994,10 @@
14596
14542
case $host_os in
14597
14543
solaris2.[0-5] | solaris2.[0-5].*) ;;
14598
14544
*)
14611
14557
;;
14612
14558
esac
14613
14559
link_all_deplibs_CXX=yes
14614
@@ -11236,6 +12054,12 @@
14560
@@ -11224,6 +12044,12 @@
14615
14561
fi
14616
14562
14617
14563
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
14624
14570
fi
14625
14571
;;
14626
14572
esac
14627
@@ -11316,8 +12140,8 @@
14573
@@ -11304,8 +12130,8 @@
14628
14574
ld_shlibs_CXX=no
14629
14575
;;
14630
14576
esac
14635
14581
test "$ld_shlibs_CXX" = no && can_build_shared=no
14636
14582
14637
14583
GCC_CXX="$GXX"
14638
@@ -11427,7 +12251,7 @@
14584
@@ -11415,7 +12241,7 @@
14639
14585
14640
14586
# PORTME: override above test on systems where it is broken
14641
14587
case $host_os in
14644
14590
# Interix 3.5 installs completely hosed .la files for C++, so rather than
14645
14591
# hack all around it, let's just trust "g++" to DTRT.
14646
14592
predep_objects_CXX=
14647
@@ -11435,13 +12259,46 @@
14593
@@ -11423,13 +12249,46 @@
14648
14594
postdeps_CXX=
14649
14595
;;
14650
14596
14692
14638
;;
14693
14639
esac
14694
14640
;;
14695
@@ -11456,8 +12313,8 @@
14641
@@ -11444,8 +12303,8 @@
14696
14642
lt_prog_compiler_pic_CXX=
14697
14643
lt_prog_compiler_static_CXX=
14698
14644
14703
14649
14704
14650
# C++ specific cases for pic, static, wl, etc.
14705
14651
if test "$GXX" = yes; then
14706
@@ -11478,12 +12335,14 @@
14652
@@ -11466,12 +12325,14 @@
14707
14653
# like `-m68040'.
14708
14654
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
14709
14655
;;
14720
14666
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
14721
14667
;;
14722
14668
darwin* | rhapsody*)
14723
@@ -11495,7 +12354,7 @@
14669
@@ -11483,7 +12344,7 @@
14724
14670
# DJGPP does not support shared libraries at all
14725
14671
lt_prog_compiler_pic_CXX=
14726
14672
;;
14729
14675
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
14730
14676
# Instead, we relocate shared libraries at runtime.
14731
14677
;;
14732
@@ -11561,7 +12420,7 @@
14678
@@ -11549,7 +12410,7 @@
14733
14679
;;
14734
14680
esac
14735
14681
;;
14738
14684
# FreeBSD uses GNU C++
14739
14685
;;
14740
14686
hpux9* | hpux10* | hpux11*)
14741
@@ -11604,7 +12463,7 @@
14687
@@ -11592,7 +12453,7 @@
14742
14688
;;
14743
14689
esac
14744
14690
;;
14747
14693
case $cc_basename in
14748
14694
KCC*)
14749
14695
# KAI C++ Compiler
14750
@@ -11631,6 +12490,14 @@
14696
@@ -11619,6 +12480,14 @@
14751
14697
lt_prog_compiler_static_CXX='-non_shared'
14752
14698
;;
14753
14699
*)
14762
14708
;;
14763
14709
esac
14764
14710
;;
14765
@@ -11647,7 +12514,7 @@
14711
@@ -11635,7 +12504,7 @@
14766
14712
;;
14767
14713
esac
14768
14714
;;
14771
14717
;;
14772
14718
osf3* | osf4* | osf5*)
14773
14719
case $cc_basename in
14774
@@ -11730,22 +12597,22 @@
14720
@@ -11718,22 +12587,22 @@
14775
14721
esac
14776
14722
fi
14777
14723
14799
14745
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
14800
14746
# Insert the option either (1) after the last *FLAGS variable, or
14801
14747
# (2) before a word containing "conftest.", or (3) at the end.
14802
@@ -11756,11 +12623,11 @@
14748
@@ -11744,11 +12613,11 @@
14803
14749
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14804
14750
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14805
14751
-e 's:$: $lt_compiler_flag:'`
14806
- (eval echo "\"\$as_me:11759: $lt_compile\"" >&5)
14807
+ (eval echo "\"\$as_me:12626: $lt_compile\"" >&5)
14752
- (eval echo "\"\$as_me:11747: $lt_compile\"" >&5)
14753
+ (eval echo "\"\$as_me:12616: $lt_compile\"" >&5)
14808
14754
(eval "$lt_compile" 2>conftest.err)
14809
14755
ac_status=$?
14810
14756
cat conftest.err >&5
14811
- echo "$as_me:11763: \$? = $ac_status" >&5
14812
+ echo "$as_me:12630: \$? = $ac_status" >&5
14757
- echo "$as_me:11751: \$? = $ac_status" >&5
14758
+ echo "$as_me:12620: \$? = $ac_status" >&5
14813
14759
if (exit $ac_status) && test -s "$ac_outfile"; then
14814
14760
# The compiler can only warn and ignore the option if not recognized
14815
14761
# So say no if there are warnings other than the usual output.
14816
@@ -11773,8 +12640,8 @@
14762
@@ -11761,8 +12630,8 @@
14817
14763
$rm conftest*
14818
14764
14819
14765
fi
14824
14770
14825
14771
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
14826
14772
case $lt_prog_compiler_pic_CXX in
14827
@@ -11801,15 +12668,15 @@
14773
@@ -11789,15 +12658,15 @@
14828
14774
# Check to make sure the static flag actually works.
14829
14775
#
14830
14776
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
14843
14789
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
14844
14790
# The linker can only warn and ignore the option if not recognized
14845
14791
# So say no if there are warnings
14846
@@ -11829,8 +12696,8 @@
14792
@@ -11817,8 +12686,8 @@
14847
14793
LDFLAGS="$save_LDFLAGS"
14848
14794
14849
14795
fi
14854
14800
14855
14801
if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
14856
14802
:
14857
@@ -11839,8 +12706,8 @@
14803
@@ -11827,8 +12696,8 @@
14858
14804
fi
14859
14805
14860
14806
14865
14811
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
14866
14812
echo $ECHO_N "(cached) $ECHO_C" >&6
14867
14813
else
14868
@@ -11849,7 +12716,7 @@
14814
@@ -11837,7 +12706,7 @@
14869
14815
mkdir conftest
14870
14816
cd conftest
14871
14817
mkdir out
14874
14820
14875
14821
lt_compiler_flag="-o out/conftest2.$ac_objext"
14876
14822
# Insert the option either (1) after the last *FLAGS variable, or
14877
@@ -11860,11 +12727,11 @@
14823
@@ -11848,11 +12717,11 @@
14878
14824
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14879
14825
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14880
14826
-e 's:$: $lt_compiler_flag:'`
14881
- (eval echo "\"\$as_me:11863: $lt_compile\"" >&5)
14882
+ (eval echo "\"\$as_me:12730: $lt_compile\"" >&5)
14827
- (eval echo "\"\$as_me:11851: $lt_compile\"" >&5)
14828
+ (eval echo "\"\$as_me:12720: $lt_compile\"" >&5)
14883
14829
(eval "$lt_compile" 2>out/conftest.err)
14884
14830
ac_status=$?
14885
14831
cat out/conftest.err >&5
14886
- echo "$as_me:11867: \$? = $ac_status" >&5
14887
+ echo "$as_me:12734: \$? = $ac_status" >&5
14832
- echo "$as_me:11855: \$? = $ac_status" >&5
14833
+ echo "$as_me:12724: \$? = $ac_status" >&5
14888
14834
if (exit $ac_status) && test -s out/conftest2.$ac_objext
14889
14835
then
14890
14836
# The compiler can only warn and ignore the option if not recognized
14891
@@ -11886,23 +12753,23 @@
14837
@@ -11874,23 +12743,23 @@
14892
14838
$rm conftest*
14893
14839
14894
14840
fi
14918
14864
if test "$hard_links" = no; then
14919
14865
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
14920
14866
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
14921
@@ -11912,8 +12779,8 @@
14867
@@ -11900,8 +12769,8 @@
14922
14868
need_locks=no
14923
14869
fi
14924
14870
14929
14875
14930
14876
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
14931
14877
case $host_os in
14932
@@ -11930,15 +12797,18 @@
14878
@@ -11918,15 +12787,18 @@
14933
14879
export_symbols_cmds_CXX="$ltdll_cmds"
14934
14880
;;
14935
14881
cygwin* | mingw*)
14951
14897
test "$ld_shlibs_CXX" = no && can_build_shared=no
14952
14898
14953
14899
#
14954
@@ -11958,10 +12828,10 @@
14900
@@ -11946,10 +12818,10 @@
14955
14901
# Test whether the compiler implicitly links with -lc since on some
14956
14902
# systems, -lgcc has to come before -lc. If gcc already passes -lc
14957
14903
# to ld, don't add -lc before -lgcc.
14965
14911
14966
14912
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14967
14913
(eval $ac_compile) 2>&5
14968
@@ -11996,16 +12866,16 @@
14914
@@ -11984,16 +12856,16 @@
14969
14915
cat conftest.err 1>&5
14970
14916
fi
14971
14917
$rm conftest*
14986
14932
library_names_spec=
14987
14933
libname_spec='lib$name'
14988
14934
soname_spec=
14989
@@ -12019,20 +12889,7 @@
14935
@@ -12007,20 +12879,7 @@
14990
14936
version_type=none
14991
14937
dynamic_linker="$host_os ld.so"
14992
14938
sys_lib_dlsearch_path_spec="/lib /usr/lib"
15008
14954
need_lib_prefix=unknown
15009
14955
hardcode_into_libs=no
15010
14956
15011
@@ -12189,12 +13046,7 @@
14957
@@ -12177,12 +13036,7 @@
15012
14958
shlibpath_overrides_runpath=yes
15013
14959
shlibpath_var=DYLD_LIBRARY_PATH
15014
14960
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
15022
14968
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
15023
14969
;;
15024
14970
15025
@@ -12211,18 +13063,6 @@
14971
@@ -12199,18 +13053,6 @@
15026
14972
dynamic_linker=no
15027
14973
;;
15028
14974
15041
14987
freebsd* | dragonfly*)
15042
14988
# DragonFly does not have aout. When/if they implement a new
15043
14989
# versioning mechanism, adjust this.
15044
@@ -12260,7 +13100,7 @@
14990
@@ -12248,7 +13090,7 @@
15045
14991
shlibpath_overrides_runpath=no
15046
14992
hardcode_into_libs=yes
15047
14993
;;
15050
14996
shlibpath_overrides_runpath=yes
15051
14997
hardcode_into_libs=yes
15052
14998
;;
15053
@@ -12323,7 +13163,7 @@
14999
@@ -12311,7 +13153,7 @@
15054
15000
postinstall_cmds='chmod 555 $lib'
15055
15001
;;
15056
15002
15059
15005
version_type=linux
15060
15006
need_lib_prefix=no
15061
15007
need_version=no
15062
@@ -12378,7 +13218,7 @@
15008
@@ -12366,7 +13208,7 @@
15063
15009
;;
15064
15010
15065
15011
# This must be Linux ELF.
15068
15014
version_type=linux
15069
15015
need_lib_prefix=no
15070
15016
need_version=no
15071
@@ -12392,31 +13232,10 @@
15017
@@ -12380,31 +13222,10 @@
15072
15018
# before this can be enabled.
15073
15019
hardcode_into_libs=yes
15074
15020
15076
15022
- libsuff=
15077
15023
- case "$host_cpu" in
15078
15024
- x86_64*|s390x*|powerpc64*)
15079
- echo '#line 12399 "configure"' > conftest.$ac_ext
15025
- echo '#line 12387 "configure"' > conftest.$ac_ext
15080
15026
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15081
15027
- (eval $ac_compile) 2>&5
15082
15028
- ac_status=$?
15102
15048
fi
15103
15049
15104
15050
# We used to test for /lib/ld.so.1 and disable shared libraries on
15105
@@ -12428,7 +13247,7 @@
15051
@@ -12416,7 +13237,7 @@
15106
15052
dynamic_linker='GNU/Linux ld.so'
15107
15053
;;
15108
15054
15111
15057
version_type=linux
15112
15058
need_lib_prefix=no
15113
15059
need_version=no
15114
@@ -12437,7 +13256,7 @@
15060
@@ -12425,7 +13246,7 @@
15115
15061
shlibpath_var=LD_LIBRARY_PATH
15116
15062
shlibpath_overrides_runpath=no
15117
15063
hardcode_into_libs=yes
15120
15066
;;
15121
15067
15122
15068
netbsd*)
15123
@@ -12521,6 +13340,10 @@
15069
@@ -12509,6 +13330,10 @@
15124
15070
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
15125
15071
;;
15126
15072
15131
15077
solaris*)
15132
15078
version_type=linux
15133
15079
need_lib_prefix=no
15134
@@ -12613,8 +13436,8 @@
15080
@@ -12601,8 +13426,8 @@
15135
15081
dynamic_linker=no
15136
15082
;;
15137
15083
esac
15142
15088
test "$dynamic_linker" = no && can_build_shared=no
15143
15089
15144
15090
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
15145
@@ -12622,8 +13445,8 @@
15091
@@ -12610,8 +13435,8 @@
15146
15092
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
15147
15093
fi
15148
15094
15153
15099
hardcode_action_CXX=
15154
15100
if test -n "$hardcode_libdir_flag_spec_CXX" || \
15155
15101
test -n "$runpath_var_CXX" || \
15156
@@ -12647,8 +13470,8 @@
15102
@@ -12635,8 +13460,8 @@
15157
15103
# directories.
15158
15104
hardcode_action_CXX=unsupported
15159
15105
fi
15164
15110
15165
15111
if test "$hardcode_action_CXX" = relink; then
15166
15112
# Fast installation is not supported
15167
@@ -12715,6 +13538,7 @@
15113
@@ -12703,6 +13528,7 @@
15168
15114
module_cmds_CXX \
15169
15115
module_expsym_cmds_CXX \
15170
15116
lt_cv_prog_compiler_c_o_CXX \
15172
15118
exclude_expsyms_CXX \
15173
15119
include_expsyms_CXX; do
15174
15120
15175
@@ -12800,9 +13624,6 @@
15121
@@ -12788,9 +13614,6 @@
15176
15122
# Is the compiler the GNU C compiler?
15177
15123
with_gcc=$GCC_CXX
15178
15124
15182
15128
# An ERE matcher.
15183
15129
EGREP=$lt_EGREP
15184
15130
15185
@@ -12936,11 +13757,11 @@
15131
@@ -12924,11 +13747,11 @@
15186
15132
15187
15133
# Dependencies to place before the objects being linked to create a
15188
15134
# shared library.
15196
15142
15197
15143
# Dependencies to place before the objects being linked to create a
15198
15144
# shared library.
15199
@@ -12952,7 +13773,7 @@
15145
@@ -12940,7 +13763,7 @@
15200
15146
15201
15147
# The library search path used internally by the compiler when linking
15202
15148
# a shared library.
15205
15151
15206
15152
# Method to check whether dependent libraries are shared objects.
15207
15153
deplibs_check_method=$lt_deplibs_check_method
15208
@@ -13032,13 +13853,13 @@
15154
@@ -13020,13 +13843,13 @@
15209
15155
link_all_deplibs=$link_all_deplibs_CXX
15210
15156
15211
15157
# Compile-time system search path for libraries
15221
15167
15222
15168
# Set to yes if exported symbols are required.
15223
15169
always_export_symbols=$always_export_symbols_CXX
15224
@@ -13129,10 +13950,17 @@
15170
@@ -13117,10 +13940,17 @@
15225
15171
objext_F77=$objext
15226
15172
15227
15173
# Code to be used in simple compile tests
15241
15187
15242
15188
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
15243
15189
15244
@@ -13148,13 +13976,13 @@
15190
@@ -13136,13 +13966,13 @@
15245
15191
15246
15192
# save warnings/boilerplate of simple test code
15247
15193
ac_outfile=conftest.$ac_objext
15257
15203
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
15258
15204
_lt_linker_boilerplate=`cat conftest.err`
15259
15205
$rm conftest*
15260
@@ -13176,13 +14004,13 @@
15206
@@ -13164,13 +13994,13 @@
15261
15207
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
15262
15208
15263
15209
15277
15223
test "$can_build_shared" = "no" && enable_shared=no
15278
15224
15279
15225
# On AIX, shared libraries and static libraries use the same namespace, and
15280
@@ -13201,15 +14029,15 @@
15226
@@ -13189,15 +14019,15 @@
15281
15227
fi
15282
15228
;;
15283
15229
esac
15299
15245
15300
15246
GCC_F77="$G77"
15301
15247
LD_F77="$LD"
15302
@@ -13218,8 +14046,8 @@
15248
@@ -13206,8 +14036,8 @@
15303
15249
lt_prog_compiler_pic_F77=
15304
15250
lt_prog_compiler_static_F77=
15305
15251
15310
15256
15311
15257
if test "$GCC" = yes; then
15312
15258
lt_prog_compiler_wl_F77='-Wl,'
15313
@@ -13241,13 +14069,15 @@
15259
@@ -13229,13 +14059,15 @@
15314
15260
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
15315
15261
;;
15316
15262
15328
15274
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
15329
15275
;;
15330
15276
15331
@@ -13257,7 +14087,7 @@
15277
@@ -13245,7 +14077,7 @@
15332
15278
lt_prog_compiler_pic_F77='-fno-common'
15333
15279
;;
15334
15280
15337
15283
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
15338
15284
# Instead, we relocate shared libraries at runtime.
15339
15285
;;
15340
@@ -13315,7 +14145,7 @@
15286
@@ -13303,7 +14135,7 @@
15341
15287
esac
15342
15288
;;
15343
15289
15346
15292
# This hack is so that the source file can tell whether it is being
15347
15293
# built for inclusion in a dll (and should export symbols for example).
15348
15294
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
15349
@@ -13348,7 +14178,7 @@
15295
@@ -13336,7 +14168,7 @@
15350
15296
lt_prog_compiler_static_F77='-Bstatic'
15351
15297
;;
15352
15298
15355
15301
case $cc_basename in
15356
15302
icc* | ecc*)
15357
15303
lt_prog_compiler_wl_F77='-Wl,'
15358
@@ -13367,6 +14197,22 @@
15304
@@ -13355,6 +14187,22 @@
15359
15305
# All Alpha code is PIC.
15360
15306
lt_prog_compiler_static_F77='-non_shared'
15361
15307
;;
15378
15324
esac
15379
15325
;;
15380
15326
15381
@@ -13376,6 +14222,10 @@
15327
@@ -13364,6 +14212,10 @@
15382
15328
lt_prog_compiler_static_F77='-non_shared'
15383
15329
;;
15384
15330
15389
15335
solaris*)
15390
15336
lt_prog_compiler_pic_F77='-KPIC'
15391
15337
lt_prog_compiler_static_F77='-Bstatic'
15392
@@ -13428,22 +14278,22 @@
15338
@@ -13416,22 +14268,22 @@
15393
15339
esac
15394
15340
fi
15395
15341
15417
15363
lt_compiler_flag="$lt_prog_compiler_pic_F77"
15418
15364
# Insert the option either (1) after the last *FLAGS variable, or
15419
15365
# (2) before a word containing "conftest.", or (3) at the end.
15420
@@ -13454,11 +14304,11 @@
15366
@@ -13442,11 +14294,11 @@
15421
15367
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
15422
15368
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
15423
15369
-e 's:$: $lt_compiler_flag:'`
15424
- (eval echo "\"\$as_me:13457: $lt_compile\"" >&5)
15425
+ (eval echo "\"\$as_me:14307: $lt_compile\"" >&5)
15370
- (eval echo "\"\$as_me:13445: $lt_compile\"" >&5)
15371
+ (eval echo "\"\$as_me:14297: $lt_compile\"" >&5)
15426
15372
(eval "$lt_compile" 2>conftest.err)
15427
15373
ac_status=$?
15428
15374
cat conftest.err >&5
15429
- echo "$as_me:13461: \$? = $ac_status" >&5
15430
+ echo "$as_me:14311: \$? = $ac_status" >&5
15375
- echo "$as_me:13449: \$? = $ac_status" >&5
15376
+ echo "$as_me:14301: \$? = $ac_status" >&5
15431
15377
if (exit $ac_status) && test -s "$ac_outfile"; then
15432
15378
# The compiler can only warn and ignore the option if not recognized
15433
15379
# So say no if there are warnings other than the usual output.
15434
@@ -13471,8 +14321,8 @@
15380
@@ -13459,8 +14311,8 @@
15435
15381
$rm conftest*
15436
15382
15437
15383
fi
15442
15388
15443
15389
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
15444
15390
case $lt_prog_compiler_pic_F77 in
15445
@@ -13499,15 +14349,15 @@
15391
@@ -13487,15 +14339,15 @@
15446
15392
# Check to make sure the static flag actually works.
15447
15393
#
15448
15394
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
15461
15407
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
15462
15408
# The linker can only warn and ignore the option if not recognized
15463
15409
# So say no if there are warnings
15464
@@ -13527,8 +14377,8 @@
15410
@@ -13515,8 +14367,8 @@
15465
15411
LDFLAGS="$save_LDFLAGS"
15466
15412
15467
15413
fi
15472
15418
15473
15419
if test x"$lt_prog_compiler_static_works_F77" = xyes; then
15474
15420
:
15475
@@ -13537,8 +14387,8 @@
15421
@@ -13525,8 +14377,8 @@
15476
15422
fi
15477
15423
15478
15424
15483
15429
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
15484
15430
echo $ECHO_N "(cached) $ECHO_C" >&6
15485
15431
else
15486
@@ -13547,7 +14397,7 @@
15432
@@ -13535,7 +14387,7 @@
15487
15433
mkdir conftest
15488
15434
cd conftest
15489
15435
mkdir out
15492
15438
15493
15439
lt_compiler_flag="-o out/conftest2.$ac_objext"
15494
15440
# Insert the option either (1) after the last *FLAGS variable, or
15495
@@ -13558,11 +14408,11 @@
15441
@@ -13546,11 +14398,11 @@
15496
15442
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
15497
15443
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
15498
15444
-e 's:$: $lt_compiler_flag:'`
15499
- (eval echo "\"\$as_me:13561: $lt_compile\"" >&5)
15500
+ (eval echo "\"\$as_me:14411: $lt_compile\"" >&5)
15445
- (eval echo "\"\$as_me:13549: $lt_compile\"" >&5)
15446
+ (eval echo "\"\$as_me:14401: $lt_compile\"" >&5)
15501
15447
(eval "$lt_compile" 2>out/conftest.err)
15502
15448
ac_status=$?
15503
15449
cat out/conftest.err >&5
15504
- echo "$as_me:13565: \$? = $ac_status" >&5
15505
+ echo "$as_me:14415: \$? = $ac_status" >&5
15450
- echo "$as_me:13553: \$? = $ac_status" >&5
15451
+ echo "$as_me:14405: \$? = $ac_status" >&5
15506
15452
if (exit $ac_status) && test -s out/conftest2.$ac_objext
15507
15453
then
15508
15454
# The compiler can only warn and ignore the option if not recognized
15509
@@ -13584,23 +14434,23 @@
15455
@@ -13572,23 +14424,23 @@
15510
15456
$rm conftest*
15511
15457
15512
15458
fi
15536
15482
if test "$hard_links" = no; then
15537
15483
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
15538
15484
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
15539
@@ -13610,8 +14460,8 @@
15485
@@ -13598,8 +14450,8 @@
15540
15486
need_locks=no
15541
15487
fi
15542
15488
15547
15493
15548
15494
runpath_var=
15549
15495
allow_undefined_flag_F77=
15550
@@ -13754,7 +14604,7 @@
15496
@@ -13742,7 +14594,7 @@
15551
15497
allow_undefined_flag_F77=unsupported
15552
15498
always_export_symbols_F77=no
15553
15499
enable_shared_with_static_runtimes_F77=yes
15556
15502
15557
15503
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
15558
15504
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
15559
@@ -13772,7 +14622,7 @@
15505
@@ -13760,7 +14612,7 @@
15560
15506
fi
15561
15507
;;
15562
15508
15565
15511
hardcode_direct_F77=no
15566
15512
hardcode_shlibpath_var_F77=no
15567
15513
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
15568
@@ -13787,7 +14637,7 @@
15514
@@ -13775,7 +14627,7 @@
15569
15515
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
15570
15516
;;
15571
15517
15574
15520
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
15575
15521
tmp_addflag=
15576
15522
case $cc_basename,$host_cpu in
15577
@@ -13805,20 +14655,30 @@
15523
@@ -13793,20 +14645,30 @@
15578
15524
ifc* | ifort*) # Intel Fortran compiler
15579
15525
tmp_addflag=' -nofor_main' ;;
15580
15526
esac
15608
15554
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
15609
15555
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
15610
15556
wlarc=
15611
@@ -13970,7 +14830,7 @@
15557
@@ -13958,7 +14820,7 @@
15612
15558
strings "$collect2name" | grep resolve_lib_name >/dev/null
15613
15559
then
15614
15560
# We have reworked collect2
15617
15563
else
15618
15564
# We have old collect2
15619
15565
hardcode_direct_F77=unsupported
15620
@@ -14016,39 +14876,44 @@
15621
end
15622
_ACEOF
15623
rm -f conftest.$ac_objext conftest$ac_exeext
15624
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15625
- (eval $ac_link) 2>conftest.er1
15626
+if { (ac_try="$ac_link"
15627
+case "(($ac_try" in
15628
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15629
+ *) ac_try_echo=$ac_try;;
15630
+esac
15631
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15632
+ (eval "$ac_link") 2>conftest.er1
15633
ac_status=$?
15634
grep -v '^ *+' conftest.er1 >conftest.err
15635
rm -f conftest.er1
15636
cat conftest.err >&5
15637
echo "$as_me:$LINENO: \$? = $ac_status" >&5
15638
- (exit $ac_status); } &&
15639
- { ac_try='test -z "$ac_f77_werror_flag"
15640
- || test ! -s conftest.err'
15641
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15642
- (eval $ac_try) 2>&5
15643
- ac_status=$?
15644
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15645
- (exit $ac_status); }; } &&
15646
- { ac_try='test -s conftest$ac_exeext'
15647
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15648
- (eval $ac_try) 2>&5
15649
- ac_status=$?
15650
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15651
- (exit $ac_status); }; }; then
15652
+ (exit $ac_status); } && {
15653
+ test -z "$ac_f77_werror_flag" ||
15654
+ test ! -s conftest.err
15655
+ } && test -s conftest$ac_exeext &&
15656
+ $as_test_x conftest$ac_exeext; then
15657
15658
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15659
-}'`
15660
+lt_aix_libpath_sed='
15661
+ /Import File Strings/,/^$/ {
15662
+ /^0/ {
15663
+ s/^0 *\(.*\)$/\1/
15664
+ p
15665
+ }
15666
+ }'
15667
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15668
# Check for a 64-bit object if we didn't find anything.
15669
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15670
-}'`; fi
15671
+if test -z "$aix_libpath"; then
15672
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15673
+fi
15674
else
15675
echo "$as_me: failed program was:" >&5
15676
sed 's/^/| /' conftest.$ac_ext >&5
15677
15678
+
15679
fi
15680
-rm -f conftest.err conftest.$ac_objext \
15681
+
15682
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15683
conftest$ac_exeext conftest.$ac_ext
15684
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15685
15686
@@ -14067,39 +14932,44 @@
15687
end
15688
_ACEOF
15689
rm -f conftest.$ac_objext conftest$ac_exeext
15690
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15691
- (eval $ac_link) 2>conftest.er1
15692
+if { (ac_try="$ac_link"
15693
+case "(($ac_try" in
15694
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15695
+ *) ac_try_echo=$ac_try;;
15696
+esac
15697
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15698
+ (eval "$ac_link") 2>conftest.er1
15699
ac_status=$?
15700
grep -v '^ *+' conftest.er1 >conftest.err
15701
rm -f conftest.er1
15702
cat conftest.err >&5
15703
echo "$as_me:$LINENO: \$? = $ac_status" >&5
15704
- (exit $ac_status); } &&
15705
- { ac_try='test -z "$ac_f77_werror_flag"
15706
- || test ! -s conftest.err'
15707
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15708
- (eval $ac_try) 2>&5
15709
- ac_status=$?
15710
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15711
- (exit $ac_status); }; } &&
15712
- { ac_try='test -s conftest$ac_exeext'
15713
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15714
- (eval $ac_try) 2>&5
15715
- ac_status=$?
15716
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15717
- (exit $ac_status); }; }; then
15718
+ (exit $ac_status); } && {
15719
+ test -z "$ac_f77_werror_flag" ||
15720
+ test ! -s conftest.err
15721
+ } && test -s conftest$ac_exeext &&
15722
+ $as_test_x conftest$ac_exeext; then
15723
15724
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15725
-}'`
15726
+lt_aix_libpath_sed='
15727
+ /Import File Strings/,/^$/ {
15728
+ /^0/ {
15729
+ s/^0 *\(.*\)$/\1/
15730
+ p
15731
+ }
15732
+ }'
15733
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15734
# Check for a 64-bit object if we didn't find anything.
15735
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15736
-}'`; fi
15737
+if test -z "$aix_libpath"; then
15738
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15739
+fi
15740
else
15741
echo "$as_me: failed program was:" >&5
15742
sed 's/^/| /' conftest.$ac_ext >&5
15743
15744
+
15745
fi
15746
-rm -f conftest.err conftest.$ac_objext \
15747
+
15748
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15749
conftest$ac_exeext conftest.$ac_ext
15750
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15751
15752
@@ -14145,7 +15015,7 @@
15566
@@ -14004,39 +14866,44 @@
15567
end
15568
_ACEOF
15569
rm -f conftest.$ac_objext conftest$ac_exeext
15570
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15571
- (eval $ac_link) 2>conftest.er1
15572
+if { (ac_try="$ac_link"
15573
+case "(($ac_try" in
15574
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15575
+ *) ac_try_echo=$ac_try;;
15576
+esac
15577
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15578
+ (eval "$ac_link") 2>conftest.er1
15579
ac_status=$?
15580
grep -v '^ *+' conftest.er1 >conftest.err
15581
rm -f conftest.er1
15582
cat conftest.err >&5
15583
echo "$as_me:$LINENO: \$? = $ac_status" >&5
15584
- (exit $ac_status); } &&
15585
- { ac_try='test -z "$ac_f77_werror_flag"
15586
- || test ! -s conftest.err'
15587
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15588
- (eval $ac_try) 2>&5
15589
- ac_status=$?
15590
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15591
- (exit $ac_status); }; } &&
15592
- { ac_try='test -s conftest$ac_exeext'
15593
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15594
- (eval $ac_try) 2>&5
15595
- ac_status=$?
15596
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15597
- (exit $ac_status); }; }; then
15598
+ (exit $ac_status); } && {
15599
+ test -z "$ac_f77_werror_flag" ||
15600
+ test ! -s conftest.err
15601
+ } && test -s conftest$ac_exeext &&
15602
+ $as_test_x conftest$ac_exeext; then
15603
15604
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15605
-}'`
15606
+lt_aix_libpath_sed='
15607
+ /Import File Strings/,/^$/ {
15608
+ /^0/ {
15609
+ s/^0 *\(.*\)$/\1/
15610
+ p
15611
+ }
15612
+ }'
15613
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15614
# Check for a 64-bit object if we didn't find anything.
15615
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15616
-}'`; fi
15617
+if test -z "$aix_libpath"; then
15618
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15619
+fi
15620
else
15621
echo "$as_me: failed program was:" >&5
15622
sed 's/^/| /' conftest.$ac_ext >&5
15623
15624
+
15625
fi
15626
-rm -f conftest.err conftest.$ac_objext \
15627
+
15628
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15629
conftest$ac_exeext conftest.$ac_ext
15630
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15631
15632
@@ -14055,39 +14922,44 @@
15633
end
15634
_ACEOF
15635
rm -f conftest.$ac_objext conftest$ac_exeext
15636
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15637
- (eval $ac_link) 2>conftest.er1
15638
+if { (ac_try="$ac_link"
15639
+case "(($ac_try" in
15640
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15641
+ *) ac_try_echo=$ac_try;;
15642
+esac
15643
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15644
+ (eval "$ac_link") 2>conftest.er1
15645
ac_status=$?
15646
grep -v '^ *+' conftest.er1 >conftest.err
15647
rm -f conftest.er1
15648
cat conftest.err >&5
15649
echo "$as_me:$LINENO: \$? = $ac_status" >&5
15650
- (exit $ac_status); } &&
15651
- { ac_try='test -z "$ac_f77_werror_flag"
15652
- || test ! -s conftest.err'
15653
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15654
- (eval $ac_try) 2>&5
15655
- ac_status=$?
15656
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15657
- (exit $ac_status); }; } &&
15658
- { ac_try='test -s conftest$ac_exeext'
15659
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15660
- (eval $ac_try) 2>&5
15661
- ac_status=$?
15662
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
15663
- (exit $ac_status); }; }; then
15664
+ (exit $ac_status); } && {
15665
+ test -z "$ac_f77_werror_flag" ||
15666
+ test ! -s conftest.err
15667
+ } && test -s conftest$ac_exeext &&
15668
+ $as_test_x conftest$ac_exeext; then
15669
15670
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15671
-}'`
15672
+lt_aix_libpath_sed='
15673
+ /Import File Strings/,/^$/ {
15674
+ /^0/ {
15675
+ s/^0 *\(.*\)$/\1/
15676
+ p
15677
+ }
15678
+ }'
15679
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15680
# Check for a 64-bit object if we didn't find anything.
15681
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15682
-}'`; fi
15683
+if test -z "$aix_libpath"; then
15684
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15685
+fi
15686
else
15687
echo "$as_me: failed program was:" >&5
15688
sed 's/^/| /' conftest.$ac_ext >&5
15689
15690
+
15691
fi
15692
-rm -f conftest.err conftest.$ac_objext \
15693
+
15694
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15695
conftest$ac_exeext conftest.$ac_ext
15696
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15697
15698
@@ -14133,7 +15005,7 @@
15753
15699
# The linker will automatically build a .lib file if we build a DLL.
15754
15700
old_archive_From_new_cmds_F77='true'
15755
15701
# FIXME: Should let the user specify the lib program.
15758
15704
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
15759
15705
enable_shared_with_static_runtimes_F77=yes
15760
15706
;;
15761
@@ -14187,10 +15057,10 @@
15707
@@ -14175,10 +15047,10 @@
15762
15708
case $cc_basename in
15763
15709
xlc*)
15764
15710
output_verbose_link_cmd='echo'
15771
15717
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
15772
15718
;;
15773
15719
*)
15774
@@ -14230,7 +15100,7 @@
15720
@@ -14218,7 +15090,7 @@
15775
15721
;;
15776
15722
15777
15723
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
15780
15726
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
15781
15727
hardcode_libdir_flag_spec_F77='-R$libdir'
15782
15728
hardcode_direct_F77=yes
15783
@@ -14332,7 +15202,7 @@
15729
@@ -14320,7 +15192,7 @@
15784
15730
link_all_deplibs_F77=yes
15785
15731
;;
15786
15732
15789
15735
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
15790
15736
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
15791
15737
else
15792
@@ -14352,24 +15222,28 @@
15738
@@ -14340,24 +15212,28 @@
15793
15739
;;
15794
15740
15795
15741
openbsd*)
15835
15781
fi
15836
15782
;;
15837
15783
15838
@@ -14428,17 +15302,16 @@
15784
@@ -14416,17 +15292,16 @@
15839
15785
case $host_os in
15840
15786
solaris2.[0-5] | solaris2.[0-5].*) ;;
15841
15787
*)
15862
15808
esac
15863
15809
link_all_deplibs_F77=yes
15864
15810
;;
15865
@@ -14495,7 +15368,7 @@
15811
@@ -14483,7 +15358,7 @@
15866
15812
fi
15867
15813
;;
15868
15814
15871
15817
no_undefined_flag_F77='${wl}-z,text'
15872
15818
archive_cmds_need_lc_F77=no
15873
15819
hardcode_shlibpath_var_F77=no
15874
@@ -14548,8 +15421,8 @@
15820
@@ -14536,8 +15411,8 @@
15875
15821
esac
15876
15822
fi
15877
15823
15882
15828
test "$ld_shlibs_F77" = no && can_build_shared=no
15883
15829
15884
15830
#
15885
@@ -14569,10 +15442,10 @@
15831
@@ -14557,10 +15432,10 @@
15886
15832
# Test whether the compiler implicitly links with -lc since on some
15887
15833
# systems, -lgcc has to come before -lc. If gcc already passes -lc
15888
15834
# to ld, don't add -lc before -lgcc.
15896
15842
15897
15843
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15898
15844
(eval $ac_compile) 2>&5
15899
@@ -14607,16 +15480,16 @@
15845
@@ -14595,16 +15470,16 @@
15900
15846
cat conftest.err 1>&5
15901
15847
fi
15902
15848
$rm conftest*
15917
15863
library_names_spec=
15918
15864
libname_spec='lib$name'
15919
15865
soname_spec=
15920
@@ -14630,20 +15503,7 @@
15866
@@ -14618,20 +15493,7 @@
15921
15867
version_type=none
15922
15868
dynamic_linker="$host_os ld.so"
15923
15869
sys_lib_dlsearch_path_spec="/lib /usr/lib"
15939
15885
need_lib_prefix=unknown
15940
15886
hardcode_into_libs=no
15941
15887
15942
@@ -14800,12 +15660,7 @@
15888
@@ -14788,12 +15650,7 @@
15943
15889
shlibpath_overrides_runpath=yes
15944
15890
shlibpath_var=DYLD_LIBRARY_PATH
15945
15891
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
15953
15899
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
15954
15900
;;
15955
15901
15956
@@ -14822,18 +15677,6 @@
15902
@@ -14810,18 +15667,6 @@
15957
15903
dynamic_linker=no
15958
15904
;;
15959
15905
15972
15918
freebsd* | dragonfly*)
15973
15919
# DragonFly does not have aout. When/if they implement a new
15974
15920
# versioning mechanism, adjust this.
15975
@@ -14871,7 +15714,7 @@
15921
@@ -14859,7 +15704,7 @@
15976
15922
shlibpath_overrides_runpath=no
15977
15923
hardcode_into_libs=yes
15978
15924
;;
15981
15927
shlibpath_overrides_runpath=yes
15982
15928
hardcode_into_libs=yes
15983
15929
;;
15984
@@ -14934,7 +15777,7 @@
15930
@@ -14922,7 +15767,7 @@
15985
15931
postinstall_cmds='chmod 555 $lib'
15986
15932
;;
15987
15933
15990
15936
version_type=linux
15991
15937
need_lib_prefix=no
15992
15938
need_version=no
15993
@@ -14989,7 +15832,7 @@
15939
@@ -14977,7 +15822,7 @@
15994
15940
;;
15995
15941
15996
15942
# This must be Linux ELF.
15999
15945
version_type=linux
16000
15946
need_lib_prefix=no
16001
15947
need_version=no
16002
@@ -15003,31 +15846,10 @@
15948
@@ -14991,31 +15836,10 @@
16003
15949
# before this can be enabled.
16004
15950
hardcode_into_libs=yes
16005
15951
16007
15953
- libsuff=
16008
15954
- case "$host_cpu" in
16009
15955
- x86_64*|s390x*|powerpc64*)
16010
- echo '#line 15010 "configure"' > conftest.$ac_ext
15956
- echo '#line 14998 "configure"' > conftest.$ac_ext
16011
15957
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16012
15958
- (eval $ac_compile) 2>&5
16013
15959
- ac_status=$?
16033
15979
fi
16034
15980
16035
15981
# We used to test for /lib/ld.so.1 and disable shared libraries on
16036
@@ -15039,7 +15861,7 @@
15982
@@ -15027,7 +15851,7 @@
16037
15983
dynamic_linker='GNU/Linux ld.so'
16038
15984
;;
16039
15985
16042
15988
version_type=linux
16043
15989
need_lib_prefix=no
16044
15990
need_version=no
16045
@@ -15048,7 +15870,7 @@
15991
@@ -15036,7 +15860,7 @@
16046
15992
shlibpath_var=LD_LIBRARY_PATH
16047
15993
shlibpath_overrides_runpath=no
16048
15994
hardcode_into_libs=yes
16051
15997
;;
16052
15998
16053
15999
netbsd*)
16054
@@ -15132,6 +15954,10 @@
16000
@@ -15120,6 +15944,10 @@
16055
16001
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
16056
16002
;;
16057
16003
16062
16008
solaris*)
16063
16009
version_type=linux
16064
16010
need_lib_prefix=no
16065
@@ -15224,8 +16050,8 @@
16011
@@ -15212,8 +16040,8 @@
16066
16012
dynamic_linker=no
16067
16013
;;
16068
16014
esac
16073
16019
test "$dynamic_linker" = no && can_build_shared=no
16074
16020
16075
16021
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
16076
@@ -15233,8 +16059,8 @@
16022
@@ -15221,8 +16049,8 @@
16077
16023
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
16078
16024
fi
16079
16025
16084
16030
hardcode_action_F77=
16085
16031
if test -n "$hardcode_libdir_flag_spec_F77" || \
16086
16032
test -n "$runpath_var_F77" || \
16087
@@ -15258,8 +16084,8 @@
16033
@@ -15246,8 +16074,8 @@
16088
16034
# directories.
16089
16035
hardcode_action_F77=unsupported
16090
16036
fi
16095
16041
16096
16042
if test "$hardcode_action_F77" = relink; then
16097
16043
# Fast installation is not supported
16098
@@ -15326,6 +16152,7 @@
16044
@@ -15314,6 +16142,7 @@
16099
16045
module_cmds_F77 \
16100
16046
module_expsym_cmds_F77 \
16101
16047
lt_cv_prog_compiler_c_o_F77 \
16103
16049
exclude_expsyms_F77 \
16104
16050
include_expsyms_F77; do
16105
16051
16106
@@ -15411,9 +16238,6 @@
16052
@@ -15399,9 +16228,6 @@
16107
16053
# Is the compiler the GNU C compiler?
16108
16054
with_gcc=$GCC_F77
16109
16055
16113
16059
# An ERE matcher.
16114
16060
EGREP=$lt_EGREP
16115
16061
16116
@@ -15547,11 +16371,11 @@
16062
@@ -15535,11 +16361,11 @@
16117
16063
16118
16064
# Dependencies to place before the objects being linked to create a
16119
16065
# shared library.
16127
16073
16128
16074
# Dependencies to place before the objects being linked to create a
16129
16075
# shared library.
16130
@@ -15563,7 +16387,7 @@
16076
@@ -15551,7 +16377,7 @@
16131
16077
16132
16078
# The library search path used internally by the compiler when linking
16133
16079
# a shared library.
16136
16082
16137
16083
# Method to check whether dependent libraries are shared objects.
16138
16084
deplibs_check_method=$lt_deplibs_check_method
16139
@@ -15643,13 +16467,13 @@
16085
@@ -15631,13 +16457,13 @@
16140
16086
link_all_deplibs=$link_all_deplibs_F77
16141
16087
16142
16088
# Compile-time system search path for libraries
16152
16098
16153
16099
# Set to yes if exported symbols are required.
16154
16100
always_export_symbols=$always_export_symbols_F77
16155
@@ -15699,7 +16523,6 @@
16101
@@ -15687,7 +16513,6 @@
16156
16102
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
16157
16103
16158
16104
16160
16106
# Source file extension for Java test sources.
16161
16107
ac_ext=java
16162
16108
16163
@@ -15708,10 +16531,10 @@
16109
@@ -15696,10 +16521,10 @@
16164
16110
objext_GCJ=$objext
16165
16111
16166
16112
# Code to be used in simple compile tests
16173
16119
16174
16120
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
16175
16121
16176
@@ -15727,13 +16550,13 @@
16122
@@ -15715,13 +16540,13 @@
16177
16123
16178
16124
# save warnings/boilerplate of simple test code
16179
16125
ac_outfile=conftest.$ac_objext
16189
16135
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
16190
16136
_lt_linker_boilerplate=`cat conftest.err`
16191
16137
$rm conftest*
16192
@@ -15767,14 +16590,14 @@
16138
@@ -15755,14 +16580,14 @@
16193
16139
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
16194
16140
16195
16141
16207
16153
lt_compiler_flag="-fno-rtti -fno-exceptions"
16208
16154
# Insert the option either (1) after the last *FLAGS variable, or
16209
16155
# (2) before a word containing "conftest.", or (3) at the end.
16210
@@ -15785,11 +16608,11 @@
16156
@@ -15773,11 +16598,11 @@
16211
16157
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16212
16158
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16213
16159
-e 's:$: $lt_compiler_flag:'`
16214
- (eval echo "\"\$as_me:15788: $lt_compile\"" >&5)
16215
+ (eval echo "\"\$as_me:16611: $lt_compile\"" >&5)
16160
- (eval echo "\"\$as_me:15776: $lt_compile\"" >&5)
16161
+ (eval echo "\"\$as_me:16601: $lt_compile\"" >&5)
16216
16162
(eval "$lt_compile" 2>conftest.err)
16217
16163
ac_status=$?
16218
16164
cat conftest.err >&5
16219
- echo "$as_me:15792: \$? = $ac_status" >&5
16220
+ echo "$as_me:16615: \$? = $ac_status" >&5
16165
- echo "$as_me:15780: \$? = $ac_status" >&5
16166
+ echo "$as_me:16605: \$? = $ac_status" >&5
16221
16167
if (exit $ac_status) && test -s "$ac_outfile"; then
16222
16168
# The compiler can only warn and ignore the option if not recognized
16223
16169
# So say no if there are warnings other than the usual output.
16224
@@ -15802,8 +16625,8 @@
16170
@@ -15790,8 +16615,8 @@
16225
16171
$rm conftest*
16226
16172
16227
16173
fi
16232
16178
16233
16179
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
16234
16180
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
16235
@@ -15817,8 +16640,8 @@
16181
@@ -15805,8 +16630,8 @@
16236
16182
lt_prog_compiler_pic_GCJ=
16237
16183
lt_prog_compiler_static_GCJ=
16238
16184
16243
16189
16244
16190
if test "$GCC" = yes; then
16245
16191
lt_prog_compiler_wl_GCJ='-Wl,'
16246
@@ -15840,13 +16663,15 @@
16192
@@ -15828,13 +16653,15 @@
16247
16193
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
16248
16194
;;
16249
16195
16261
16207
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
16262
16208
;;
16263
16209
16264
@@ -15856,7 +16681,7 @@
16210
@@ -15844,7 +16671,7 @@
16265
16211
lt_prog_compiler_pic_GCJ='-fno-common'
16266
16212
;;
16267
16213
16270
16216
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
16271
16217
# Instead, we relocate shared libraries at runtime.
16272
16218
;;
16273
@@ -15914,7 +16739,7 @@
16219
@@ -15902,7 +16729,7 @@
16274
16220
esac
16275
16221
;;
16276
16222
16279
16225
# This hack is so that the source file can tell whether it is being
16280
16226
# built for inclusion in a dll (and should export symbols for example).
16281
16227
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
16282
@@ -15947,7 +16772,7 @@
16228
@@ -15935,7 +16762,7 @@
16283
16229
lt_prog_compiler_static_GCJ='-Bstatic'
16284
16230
;;
16285
16231
16288
16234
case $cc_basename in
16289
16235
icc* | ecc*)
16290
16236
lt_prog_compiler_wl_GCJ='-Wl,'
16291
@@ -15966,6 +16791,22 @@
16237
@@ -15954,6 +16781,22 @@
16292
16238
# All Alpha code is PIC.
16293
16239
lt_prog_compiler_static_GCJ='-non_shared'
16294
16240
;;
16311
16257
esac
16312
16258
;;
16313
16259
16314
@@ -15975,6 +16816,10 @@
16260
@@ -15963,6 +16806,10 @@
16315
16261
lt_prog_compiler_static_GCJ='-non_shared'
16316
16262
;;
16317
16263
16322
16268
solaris*)
16323
16269
lt_prog_compiler_pic_GCJ='-KPIC'
16324
16270
lt_prog_compiler_static_GCJ='-Bstatic'
16325
@@ -16027,22 +16872,22 @@
16271
@@ -16015,22 +16862,22 @@
16326
16272
esac
16327
16273
fi
16328
16274
16350
16296
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
16351
16297
# Insert the option either (1) after the last *FLAGS variable, or
16352
16298
# (2) before a word containing "conftest.", or (3) at the end.
16353
@@ -16053,11 +16898,11 @@
16299
@@ -16041,11 +16888,11 @@
16354
16300
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16355
16301
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16356
16302
-e 's:$: $lt_compiler_flag:'`
16357
- (eval echo "\"\$as_me:16056: $lt_compile\"" >&5)
16358
+ (eval echo "\"\$as_me:16901: $lt_compile\"" >&5)
16303
- (eval echo "\"\$as_me:16044: $lt_compile\"" >&5)
16304
+ (eval echo "\"\$as_me:16891: $lt_compile\"" >&5)
16359
16305
(eval "$lt_compile" 2>conftest.err)
16360
16306
ac_status=$?
16361
16307
cat conftest.err >&5
16362
- echo "$as_me:16060: \$? = $ac_status" >&5
16363
+ echo "$as_me:16905: \$? = $ac_status" >&5
16308
- echo "$as_me:16048: \$? = $ac_status" >&5
16309
+ echo "$as_me:16895: \$? = $ac_status" >&5
16364
16310
if (exit $ac_status) && test -s "$ac_outfile"; then
16365
16311
# The compiler can only warn and ignore the option if not recognized
16366
16312
# So say no if there are warnings other than the usual output.
16367
@@ -16070,8 +16915,8 @@
16313
@@ -16058,8 +16905,8 @@
16368
16314
$rm conftest*
16369
16315
16370
16316
fi
16375
16321
16376
16322
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
16377
16323
case $lt_prog_compiler_pic_GCJ in
16378
@@ -16098,15 +16943,15 @@
16324
@@ -16086,15 +16933,15 @@
16379
16325
# Check to make sure the static flag actually works.
16380
16326
#
16381
16327
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
16394
16340
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
16395
16341
# The linker can only warn and ignore the option if not recognized
16396
16342
# So say no if there are warnings
16397
@@ -16126,8 +16971,8 @@
16343
@@ -16114,8 +16961,8 @@
16398
16344
LDFLAGS="$save_LDFLAGS"
16399
16345
16400
16346
fi
16405
16351
16406
16352
if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
16407
16353
:
16408
@@ -16136,8 +16981,8 @@
16354
@@ -16124,8 +16971,8 @@
16409
16355
fi
16410
16356
16411
16357
16416
16362
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
16417
16363
echo $ECHO_N "(cached) $ECHO_C" >&6
16418
16364
else
16419
@@ -16146,7 +16991,7 @@
16365
@@ -16134,7 +16981,7 @@
16420
16366
mkdir conftest
16421
16367
cd conftest
16422
16368
mkdir out
16425
16371
16426
16372
lt_compiler_flag="-o out/conftest2.$ac_objext"
16427
16373
# Insert the option either (1) after the last *FLAGS variable, or
16428
@@ -16157,11 +17002,11 @@
16374
@@ -16145,11 +16992,11 @@
16429
16375
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16430
16376
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16431
16377
-e 's:$: $lt_compiler_flag:'`
16432
- (eval echo "\"\$as_me:16160: $lt_compile\"" >&5)
16433
+ (eval echo "\"\$as_me:17005: $lt_compile\"" >&5)
16378
- (eval echo "\"\$as_me:16148: $lt_compile\"" >&5)
16379
+ (eval echo "\"\$as_me:16995: $lt_compile\"" >&5)
16434
16380
(eval "$lt_compile" 2>out/conftest.err)
16435
16381
ac_status=$?
16436
16382
cat out/conftest.err >&5
16437
- echo "$as_me:16164: \$? = $ac_status" >&5
16438
+ echo "$as_me:17009: \$? = $ac_status" >&5
16383
- echo "$as_me:16152: \$? = $ac_status" >&5
16384
+ echo "$as_me:16999: \$? = $ac_status" >&5
16439
16385
if (exit $ac_status) && test -s out/conftest2.$ac_objext
16440
16386
then
16441
16387
# The compiler can only warn and ignore the option if not recognized
16442
@@ -16183,23 +17028,23 @@
16388
@@ -16171,23 +17018,23 @@
16443
16389
$rm conftest*
16444
16390
16445
16391
fi
16469
16415
if test "$hard_links" = no; then
16470
16416
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
16471
16417
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
16472
@@ -16209,8 +17054,8 @@
16418
@@ -16197,8 +17044,8 @@
16473
16419
need_locks=no
16474
16420
fi
16475
16421
16480
16426
16481
16427
runpath_var=
16482
16428
allow_undefined_flag_GCJ=
16483
@@ -16353,7 +17198,7 @@
16429
@@ -16341,7 +17188,7 @@
16484
16430
allow_undefined_flag_GCJ=unsupported
16485
16431
always_export_symbols_GCJ=no
16486
16432
enable_shared_with_static_runtimes_GCJ=yes
16489
16435
16490
16436
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
16491
16437
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
16492
@@ -16371,7 +17216,7 @@
16438
@@ -16359,7 +17206,7 @@
16493
16439
fi
16494
16440
;;
16495
16441
16498
16444
hardcode_direct_GCJ=no
16499
16445
hardcode_shlibpath_var_GCJ=no
16500
16446
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
16501
@@ -16386,7 +17231,7 @@
16447
@@ -16374,7 +17221,7 @@
16502
16448
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
16503
16449
;;
16504
16450
16507
16453
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
16508
16454
tmp_addflag=
16509
16455
case $cc_basename,$host_cpu in
16510
@@ -16404,20 +17249,30 @@
16456
@@ -16392,20 +17239,30 @@
16511
16457
ifc* | ifort*) # Intel Fortran compiler
16512
16458
tmp_addflag=' -nofor_main' ;;
16513
16459
esac
16541
16487
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
16542
16488
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
16543
16489
wlarc=
16544
@@ -16569,7 +17424,7 @@
16490
@@ -16557,7 +17414,7 @@
16545
16491
strings "$collect2name" | grep resolve_lib_name >/dev/null
16546
16492
then
16547
16493
# We have reworked collect2
16550
16496
else
16551
16497
# We have old collect2
16552
16498
hardcode_direct_GCJ=unsupported
16553
@@ -16625,39 +17480,44 @@
16554
}
16555
_ACEOF
16556
rm -f conftest.$ac_objext conftest$ac_exeext
16557
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16558
- (eval $ac_link) 2>conftest.er1
16559
+if { (ac_try="$ac_link"
16560
+case "(($ac_try" in
16561
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16562
+ *) ac_try_echo=$ac_try;;
16563
+esac
16564
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16565
+ (eval "$ac_link") 2>conftest.er1
16566
ac_status=$?
16567
grep -v '^ *+' conftest.er1 >conftest.err
16568
rm -f conftest.er1
16569
cat conftest.err >&5
16570
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16571
- (exit $ac_status); } &&
16572
- { ac_try='test -z "$ac_c_werror_flag"
16573
- || test ! -s conftest.err'
16574
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16575
- (eval $ac_try) 2>&5
16576
- ac_status=$?
16577
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16578
- (exit $ac_status); }; } &&
16579
- { ac_try='test -s conftest$ac_exeext'
16580
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16581
- (eval $ac_try) 2>&5
16582
- ac_status=$?
16583
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16584
- (exit $ac_status); }; }; then
16585
+ (exit $ac_status); } && {
16586
+ test -z "$ac_c_werror_flag" ||
16587
+ test ! -s conftest.err
16588
+ } && test -s conftest$ac_exeext &&
16589
+ $as_test_x conftest$ac_exeext; then
16590
16591
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16592
-}'`
16593
+lt_aix_libpath_sed='
16594
+ /Import File Strings/,/^$/ {
16595
+ /^0/ {
16596
+ s/^0 *\(.*\)$/\1/
16597
+ p
16598
+ }
16599
+ }'
16600
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16601
# Check for a 64-bit object if we didn't find anything.
16602
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16603
-}'`; fi
16604
+if test -z "$aix_libpath"; then
16605
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16606
+fi
16607
else
16608
echo "$as_me: failed program was:" >&5
16609
sed 's/^/| /' conftest.$ac_ext >&5
16610
16611
+
16612
fi
16613
-rm -f conftest.err conftest.$ac_objext \
16614
+
16615
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16616
conftest$ac_exeext conftest.$ac_ext
16617
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16618
16619
@@ -16686,39 +17546,44 @@
16620
}
16621
_ACEOF
16622
rm -f conftest.$ac_objext conftest$ac_exeext
16623
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16624
- (eval $ac_link) 2>conftest.er1
16625
+if { (ac_try="$ac_link"
16626
+case "(($ac_try" in
16627
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16628
+ *) ac_try_echo=$ac_try;;
16629
+esac
16630
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16631
+ (eval "$ac_link") 2>conftest.er1
16632
ac_status=$?
16633
grep -v '^ *+' conftest.er1 >conftest.err
16634
rm -f conftest.er1
16635
cat conftest.err >&5
16636
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16637
- (exit $ac_status); } &&
16638
- { ac_try='test -z "$ac_c_werror_flag"
16639
- || test ! -s conftest.err'
16640
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16641
- (eval $ac_try) 2>&5
16642
- ac_status=$?
16643
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16644
- (exit $ac_status); }; } &&
16645
- { ac_try='test -s conftest$ac_exeext'
16646
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16647
- (eval $ac_try) 2>&5
16648
- ac_status=$?
16649
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16650
- (exit $ac_status); }; }; then
16651
+ (exit $ac_status); } && {
16652
+ test -z "$ac_c_werror_flag" ||
16653
+ test ! -s conftest.err
16654
+ } && test -s conftest$ac_exeext &&
16655
+ $as_test_x conftest$ac_exeext; then
16656
16657
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16658
-}'`
16659
+lt_aix_libpath_sed='
16660
+ /Import File Strings/,/^$/ {
16661
+ /^0/ {
16662
+ s/^0 *\(.*\)$/\1/
16663
+ p
16664
+ }
16665
+ }'
16666
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16667
# Check for a 64-bit object if we didn't find anything.
16668
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16669
-}'`; fi
16670
+if test -z "$aix_libpath"; then
16671
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16672
+fi
16673
else
16674
echo "$as_me: failed program was:" >&5
16675
sed 's/^/| /' conftest.$ac_ext >&5
16676
16677
+
16678
fi
16679
-rm -f conftest.err conftest.$ac_objext \
16680
+
16681
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16682
conftest$ac_exeext conftest.$ac_ext
16683
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16684
16685
@@ -16764,7 +17629,7 @@
16499
@@ -16613,39 +17470,44 @@
16500
}
16501
_ACEOF
16502
rm -f conftest.$ac_objext conftest$ac_exeext
16503
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16504
- (eval $ac_link) 2>conftest.er1
16505
+if { (ac_try="$ac_link"
16506
+case "(($ac_try" in
16507
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16508
+ *) ac_try_echo=$ac_try;;
16509
+esac
16510
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16511
+ (eval "$ac_link") 2>conftest.er1
16512
ac_status=$?
16513
grep -v '^ *+' conftest.er1 >conftest.err
16514
rm -f conftest.er1
16515
cat conftest.err >&5
16516
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16517
- (exit $ac_status); } &&
16518
- { ac_try='test -z "$ac_c_werror_flag"
16519
- || test ! -s conftest.err'
16520
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16521
- (eval $ac_try) 2>&5
16522
- ac_status=$?
16523
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16524
- (exit $ac_status); }; } &&
16525
- { ac_try='test -s conftest$ac_exeext'
16526
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16527
- (eval $ac_try) 2>&5
16528
- ac_status=$?
16529
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16530
- (exit $ac_status); }; }; then
16531
+ (exit $ac_status); } && {
16532
+ test -z "$ac_c_werror_flag" ||
16533
+ test ! -s conftest.err
16534
+ } && test -s conftest$ac_exeext &&
16535
+ $as_test_x conftest$ac_exeext; then
16536
16537
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16538
-}'`
16539
+lt_aix_libpath_sed='
16540
+ /Import File Strings/,/^$/ {
16541
+ /^0/ {
16542
+ s/^0 *\(.*\)$/\1/
16543
+ p
16544
+ }
16545
+ }'
16546
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16547
# Check for a 64-bit object if we didn't find anything.
16548
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16549
-}'`; fi
16550
+if test -z "$aix_libpath"; then
16551
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16552
+fi
16553
else
16554
echo "$as_me: failed program was:" >&5
16555
sed 's/^/| /' conftest.$ac_ext >&5
16556
16557
+
16558
fi
16559
-rm -f conftest.err conftest.$ac_objext \
16560
+
16561
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16562
conftest$ac_exeext conftest.$ac_ext
16563
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16564
16565
@@ -16674,39 +17536,44 @@
16566
}
16567
_ACEOF
16568
rm -f conftest.$ac_objext conftest$ac_exeext
16569
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16570
- (eval $ac_link) 2>conftest.er1
16571
+if { (ac_try="$ac_link"
16572
+case "(($ac_try" in
16573
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16574
+ *) ac_try_echo=$ac_try;;
16575
+esac
16576
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16577
+ (eval "$ac_link") 2>conftest.er1
16578
ac_status=$?
16579
grep -v '^ *+' conftest.er1 >conftest.err
16580
rm -f conftest.er1
16581
cat conftest.err >&5
16582
echo "$as_me:$LINENO: \$? = $ac_status" >&5
16583
- (exit $ac_status); } &&
16584
- { ac_try='test -z "$ac_c_werror_flag"
16585
- || test ! -s conftest.err'
16586
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16587
- (eval $ac_try) 2>&5
16588
- ac_status=$?
16589
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16590
- (exit $ac_status); }; } &&
16591
- { ac_try='test -s conftest$ac_exeext'
16592
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16593
- (eval $ac_try) 2>&5
16594
- ac_status=$?
16595
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16596
- (exit $ac_status); }; }; then
16597
+ (exit $ac_status); } && {
16598
+ test -z "$ac_c_werror_flag" ||
16599
+ test ! -s conftest.err
16600
+ } && test -s conftest$ac_exeext &&
16601
+ $as_test_x conftest$ac_exeext; then
16602
16603
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16604
-}'`
16605
+lt_aix_libpath_sed='
16606
+ /Import File Strings/,/^$/ {
16607
+ /^0/ {
16608
+ s/^0 *\(.*\)$/\1/
16609
+ p
16610
+ }
16611
+ }'
16612
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16613
# Check for a 64-bit object if we didn't find anything.
16614
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16615
-}'`; fi
16616
+if test -z "$aix_libpath"; then
16617
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16618
+fi
16619
else
16620
echo "$as_me: failed program was:" >&5
16621
sed 's/^/| /' conftest.$ac_ext >&5
16622
16623
+
16624
fi
16625
-rm -f conftest.err conftest.$ac_objext \
16626
+
16627
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16628
conftest$ac_exeext conftest.$ac_ext
16629
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16630
16631
@@ -16752,7 +17619,7 @@
16686
16632
# The linker will automatically build a .lib file if we build a DLL.
16687
16633
old_archive_From_new_cmds_GCJ='true'
16688
16634
# FIXME: Should let the user specify the lib program.
16691
16637
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
16692
16638
enable_shared_with_static_runtimes_GCJ=yes
16693
16639
;;
16694
@@ -16806,10 +17671,10 @@
16640
@@ -16794,10 +17661,10 @@
16695
16641
case $cc_basename in
16696
16642
xlc*)
16697
16643
output_verbose_link_cmd='echo'
16704
16650
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
16705
16651
;;
16706
16652
*)
16707
@@ -16849,7 +17714,7 @@
16653
@@ -16837,7 +17704,7 @@
16708
16654
;;
16709
16655
16710
16656
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
16713
16659
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
16714
16660
hardcode_libdir_flag_spec_GCJ='-R$libdir'
16715
16661
hardcode_direct_GCJ=yes
16716
@@ -16951,7 +17816,7 @@
16662
@@ -16939,7 +17806,7 @@
16717
16663
link_all_deplibs_GCJ=yes
16718
16664
;;
16719
16665
16722
16668
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
16723
16669
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
16724
16670
else
16725
@@ -16971,24 +17836,28 @@
16671
@@ -16959,24 +17826,28 @@
16726
16672
;;
16727
16673
16728
16674
openbsd*)
16768
16714
fi
16769
16715
;;
16770
16716
16771
@@ -17047,17 +17916,16 @@
16717
@@ -17035,17 +17906,16 @@
16772
16718
case $host_os in
16773
16719
solaris2.[0-5] | solaris2.[0-5].*) ;;
16774
16720
*)
16795
16741
esac
16796
16742
link_all_deplibs_GCJ=yes
16797
16743
;;
16798
@@ -17114,7 +17982,7 @@
16744
@@ -17102,7 +17972,7 @@
16799
16745
fi
16800
16746
;;
16801
16747
16804
16750
no_undefined_flag_GCJ='${wl}-z,text'
16805
16751
archive_cmds_need_lc_GCJ=no
16806
16752
hardcode_shlibpath_var_GCJ=no
16807
@@ -17167,8 +18035,8 @@
16753
@@ -17155,8 +18025,8 @@
16808
16754
esac
16809
16755
fi
16810
16756
16815
16761
test "$ld_shlibs_GCJ" = no && can_build_shared=no
16816
16762
16817
16763
#
16818
@@ -17188,10 +18056,10 @@
16764
@@ -17176,10 +18046,10 @@
16819
16765
# Test whether the compiler implicitly links with -lc since on some
16820
16766
# systems, -lgcc has to come before -lc. If gcc already passes -lc
16821
16767
# to ld, don't add -lc before -lgcc.
16829
16775
16830
16776
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16831
16777
(eval $ac_compile) 2>&5
16832
@@ -17226,16 +18094,16 @@
16778
@@ -17214,16 +18084,16 @@
16833
16779
cat conftest.err 1>&5
16834
16780
fi
16835
16781
$rm conftest*
16850
16796
library_names_spec=
16851
16797
libname_spec='lib$name'
16852
16798
soname_spec=
16853
@@ -17249,20 +18117,7 @@
16799
@@ -17237,20 +18107,7 @@
16854
16800
version_type=none
16855
16801
dynamic_linker="$host_os ld.so"
16856
16802
sys_lib_dlsearch_path_spec="/lib /usr/lib"
16872
16818
need_lib_prefix=unknown
16873
16819
hardcode_into_libs=no
16874
16820
16875
@@ -17419,12 +18274,7 @@
16821
@@ -17407,12 +18264,7 @@
16876
16822
shlibpath_overrides_runpath=yes
16877
16823
shlibpath_var=DYLD_LIBRARY_PATH
16878
16824
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
16886
16832
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
16887
16833
;;
16888
16834
16889
@@ -17441,18 +18291,6 @@
16835
@@ -17429,18 +18281,6 @@
16890
16836
dynamic_linker=no
16891
16837
;;
16892
16838
16905
16851
freebsd* | dragonfly*)
16906
16852
# DragonFly does not have aout. When/if they implement a new
16907
16853
# versioning mechanism, adjust this.
16908
@@ -17490,7 +18328,7 @@
16854
@@ -17478,7 +18318,7 @@
16909
16855
shlibpath_overrides_runpath=no
16910
16856
hardcode_into_libs=yes
16911
16857
;;
16914
16860
shlibpath_overrides_runpath=yes
16915
16861
hardcode_into_libs=yes
16916
16862
;;
16917
@@ -17553,7 +18391,7 @@
16863
@@ -17541,7 +18381,7 @@
16918
16864
postinstall_cmds='chmod 555 $lib'
16919
16865
;;
16920
16866
16923
16869
version_type=linux
16924
16870
need_lib_prefix=no
16925
16871
need_version=no
16926
@@ -17608,7 +18446,7 @@
16872
@@ -17596,7 +18436,7 @@
16927
16873
;;
16928
16874
16929
16875
# This must be Linux ELF.
16932
16878
version_type=linux
16933
16879
need_lib_prefix=no
16934
16880
need_version=no
16935
@@ -17622,31 +18460,10 @@
16881
@@ -17610,31 +18450,10 @@
16936
16882
# before this can be enabled.
16937
16883
hardcode_into_libs=yes
16938
16884
16940
16886
- libsuff=
16941
16887
- case "$host_cpu" in
16942
16888
- x86_64*|s390x*|powerpc64*)
16943
- echo '#line 17629 "configure"' > conftest.$ac_ext
16889
- echo '#line 17617 "configure"' > conftest.$ac_ext
16944
16890
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16945
16891
- (eval $ac_compile) 2>&5
16946
16892
- ac_status=$?
16966
16912
fi
16967
16913
16968
16914
# We used to test for /lib/ld.so.1 and disable shared libraries on
16969
@@ -17658,7 +18475,7 @@
16915
@@ -17646,7 +18465,7 @@
16970
16916
dynamic_linker='GNU/Linux ld.so'
16971
16917
;;
16972
16918
16975
16921
version_type=linux
16976
16922
need_lib_prefix=no
16977
16923
need_version=no
16978
@@ -17667,7 +18484,7 @@
16924
@@ -17655,7 +18474,7 @@
16979
16925
shlibpath_var=LD_LIBRARY_PATH
16980
16926
shlibpath_overrides_runpath=no
16981
16927
hardcode_into_libs=yes
16984
16930
;;
16985
16931
16986
16932
netbsd*)
16987
@@ -17751,6 +18568,10 @@
16933
@@ -17739,6 +18558,10 @@
16988
16934
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
16989
16935
;;
16990
16936
16995
16941
solaris*)
16996
16942
version_type=linux
16997
16943
need_lib_prefix=no
16998
@@ -17843,8 +18664,8 @@
16944
@@ -17831,8 +18654,8 @@
16999
16945
dynamic_linker=no
17000
16946
;;
17001
16947
esac
17006
16952
test "$dynamic_linker" = no && can_build_shared=no
17007
16953
17008
16954
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
17009
@@ -17852,8 +18673,8 @@
16955
@@ -17840,8 +18663,8 @@
17010
16956
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
17011
16957
fi
17012
16958
17017
16963
hardcode_action_GCJ=
17018
16964
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
17019
16965
test -n "$runpath_var_GCJ" || \
17020
@@ -17877,8 +18698,8 @@
16966
@@ -17865,8 +18688,8 @@
17021
16967
# directories.
17022
16968
hardcode_action_GCJ=unsupported
17023
16969
fi
17028
16974
17029
16975
if test "$hardcode_action_GCJ" = relink; then
17030
16976
# Fast installation is not supported
17031
@@ -17945,6 +18766,7 @@
16977
@@ -17933,6 +18756,7 @@
17032
16978
module_cmds_GCJ \
17033
16979
module_expsym_cmds_GCJ \
17034
16980
lt_cv_prog_compiler_c_o_GCJ \
17036
16982
exclude_expsyms_GCJ \
17037
16983
include_expsyms_GCJ; do
17038
16984
17039
@@ -18030,9 +18852,6 @@
16985
@@ -18018,9 +18842,6 @@
17040
16986
# Is the compiler the GNU C compiler?
17041
16987
with_gcc=$GCC_GCJ
17042
16988
17046
16992
# An ERE matcher.
17047
16993
EGREP=$lt_EGREP
17048
16994
17049
@@ -18166,11 +18985,11 @@
16995
@@ -18154,11 +18975,11 @@
17050
16996
17051
16997
# Dependencies to place before the objects being linked to create a
17052
16998
# shared library.
17060
17006
17061
17007
# Dependencies to place before the objects being linked to create a
17062
17008
# shared library.
17063
@@ -18182,7 +19001,7 @@
17009
@@ -18170,7 +18991,7 @@
17064
17010
17065
17011
# The library search path used internally by the compiler when linking
17066
17012
# a shared library.
17069
17015
17070
17016
# Method to check whether dependent libraries are shared objects.
17071
17017
deplibs_check_method=$lt_deplibs_check_method
17072
@@ -18262,13 +19081,13 @@
17018
@@ -18250,13 +19071,13 @@
17073
17019
link_all_deplibs=$link_all_deplibs_GCJ
17074
17020
17075
17021
# Compile-time system search path for libraries
17085
17031
17086
17032
# Set to yes if exported symbols are required.
17087
17033
always_export_symbols=$always_export_symbols_GCJ
17088
@@ -18317,7 +19136,6 @@
17034
@@ -18305,7 +19126,6 @@
17089
17035
RC)
17090
17036
17091
17037
17093
17039
# Source file extension for RC test sources.
17094
17040
ac_ext=rc
17095
17041
17096
@@ -18326,7 +19144,7 @@
17042
@@ -18314,7 +19134,7 @@
17097
17043
objext_RC=$objext
17098
17044
17099
17045
# Code to be used in simple compile tests
17102
17048
17103
17049
# Code to be used in simple link tests
17104
17050
lt_simple_link_test_code="$lt_simple_compile_test_code"
17105
@@ -18345,13 +19163,13 @@
17051
@@ -18333,13 +19153,13 @@
17106
17052
17107
17053
# save warnings/boilerplate of simple test code
17108
17054
ac_outfile=conftest.$ac_objext
17118
17064
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
17119
17065
_lt_linker_boilerplate=`cat conftest.err`
17120
17066
$rm conftest*
17121
@@ -18429,6 +19247,7 @@
17067
@@ -18417,6 +19237,7 @@
17122
17068
module_cmds_RC \
17123
17069
module_expsym_cmds_RC \
17124
17070
lt_cv_prog_compiler_c_o_RC \
17126
17072
exclude_expsyms_RC \
17127
17073
include_expsyms_RC; do
17128
17074
17129
@@ -18514,9 +19333,6 @@
17075
@@ -18502,9 +19323,6 @@
17130
17076
# Is the compiler the GNU C compiler?
17131
17077
with_gcc=$GCC_RC
17132
17078
17136
17082
# An ERE matcher.
17137
17083
EGREP=$lt_EGREP
17138
17084
17139
@@ -18650,11 +19466,11 @@
17085
@@ -18638,11 +19456,11 @@
17140
17086
17141
17087
# Dependencies to place before the objects being linked to create a
17142
17088
# shared library.
17150
17096
17151
17097
# Dependencies to place before the objects being linked to create a
17152
17098
# shared library.
17153
@@ -18666,7 +19482,7 @@
17099
@@ -18654,7 +19472,7 @@
17154
17100
17155
17101
# The library search path used internally by the compiler when linking
17156
17102
# a shared library.
17159
17105
17160
17106
# Method to check whether dependent libraries are shared objects.
17161
17107
deplibs_check_method=$lt_deplibs_check_method
17162
@@ -18746,13 +19562,13 @@
17108
@@ -18734,13 +19552,13 @@
17163
17109
link_all_deplibs=$link_all_deplibs_RC
17164
17110
17165
17111
# Compile-time system search path for libraries
17175
17121
17176
17122
# Set to yes if exported symbols are required.
17177
17123
always_export_symbols=$always_export_symbols_RC
17178
@@ -18852,13 +19668,12 @@
17124
@@ -18840,13 +19658,12 @@
17179
17125
17180
17126
17181
17127
17191
17137
cat >conftest.$ac_ext <<_ACEOF
17192
17138
/* confdefs.h. */
17193
17139
_ACEOF
17194
@@ -18866,115 +19681,73 @@
17140
@@ -18854,115 +19671,73 @@
17195
17141
cat >>conftest.$ac_ext <<_ACEOF
17196
17142
/* end confdefs.h. */
17197
17143
17348
17294
17349
17295
fi
17350
17296
17351
@@ -18986,8 +19759,8 @@
17297
@@ -18974,8 +19749,8 @@
17352
17298
if test -n "$ac_tool_prefix"; then
17353
17299
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
17354
17300
set dummy ${ac_tool_prefix}gcc; ac_word=$2
17359
17305
if test "${ac_cv_prog_CC+set}" = set; then
17360
17306
echo $ECHO_N "(cached) $ECHO_C" >&6
17361
17307
else
17362
@@ -19000,32 +19773,34 @@
17308
@@ -18988,32 +19763,34 @@
17363
17309
IFS=$as_save_IFS
17364
17310
test -z "$as_dir" && as_dir=.
17365
17311
for ac_exec_ext in '' $ac_executable_extensions; do
17401
17347
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
17402
17348
echo $ECHO_N "(cached) $ECHO_C" >&6
17403
17349
else
17404
@@ -19038,36 +19813,51 @@
17350
@@ -19026,36 +19803,51 @@
17405
17351
IFS=$as_save_IFS
17406
17352
test -z "$as_dir" && as_dir=.
17407
17353
for ac_exec_ext in '' $ac_executable_extensions; do
17463
17409
if test "${ac_cv_prog_CC+set}" = set; then
17464
17410
echo $ECHO_N "(cached) $ECHO_C" >&6
17465
17411
else
17466
@@ -19080,131 +19870,93 @@
17412
@@ -19068,131 +19860,93 @@
17467
17413
IFS=$as_save_IFS
17468
17414
test -z "$as_dir" && as_dir=.
17469
17415
for ac_exec_ext in '' $ac_executable_extensions; do
17636
17582
if test "${ac_cv_prog_CC+set}" = set; then
17637
17583
echo $ECHO_N "(cached) $ECHO_C" >&6
17638
17584
else
17639
@@ -19217,36 +19969,38 @@
17585
@@ -19205,36 +19959,38 @@
17640
17586
IFS=$as_save_IFS
17641
17587
test -z "$as_dir" && as_dir=.
17642
17588
for ac_exec_ext in '' $ac_executable_extensions; do
17683
17629
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
17684
17630
echo $ECHO_N "(cached) $ECHO_C" >&6
17685
17631
else
17686
@@ -19259,29 +20013,45 @@
17632
@@ -19247,29 +20003,45 @@
17687
17633
IFS=$as_save_IFS
17688
17634
test -z "$as_dir" && as_dir=.
17689
17635
for ac_exec_ext in '' $ac_executable_extensions; do
17735
17681
fi
17736
17682
17737
17683
fi
17738
@@ -19294,27 +20064,41 @@
17684
@@ -19282,27 +20054,41 @@
17739
17685
{ (exit 1); exit 1; }; }
17740
17686
17741
17687
# Provide some information about the compiler.
17787
17733
if test "${ac_cv_c_compiler_gnu+set}" = set; then
17788
17734
echo $ECHO_N "(cached) $ECHO_C" >&6
17789
17735
else
17790
@@ -19337,50 +20121,49 @@
17736
@@ -19325,50 +20111,49 @@
17791
17737
}
17792
17738
_ACEOF
17793
17739
rm -f conftest.$ac_objext
17861
17807
/* confdefs.h. */
17862
17808
_ACEOF
17863
17809
cat confdefs.h >>conftest.$ac_ext
17864
@@ -19396,38 +20179,118 @@
17810
@@ -19384,38 +20169,118 @@
17865
17811
}
17866
17812
_ACEOF
17867
17813
rm -f conftest.$ac_objext
17996
17942
if test "$ac_test_CFLAGS" = set; then
17997
17943
CFLAGS=$ac_save_CFLAGS
17998
17944
elif test $ac_cv_prog_cc_g = yes; then
17999
@@ -19443,12 +20306,12 @@
17945
@@ -19431,12 +20296,12 @@
18000
17946
CFLAGS=
18001
17947
fi
18002
17948
fi
18013
17959
ac_save_CC=$CC
18014
17960
cat >conftest.$ac_ext <<_ACEOF
18015
17961
/* confdefs.h. */
18016
@@ -19482,12 +20345,17 @@
17962
@@ -19470,12 +20335,17 @@
18017
17963
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
18018
17964
function prototypes and stuff, but not '\xHH' hex character constants.
18019
17965
These don't provoke an error unfortunately, instead are silently treated
18033
17979
int test (int i, double x);
18034
17980
struct s1 {int (*f) (int a);};
18035
17981
struct s2 {int (*f) (double a);};
18036
@@ -19502,205 +20370,57 @@
17982
@@ -19490,205 +20360,57 @@
18037
17983
return 0;
18038
17984
}
18039
17985
_ACEOF
18269
18215
ac_ext=c
18270
18216
ac_cpp='$CPP $CPPFLAGS'
18271
18217
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
18272
@@ -19709,8 +20429,8 @@
18218
@@ -19697,8 +20419,8 @@
18273
18219
18274
18220
depcc="$CC" am_compiler_list=
18275
18221
18280
18226
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
18281
18227
echo $ECHO_N "(cached) $ECHO_C" >&6
18282
18228
else
18283
@@ -19774,6 +20494,7 @@
18229
@@ -19762,6 +20484,7 @@
18284
18230
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
18285
18231
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
18286
18232
>/dev/null 2>conftest.err &&
18288
18234
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
18289
18235
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
18290
18236
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
18291
@@ -19799,13 +20520,11 @@
18237
@@ -19787,13 +20510,11 @@
18292
18238
fi
18293
18239
18294
18240
fi
18305
18251
test "x$enable_dependency_tracking" != xno \
18306
18252
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
18307
18253
am__fastdepCC_TRUE=
18308
@@ -19824,8 +20543,8 @@
18254
@@ -19812,8 +20533,8 @@
18309
18255
if test -n "$ac_tool_prefix"; then
18310
18256
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
18311
18257
set dummy ${ac_tool_prefix}gcc; ac_word=$2
18316
18262
if test "${ac_cv_prog_CC+set}" = set; then
18317
18263
echo $ECHO_N "(cached) $ECHO_C" >&6
18318
18264
else
18319
@@ -19838,32 +20557,34 @@
18265
@@ -19826,32 +20547,34 @@
18320
18266
IFS=$as_save_IFS
18321
18267
test -z "$as_dir" && as_dir=.
18322
18268
for ac_exec_ext in '' $ac_executable_extensions; do
18358
18304
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
18359
18305
echo $ECHO_N "(cached) $ECHO_C" >&6
18360
18306
else
18361
@@ -19876,36 +20597,51 @@
18307
@@ -19864,36 +20587,51 @@
18362
18308
IFS=$as_save_IFS
18363
18309
test -z "$as_dir" && as_dir=.
18364
18310
for ac_exec_ext in '' $ac_executable_extensions; do
18420
18366
if test "${ac_cv_prog_CC+set}" = set; then
18421
18367
echo $ECHO_N "(cached) $ECHO_C" >&6
18422
18368
else
18423
@@ -19918,98 +20654,59 @@
18369
@@ -19906,98 +20644,59 @@
18424
18370
IFS=$as_save_IFS
18425
18371
test -z "$as_dir" && as_dir=.
18426
18372
for ac_exec_ext in '' $ac_executable_extensions; do
18541
18487
18542
18488
if test $ac_prog_rejected = yes; then
18543
18489
# We found a bogon in the path, so make sure we never use it.
18544
@@ -20027,22 +20724,23 @@
18490
@@ -20015,22 +20714,23 @@
18545
18491
fi
18546
18492
CC=$ac_cv_prog_CC
18547
18493
if test -n "$CC"; then
18572
18518
if test "${ac_cv_prog_CC+set}" = set; then
18573
18519
echo $ECHO_N "(cached) $ECHO_C" >&6
18574
18520
else
18575
@@ -20055,36 +20753,38 @@
18521
@@ -20043,36 +20743,38 @@
18576
18522
IFS=$as_save_IFS
18577
18523
test -z "$as_dir" && as_dir=.
18578
18524
for ac_exec_ext in '' $ac_executable_extensions; do
18619
18565
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
18620
18566
echo $ECHO_N "(cached) $ECHO_C" >&6
18621
18567
else
18622
@@ -20097,29 +20797,45 @@
18568
@@ -20085,29 +20787,45 @@
18623
18569
IFS=$as_save_IFS
18624
18570
test -z "$as_dir" && as_dir=.
18625
18571
for ac_exec_ext in '' $ac_executable_extensions; do
18671
18617
fi
18672
18618
18673
18619
fi
18674
@@ -20132,27 +20848,41 @@
18620
@@ -20120,27 +20838,41 @@
18675
18621
{ (exit 1); exit 1; }; }
18676
18622
18677
18623
# Provide some information about the compiler.
18723
18669
if test "${ac_cv_c_compiler_gnu+set}" = set; then
18724
18670
echo $ECHO_N "(cached) $ECHO_C" >&6
18725
18671
else
18726
@@ -20175,50 +20905,49 @@
18672
@@ -20163,50 +20895,49 @@
18727
18673
}
18728
18674
_ACEOF
18729
18675
rm -f conftest.$ac_objext
18797
18743
/* confdefs.h. */
18798
18744
_ACEOF
18799
18745
cat confdefs.h >>conftest.$ac_ext
18800
@@ -20234,38 +20963,118 @@
18746
@@ -20222,38 +20953,118 @@
18801
18747
}
18802
18748
_ACEOF
18803
18749
rm -f conftest.$ac_objext
18932
18878
if test "$ac_test_CFLAGS" = set; then
18933
18879
CFLAGS=$ac_save_CFLAGS
18934
18880
elif test $ac_cv_prog_cc_g = yes; then
18935
@@ -20281,12 +21090,12 @@
18881
@@ -20269,12 +21080,12 @@
18936
18882
CFLAGS=
18937
18883
fi
18938
18884
fi
18949
18895
ac_save_CC=$CC
18950
18896
cat >conftest.$ac_ext <<_ACEOF
18951
18897
/* confdefs.h. */
18952
@@ -20320,12 +21129,17 @@
18898
@@ -20308,12 +21119,17 @@
18953
18899
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
18954
18900
function prototypes and stuff, but not '\xHH' hex character constants.
18955
18901
These don't provoke an error unfortunately, instead are silently treated
18969
18915
int test (int i, double x);
18970
18916
struct s1 {int (*f) (int a);};
18971
18917
struct s2 {int (*f) (double a);};
18972
@@ -20340,205 +21154,57 @@
18918
@@ -20328,205 +21144,57 @@
18973
18919
return 0;
18974
18920
}
18975
18921
_ACEOF
19205
19151
ac_ext=c
19206
19152
ac_cpp='$CPP $CPPFLAGS'
19207
19153
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19208
@@ -20547,8 +21213,8 @@
19154
@@ -20535,8 +21203,8 @@
19209
19155
19210
19156
depcc="$CC" am_compiler_list=
19211
19157
19216
19162
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
19217
19163
echo $ECHO_N "(cached) $ECHO_C" >&6
19218
19164
else
19219
@@ -20612,6 +21278,7 @@
19165
@@ -20600,6 +21268,7 @@
19220
19166
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
19221
19167
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
19222
19168
>/dev/null 2>conftest.err &&
19224
19170
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
19225
19171
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
19226
19172
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
19227
@@ -20637,13 +21304,11 @@
19173
@@ -20625,13 +21294,11 @@
19228
19174
fi
19229
19175
19230
19176
fi
19241
19187
test "x$enable_dependency_tracking" != xno \
19242
19188
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
19243
19189
am__fastdepCC_TRUE=
19244
@@ -20657,18 +21322,22 @@
19190
@@ -20645,18 +21312,22 @@
19245
19191
19246
19192
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
19247
19193
19269
19215
if test "${ac_cv_prog_CXX+set}" = set; then
19270
19216
echo $ECHO_N "(cached) $ECHO_C" >&6
19271
19217
else
19272
@@ -20681,36 +21350,38 @@
19218
@@ -20669,36 +21340,38 @@
19273
19219
IFS=$as_save_IFS
19274
19220
test -z "$as_dir" && as_dir=.
19275
19221
for ac_exec_ext in '' $ac_executable_extensions; do
19316
19262
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
19317
19263
echo $ECHO_N "(cached) $ECHO_C" >&6
19318
19264
else
19319
@@ -20723,55 +21394,85 @@
19265
@@ -20711,55 +21384,85 @@
19320
19266
IFS=$as_save_IFS
19321
19267
test -z "$as_dir" && as_dir=.
19322
19268
for ac_exec_ext in '' $ac_executable_extensions; do
19420
19366
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
19421
19367
echo $ECHO_N "(cached) $ECHO_C" >&6
19422
19368
else
19423
@@ -20794,50 +21495,49 @@
19369
@@ -20782,50 +21485,49 @@
19424
19370
}
19425
19371
_ACEOF
19426
19372
rm -f conftest.$ac_objext
19494
19440
/* confdefs.h. */
19495
19441
_ACEOF
19496
19442
cat confdefs.h >>conftest.$ac_ext
19497
@@ -20853,159 +21553,133 @@
19443
@@ -20841,159 +21543,133 @@
19498
19444
}
19499
19445
_ACEOF
19500
19446
rm -f conftest.$ac_objext
19723
19669
ac_ext=c
19724
19670
ac_cpp='$CPP $CPPFLAGS'
19725
19671
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19726
@@ -21014,8 +21688,8 @@
19672
@@ -21002,8 +21678,8 @@
19727
19673
19728
19674
depcc="$CXX" am_compiler_list=
19729
19675
19734
19680
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
19735
19681
echo $ECHO_N "(cached) $ECHO_C" >&6
19736
19682
else
19737
@@ -21079,6 +21753,7 @@
19683
@@ -21067,6 +21743,7 @@
19738
19684
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
19739
19685
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
19740
19686
>/dev/null 2>conftest.err &&
19742
19688
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
19743
19689
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
19744
19690
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
19745
@@ -21104,13 +21779,11 @@
19691
@@ -21092,13 +21769,11 @@
19746
19692
fi
19747
19693
19748
19694
fi
19759
19705
test "x$enable_dependency_tracking" != xno \
19760
19706
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
19761
19707
am__fastdepCXX_TRUE=
19762
@@ -21121,8 +21794,8 @@
19708
@@ -21109,8 +21784,8 @@
19763
19709
fi
19764
19710
19765
19711
19770
19716
if test "${ac_cv_header_stdc+set}" = set; then
19771
19717
echo $ECHO_N "(cached) $ECHO_C" >&6
19772
19718
else
19773
@@ -21146,35 +21819,31 @@
19719
@@ -21134,35 +21809,31 @@
19774
19720
}
19775
19721
_ACEOF
19776
19722
rm -f conftest.$ac_objext
19820
19766
19821
19767
if test $ac_cv_header_stdc = yes; then
19822
19768
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
19823
@@ -21230,6 +21899,7 @@
19769
@@ -21218,6 +21889,7 @@
19824
19770
cat >>conftest.$ac_ext <<_ACEOF
19825
19771
/* end confdefs.h. */
19826
19772
#include <ctype.h>
19828
19774
#if ((' ' & 0x0FF) == 0x020)
19829
19775
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
19830
19776
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
19831
@@ -21249,18 +21919,27 @@
19777
@@ -21237,18 +21909,27 @@
19832
19778
for (i = 0; i < 256; i++)
19833
19779
if (XOR (islower (i), ISLOWER (i))
19834
19780
|| toupper (i) != TOUPPER (i))
19862
19808
ac_status=$?
19863
19809
echo "$as_me:$LINENO: \$? = $ac_status" >&5
19864
19810
(exit $ac_status); }; }; then
19865
@@ -21273,12 +21952,14 @@
19811
@@ -21261,12 +21942,14 @@
19866
19812
( exit $ac_status )
19867
19813
ac_cv_header_stdc=no
19868
19814
fi
19880
19826
if test $ac_cv_header_stdc = yes; then
19881
19827
19882
19828
cat >>confdefs.h <<\_ACEOF
19883
@@ -21299,15 +21980,15 @@
19829
@@ -21287,15 +21970,15 @@
19884
19830
esac
19885
19831
19886
19832
if test -n "0.35.0"; then
19900
19846
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
19901
19847
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
19902
19848
echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
19903
@@ -21332,6 +22013,8 @@
19849
@@ -21320,6 +22003,8 @@
19904
19850
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
19905
19851
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
19906
19852
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
19909
19855
19910
19856
19911
19857
19912
@@ -21362,8 +22045,8 @@
19858
@@ -21350,8 +22035,8 @@
19913
19859
19914
19860
# Extract the first word of "perl", so it can be a program name with args.
19915
19861
set dummy perl; ac_word=$2
19920
19866
if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
19921
19867
echo $ECHO_N "(cached) $ECHO_C" >&6
19922
19868
else
19923
@@ -21378,27 +22061,28 @@
19869
@@ -21366,27 +22051,28 @@
19924
19870
IFS=$as_save_IFS
19925
19871
test -z "$as_dir" && as_dir=.
19926
19872
for ac_exec_ext in '' $ac_executable_extensions; do
19955
19901
if test -z "$INTLTOOL_PERL"; then
19956
19902
{ { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
19957
19903
echo "$as_me: error: perl not found; required for intltool" >&2;}
19958
@@ -21410,11 +22094,11 @@
19904
@@ -21398,11 +22084,11 @@
19959
19905
{ (exit 1); exit 1; }; }
19960
19906
fi
19961
19907
if test "x" != "xno-xml"; then
19971
19917
else
19972
19918
{ { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
19973
19919
echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
19974
@@ -21422,167 +22106,6 @@
19920
@@ -21410,167 +22096,6 @@
19975
19921
fi
19976
19922
fi
19977
19923
20139
20085
# Substitute ALL_LINGUAS so we can use it in po/Makefile
20140
20086
20141
20087
20142
@@ -21600,42 +22123,38 @@
20088
@@ -21588,42 +22113,38 @@
20143
20089
main ()
20144
20090
{
20145
20091
extern int _nl_msg_cat_cntr;
20198
20144
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
20199
20145
echo $ECHO_N "(cached) $ECHO_C" >&6
20200
20146
else
20201
@@ -21662,68 +22181,59 @@
20147
@@ -21650,68 +22171,59 @@
20202
20148
20203
20149
#undef bind_textdomain_codeset
20204
20150
20289
20235
if test $ac_cv_func_bind_textdomain_codeset = yes; then
20290
20236
DATADIRNAME=share
20291
20237
else
20292
@@ -21736,7 +22246,8 @@
20238
@@ -21724,7 +22236,8 @@
20293
20239
;;
20294
20240
esac
20295
20241
fi
20299
20245
conftest$ac_exeext conftest.$ac_ext
20300
20246
fi
20301
20247
20302
@@ -21744,14 +22255,14 @@
20248
@@ -21732,14 +22245,14 @@
20303
20249
20304
20250
20305
20251
20317
20263
if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
20318
20264
echo $ECHO_N "(cached) $ECHO_C" >&6
20319
20265
else
20320
@@ -21766,31 +22277,32 @@
20266
@@ -21754,31 +22267,32 @@
20321
20267
IFS=$as_save_IFS
20322
20268
test -z "$as_dir" && as_dir=.
20323
20269
for ac_exec_ext in '' $ac_executable_extensions; do
20358
20304
if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then
20359
20305
echo $ECHO_N "(cached) $ECHO_C" >&6
20360
20306
else
20361
@@ -21805,31 +22317,32 @@
20307
@@ -21793,31 +22307,32 @@
20362
20308
IFS=$as_save_IFS
20363
20309
test -z "$as_dir" && as_dir=.
20364
20310
for ac_exec_ext in '' $ac_executable_extensions; do
20397
20343
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
20398
20344
if test -n "$ac_macro_dir"; then
20399
20345
ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
20400
@@ -21843,8 +22356,8 @@
20346
@@ -21831,8 +22346,8 @@
20401
20347
if test -n "$ac_tool_prefix"; then
20402
20348
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
20403
20349
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
20408
20354
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
20409
20355
echo $ECHO_N "(cached) $ECHO_C" >&6
20410
20356
else
20411
@@ -21859,34 +22372,35 @@
20357
@@ -21847,34 +22362,35 @@
20412
20358
IFS=$as_save_IFS
20413
20359
test -z "$as_dir" && as_dir=.
20414
20360
for ac_exec_ext in '' $ac_executable_extensions; do
20452
20398
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
20453
20399
echo $ECHO_N "(cached) $ECHO_C" >&6
20454
20400
else
20455
@@ -21901,28 +22415,42 @@
20401
@@ -21889,28 +22405,42 @@
20456
20402
IFS=$as_save_IFS
20457
20403
test -z "$as_dir" && as_dir=.
20458
20404
for ac_exec_ext in '' $ac_executable_extensions; do
20502
20448
else
20503
20449
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
20504
20450
fi
20505
@@ -21930,14 +22458,14 @@
20451
@@ -21918,14 +22448,14 @@
20506
20452
fi
20507
20453
if test -n "$PKG_CONFIG"; then
20508
20454
_pkg_min_version=0.9.0
20523
20469
PKG_CONFIG=""
20524
20470
fi
20525
20471
20526
@@ -21966,48 +22494,46 @@
20472
@@ -21954,48 +22484,46 @@
20527
20473
20528
20474
20529
20475
20588
20534
ENABLE_SK_TRUE=
20589
20535
ENABLE_SK_FALSE='#'
20590
20536
else
20591
@@ -22016,9 +22542,7 @@
20537
@@ -22004,9 +22532,7 @@
20592
20538
fi
20593
20539
20594
20540
20599
20545
HAVE_GNOME_DOC_UTILS_TRUE=
20600
20546
HAVE_GNOME_DOC_UTILS_FALSE='#'
20601
20547
else
20602
@@ -22032,7 +22556,7 @@
20548
@@ -22020,7 +22546,7 @@
20603
20549
20604
20550
20605
20551
if test $USE_MAINTAINER_MODE = yes; then
20608
20554
else
20609
20555
DISABLE_DEPRECATED=""
20610
20556
fi
20611
@@ -22040,13 +22564,13 @@
20557
@@ -22028,13 +22554,13 @@
20612
20558
20613
20559
20614
20560
20626
20572
20627
20573
warnCFLAGS=
20628
20574
if test "x$GCC" != xyes; then
20629
@@ -22072,8 +22596,8 @@
20575
@@ -22060,8 +22586,8 @@
20630
20576
for option in -Wno-sign-compare; do
20631
20577
SAVE_CFLAGS="$CFLAGS"
20632
20578
CFLAGS="$CFLAGS $option"
20637
20583
cat >conftest.$ac_ext <<_ACEOF
20638
20584
/* confdefs.h. */
20639
20585
_ACEOF
20640
@@ -22090,38 +22614,34 @@
20586
@@ -22078,38 +22604,34 @@
20641
20587
}
20642
20588
_ACEOF
20643
20589
rm -f conftest.$ac_objext
20692
20638
if test $has_option = yes; then
20693
20639
warning_flags="$warning_flags $option"
20694
20640
fi
20695
@@ -22140,21 +22660,21 @@
20641
@@ -22128,21 +22650,21 @@
20696
20642
;;
20697
20643
esac
20698
20644
CFLAGS="$realsave_CFLAGS"
20724
20670
complCFLAGS=
20725
20671
if test "x$enable_iso_c" != "xno"; then
20726
20672
if test "x$GCC" = "xyes"; then
20727
@@ -22168,29 +22688,29 @@
20673
@@ -22156,29 +22678,29 @@
20728
20674
esac
20729
20675
fi
20730
20676
fi
20765
20711
case " $CXXFLAGS " in
20766
20712
*\ \ -Wall\ \ *) ;;
20767
20713
*) warnCXXFLAGS="-Wall -Wno-unused" ;;
20768
@@ -22203,22 +22723,22 @@
20714
@@ -22191,22 +22713,22 @@
20769
20715
fi
20770
20716
fi
20771
20717
fi
20797
20743
case " $CXXFLAGS " in
20798
20744
*\ \ -ansi\ \ *) ;;
20799
20745
*) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
20800
@@ -22230,20 +22750,20 @@
20746
@@ -22218,20 +22740,20 @@
20801
20747
esac
20802
20748
fi
20803
20749
fi
20824
20770
20825
20771
if test x$enable_debug = xyes ; then
20826
20772
20827
@@ -22256,37 +22776,56 @@
20773
@@ -22244,37 +22766,56 @@
20828
20774
20829
20775
20830
20776
20898
20844
;;
20899
20845
*)
20900
20846
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20901
@@ -22295,55 +22834,33 @@
20847
@@ -22283,55 +22824,33 @@
20902
20848
IFS=$as_save_IFS
20903
20849
test -z "$as_dir" && as_dir=.
20904
20850
for ac_exec_ext in '' $ac_executable_extensions; do
20966
20912
ENABLE_GTK_DOC_TRUE=
20967
20913
ENABLE_GTK_DOC_FALSE='#'
20968
20914
else
20969
@@ -22351,9 +22868,7 @@
20915
@@ -22339,9 +22858,7 @@
20970
20916
ENABLE_GTK_DOC_FALSE=
20971
20917
fi
20972
20918
20977
20923
GTK_DOC_USE_LIBTOOL_TRUE=
20978
20924
GTK_DOC_USE_LIBTOOL_FALSE='#'
20979
20925
else
20980
@@ -22375,18 +22890,19 @@
20926
@@ -22363,18 +22880,19 @@
20981
20927
for ac_header in locale.h
20982
20928
do
20983
20929
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
21005
20951
cat >conftest.$ac_ext <<_ACEOF
21006
20952
/* confdefs.h. */
21007
20953
_ACEOF
21008
@@ -22397,41 +22913,37 @@
20954
@@ -22385,41 +22903,37 @@
21009
20955
#include <$ac_header>
21010
20956
_ACEOF
21011
20957
rm -f conftest.$ac_objext
21065
21011
cat >conftest.$ac_ext <<_ACEOF
21066
21012
/* confdefs.h. */
21067
21013
_ACEOF
21068
@@ -22440,24 +22952,22 @@
21014
@@ -22428,24 +22942,22 @@
21069
21015
/* end confdefs.h. */
21070
21016
#include <$ac_header>
21071
21017
_ACEOF
21101
21047
ac_header_preproc=yes
21102
21048
else
21103
21049
echo "$as_me: failed program was:" >&5
21104
@@ -22465,9 +22975,10 @@
21050
@@ -22453,9 +22965,10 @@
21105
21051
21106
21052
ac_header_preproc=no
21107
21053
fi
21114
21060
21115
21061
# So? What about this header?
21116
21062
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
21117
@@ -22491,25 +23002,24 @@
21063
@@ -22479,25 +22992,24 @@
21118
21064
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
21119
21065
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
21120
21066
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
21148
21094
21149
21095
fi
21150
21096
if test `eval echo '${'$as_ac_Header'}'` = yes; then
21151
@@ -22522,8 +23032,8 @@
21097
@@ -22510,8 +23022,8 @@
21152
21098
done
21153
21099
21154
21100
if test $ac_cv_header_locale_h = yes; then
21159
21105
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
21160
21106
echo $ECHO_N "(cached) $ECHO_C" >&6
21161
21107
else
21162
@@ -22543,39 +23053,36 @@
21108
@@ -22531,39 +23043,36 @@
21163
21109
}
21164
21110
_ACEOF
21165
21111
rm -f conftest.$ac_objext conftest$ac_exeext
21216
21162
if test $am_cv_val_LC_MESSAGES = yes; then
21217
21163
21218
21164
cat >>confdefs.h <<\_ACEOF
21219
@@ -22594,17 +23101,17 @@
21165
@@ -22582,17 +23091,17 @@
21220
21166
INTLLIBS=
21221
21167
21222
21168
if test "${ac_cv_header_libintl_h+set}" = set; then
21240
21186
cat >conftest.$ac_ext <<_ACEOF
21241
21187
/* confdefs.h. */
21242
21188
_ACEOF
21243
@@ -22615,41 +23122,37 @@
21189
@@ -22603,41 +23112,37 @@
21244
21190
#include <libintl.h>
21245
21191
_ACEOF
21246
21192
rm -f conftest.$ac_objext
21300
21246
cat >conftest.$ac_ext <<_ACEOF
21301
21247
/* confdefs.h. */
21302
21248
_ACEOF
21303
@@ -22658,24 +23161,22 @@
21249
@@ -22646,24 +23151,22 @@
21304
21250
/* end confdefs.h. */
21305
21251
#include <libintl.h>
21306
21252
_ACEOF
21336
21282
ac_header_preproc=yes
21337
21283
else
21338
21284
echo "$as_me: failed program was:" >&5
21339
@@ -22683,9 +23184,10 @@
21285
@@ -22671,9 +23174,10 @@
21340
21286
21341
21287
ac_header_preproc=no
21342
21288
fi
21349
21295
21350
21296
# So? What about this header?
21351
21297
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
21352
@@ -22709,25 +23211,23 @@
21298
@@ -22697,25 +23201,23 @@
21353
21299
echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
21354
21300
{ echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
21355
21301
echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
21381
21327
21382
21328
fi
21383
21329
if test $ac_cv_header_libintl_h = yes; then
21384
@@ -22737,8 +23237,8 @@
21330
@@ -22725,8 +23227,8 @@
21385
21331
#
21386
21332
# First check in libc
21387
21333
#
21392
21338
if test "${gt_cv_func_ngettext_libc+set}" = set; then
21393
21339
echo $ECHO_N "(cached) $ECHO_C" >&6
21394
21340
else
21395
@@ -22760,44 +23260,41 @@
21341
@@ -22748,44 +23250,41 @@
21396
21342
}
21397
21343
_ACEOF
21398
21344
rm -f conftest.$ac_objext conftest$ac_exeext
21456
21402
if test "${gt_cv_func_dgettext_libc+set}" = set; then
21457
21403
echo $ECHO_N "(cached) $ECHO_C" >&6
21458
21404
else
21459
@@ -22819,40 +23316,37 @@
21405
@@ -22807,40 +23306,37 @@
21460
21406
}
21461
21407
_ACEOF
21462
21408
rm -f conftest.$ac_objext conftest$ac_exeext
21514
21460
fi
21515
21461
21516
21462
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
21517
@@ -22860,9 +23354,9 @@
21463
@@ -22848,9 +23344,9 @@
21518
21464
for ac_func in bind_textdomain_codeset
21519
21465
do
21520
21466
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
21527
21473
echo $ECHO_N "(cached) $ECHO_C" >&6
21528
21474
else
21529
21475
cat >conftest.$ac_ext <<_ACEOF
21530
@@ -22888,68 +23382,60 @@
21476
@@ -22876,68 +23372,60 @@
21531
21477
21532
21478
#undef $ac_func
21533
21479
21619
21565
if test `eval echo '${'$as_ac_var'}'` = yes; then
21620
21566
cat >>confdefs.h <<_ACEOF
21621
21567
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
21622
@@ -22967,8 +23453,8 @@
21568
@@ -22955,8 +23443,8 @@
21623
21569
|| test "$gt_cv_func_ngettext_libc" != "yes" \
21624
21570
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
21625
21571
21630
21576
if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
21631
21577
echo $ECHO_N "(cached) $ECHO_C" >&6
21632
21578
else
21633
@@ -22981,59 +23467,56 @@
21579
@@ -22969,59 +23457,56 @@
21634
21580
cat >>conftest.$ac_ext <<_ACEOF
21635
21581
/* end confdefs.h. */
21636
21582
21713
21659
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
21714
21660
echo $ECHO_N "(cached) $ECHO_C" >&6
21715
21661
else
21716
@@ -23046,59 +23529,56 @@
21662
@@ -23034,59 +23519,56 @@
21717
21663
cat >>conftest.$ac_ext <<_ACEOF
21718
21664
/* end confdefs.h. */
21719
21665
21796
21742
if test "${ac_cv_lib_intl_dgettext+set}" = set; then
21797
21743
echo $ECHO_N "(cached) $ECHO_C" >&6
21798
21744
else
21799
@@ -23111,56 +23591,53 @@
21745
@@ -23099,56 +23581,53 @@
21800
21746
cat >>conftest.$ac_ext <<_ACEOF
21801
21747
/* end confdefs.h. */
21802
21748
21874
21820
if test $ac_cv_lib_intl_dgettext = yes; then
21875
21821
gt_cv_func_dgettext_libintl=yes
21876
21822
fi
21877
@@ -23171,12 +23648,12 @@
21823
@@ -23159,12 +23638,12 @@
21878
21824
21879
21825
21880
21826
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
21893
21839
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
21894
21840
echo $ECHO_N "(cached) $ECHO_C" >&6
21895
21841
else
21896
@@ -23189,59 +23666,56 @@
21842
@@ -23177,59 +23656,56 @@
21897
21843
cat >>conftest.$ac_ext <<_ACEOF
21898
21844
/* end confdefs.h. */
21899
21845
21976
21922
if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
21977
21923
echo $ECHO_N "(cached) $ECHO_C" >&6
21978
21924
else
21979
@@ -23254,56 +23728,53 @@
21925
@@ -23242,56 +23718,53 @@
21980
21926
cat >>conftest.$ac_ext <<_ACEOF
21981
21927
/* end confdefs.h. */
21982
21928
22054
22000
if test $ac_cv_lib_intl_dcgettext = yes; then
22055
22001
gt_cv_func_dgettext_libintl=yes
22056
22002
libintl_extra_libs=-liconv
22057
@@ -23330,9 +23801,9 @@
22003
@@ -23318,9 +23791,9 @@
22058
22004
for ac_func in bind_textdomain_codeset
22059
22005
do
22060
22006
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
22067
22013
echo $ECHO_N "(cached) $ECHO_C" >&6
22068
22014
else
22069
22015
cat >conftest.$ac_ext <<_ACEOF
22070
@@ -23358,68 +23829,60 @@
22016
@@ -23346,68 +23819,60 @@
22071
22017
22072
22018
#undef $ac_func
22073
22019
22159
22105
if test `eval echo '${'$as_ac_var'}'` = yes; then
22160
22106
cat >>confdefs.h <<_ACEOF
22161
22107
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
22162
@@ -23458,8 +23921,8 @@
22108
@@ -23446,8 +23911,8 @@
22163
22109
22164
22110
# Extract the first word of "msgfmt", so it can be a program name with args.
22165
22111
set dummy msgfmt; ac_word=$2
22170
22116
if test "${ac_cv_path_MSGFMT+set}" = set; then
22171
22117
echo $ECHO_N "(cached) $ECHO_C" >&6
22172
22118
else
22173
@@ -23485,11 +23948,11 @@
22119
@@ -23473,11 +23938,11 @@
22174
22120
fi
22175
22121
MSGFMT="$ac_cv_path_MSGFMT"
22176
22122
if test "$MSGFMT" != "no"; then
22186
22132
fi
22187
22133
if test "$MSGFMT" != "no"; then
22188
22134
glib_save_LIBS="$LIBS"
22189
@@ -23498,9 +23961,9 @@
22135
@@ -23486,9 +23951,9 @@
22190
22136
for ac_func in dcgettext
22191
22137
do
22192
22138
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
22199
22145
echo $ECHO_N "(cached) $ECHO_C" >&6
22200
22146
else
22201
22147
cat >conftest.$ac_ext <<_ACEOF
22202
@@ -23526,68 +23989,60 @@
22148
@@ -23514,68 +23979,60 @@
22203
22149
22204
22150
#undef $ac_func
22205
22151
22291
22237
if test `eval echo '${'$as_ac_var'}'` = yes; then
22292
22238
cat >>confdefs.h <<_ACEOF
22293
22239
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
22294
@@ -23597,8 +24052,8 @@
22240
@@ -23585,8 +24042,8 @@
22295
22241
done
22296
22242
22297
22243
MSGFMT_OPTS=
22302
22248
cat >conftest.foo <<_ACEOF
22303
22249
22304
22250
msgid ""
22305
@@ -23617,18 +24072,18 @@
22251
@@ -23605,18 +24062,18 @@
22306
22252
ac_status=$?
22307
22253
echo "$as_me:$LINENO: \$? = $ac_status" >&5
22308
22254
(exit $ac_status); }; then
22327
22273
if test "${ac_cv_path_GMSGFMT+set}" = set; then
22328
22274
echo $ECHO_N "(cached) $ECHO_C" >&6
22329
22275
else
22330
@@ -23643,32 +24098,33 @@
22276
@@ -23631,32 +24088,33 @@
22331
22277
IFS=$as_save_IFS
22332
22278
test -z "$as_dir" && as_dir=.
22333
22279
for ac_exec_ext in '' $ac_executable_extensions; do
22369
22315
if test "${ac_cv_path_XGETTEXT+set}" = set; then
22370
22316
echo $ECHO_N "(cached) $ECHO_C" >&6
22371
22317
else
22372
@@ -23694,11 +24150,11 @@
22318
@@ -23682,11 +24140,11 @@
22373
22319
fi
22374
22320
XGETTEXT="$ac_cv_path_XGETTEXT"
22375
22321
if test "$XGETTEXT" != ":"; then
22385
22331
fi
22386
22332
22387
22333
cat >conftest.$ac_ext <<_ACEOF
22388
@@ -23718,37 +24174,33 @@
22334
@@ -23706,37 +24164,33 @@
22389
22335
}
22390
22336
_ACEOF
22391
22337
rm -f conftest.$ac_objext conftest$ac_exeext
22438
22384
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
22439
22385
echo $ECHO_N "(cached) $ECHO_C" >&6
22440
22386
else
22441
@@ -23775,68 +24227,59 @@
22387
@@ -23763,68 +24217,59 @@
22442
22388
22443
22389
#undef bind_textdomain_codeset
22444
22390
22529
22475
if test $ac_cv_func_bind_textdomain_codeset = yes; then
22530
22476
CATOBJEXT=.gmo
22531
22477
DATADIRNAME=share
22532
@@ -23852,7 +24295,8 @@
22478
@@ -23840,7 +24285,8 @@
22533
22479
;;
22534
22480
esac
22535
22481
fi
22539
22485
conftest$ac_exeext conftest.$ac_ext
22540
22486
LIBS="$glib_save_LIBS"
22541
22487
INSTOBJEXT=.mo
22542
@@ -23877,8 +24321,8 @@
22488
@@ -23865,8 +24311,8 @@
22543
22489
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
22544
22490
: ;
22545
22491
else
22550
22496
XGETTEXT=":"
22551
22497
fi
22552
22498
fi
22553
@@ -23886,7 +24330,7 @@
22499
@@ -23874,7 +24320,7 @@
22554
22500
# We need to process the po/ directory.
22555
22501
POSUB=po
22556
22502
22559
22505
22560
22506
22561
22507
for lang in $ALL_LINGUAS; do
22562
@@ -23910,8 +24354,8 @@
22508
@@ -23898,8 +24344,8 @@
22563
22509
if test "x$ALL_LINGUAS" = "x"; then
22564
22510
LINGUAS=
22565
22511
else
22570
22516
NEW_LINGUAS=
22571
22517
for presentlang in $ALL_LINGUAS; do
22572
22518
useit=no
22573
@@ -23935,8 +24379,8 @@
22519
@@ -23923,8 +24369,8 @@
22574
22520
fi
22575
22521
done
22576
22522
LINGUAS=$NEW_LINGUAS
22581
22527
fi
22582
22528
22583
22529
if test -n "$LINGUAS"; then
22584
@@ -23990,8 +24434,8 @@
22530
@@ -23978,8 +24424,8 @@
22585
22531
22586
22532
22587
22533
pkg_failed=no
22592
22538
22593
22539
if test -n "$PKG_CONFIG"; then
22594
22540
if test -n "$LIB_CFLAGS"; then
22595
@@ -24079,7 +24523,7 @@
22541
@@ -24067,7 +24513,7 @@
22596
22542
and LIB_LIBS to avoid the need to call pkg-config.
22597
22543
See the pkg-config man page for more details.
22598
22544
22601
22547
See \`config.log' for more details." >&5
22602
22548
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
22603
22549
is in your PATH or set the PKG_CONFIG environment variable to the full
22604
@@ -24089,20 +24533,20 @@
22550
@@ -24077,20 +24523,20 @@
22605
22551
and LIB_LIBS to avoid the need to call pkg-config.
22606
22552
See the pkg-config man page for more details.
22607
22553
22627
22573
22628
22574
if test -n "$PKG_CONFIG"; then
22629
22575
if test -n "$BACKEND_CFLAGS"; then
22630
@@ -24190,7 +24634,7 @@
22576
@@ -24178,7 +24624,7 @@
22631
22577
and BACKEND_LIBS to avoid the need to call pkg-config.
22632
22578
See the pkg-config man page for more details.
22633
22579
22636
22582
See \`config.log' for more details." >&5
22637
22583
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
22638
22584
is in your PATH or set the PKG_CONFIG environment variable to the full
22639
@@ -24200,20 +24644,20 @@
22585
@@ -24188,20 +24634,20 @@
22640
22586
and BACKEND_LIBS to avoid the need to call pkg-config.
22641
22587
See the pkg-config man page for more details.
22642
22588
22662
22608
22663
22609
if test -n "$PKG_CONFIG"; then
22664
22610
if test -n "$FRONTEND_CORE_CFLAGS"; then
22665
@@ -24301,7 +24745,7 @@
22611
@@ -24289,7 +24735,7 @@
22666
22612
and FRONTEND_CORE_LIBS to avoid the need to call pkg-config.
22667
22613
See the pkg-config man page for more details.
22668
22614
22671
22617
See \`config.log' for more details." >&5
22672
22618
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
22673
22619
is in your PATH or set the PKG_CONFIG environment variable to the full
22674
@@ -24311,32 +24755,32 @@
22620
@@ -24299,32 +24745,32 @@
22675
22621
and FRONTEND_CORE_LIBS to avoid the need to call pkg-config.
22676
22622
See the pkg-config man page for more details.
22677
22623
22712
22658
else
22713
22659
pkg_failed=yes
22714
22660
fi
22715
@@ -24349,12 +24793,12 @@
22661
@@ -24337,12 +24783,12 @@
22716
22662
pkg_cv_SHELL_CORE_LIBS="$SHELL_CORE_LIBS"
22717
22663
else
22718
22664
if test -n "$PKG_CONFIG" && \
22728
22674
else
22729
22675
pkg_failed=yes
22730
22676
fi
22731
@@ -24373,14 +24817,14 @@
22677
@@ -24361,14 +24807,14 @@
22732
22678
_pkg_short_errors_supported=no
22733
22679
fi
22734
22680
if test $_pkg_short_errors_supported = yes; then
22746
22692
22747
22693
$SHELL_CORE_PKG_ERRORS
22748
22694
22749
@@ -24391,7 +24835,7 @@
22695
@@ -24379,7 +24825,7 @@
22750
22696
and SHELL_CORE_LIBS to avoid the need to call pkg-config.
22751
22697
See the pkg-config man page for more details.
22752
22698
" >&5
22755
22701
22756
22702
$SHELL_CORE_PKG_ERRORS
22757
22703
22758
@@ -24412,7 +24856,7 @@
22704
@@ -24400,7 +24846,7 @@
22759
22705
and SHELL_CORE_LIBS to avoid the need to call pkg-config.
22760
22706
See the pkg-config man page for more details.
22761
22707
22764
22710
See \`config.log' for more details." >&5
22765
22711
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
22766
22712
is in your PATH or set the PKG_CONFIG environment variable to the full
22767
@@ -24422,58 +24866,43 @@
22713
@@ -24410,58 +24856,43 @@
22768
22714
and SHELL_CORE_LIBS to avoid the need to call pkg-config.
22769
22715
See the pkg-config man page for more details.
22770
22716
22838
22784
else
22839
22785
pkg_failed=yes
22840
22786
fi
22841
@@ -24482,16 +24911,16 @@
22787
@@ -24470,16 +24901,16 @@
22842
22788
pkg_failed=untried
22843
22789
fi
22844
22790
if test -n "$PKG_CONFIG"; then
22860
22806
else
22861
22807
pkg_failed=yes
22862
22808
fi
22863
@@ -24510,32 +24939,150 @@
22809
@@ -24498,32 +24929,150 @@
22864
22810
_pkg_short_errors_supported=no
22865
22811
fi
22866
22812
if test $_pkg_short_errors_supported = yes; then
23027
22973
and GNOME_LIBS to avoid the need to call pkg-config.
23028
22974
See the pkg-config man page for more details.
23029
22975
" >&2;}
23030
@@ -24549,7 +25096,7 @@
22976
@@ -24537,7 +25086,7 @@
23031
22977
and GNOME_LIBS to avoid the need to call pkg-config.
23032
22978
See the pkg-config man page for more details.
23033
22979
23036
22982
See \`config.log' for more details." >&5
23037
22983
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
23038
22984
is in your PATH or set the PKG_CONFIG environment variable to the full
23039
@@ -24559,20 +25106,20 @@
22985
@@ -24547,20 +25096,20 @@
23040
22986
and GNOME_LIBS to avoid the need to call pkg-config.
23041
22987
See the pkg-config man page for more details.
23042
22988
23062
23008
23063
23009
if test -n "$PKG_CONFIG"; then
23064
23010
if test -n "$GNOMEUI_CFLAGS"; then
23065
@@ -24660,7 +25207,7 @@
23011
@@ -24648,7 +25197,7 @@
23066
23012
and GNOMEUI_LIBS to avoid the need to call pkg-config.
23067
23013
See the pkg-config man page for more details.
23068
23014
23071
23017
See \`config.log' for more details." >&5
23072
23018
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
23073
23019
is in your PATH or set the PKG_CONFIG environment variable to the full
23074
@@ -24670,14 +25217,14 @@
23020
@@ -24658,14 +25207,14 @@
23075
23021
and GNOMEUI_LIBS to avoid the need to call pkg-config.
23076
23022
See the pkg-config man page for more details.
23077
23023
23089
23035
:
23090
23036
fi
23091
23037
23092
@@ -24691,18 +25238,18 @@
23038
@@ -24679,18 +25228,18 @@
23093
23039
23094
23040
23095
23041
23114
23060
23115
23061
if test -n "$PKG_CONFIG"; then
23116
23062
if test -n "$GNOME_PRINT_CFLAGS"; then
23117
@@ -24758,22 +25305,22 @@
23063
@@ -24746,22 +25295,22 @@
23118
23064
# Put the nasty error message in config.log where it belongs
23119
23065
echo "$GNOME_PRINT_PKG_ERRORS" >&5
23120
23066
23143
23089
23144
23090
if test -n "$PKG_CONFIG"; then
23145
23091
if test -n "$GTK_PRINT_CFLAGS"; then
23146
@@ -24829,16 +25376,16 @@
23092
@@ -24817,16 +25366,16 @@
23147
23093
# Put the nasty error message in config.log where it belongs
23148
23094
echo "$GTK_PRINT_PKG_ERRORS" >&5
23149
23095
23164
23110
enable_gtk_print=yes
23165
23111
fi
23166
23112
enable_print=no
23167
@@ -24890,9 +25437,7 @@
23113
@@ -24878,9 +25427,7 @@
23168
23114
23169
23115
fi
23170
23116
23175
23121
WITH_GNOME_PRINT_TRUE=
23176
23122
WITH_GNOME_PRINT_FALSE='#'
23177
23123
else
23178
@@ -24900,9 +25445,7 @@
23124
@@ -24888,9 +25435,7 @@
23179
23125
WITH_GNOME_PRINT_FALSE=
23180
23126
fi
23181
23127
23186
23132
WITH_GTK_PRINT_TRUE=
23187
23133
WITH_GTK_PRINT_FALSE='#'
23188
23134
else
23189
@@ -24914,8 +25457,8 @@
23135
@@ -24902,8 +25447,8 @@
23190
23136
23191
23137
23192
23138
pkg_failed=no
23197
23143
23198
23144
if test -n "$PKG_CONFIG"; then
23199
23145
if test -n "$DBUS_CFLAGS"; then
23200
@@ -24971,16 +25514,16 @@
23146
@@ -24959,16 +25504,16 @@
23201
23147
# Put the nasty error message in config.log where it belongs
23202
23148
echo "$DBUS_PKG_ERRORS" >&5
23203
23149
23218
23164
enable_dbus=yes
23219
23165
fi
23220
23166
23221
@@ -24994,8 +25537,8 @@
23167
@@ -24982,8 +25527,8 @@
23222
23168
if test "x$enable_dbus" = "xyes" ; then
23223
23169
# Extract the first word of "dbus-binding-tool", so it can be a program name with args.
23224
23170
set dummy dbus-binding-tool; ac_word=$2
23229
23175
if test "${ac_cv_path_DBUS_BINDING_TOOL+set}" = set; then
23230
23176
echo $ECHO_N "(cached) $ECHO_C" >&6
23231
23177
else
23232
@@ -25010,29 +25553,30 @@
23178
@@ -24998,29 +25543,30 @@
23233
23179
IFS=$as_save_IFS
23234
23180
test -z "$as_dir" && as_dir=.
23235
23181
for ac_exec_ext in '' $ac_executable_extensions; do
23266
23212
if test x$DBUS_BINDING_TOOL = "xno" ; then
23267
23213
{ { echo "$as_me:$LINENO: error: dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings" >&5
23268
23214
echo "$as_me: error: dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings" >&2;}
23269
@@ -25066,9 +25610,7 @@
23215
@@ -25054,9 +25600,7 @@
23270
23216
23271
23217
23272
23218
23277
23223
ENABLE_DBUS_TRUE=
23278
23224
ENABLE_DBUS_FALSE='#'
23279
23225
else
23280
@@ -25076,9 +25618,7 @@
23226
@@ -25064,9 +25608,7 @@
23281
23227
ENABLE_DBUS_FALSE=
23282
23228
fi
23283
23229
23288
23234
DBUS_TOOL_NO_PREFIX_TRUE=
23289
23235
DBUS_TOOL_NO_PREFIX_FALSE='#'
23290
23236
else
23291
@@ -25087,10 +25627,9 @@
23237
@@ -25075,10 +25617,9 @@
23292
23238
fi
23293
23239
23294
23240
23301
23247
yes) ENABLE_NAUTILUS=yes ;;
23302
23248
no) ENABLE_NAUTILUS=no ;;
23303
23249
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nautilus" >&5
23304
@@ -25099,12 +25638,13 @@
23250
@@ -25087,12 +25628,13 @@
23305
23251
esac
23306
23252
else
23307
23253
ENABLE_NAUTILUS=yes
23318
23264
23319
23265
if test -n "$PKG_CONFIG"; then
23320
23266
if test -n "$NAUTILUS_CFLAGS"; then
23321
@@ -25160,16 +25700,16 @@
23267
@@ -25148,16 +25690,16 @@
23322
23268
# Put the nasty error message in config.log where it belongs
23323
23269
echo "$NAUTILUS_PKG_ERRORS" >&5
23324
23270
23339
23285
HAVE_NAUTILUS=yes
23340
23286
fi
23341
23287
fi
23342
@@ -25183,9 +25723,7 @@
23288
@@ -25171,9 +25713,7 @@
23343
23289
_ACEOF
23344
23290
23345
23291
fi
23350
23296
HAVE_NAUTILUS_TRUE=
23351
23297
HAVE_NAUTILUS_FALSE='#'
23352
23298
else
23353
@@ -25195,10 +25733,9 @@
23299
@@ -25183,10 +25723,9 @@
23354
23300
23355
23301
23356
23302
23363
23309
yes) ENABLE_THUMBNAILER=yes ;;
23364
23310
no) ENABLE_THUMBNAILER=no ;;
23365
23311
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-thumbnailer" >&5
23366
@@ -25207,9 +25744,8 @@
23312
@@ -25195,9 +25734,8 @@
23367
23313
esac
23368
23314
else
23369
23315
ENABLE_THUMBNAILER=yes
23375
23321
ENABLE_THUMBNAILER_TRUE=
23376
23322
ENABLE_THUMBNAILER_FALSE='#'
23377
23323
else
23378
@@ -25221,8 +25757,8 @@
23379
23380
23381
pkg_failed=no
23382
-echo "$as_me:$LINENO: checking for GTK_RECENT" >&5
23383
-echo $ECHO_N "checking for GTK_RECENT... $ECHO_C" >&6
23384
+{ echo "$as_me:$LINENO: checking for GTK_RECENT" >&5
23385
+echo $ECHO_N "checking for GTK_RECENT... $ECHO_C" >&6; }
23386
23387
if test -n "$PKG_CONFIG"; then
23388
if test -n "$GTK_RECENT_CFLAGS"; then
23389
@@ -25278,16 +25814,16 @@
23390
# Put the nasty error message in config.log where it belongs
23391
echo "$GTK_RECENT_PKG_ERRORS" >&5
23392
23393
- echo "$as_me:$LINENO: result: no" >&5
23394
-echo "${ECHO_T}no" >&6
23395
+ { echo "$as_me:$LINENO: result: no" >&5
23396
+echo "${ECHO_T}no" >&6; }
23397
HAVE_GTK_RECENT=no
23398
elif test $pkg_failed = untried; then
23399
HAVE_GTK_RECENT=no
23400
else
23401
GTK_RECENT_CFLAGS=$pkg_cv_GTK_RECENT_CFLAGS
23402
GTK_RECENT_LIBS=$pkg_cv_GTK_RECENT_LIBS
23403
- echo "$as_me:$LINENO: result: yes" >&5
23404
-echo "${ECHO_T}yes" >&6
23405
+ { echo "$as_me:$LINENO: result: yes" >&5
23406
+echo "${ECHO_T}yes" >&6; }
23407
HAVE_GTK_RECENT=yes
23408
fi
23409
if test x$HAVE_GTK_RECENT = xyes; then
23410
@@ -25297,9 +25833,7 @@
23411
_ACEOF
23412
23413
fi
23414
-
23415
-
23416
-if test x$HAVE_GTK_RECENT = "xyes"; then
23417
+ if test x$HAVE_GTK_RECENT = "xyes"; then
23418
HAVE_GTK_RECENT_TRUE=
23419
HAVE_GTK_RECENT_FALSE='#'
23420
else
23421
@@ -25316,44 +25850,42 @@
23324
@@ -25214,44 +25752,42 @@
23422
23325
fi
23423
23326
23424
23327
23479
23382
GCONF_SCHEMAS_INSTALL_TRUE=
23480
23383
GCONF_SCHEMAS_INSTALL_FALSE='#'
23481
23384
else
23482
@@ -25365,8 +25897,8 @@
23385
@@ -25263,8 +25799,8 @@
23483
23386
23484
23387
# Extract the first word of "gconftool-2", so it can be a program name with args.
23485
23388
set dummy gconftool-2; ac_word=$2
23490
23393
if test "${ac_cv_path_GCONFTOOL+set}" = set; then
23491
23394
echo $ECHO_N "(cached) $ECHO_C" >&6
23492
23395
else
23493
@@ -25381,28 +25913,29 @@
23396
@@ -25279,28 +25815,29 @@
23494
23397
IFS=$as_save_IFS
23495
23398
test -z "$as_dir" && as_dir=.
23496
23399
for ac_exec_ext in '' $ac_executable_extensions; do
23526
23429
if test "x$GCONFTOOL" = "xno"; then
23527
23430
{ { echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
23528
23431
echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
23529
@@ -25414,18 +25947,19 @@
23432
@@ -25312,18 +25849,19 @@
23530
23433
for ac_header in execinfo.h
23531
23434
do
23532
23435
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
23554
23457
cat >conftest.$ac_ext <<_ACEOF
23555
23458
/* confdefs.h. */
23556
23459
_ACEOF
23557
@@ -25436,41 +25970,37 @@
23460
@@ -25334,41 +25872,37 @@
23558
23461
#include <$ac_header>
23559
23462
_ACEOF
23560
23463
rm -f conftest.$ac_objext
23614
23517
cat >conftest.$ac_ext <<_ACEOF
23615
23518
/* confdefs.h. */
23616
23519
_ACEOF
23617
@@ -25479,24 +26009,22 @@
23520
@@ -25377,24 +25911,22 @@
23618
23521
/* end confdefs.h. */
23619
23522
#include <$ac_header>
23620
23523
_ACEOF
23650
23553
ac_header_preproc=yes
23651
23554
else
23652
23555
echo "$as_me: failed program was:" >&5
23653
@@ -25504,9 +26032,10 @@
23556
@@ -25402,9 +25934,10 @@
23654
23557
23655
23558
ac_header_preproc=no
23656
23559
fi
23663
23566
23664
23567
# So? What about this header?
23665
23568
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
23666
@@ -25530,25 +26059,24 @@
23569
@@ -25428,25 +25961,24 @@
23667
23570
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
23668
23571
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
23669
23572
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
23697
23600
23698
23601
fi
23699
23602
if test `eval echo '${'$as_ac_Header'}'` = yes; then
23700
@@ -25561,8 +26089,8 @@
23603
@@ -25459,8 +25991,8 @@
23701
23604
done
23702
23605
23703
23606
23708
23611
if test "${ac_cv_have_decl__NL_MEASUREMENT_MEASUREMENT+set}" = set; then
23709
23612
echo $ECHO_N "(cached) $ECHO_C" >&6
23710
23613
else
23711
@@ -25578,7 +26106,7 @@
23614
@@ -25476,7 +26008,7 @@
23712
23615
main ()
23713
23616
{
23714
23617
#ifndef _NL_MEASUREMENT_MEASUREMENT
23717
23620
#endif
23718
23621
23719
23622
;
23720
@@ -25586,38 +26114,34 @@
23623
@@ -25484,38 +26016,34 @@
23721
23624
}
23722
23625
_ACEOF
23723
23626
rm -f conftest.$ac_objext
23772
23675
if test $ac_cv_have_decl__NL_MEASUREMENT_MEASUREMENT = yes; then
23773
23676
23774
23677
23775
@@ -25629,20 +26153,20 @@
23678
@@ -25527,20 +26055,20 @@
23776
23679
fi
23777
23680
23778
23681
23799
23702
23800
23703
if test -n "$PKG_CONFIG"; then
23801
23704
if test -n "$POPPLER_CFLAGS"; then
23802
@@ -25698,16 +26222,16 @@
23705
@@ -25596,16 +26124,16 @@
23803
23706
# Put the nasty error message in config.log where it belongs
23804
23707
echo "$POPPLER_PKG_ERRORS" >&5
23805
23708
23820
23723
enable_pdf=yes
23821
23724
fi
23822
23725
23823
@@ -25727,9 +26251,9 @@
23726
@@ -25625,9 +26153,9 @@
23824
23727
for ac_func in poppler_page_render
23825
23728
do
23826
23729
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
23833
23736
echo $ECHO_N "(cached) $ECHO_C" >&6
23834
23737
else
23835
23738
cat >conftest.$ac_ext <<_ACEOF
23836
@@ -25755,68 +26279,60 @@
23739
@@ -25653,68 +26181,60 @@
23837
23740
23838
23741
#undef $ac_func
23839
23742
23925
23828
if test `eval echo '${'$as_ac_var'}'` = yes; then
23926
23829
cat >>confdefs.h <<_ACEOF
23927
23830
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
23928
@@ -25829,9 +26345,9 @@
23831
@@ -25727,9 +26247,9 @@
23929
23832
for ac_func in poppler_page_render_for_printing
23930
23833
do
23931
23834
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
23938
23841
echo $ECHO_N "(cached) $ECHO_C" >&6
23939
23842
else
23940
23843
cat >conftest.$ac_ext <<_ACEOF
23941
@@ -25857,68 +26373,60 @@
23844
@@ -25755,68 +26275,60 @@
23942
23845
23943
23846
#undef $ac_func
23944
23847
24030
23933
if test `eval echo '${'$as_ac_var'}'` = yes; then
24031
23934
cat >>confdefs.h <<_ACEOF
24032
23935
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
24033
@@ -25931,8 +26439,8 @@
23936
@@ -25829,8 +26341,8 @@
24034
23937
24035
23938
24036
23939
pkg_failed=no
24041
23944
24042
23945
if test -n "$PKG_CONFIG"; then
24043
23946
if test -n "$CAIRO_PDF_CFLAGS"; then
24044
@@ -25988,16 +26496,16 @@
23947
@@ -25886,16 +26398,16 @@
24045
23948
# Put the nasty error message in config.log where it belongs
24046
23949
echo "$CAIRO_PDF_PKG_ERRORS" >&5
24047
23950
24062
23965
enable_cairo_pdf=yes
24063
23966
fi
24064
23967
if test x$enable_cairo_pdf == xyes; then
24065
@@ -26010,8 +26518,8 @@
23968
@@ -25908,8 +26420,8 @@
24066
23969
24067
23970
24068
23971
pkg_failed=no
24073
23976
24074
23977
if test -n "$PKG_CONFIG"; then
24075
23978
if test -n "$CAIRO_PS_CFLAGS"; then
24076
@@ -26067,16 +26575,16 @@
23979
@@ -25965,16 +26477,16 @@
24077
23980
# Put the nasty error message in config.log where it belongs
24078
23981
echo "$CAIRO_PS_PKG_ERRORS" >&5
24079
23982
24094
23997
enable_cairo_ps=yes
24095
23998
fi
24096
23999
if test x$enable_cairo_ps == xyes; then
24097
@@ -26092,9 +26600,7 @@
24000
@@ -25990,9 +26502,7 @@
24098
24001
fi
24099
24002
fi
24100
24003
24105
24008
ENABLE_PDF_TRUE=
24106
24009
ENABLE_PDF_FALSE='#'
24107
24010
else
24108
@@ -26103,13 +26609,13 @@
24011
@@ -26001,13 +26511,13 @@
24109
24012
fi
24110
24013
24111
24014
24123
24026
24124
24027
if test x$enable_ps = xyes; then
24125
24028
24126
@@ -26119,9 +26625,7 @@
24029
@@ -26017,9 +26527,7 @@
24127
24030
24128
24031
fi
24129
24032
24134
24037
ENABLE_PS_TRUE=
24135
24038
ENABLE_PS_FALSE='#'
24136
24039
else
24137
@@ -26132,11 +26636,11 @@
24040
@@ -26030,11 +26538,11 @@
24138
24041
24139
24042
if test x$enable_ps = xyes; then
24140
24043
24150
24053
if test "$GS_VERSION" -lt "7"; then
24151
24054
{ { echo "$as_me:$LINENO: error: You need Ghostscript version >= 7 in order to run evince" >&5
24152
24055
echo "$as_me: error: You need Ghostscript version >= 7 in order to run evince" >&2;}
24153
@@ -26144,49 +26648,50 @@
24056
@@ -26042,49 +26550,50 @@
24154
24057
fi
24155
24058
24156
24059
24219
24122
cat >conftest.$ac_ext <<_ACEOF
24220
24123
/* confdefs.h. */
24221
24124
_ACEOF
24222
@@ -26197,41 +26702,37 @@
24125
@@ -26095,41 +26604,37 @@
24223
24126
#include <$ac_header>
24224
24127
_ACEOF
24225
24128
rm -f conftest.$ac_objext
24279
24182
cat >conftest.$ac_ext <<_ACEOF
24280
24183
/* confdefs.h. */
24281
24184
_ACEOF
24282
@@ -26240,24 +26741,22 @@
24185
@@ -26138,24 +26643,22 @@
24283
24186
/* end confdefs.h. */
24284
24187
#include <$ac_header>
24285
24188
_ACEOF
24315
24218
ac_header_preproc=yes
24316
24219
else
24317
24220
echo "$as_me: failed program was:" >&5
24318
@@ -26265,9 +26764,10 @@
24221
@@ -26163,9 +26666,10 @@
24319
24222
24320
24223
ac_header_preproc=no
24321
24224
fi
24328
24231
24329
24232
# So? What about this header?
24330
24233
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
24331
@@ -26291,25 +26791,24 @@
24234
@@ -26189,25 +26693,24 @@
24332
24235
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
24333
24236
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
24334
24237
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
24362
24265
24363
24266
fi
24364
24267
if test `eval echo '${'$as_ac_Header'}'` = yes; then
24365
@@ -26324,8 +26823,8 @@
24268
@@ -26222,8 +26725,8 @@
24366
24269
done
24367
24270
24368
24271
if test "x$enable_tiff" = "xyes"; then
24373
24276
if test "${ac_cv_lib_tiff_TIFFOpen+set}" = set; then
24374
24277
echo $ECHO_N "(cached) $ECHO_C" >&6
24375
24278
else
24376
@@ -26338,64 +26837,61 @@
24279
@@ -26236,64 +26739,61 @@
24377
24280
cat >>conftest.$ac_ext <<_ACEOF
24378
24281
/* end confdefs.h. */
24379
24282
24461
24364
if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then
24462
24365
echo $ECHO_N "(cached) $ECHO_C" >&6
24463
24366
else
24464
@@ -26408,56 +26904,53 @@
24367
@@ -26306,56 +26806,53 @@
24465
24368
cat >>conftest.$ac_ext <<_ACEOF
24466
24369
/* end confdefs.h. */
24467
24370
24539
24442
if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then
24540
24443
enable_tiff=yes
24541
24444
else
24542
@@ -26479,9 +26972,7 @@
24445
@@ -26377,9 +26874,7 @@
24543
24446
fi
24544
24447
fi
24545
24448
24550
24453
ENABLE_TIFF_TRUE=
24551
24454
ENABLE_TIFF_FALSE='#'
24552
24455
else
24553
@@ -26491,13 +26982,13 @@
24456
@@ -26389,20 +26884,20 @@
24554
24457
24555
24458
24556
24459
24561
24464
- enable_djvu="$enableval"
24562
24465
+ enableval=$enable_djvu; enable_djvu="$enableval"
24563
24466
else
24564
enable_djvu=no
24467
enable_djvu=yes
24565
24468
-fi;
24566
24469
+fi
24567
24470
+
24568
24471
24569
24472
if test "x$enable_djvu" = "xyes"; then
24570
24571
@@ -26505,8 +26996,8 @@
24572
24473
DJVULIBRE_REQUIRED=3.5.17
24573
24474
24574
24475
pkg_failed=no
24575
24476
-echo "$as_me:$LINENO: checking for DJVU" >&5
24579
24480
24580
24481
if test -n "$PKG_CONFIG"; then
24581
24482
if test -n "$DJVU_CFLAGS"; then
24582
@@ -26562,16 +27053,16 @@
24483
@@ -26458,16 +26953,16 @@
24583
24484
# Put the nasty error message in config.log where it belongs
24584
24485
echo "$DJVU_PKG_ERRORS" >&5
24585
24486
24600
24501
enable_djvu=yes
24601
24502
fi
24602
24503
24603
@@ -26595,9 +27086,7 @@
24504
@@ -26491,9 +26986,7 @@
24604
24505
fi
24605
24506
fi
24606
24507
24611
24512
ENABLE_DJVU_TRUE=
24612
24513
ENABLE_DJVU_FALSE='#'
24613
24514
else
24614
@@ -26608,25 +27097,25 @@
24515
@@ -26504,25 +26997,25 @@
24615
24516
24616
24517
24617
24518
24622
24523
- enable_dvi="$enableval"
24623
24524
+ enableval=$enable_dvi; enable_dvi="$enableval"
24624
24525
else
24625
enable_dvi=no
24526
enable_dvi=yes
24626
24527
-fi;
24627
24528
+fi
24628
24529
+
24647
24548
if test "${ac_cv_c_const+set}" = set; then
24648
24549
echo $ECHO_N "(cached) $ECHO_C" >&6
24649
24550
else
24650
@@ -26644,10 +27133,10 @@
24551
@@ -26540,10 +27033,10 @@
24651
24552
#ifndef __cplusplus
24652
24553
/* Ultrix mips cc rejects this. */
24653
24554
typedef int charset[2];
24661
24562
/* NEC SVR4.0.2 mips cc rejects this. */
24662
24563
struct point {int x, y;};
24663
24564
static struct point const zero = {0,0};
24664
@@ -26656,16 +27145,17 @@
24565
@@ -26552,16 +27045,17 @@
24665
24566
an arm of an if-expression whose if-part is not a constant
24666
24567
expression */
24667
24568
const char *g = "string";
24683
24584
}
24684
24585
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
24685
24586
int x[] = {25, 17};
24686
@@ -26684,7 +27174,9 @@
24587
@@ -26580,7 +27074,9 @@
24687
24588
}
24688
24589
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
24689
24590
const int foo = 10;
24693
24594
#endif
24694
24595
24695
24596
;
24696
@@ -26692,38 +27184,34 @@
24597
@@ -26588,38 +27084,34 @@
24697
24598
}
24698
24599
_ACEOF
24699
24600
rm -f conftest.$ac_objext
24748
24649
if test $ac_cv_c_const = no; then
24749
24650
24750
24651
cat >>confdefs.h <<\_ACEOF
24751
@@ -26732,8 +27220,8 @@
24652
@@ -26628,8 +27120,8 @@
24752
24653
24753
24654
fi
24754
24655
24759
24660
if test "${ac_cv_c_inline+set}" = set; then
24760
24661
echo $ECHO_N "(cached) $ECHO_C" >&6
24761
24662
else
24762
@@ -26753,39 +27241,37 @@
24663
@@ -26649,39 +27141,37 @@
24763
24664
24764
24665
_ACEOF
24765
24666
rm -f conftest.$ac_objext
24817
24718
24818
24719
24819
24720
case $ac_cv_c_inline in
24820
@@ -26803,8 +27289,8 @@
24721
@@ -26699,8 +27189,8 @@
24821
24722
;;
24822
24723
esac
24823
24724
24828
24729
if test "${ac_cv_type_size_t+set}" = set; then
24829
24730
echo $ECHO_N "(cached) $ECHO_C" >&6
24830
24731
else
24831
@@ -26815,62 +27301,59 @@
24732
@@ -26711,62 +27201,59 @@
24832
24733
cat >>conftest.$ac_ext <<_ACEOF
24833
24734
/* end confdefs.h. */
24834
24735
$ac_includes_default
24913
24814
if test "${ac_cv_type_long+set}" = set; then
24914
24815
echo $ECHO_N "(cached) $ECHO_C" >&6
24915
24816
else
24916
@@ -26881,61 +27364,57 @@
24817
@@ -26777,61 +27264,57 @@
24917
24818
cat >>conftest.$ac_ext <<_ACEOF
24918
24819
/* end confdefs.h. */
24919
24820
$ac_includes_default
25000
24901
if test "$cross_compiling" = yes; then
25001
24902
# Depending upon the size, compute the lo and hi bounds.
25002
24903
cat >conftest.$ac_ext <<_ACEOF
25003
@@ -26945,10 +27424,11 @@
24904
@@ -26841,10 +27324,11 @@
25004
24905
cat >>conftest.$ac_ext <<_ACEOF
25005
24906
/* end confdefs.h. */
25006
24907
$ac_includes_default
25013
24914
test_array [0] = 0
25014
24915
25015
24916
;
25016
@@ -26956,27 +27436,22 @@
24917
@@ -26852,27 +27336,22 @@
25017
24918
}
25018
24919
_ACEOF
25019
24920
rm -f conftest.$ac_objext
25052
24953
ac_lo=0 ac_mid=0
25053
24954
while :; do
25054
24955
cat >conftest.$ac_ext <<_ACEOF
25055
@@ -26986,10 +27461,11 @@
24956
@@ -26882,10 +27361,11 @@
25056
24957
cat >>conftest.$ac_ext <<_ACEOF
25057
24958
/* end confdefs.h. */
25058
24959
$ac_includes_default
25065
24966
test_array [0] = 0
25066
24967
25067
24968
;
25068
@@ -26997,56 +27473,53 @@
24969
@@ -26893,56 +27373,53 @@
25069
24970
}
25070
24971
_ACEOF
25071
24972
rm -f conftest.$ac_objext
25144
25045
test_array [0] = 0
25145
25046
25146
25047
;
25147
@@ -27054,27 +27527,22 @@
25048
@@ -26950,27 +27427,22 @@
25148
25049
}
25149
25050
_ACEOF
25150
25051
rm -f conftest.$ac_objext
25183
25084
ac_hi=-1 ac_mid=-1
25184
25085
while :; do
25185
25086
cat >conftest.$ac_ext <<_ACEOF
25186
@@ -27084,10 +27552,11 @@
25087
@@ -26980,10 +27452,11 @@
25187
25088
cat >>conftest.$ac_ext <<_ACEOF
25188
25089
/* end confdefs.h. */
25189
25090
$ac_includes_default
25196
25097
test_array [0] = 0
25197
25098
25198
25099
;
25199
@@ -27095,50 +27564,48 @@
25100
@@ -26991,50 +27464,48 @@
25200
25101
}
25201
25102
_ACEOF
25202
25103
rm -f conftest.$ac_objext
25271
25172
# Binary search between lo and hi bounds.
25272
25173
while test "x$ac_lo" != "x$ac_hi"; do
25273
25174
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
25274
@@ -27149,10 +27616,11 @@
25175
@@ -27045,10 +27516,11 @@
25275
25176
cat >>conftest.$ac_ext <<_ACEOF
25276
25177
/* end confdefs.h. */
25277
25178
$ac_includes_default
25284
25185
test_array [0] = 0
25285
25186
25286
25187
;
25287
@@ -27160,52 +27628,45 @@
25188
@@ -27056,52 +27528,45 @@
25288
25189
}
25289
25190
_ACEOF
25290
25191
rm -f conftest.$ac_objext
25358
25259
cat >conftest.$ac_ext <<_ACEOF
25359
25260
/* confdefs.h. */
25360
25261
_ACEOF
25361
@@ -27213,8 +27674,9 @@
25262
@@ -27109,8 +27574,9 @@
25362
25263
cat >>conftest.$ac_ext <<_ACEOF
25363
25264
/* end confdefs.h. */
25364
25265
$ac_includes_default
25370
25271
#include <stdio.h>
25371
25272
#include <stdlib.h>
25372
25273
int
25373
@@ -27223,35 +27685,44 @@
25274
@@ -27119,35 +27585,44 @@
25374
25275
25375
25276
FILE *f = fopen ("conftest.val", "w");
25376
25277
if (! f)
25428
25329
ac_status=$?
25429
25330
echo "$as_me:$LINENO: \$? = $ac_status" >&5
25430
25331
(exit $ac_status); }; }; then
25431
@@ -27262,29 +27733,32 @@
25332
@@ -27158,29 +27633,32 @@
25432
25333
sed 's/^/| /' conftest.$ac_ext >&5
25433
25334
25434
25335
( exit $ac_status )
25473
25374
if test "${ac_cv_type_int+set}" = set; then
25474
25375
echo $ECHO_N "(cached) $ECHO_C" >&6
25475
25376
else
25476
@@ -27295,61 +27769,57 @@
25377
@@ -27191,61 +27669,57 @@
25477
25378
cat >>conftest.$ac_ext <<_ACEOF
25478
25379
/* end confdefs.h. */
25479
25380
$ac_includes_default
25560
25461
if test "$cross_compiling" = yes; then
25561
25462
# Depending upon the size, compute the lo and hi bounds.
25562
25463
cat >conftest.$ac_ext <<_ACEOF
25563
@@ -27359,10 +27829,11 @@
25464
@@ -27255,10 +27729,11 @@
25564
25465
cat >>conftest.$ac_ext <<_ACEOF
25565
25466
/* end confdefs.h. */
25566
25467
$ac_includes_default
25573
25474
test_array [0] = 0
25574
25475
25575
25476
;
25576
@@ -27370,27 +27841,22 @@
25477
@@ -27266,27 +27741,22 @@
25577
25478
}
25578
25479
_ACEOF
25579
25480
rm -f conftest.$ac_objext
25612
25513
ac_lo=0 ac_mid=0
25613
25514
while :; do
25614
25515
cat >conftest.$ac_ext <<_ACEOF
25615
@@ -27400,10 +27866,11 @@
25516
@@ -27296,10 +27766,11 @@
25616
25517
cat >>conftest.$ac_ext <<_ACEOF
25617
25518
/* end confdefs.h. */
25618
25519
$ac_includes_default
25625
25526
test_array [0] = 0
25626
25527
25627
25528
;
25628
@@ -27411,56 +27878,53 @@
25529
@@ -27307,56 +27778,53 @@
25629
25530
}
25630
25531
_ACEOF
25631
25532
rm -f conftest.$ac_objext
25704
25605
test_array [0] = 0
25705
25606
25706
25607
;
25707
@@ -27468,27 +27932,22 @@
25608
@@ -27364,27 +27832,22 @@
25708
25609
}
25709
25610
_ACEOF
25710
25611
rm -f conftest.$ac_objext
25743
25644
ac_hi=-1 ac_mid=-1
25744
25645
while :; do
25745
25646
cat >conftest.$ac_ext <<_ACEOF
25746
@@ -27498,10 +27957,11 @@
25647
@@ -27394,10 +27857,11 @@
25747
25648
cat >>conftest.$ac_ext <<_ACEOF
25748
25649
/* end confdefs.h. */
25749
25650
$ac_includes_default
25756
25657
test_array [0] = 0
25757
25658
25758
25659
;
25759
@@ -27509,50 +27969,48 @@
25660
@@ -27405,50 +27869,48 @@
25760
25661
}
25761
25662
_ACEOF
25762
25663
rm -f conftest.$ac_objext
25831
25732
# Binary search between lo and hi bounds.
25832
25733
while test "x$ac_lo" != "x$ac_hi"; do
25833
25734
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
25834
@@ -27563,10 +28021,11 @@
25735
@@ -27459,10 +27921,11 @@
25835
25736
cat >>conftest.$ac_ext <<_ACEOF
25836
25737
/* end confdefs.h. */
25837
25738
$ac_includes_default
25844
25745
test_array [0] = 0
25845
25746
25846
25747
;
25847
@@ -27574,52 +28033,45 @@
25748
@@ -27470,52 +27933,45 @@
25848
25749
}
25849
25750
_ACEOF
25850
25751
rm -f conftest.$ac_objext
25918
25819
cat >conftest.$ac_ext <<_ACEOF
25919
25820
/* confdefs.h. */
25920
25821
_ACEOF
25921
@@ -27627,8 +28079,9 @@
25822
@@ -27523,8 +27979,9 @@
25922
25823
cat >>conftest.$ac_ext <<_ACEOF
25923
25824
/* end confdefs.h. */
25924
25825
$ac_includes_default
25930
25831
#include <stdio.h>
25931
25832
#include <stdlib.h>
25932
25833
int
25933
@@ -27637,35 +28090,44 @@
25834
@@ -27533,35 +27990,44 @@
25934
25835
25935
25836
FILE *f = fopen ("conftest.val", "w");
25936
25837
if (! f)
25988
25889
ac_status=$?
25989
25890
echo "$as_me:$LINENO: \$? = $ac_status" >&5
25990
25891
(exit $ac_status); }; }; then
25991
@@ -27676,29 +28138,32 @@
25892
@@ -27572,29 +28038,32 @@
25992
25893
sed 's/^/| /' conftest.$ac_ext >&5
25993
25894
25994
25895
( exit $ac_status )
26033
25934
if test "${ac_cv_type_short+set}" = set; then
26034
25935
echo $ECHO_N "(cached) $ECHO_C" >&6
26035
25936
else
26036
@@ -27709,61 +28174,57 @@
25937
@@ -27605,61 +28074,57 @@
26037
25938
cat >>conftest.$ac_ext <<_ACEOF
26038
25939
/* end confdefs.h. */
26039
25940
$ac_includes_default
26120
26021
if test "$cross_compiling" = yes; then
26121
26022
# Depending upon the size, compute the lo and hi bounds.
26122
26023
cat >conftest.$ac_ext <<_ACEOF
26123
@@ -27773,10 +28234,11 @@
26024
@@ -27669,10 +28134,11 @@
26124
26025
cat >>conftest.$ac_ext <<_ACEOF
26125
26026
/* end confdefs.h. */
26126
26027
$ac_includes_default
26133
26034
test_array [0] = 0
26134
26035
26135
26036
;
26136
@@ -27784,27 +28246,22 @@
26037
@@ -27680,27 +28146,22 @@
26137
26038
}
26138
26039
_ACEOF
26139
26040
rm -f conftest.$ac_objext
26172
26073
ac_lo=0 ac_mid=0
26173
26074
while :; do
26174
26075
cat >conftest.$ac_ext <<_ACEOF
26175
@@ -27814,10 +28271,11 @@
26076
@@ -27710,10 +28171,11 @@
26176
26077
cat >>conftest.$ac_ext <<_ACEOF
26177
26078
/* end confdefs.h. */
26178
26079
$ac_includes_default
26185
26086
test_array [0] = 0
26186
26087
26187
26088
;
26188
@@ -27825,56 +28283,53 @@
26089
@@ -27721,56 +28183,53 @@
26189
26090
}
26190
26091
_ACEOF
26191
26092
rm -f conftest.$ac_objext
26264
26165
test_array [0] = 0
26265
26166
26266
26167
;
26267
@@ -27882,27 +28337,22 @@
26168
@@ -27778,27 +28237,22 @@
26268
26169
}
26269
26170
_ACEOF
26270
26171
rm -f conftest.$ac_objext
26303
26204
ac_hi=-1 ac_mid=-1
26304
26205
while :; do
26305
26206
cat >conftest.$ac_ext <<_ACEOF
26306
@@ -27912,10 +28362,11 @@
26207
@@ -27808,10 +28262,11 @@
26307
26208
cat >>conftest.$ac_ext <<_ACEOF
26308
26209
/* end confdefs.h. */
26309
26210
$ac_includes_default
26316
26217
test_array [0] = 0
26317
26218
26318
26219
;
26319
@@ -27923,50 +28374,48 @@
26220
@@ -27819,50 +28274,48 @@
26320
26221
}
26321
26222
_ACEOF
26322
26223
rm -f conftest.$ac_objext
26391
26292
# Binary search between lo and hi bounds.
26392
26293
while test "x$ac_lo" != "x$ac_hi"; do
26393
26294
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
26394
@@ -27977,10 +28426,11 @@
26295
@@ -27873,10 +28326,11 @@
26395
26296
cat >>conftest.$ac_ext <<_ACEOF
26396
26297
/* end confdefs.h. */
26397
26298
$ac_includes_default
26404
26305
test_array [0] = 0
26405
26306
26406
26307
;
26407
@@ -27988,52 +28438,45 @@
26308
@@ -27884,52 +28338,45 @@
26408
26309
}
26409
26310
_ACEOF
26410
26311
rm -f conftest.$ac_objext
26478
26379
cat >conftest.$ac_ext <<_ACEOF
26479
26380
/* confdefs.h. */
26480
26381
_ACEOF
26481
@@ -28041,8 +28484,9 @@
26382
@@ -27937,8 +28384,9 @@
26482
26383
cat >>conftest.$ac_ext <<_ACEOF
26483
26384
/* end confdefs.h. */
26484
26385
$ac_includes_default
26490
26391
#include <stdio.h>
26491
26392
#include <stdlib.h>
26492
26393
int
26493
@@ -28051,35 +28495,44 @@
26394
@@ -27947,35 +28395,44 @@
26494
26395
26495
26396
FILE *f = fopen ("conftest.val", "w");
26496
26397
if (! f)
26548
26449
ac_status=$?
26549
26450
echo "$as_me:$LINENO: \$? = $ac_status" >&5
26550
26451
(exit $ac_status); }; }; then
26551
@@ -28090,29 +28543,32 @@
26452
@@ -27986,29 +28443,32 @@
26552
26453
sed 's/^/| /' conftest.$ac_ext >&5
26553
26454
26554
26455
( exit $ac_status )
26593
26494
if test "${ac_cv_type_void_p+set}" = set; then
26594
26495
echo $ECHO_N "(cached) $ECHO_C" >&6
26595
26496
else
26596
@@ -28123,61 +28579,57 @@
26497
@@ -28019,61 +28479,57 @@
26597
26498
cat >>conftest.$ac_ext <<_ACEOF
26598
26499
/* end confdefs.h. */
26599
26500
$ac_includes_default
26680
26581
if test "$cross_compiling" = yes; then
26681
26582
# Depending upon the size, compute the lo and hi bounds.
26682
26583
cat >conftest.$ac_ext <<_ACEOF
26683
@@ -28187,10 +28639,11 @@
26584
@@ -28083,10 +28539,11 @@
26684
26585
cat >>conftest.$ac_ext <<_ACEOF
26685
26586
/* end confdefs.h. */
26686
26587
$ac_includes_default
26693
26594
test_array [0] = 0
26694
26595
26695
26596
;
26696
@@ -28198,27 +28651,22 @@
26597
@@ -28094,27 +28551,22 @@
26697
26598
}
26698
26599
_ACEOF
26699
26600
rm -f conftest.$ac_objext
26732
26633
ac_lo=0 ac_mid=0
26733
26634
while :; do
26734
26635
cat >conftest.$ac_ext <<_ACEOF
26735
@@ -28228,10 +28676,11 @@
26636
@@ -28124,10 +28576,11 @@
26736
26637
cat >>conftest.$ac_ext <<_ACEOF
26737
26638
/* end confdefs.h. */
26738
26639
$ac_includes_default
26745
26646
test_array [0] = 0
26746
26647
26747
26648
;
26748
@@ -28239,56 +28688,53 @@
26649
@@ -28135,56 +28588,53 @@
26749
26650
}
26750
26651
_ACEOF
26751
26652
rm -f conftest.$ac_objext
26824
26725
test_array [0] = 0
26825
26726
26826
26727
;
26827
@@ -28296,27 +28742,22 @@
26728
@@ -28192,27 +28642,22 @@
26828
26729
}
26829
26730
_ACEOF
26830
26731
rm -f conftest.$ac_objext
26863
26764
ac_hi=-1 ac_mid=-1
26864
26765
while :; do
26865
26766
cat >conftest.$ac_ext <<_ACEOF
26866
@@ -28326,10 +28767,11 @@
26767
@@ -28222,10 +28667,11 @@
26867
26768
cat >>conftest.$ac_ext <<_ACEOF
26868
26769
/* end confdefs.h. */
26869
26770
$ac_includes_default
26876
26777
test_array [0] = 0
26877
26778
26878
26779
;
26879
@@ -28337,50 +28779,48 @@
26780
@@ -28233,50 +28679,48 @@
26880
26781
}
26881
26782
_ACEOF
26882
26783
rm -f conftest.$ac_objext
26951
26852
# Binary search between lo and hi bounds.
26952
26853
while test "x$ac_lo" != "x$ac_hi"; do
26953
26854
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
26954
@@ -28391,10 +28831,11 @@
26855
@@ -28287,10 +28731,11 @@
26955
26856
cat >>conftest.$ac_ext <<_ACEOF
26956
26857
/* end confdefs.h. */
26957
26858
$ac_includes_default
26964
26865
test_array [0] = 0
26965
26866
26966
26867
;
26967
@@ -28402,52 +28843,45 @@
26868
@@ -28298,52 +28743,45 @@
26968
26869
}
26969
26870
_ACEOF
26970
26871
rm -f conftest.$ac_objext
27038
26939
cat >conftest.$ac_ext <<_ACEOF
27039
26940
/* confdefs.h. */
27040
26941
_ACEOF
27041
@@ -28455,8 +28889,9 @@
26942
@@ -28351,8 +28789,9 @@
27042
26943
cat >>conftest.$ac_ext <<_ACEOF
27043
26944
/* end confdefs.h. */
27044
26945
$ac_includes_default
27050
26951
#include <stdio.h>
27051
26952
#include <stdlib.h>
27052
26953
int
27053
@@ -28465,35 +28900,44 @@
26954
@@ -28361,35 +28800,44 @@
27054
26955
27055
26956
FILE *f = fopen ("conftest.val", "w");
27056
26957
if (! f)
27108
27009
ac_status=$?
27109
27010
echo "$as_me:$LINENO: \$? = $ac_status" >&5
27110
27011
(exit $ac_status); }; }; then
27111
@@ -28504,29 +28948,32 @@
27012
@@ -28400,29 +28848,32 @@
27112
27013
sed 's/^/| /' conftest.$ac_ext >&5
27113
27014
27114
27015
( exit $ac_status )
27153
27054
if test "${ac_cv_lib_kpathsea_kpse_init_prog+set}" = set; then
27154
27055
echo $ECHO_N "(cached) $ECHO_C" >&6
27155
27056
else
27156
@@ -28539,56 +28986,53 @@
27057
@@ -28435,56 +28886,53 @@
27157
27058
cat >>conftest.$ac_ext <<_ACEOF
27158
27059
/* end confdefs.h. */
27159
27060
27231
27132
if test $ac_cv_lib_kpathsea_kpse_init_prog = yes; then
27232
27133
enable_dvi=yes
27233
27134
else
27234
@@ -28607,9 +29051,7 @@
27135
@@ -28503,9 +28951,7 @@
27235
27136
echo "$as_me: WARNING: \"Dvi support is disabled since kpathsea library is not found. Check your TeX installation.\"" >&2;}
27236
27137
fi
27237
27138
fi
27242
27143
ENABLE_DVI_TRUE=
27243
27144
ENABLE_DVI_FALSE='#'
27244
27145
else
27245
@@ -28620,8 +29062,8 @@
27146
@@ -28516,8 +28962,8 @@
27246
27147
27247
27148
if test "x$enable_dvi" = "xyes"; then
27248
27149
if test "x$enable_type1_fonts" = "xyes"; then
27253
27154
if test "${ac_cv_lib_t1_T1_InitLib+set}" = set; then
27254
27155
echo $ECHO_N "(cached) $ECHO_C" >&6
27255
27156
else
27256
@@ -28634,56 +29076,53 @@
27157
@@ -28530,56 +28976,53 @@
27257
27158
cat >>conftest.$ac_ext <<_ACEOF
27258
27159
/* end confdefs.h. */
27259
27160
27331
27232
if test $ac_cv_lib_t1_T1_InitLib = yes; then
27332
27233
enable_type1_fonts=yes
27333
27234
else
27334
@@ -28702,9 +29141,7 @@
27235
@@ -28598,9 +29041,7 @@
27335
27236
else
27336
27237
enable_type1_fonts=no
27337
27238
fi
27342
27243
WITH_TYPE1_FONTS_TRUE=
27343
27244
WITH_TYPE1_FONTS_FALSE='#'
27344
27245
else
27345
@@ -28715,13 +29152,13 @@
27246
@@ -28611,13 +29052,13 @@
27346
27247
27347
27248
27348
27249
27360
27261
if test "x$enable_pixbuf" = "xyes"; then
27361
27262
27362
27263
cat >>confdefs.h <<\_ACEOF
27363
@@ -28729,9 +29166,7 @@
27264
@@ -28625,9 +29066,7 @@
27364
27265
_ACEOF
27365
27266
27366
27267
fi
27371
27272
ENABLE_PIXBUF_TRUE=
27372
27273
ENABLE_PIXBUF_FALSE='#'
27373
27274
else
27374
@@ -28742,13 +29177,13 @@
27275
@@ -28638,13 +29077,13 @@
27375
27276
27376
27277
27377
27278
27382
27283
- enable_comics="$enableval"
27383
27284
+ enableval=$enable_comics; enable_comics="$enableval"
27384
27285
else
27385
enable_comics=no
27286
enable_comics=yes
27386
27287
-fi;
27387
27288
+fi
27388
27289
+
27389
27290
if test "x$enable_comics" = "xyes"; then
27390
27291
27391
27292
cat >>confdefs.h <<\_ACEOF
27392
@@ -28756,9 +29191,7 @@
27293
@@ -28652,9 +29091,7 @@
27393
27294
_ACEOF
27394
27295
27395
27296
fi
27400
27301
ENABLE_COMICS_TRUE=
27401
27302
ENABLE_COMICS_FALSE='#'
27402
27303
else
27403
@@ -28769,13 +29202,13 @@
27304
@@ -28665,13 +29102,13 @@
27404
27305
27405
27306
27406
27307
27418
27319
if test "x$enable_impress" = "xyes"; then
27419
27320
27420
27321
cat >>confdefs.h <<\_ACEOF
27421
@@ -28783,9 +29216,7 @@
27322
@@ -28679,9 +29116,7 @@
27422
27323
_ACEOF
27423
27324
27424
27325
fi
27429
27330
ENABLE_IMPRESS_TRUE=
27430
27331
ENABLE_IMPRESS_FALSE='#'
27431
27332
else
27432
@@ -28803,7 +29234,7 @@
27333
@@ -28699,7 +29134,7 @@
27433
27334
EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;"
27434
27335
fi
27435
27336
if test "x$enable_dvi" = "xyes"; then
27438
27339
fi
27439
27340
if test "x$enable_djvu" = "xyes"; then
27440
27341
EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/vnd.djvu;"
27441
@@ -28822,7 +29253,7 @@
27342
@@ -28718,7 +29153,7 @@
27442
27343
fi
27443
27344
27444
27345
27445
- ac_config_files="$ac_config_files backend/Makefile backend/comics/Makefile backend/djvu/Makefile backend/dvi/Makefile backend/dvi/mdvi-lib/Makefile backend/impress/Makefile backend/pdf/Makefile backend/pixbuf/Makefile backend/ps/Makefile backend/tiff/Makefile cut-n-paste/Makefile cut-n-paste/recent-files/Makefile cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile cut-n-paste/totem-screensaver/Makefile data/evince.desktop.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/actions/Makefile data/icons/22x22/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/actions/Makefile data/icons/24x24/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/actions/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/actions/Makefile data/icons/scalable/Makefile data/icons/scalable/apps/Makefile help/Makefile help/reference/Makefile help/reference/version.xml libdocument/Makefile Makefile po/Makefile.in properties/Makefile shell/Makefile test/Makefile thumbnailer/Makefile"
27446
+ac_config_files="$ac_config_files backend/Makefile backend/comics/Makefile backend/djvu/Makefile backend/dvi/Makefile backend/dvi/mdvi-lib/Makefile backend/impress/Makefile backend/pdf/Makefile backend/pixbuf/Makefile backend/ps/Makefile backend/tiff/Makefile cut-n-paste/Makefile cut-n-paste/recent-files/Makefile cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile cut-n-paste/totem-screensaver/Makefile data/evince.desktop.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/actions/Makefile data/icons/22x22/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/actions/Makefile data/icons/24x24/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/actions/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/actions/Makefile data/icons/scalable/Makefile data/icons/scalable/apps/Makefile help/Makefile help/reference/Makefile help/reference/version.xml libdocument/Makefile Makefile po/Makefile.in properties/Makefile shell/Makefile test/Makefile thumbnailer/Makefile"
27346
- ac_config_files="$ac_config_files backend/Makefile backend/comics/Makefile backend/djvu/Makefile backend/dvi/Makefile backend/dvi/mdvi-lib/Makefile backend/impress/Makefile backend/pdf/Makefile backend/pixbuf/Makefile backend/ps/Makefile backend/tiff/Makefile cut-n-paste/Makefile cut-n-paste/gedit-message-area/Makefile cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile cut-n-paste/totem-screensaver/Makefile data/evince.desktop.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/actions/Makefile data/icons/22x22/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/actions/Makefile data/icons/24x24/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/actions/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/actions/Makefile data/icons/scalable/Makefile data/icons/scalable/apps/Makefile help/Makefile help/reference/Makefile help/reference/version.xml libdocument/Makefile Makefile po/Makefile.in properties/Makefile shell/Makefile test/Makefile thumbnailer/Makefile"
27347
+ac_config_files="$ac_config_files backend/Makefile backend/comics/Makefile backend/djvu/Makefile backend/dvi/Makefile backend/dvi/mdvi-lib/Makefile backend/impress/Makefile backend/pdf/Makefile backend/pixbuf/Makefile backend/ps/Makefile backend/tiff/Makefile cut-n-paste/Makefile cut-n-paste/gedit-message-area/Makefile cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile cut-n-paste/totem-screensaver/Makefile data/evince.desktop.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/actions/Makefile data/icons/22x22/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/actions/Makefile data/icons/24x24/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/actions/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/actions/Makefile data/icons/scalable/Makefile data/icons/scalable/apps/Makefile help/Makefile help/reference/Makefile help/reference/version.xml libdocument/Makefile Makefile po/Makefile.in properties/Makefile shell/Makefile test/Makefile thumbnailer/Makefile"
27447
27348
27448
27349
27449
27350
cat >confcache <<\_ACEOF
27450
@@ -28843,39 +29274,58 @@
27351
@@ -28739,39 +29174,58 @@
27451
27352
27452
27353
# The following way of writing the cache mishandles newlines in values,
27453
27354
# but we know of no workaround that is simple, portable, and efficient.
27522
27423
fi
27523
27424
fi
27524
27425
rm -f confcache
27525
@@ -28884,32 +29334,18 @@
27426
@@ -28780,32 +29234,18 @@
27526
27427
# Let make expand exec_prefix.
27527
27428
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
27528
27429
27561
27462
done
27562
27463
LIBOBJS=$ac_libobjs
27563
27464
27564
@@ -28966,7 +29402,7 @@
27465
@@ -28862,7 +29302,7 @@
27565
27466
{ (exit 1); exit 1; }; }
27566
27467
fi
27567
27468
27570
27471
27571
27472
27572
27473
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
27573
@@ -28997,6 +29433,13 @@
27474
@@ -28893,6 +29333,13 @@
27574
27475
Usually this means the macro was only invoked conditionally." >&2;}
27575
27476
{ (exit 1); exit 1; }; }
27576
27477
fi
27584
27485
if test -z "${WITH_GNOME_TRUE}" && test -z "${WITH_GNOME_FALSE}"; then
27585
27486
{ { echo "$as_me:$LINENO: error: conditional \"WITH_GNOME\" was never defined.
27586
27487
Usually this means the macro was only invoked conditionally." >&5
27587
@@ -29147,17 +29590,45 @@
27488
@@ -29036,17 +29483,45 @@
27588
27489
## M4sh Initialization. ##
27589
27490
## --------------------- ##
27590
27491
27634
27535
27635
27536
# Support unset when possible.
27636
27537
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
27637
@@ -29167,8 +29638,43 @@
27538
@@ -29056,8 +29531,43 @@
27638
27539
fi
27639
27540
27640
27541
27679
27580
PS1='$ '
27680
27581
PS2='> '
27681
27582
PS4='+ '
27682
@@ -29182,18 +29688,19 @@
27583
@@ -29071,18 +29581,19 @@
27683
27584
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
27684
27585
eval $as_var=C; export $as_var
27685
27586
else
27702
27603
as_basename=basename
27703
27604
else
27704
27605
as_basename=false
27705
@@ -29201,159 +29708,120 @@
27606
@@ -29090,159 +29601,120 @@
27706
27607
27707
27608
27708
27609
# Name of the executable.
27933
27834
27934
27835
if mkdir -p . 2>/dev/null; then
27935
27836
as_mkdir_p=:
27936
@@ -29362,7 +29830,28 @@
27837
@@ -29251,7 +29723,28 @@
27937
27838
as_mkdir_p=false
27938
27839
fi
27939
27840
27963
27864
27964
27865
# Sed expression to map a string onto a valid CPP name.
27965
27866
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
27966
@@ -29371,31 +29860,14 @@
27867
@@ -29260,31 +29753,14 @@
27967
27868
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
27968
27869
27969
27870
27993
27894
-
27994
27895
+# values after options handling.
27995
27896
+ac_log="
27996
This file was extended by Evince $as_me 2.20.2, which was
27897
This file was extended by Evince $as_me 2.21.1, which was
27997
27898
-generated by GNU Autoconf 2.59. Invocation command line was
27998
27899
+generated by GNU Autoconf 2.61. Invocation command line was
27999
27900
28000
27901
CONFIG_FILES = $CONFIG_FILES
28001
27902
CONFIG_HEADERS = $CONFIG_HEADERS
28002
@@ -29403,30 +29875,20 @@
27903
@@ -29292,30 +29768,20 @@
28003
27904
CONFIG_COMMANDS = $CONFIG_COMMANDS
28004
27905
$ $0 $@
28005
27906
28020
27921
-if test -n "$ac_config_headers"; then
28021
27922
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
28022
27923
-fi
27924
-
27925
-if test -n "$ac_config_links"; then
27926
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
27927
-fi
28023
27928
+config_files="$ac_config_files"
28024
27929
+config_headers="$ac_config_headers"
28025
27930
+config_commands="$ac_config_commands"
28026
27931
28027
-if test -n "$ac_config_links"; then
28028
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
28029
-fi
28030
-
28031
27932
-if test -n "$ac_config_commands"; then
28032
27933
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
28033
27934
-fi
28038
27939
ac_cs_usage="\
28039
27940
\`$as_me' instantiates files from templates according to the
28040
27941
current configuration.
28041
@@ -29434,7 +29896,7 @@
27942
@@ -29323,7 +29789,7 @@
28042
27943
Usage: $0 [OPTIONS] [FILE]...
28043
27944
28044
27945
-h, --help print this help, then exit
28047
27948
-q, --quiet do not print progress messages
28048
27949
-d, --debug don't remove temporary files
28049
27950
--recheck update $as_me by reconfiguring in the same conditions
28050
@@ -29453,19 +29915,22 @@
27951
@@ -29342,19 +29808,22 @@
28051
27952
$config_commands
28052
27953
28053
27954
Report bugs to <bug-autoconf@gnu.org>."
28056
27957
+_ACEOF
28057
27958
cat >>$CONFIG_STATUS <<_ACEOF
28058
27959
ac_cs_version="\\
28059
Evince config.status 2.20.2
27960
Evince config.status 2.21.1
28060
27961
-configured by $0, generated by GNU Autoconf 2.59,
28061
27962
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
28062
27963
+configured by $0, generated by GNU Autoconf 2.61,
28076
27977
_ACEOF
28077
27978
28078
27979
cat >>$CONFIG_STATUS <<\_ACEOF
28079
@@ -29476,39 +29941,24 @@
27980
@@ -29365,39 +29834,24 @@
28080
27981
do
28081
27982
case $1 in
28082
27983
--*=*)
28122
28023
debug=: ;;
28123
28024
--file | --fil | --fi | --f )
28124
28025
$ac_shift
28125
@@ -29518,18 +29968,24 @@
28026
@@ -29407,18 +29861,24 @@
28126
28027
$ac_shift
28127
28028
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
28128
28029
ac_need_defaults=false;;
28152
28053
28153
28054
esac
28154
28055
shift
28155
@@ -29545,89 +30001,99 @@
28056
@@ -29434,89 +29894,99 @@
28156
28057
_ACEOF
28157
28058
cat >>$CONFIG_STATUS <<_ACEOF
28158
28059
if \$ac_cs_recheck; then
28213
28114
- "backend/ps/Makefile" ) CONFIG_FILES="$CONFIG_FILES backend/ps/Makefile" ;;
28214
28115
- "backend/tiff/Makefile" ) CONFIG_FILES="$CONFIG_FILES backend/tiff/Makefile" ;;
28215
28116
- "cut-n-paste/Makefile" ) CONFIG_FILES="$CONFIG_FILES cut-n-paste/Makefile" ;;
28216
- "cut-n-paste/recent-files/Makefile" ) CONFIG_FILES="$CONFIG_FILES cut-n-paste/recent-files/Makefile" ;;
28117
- "cut-n-paste/gedit-message-area/Makefile" ) CONFIG_FILES="$CONFIG_FILES cut-n-paste/gedit-message-area/Makefile" ;;
28217
28118
- "cut-n-paste/toolbar-editor/Makefile" ) CONFIG_FILES="$CONFIG_FILES cut-n-paste/toolbar-editor/Makefile" ;;
28218
28119
- "cut-n-paste/zoom-control/Makefile" ) CONFIG_FILES="$CONFIG_FILES cut-n-paste/zoom-control/Makefile" ;;
28219
28120
- "cut-n-paste/totem-screensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES cut-n-paste/totem-screensaver/Makefile" ;;
28267
28168
+ "backend/ps/Makefile") CONFIG_FILES="$CONFIG_FILES backend/ps/Makefile" ;;
28268
28169
+ "backend/tiff/Makefile") CONFIG_FILES="$CONFIG_FILES backend/tiff/Makefile" ;;
28269
28170
+ "cut-n-paste/Makefile") CONFIG_FILES="$CONFIG_FILES cut-n-paste/Makefile" ;;
28270
+ "cut-n-paste/recent-files/Makefile") CONFIG_FILES="$CONFIG_FILES cut-n-paste/recent-files/Makefile" ;;
28171
+ "cut-n-paste/gedit-message-area/Makefile") CONFIG_FILES="$CONFIG_FILES cut-n-paste/gedit-message-area/Makefile" ;;
28271
28172
+ "cut-n-paste/toolbar-editor/Makefile") CONFIG_FILES="$CONFIG_FILES cut-n-paste/toolbar-editor/Makefile" ;;
28272
28173
+ "cut-n-paste/zoom-control/Makefile") CONFIG_FILES="$CONFIG_FILES cut-n-paste/zoom-control/Makefile" ;;
28273
28174
+ "cut-n-paste/totem-screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES cut-n-paste/totem-screensaver/Makefile" ;;
28312
28213
# If the user did not use the arguments to specify the items to instantiate,
28313
28214
# then the envvar interface is used. Set only those that are not.
28314
28215
# We use the long form for the default assignment because of an extremely
28315
@@ -29639,743 +30105,780 @@
28216
@@ -29528,739 +29998,776 @@
28316
28217
fi
28317
28218
28318
28219
# Have a temporary directory for convenience. Make it in the build tree
28568
28469
-s,@HAVE_NAUTILUS_FALSE@,$HAVE_NAUTILUS_FALSE,;t t
28569
28470
-s,@ENABLE_THUMBNAILER_TRUE@,$ENABLE_THUMBNAILER_TRUE,;t t
28570
28471
-s,@ENABLE_THUMBNAILER_FALSE@,$ENABLE_THUMBNAILER_FALSE,;t t
28571
-s,@GTK_RECENT_CFLAGS@,$GTK_RECENT_CFLAGS,;t t
28572
-s,@GTK_RECENT_LIBS@,$GTK_RECENT_LIBS,;t t
28573
-s,@HAVE_GTK_RECENT_TRUE@,$HAVE_GTK_RECENT_TRUE,;t t
28574
-s,@HAVE_GTK_RECENT_FALSE@,$HAVE_GTK_RECENT_FALSE,;t t
28575
28472
-s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
28576
28473
-s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
28577
28474
-s,@GCONF_SCHEMAS_INSTALL_TRUE@,$GCONF_SCHEMAS_INSTALL_TRUE,;t t
28771
28668
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
28772
28669
+ ac_eof=`expr $ac_eof + 1`
28773
28670
+fi
28774
+
28671
28775
28672
+cat >>$CONFIG_STATUS <<_ACEOF
28776
28673
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
28777
28674
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
28947
28844
+HAVE_NAUTILUS_FALSE!$HAVE_NAUTILUS_FALSE$ac_delim
28948
28845
+ENABLE_THUMBNAILER_TRUE!$ENABLE_THUMBNAILER_TRUE$ac_delim
28949
28846
+ENABLE_THUMBNAILER_FALSE!$ENABLE_THUMBNAILER_FALSE$ac_delim
28950
+GTK_RECENT_CFLAGS!$GTK_RECENT_CFLAGS$ac_delim
28951
+GTK_RECENT_LIBS!$GTK_RECENT_LIBS$ac_delim
28952
+HAVE_GTK_RECENT_TRUE!$HAVE_GTK_RECENT_TRUE$ac_delim
28953
+HAVE_GTK_RECENT_FALSE!$HAVE_GTK_RECENT_FALSE$ac_delim
28954
28847
+GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
28955
28848
+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
28956
28849
+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
28987
28880
+LTLIBOBJS!$LTLIBOBJS$ac_delim
28988
28881
+_ACEOF
28989
28882
+
28990
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
28883
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
28991
28884
+ break
28992
28885
+ elif $ac_last_try; then
28993
28886
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
29003
28896
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
29004
28897
+ ac_eof=`expr $ac_eof + 1`
29005
28898
+fi
29006
28899
+
29007
28900
+cat >>$CONFIG_STATUS <<_ACEOF
29008
28901
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
29009
28902
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
29010
+_ACEOF
28903
_ACEOF
29011
28904
+sed '
29012
28905
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
29013
28906
+s/^/s,@/; s/!/@,|#_!!_#|/
29022
28915
+:end
29023
28916
+s/|#_!!_#|//g
29024
28917
+CEOF$ac_eof
29025
_ACEOF
28918
+_ACEOF
29026
28919
+
29027
28920
+
29028
28921
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
29066
28959
+ { (exit 1); exit 1; }; };;
29067
28960
+ :[FH]-) ac_tag=-:-;;
29068
28961
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
29069
esac
28962
+ esac
29070
28963
+ ac_save_IFS=$IFS
29071
28964
+ IFS=:
29072
28965
+ set x $ac_tag
29097
28990
+ esac
29098
28991
+ ac_file_inputs="$ac_file_inputs $ac_f"
29099
28992
+ done
29100
29101
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
29102
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
28993
+
29103
28994
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
29104
28995
+ # use $as_me), people would be surprised to read:
29105
28996
+ # /* config.h. Generated by config.status. */
29115
29006
+ *:-:* | *:-) cat >"$tmp/stdin";;
29116
29007
+ esac
29117
29008
+ ;;
29118
+ esac
29119
+
29009
esac
29010
29011
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
29012
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
29120
29013
+ ac_dir=`$as_dirname -- "$ac_file" ||
29121
29014
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
29122
29015
X"$ac_file" : 'X\(//\)[^/]' \| \
29745
29638
# Compute $ac_file's index in $config_headers.
29746
29639
_am_stamp_count=1
29747
29640
for _am_header in $config_headers :; do
29748
@@ -30386,135 +30889,39 @@
29641
@@ -30271,135 +30778,39 @@
29749
29642
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
29750
29643
esac
29751
29644
done
29907
29800
# Strip MF so we end up with the name of the file.
29908
29801
mf=`echo "$mf" | sed -e 's/:.*$//'`
29909
29802
# Check whether this is an Automake generated Makefile or not.
29910
@@ -30522,20 +30929,32 @@
29803
@@ -30407,20 +30818,32 @@
29911
29804
# some people rename them; so instead we look at the file content.
29912
29805
# Grep'ing the first line is not enough: some people post-process
29913
29806
# each Makefile.in and add a new line on top of each file to say so.
29950
29843
else
29951
29844
continue
29952
29845
fi
29953
@@ -30557,57 +30976,80 @@
29846
@@ -30442,57 +30865,80 @@
29954
29847
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
29955
29848
# Make sure the directory exists.
29956
29849
test -f "$dirpart/$file" && continue
30062
29955
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
30063
29956
< ${ac_aux_dir}/${file}.in > ${file}.out
30064
29957
if cmp -s ${file} ${file}.out 2>/dev/null; then
30065
@@ -30620,10 +31062,10 @@
29958
@@ -30505,10 +30951,10 @@
30066
29959
done
30067
29960
30068
29961
;;
30075
29968
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
30076
29969
>"po/stamp-it.tmp"
30077
29970
sed '/^#/d
30078
@@ -30646,11 +31088,10 @@
29971
@@ -30531,11 +30977,10 @@
30079
29972
rm -f "po/Makefile.tmp"
30080
29973
mv "po/stamp-it.tmp" "po/stamp-it"
30081
29974
;;
30089
29982
30090
29983
{ (exit 0); exit 0; }
30091
29984
_ACEOF
30092
@@ -30683,6 +31124,7 @@
29985
@@ -30568,6 +31013,7 @@
30093
29986
echo "
30094
29987
Configure summary:
30095
29988
GNOME Support......: $WITH_GNOME
30097
29990
Print Support......: $enable_print
30098
29991
DBUS Support.......: $enable_dbus
30099
29992
Nautilus Plugin....: $HAVE_NAUTILUS
30100
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/cut-n-paste/Makefile.in evince-2.20.2.new/cut-n-paste/Makefile.in
30101
--- evince-2.20.2/cut-n-paste/Makefile.in 2007-11-26 22:55:48.000000000 +0100
30102
+++ evince-2.20.2.new/cut-n-paste/Makefile.in 2007-11-27 22:51:54.000000000 +0100
29993
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/cut-n-paste/gedit-message-area/Makefile.in evince-2.21.1.new/cut-n-paste/gedit-message-area/Makefile.in
29994
--- evince-2.21.1/cut-n-paste/gedit-message-area/Makefile.in 2007-12-03 22:58:18.000000000 +0100
29995
+++ evince-2.21.1.new/cut-n-paste/gedit-message-area/Makefile.in 2007-12-05 00:07:24.000000000 +0100
29996
@@ -1,8 +1,8 @@
29997
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
29998
+# Makefile.in generated by automake 1.10 from Makefile.am.
29999
# @configure_input@
30000
30001
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
30002
-# 2003, 2004, 2005 Free Software Foundation, Inc.
30003
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
30004
# This Makefile.in is free software; the Free Software Foundation
30005
# gives unlimited permission to copy and/or distribute it,
30006
# with or without modifications, as long as this notice is preserved.
30007
@@ -14,15 +14,11 @@
30008
30009
@SET_MAKE@
30010
30011
-srcdir = @srcdir@
30012
-top_srcdir = @top_srcdir@
30013
VPATH = @srcdir@
30014
pkgdatadir = $(datadir)/@PACKAGE@
30015
pkglibdir = $(libdir)/@PACKAGE@
30016
pkgincludedir = $(includedir)/@PACKAGE@
30017
-top_builddir = ../..
30018
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
30019
-INSTALL = @INSTALL@
30020
install_sh_DATA = $(install_sh) -c -m 644
30021
install_sh_PROGRAM = $(install_sh) -c
30022
install_sh_SCRIPT = $(install_sh) -c
30023
@@ -50,17 +46,22 @@
30024
am_libgeditmsgarea_la_OBJECTS = \
30025
libgeditmsgarea_la-gedit-message-area.lo
30026
libgeditmsgarea_la_OBJECTS = $(am_libgeditmsgarea_la_OBJECTS)
30027
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
30028
+libgeditmsgarea_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
30029
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
30030
+ $(libgeditmsgarea_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
30031
+ $(LDFLAGS) -o $@
30032
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
30033
depcomp = $(SHELL) $(top_srcdir)/depcomp
30034
am__depfiles_maybe = depfiles
30035
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
30036
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
30037
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
30038
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
30039
- $(AM_CFLAGS) $(CFLAGS)
30040
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
30041
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
30042
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
30043
CCLD = $(CC)
30044
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
30045
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
30046
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
30047
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
30048
+ $(LDFLAGS) -o $@
30049
SOURCES = $(libgeditmsgarea_la_SOURCES)
30050
DIST_SOURCES = $(libgeditmsgarea_la_SOURCES)
30051
ETAGS = etags
30052
@@ -69,8 +70,6 @@
30053
ACLOCAL = @ACLOCAL@
30054
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
30055
ALL_LINGUAS = @ALL_LINGUAS@
30056
-AMDEP_FALSE = @AMDEP_FALSE@
30057
-AMDEP_TRUE = @AMDEP_TRUE@
30058
AMTAR = @AMTAR@
30059
AR = @AR@
30060
AUTOCONF = @AUTOCONF@
30061
@@ -99,8 +98,6 @@
30062
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
30063
DBUS_CFLAGS = @DBUS_CFLAGS@
30064
DBUS_LIBS = @DBUS_LIBS@
30065
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
30066
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
30067
DEFS = @DEFS@
30068
DEPDIR = @DEPDIR@
30069
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
30070
@@ -112,30 +109,6 @@
30071
ECHO_N = @ECHO_N@
30072
ECHO_T = @ECHO_T@
30073
EGREP = @EGREP@
30074
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
30075
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
30076
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
30077
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
30078
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
30079
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
30080
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
30081
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
30082
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
30083
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
30084
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
30085
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
30086
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
30087
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
30088
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
30089
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
30090
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
30091
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
30092
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
30093
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
30094
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
30095
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
30096
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
30097
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
30098
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
30099
EXEEXT = @EXEEXT@
30100
F77 = @F77@
30101
@@ -145,8 +118,6 @@
30102
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
30103
FRONTEND_LIBS = @FRONTEND_LIBS@
30104
GCONFTOOL = @GCONFTOOL@
30105
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
30106
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
30107
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
30108
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
30109
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
30110
@@ -160,16 +131,15 @@
30111
GNOME_LIBS = @GNOME_LIBS@
30112
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
30113
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
30114
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
30115
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
30116
+GREP = @GREP@
30117
+GTKDOC_CHECK = @GTKDOC_CHECK@
30118
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
30119
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
30120
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
30121
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
30122
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
30123
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
30124
HELP_DIR = @HELP_DIR@
30125
+HILDON_CFLAGS = @HILDON_CFLAGS@
30126
+HILDON_LIBS = @HILDON_LIBS@
30127
HTML_DIR = @HTML_DIR@
30128
+INSTALL = @INSTALL@
30129
INSTALL_DATA = @INSTALL_DATA@
30130
INSTALL_PROGRAM = @INSTALL_PROGRAM@
30131
INSTALL_SCRIPT = @INSTALL_SCRIPT@
30132
@@ -180,14 +150,12 @@
30133
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
30134
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
30135
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
30136
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
30137
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
30138
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
30139
INTLTOOL_MERGE = @INTLTOOL_MERGE@
30140
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
30141
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
30142
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
30143
INTLTOOL_PERL = @INTLTOOL_PERL@
30144
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
30145
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
30146
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
30147
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
30148
@@ -199,7 +167,6 @@
30149
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
30150
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
30151
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
30152
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
30153
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
30154
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
30155
LDFLAGS = @LDFLAGS@
30156
@@ -211,9 +178,8 @@
30157
LN_S = @LN_S@
30158
LTLIBOBJS = @LTLIBOBJS@
30159
MAINT = @MAINT@
30160
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
30161
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
30162
MAKEINFO = @MAKEINFO@
30163
+MKDIR_P = @MKDIR_P@
30164
MKINSTALLDIRS = @MKINSTALLDIRS@
30165
MSGFMT = @MSGFMT@
30166
MSGFMT_OPTS = @MSGFMT_OPTS@
30167
@@ -248,26 +214,14 @@
30168
VERSION = @VERSION@
30169
WARN_CFLAGS = @WARN_CFLAGS@
30170
WARN_CXXFLAGS = @WARN_CXXFLAGS@
30171
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
30172
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
30173
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
30174
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
30175
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
30176
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
30177
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
30178
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
30179
XGETTEXT = @XGETTEXT@
30180
-ac_ct_AR = @ac_ct_AR@
30181
+abs_builddir = @abs_builddir@
30182
+abs_srcdir = @abs_srcdir@
30183
+abs_top_builddir = @abs_top_builddir@
30184
+abs_top_srcdir = @abs_top_srcdir@
30185
ac_ct_CC = @ac_ct_CC@
30186
ac_ct_CXX = @ac_ct_CXX@
30187
ac_ct_F77 = @ac_ct_F77@
30188
-ac_ct_RANLIB = @ac_ct_RANLIB@
30189
-ac_ct_STRIP = @ac_ct_STRIP@
30190
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
30191
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
30192
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
30193
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
30194
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
30195
am__include = @am__include@
30196
am__leading_dot = @am__leading_dot@
30197
am__quote = @am__quote@
30198
@@ -279,28 +233,39 @@
30199
build_cpu = @build_cpu@
30200
build_os = @build_os@
30201
build_vendor = @build_vendor@
30202
+builddir = @builddir@
30203
datadir = @datadir@
30204
+datarootdir = @datarootdir@
30205
+docdir = @docdir@
30206
+dvidir = @dvidir@
30207
exec_prefix = @exec_prefix@
30208
host = @host@
30209
host_alias = @host_alias@
30210
host_cpu = @host_cpu@
30211
host_os = @host_os@
30212
host_vendor = @host_vendor@
30213
+htmldir = @htmldir@
30214
includedir = @includedir@
30215
infodir = @infodir@
30216
install_sh = @install_sh@
30217
libdir = @libdir@
30218
libexecdir = @libexecdir@
30219
+localedir = @localedir@
30220
localstatedir = @localstatedir@
30221
mandir = @mandir@
30222
mkdir_p = @mkdir_p@
30223
oldincludedir = @oldincludedir@
30224
+pdfdir = @pdfdir@
30225
prefix = @prefix@
30226
program_transform_name = @program_transform_name@
30227
+psdir = @psdir@
30228
sbindir = @sbindir@
30229
sharedstatedir = @sharedstatedir@
30230
+srcdir = @srcdir@
30231
sysconfdir = @sysconfdir@
30232
target_alias = @target_alias@
30233
+top_builddir = @top_builddir@
30234
+top_srcdir = @top_srcdir@
30235
noinst_LTLIBRARIES = libgeditmsgarea.la
30236
libgeditmsgarea_la_SOURCES = \
30237
gedit-message-area.c \
30238
@@ -355,7 +320,7 @@
30239
rm -f "$${dir}/so_locations"; \
30240
done
30241
libgeditmsgarea.la: $(libgeditmsgarea_la_OBJECTS) $(libgeditmsgarea_la_DEPENDENCIES)
30242
- $(LINK) $(libgeditmsgarea_la_LDFLAGS) $(libgeditmsgarea_la_OBJECTS) $(libgeditmsgarea_la_LIBADD) $(LIBS)
30243
+ $(libgeditmsgarea_la_LINK) $(libgeditmsgarea_la_OBJECTS) $(libgeditmsgarea_la_LIBADD) $(LIBS)
30244
30245
mostlyclean-compile:
30246
-rm -f *.$(OBJEXT)
30247
@@ -366,32 +331,32 @@
30248
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Plo@am__quote@
30249
30250
.c.o:
30251
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
30252
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
30253
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
30254
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
30255
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
30256
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30257
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
30258
30259
.c.obj:
30260
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
30261
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
30262
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
30263
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
30264
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
30265
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30266
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
30267
30268
.c.lo:
30269
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
30270
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
30271
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
30272
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
30273
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
30274
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30275
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
30276
30277
libgeditmsgarea_la-gedit-message-area.lo: gedit-message-area.c
30278
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgeditmsgarea_la_CFLAGS) $(CFLAGS) -MT libgeditmsgarea_la-gedit-message-area.lo -MD -MP -MF "$(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Tpo" -c -o libgeditmsgarea_la-gedit-message-area.lo `test -f 'gedit-message-area.c' || echo '$(srcdir)/'`gedit-message-area.c; \
30279
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Tpo" "$(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Plo"; else rm -f "$(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Tpo"; exit 1; fi
30280
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgeditmsgarea_la_CFLAGS) $(CFLAGS) -MT libgeditmsgarea_la-gedit-message-area.lo -MD -MP -MF $(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Tpo -c -o libgeditmsgarea_la-gedit-message-area.lo `test -f 'gedit-message-area.c' || echo '$(srcdir)/'`gedit-message-area.c
30281
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Tpo $(DEPDIR)/libgeditmsgarea_la-gedit-message-area.Plo
30282
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gedit-message-area.c' object='libgeditmsgarea_la-gedit-message-area.lo' libtool=yes @AMDEPBACKSLASH@
30283
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30284
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgeditmsgarea_la_CFLAGS) $(CFLAGS) -c -o libgeditmsgarea_la-gedit-message-area.lo `test -f 'gedit-message-area.c' || echo '$(srcdir)/'`gedit-message-area.c
30285
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgeditmsgarea_la_CFLAGS) $(CFLAGS) -c -o libgeditmsgarea_la-gedit-message-area.lo `test -f 'gedit-message-area.c' || echo '$(srcdir)/'`gedit-message-area.c
30286
30287
mostlyclean-libtool:
30288
-rm -f *.lo
30289
@@ -399,10 +364,6 @@
30290
clean-libtool:
30291
-rm -rf .libs _libs
30292
30293
-distclean-libtool:
30294
- -rm -f libtool
30295
-uninstall-info-am:
30296
-
30297
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
30298
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
30299
unique=`for i in $$list; do \
30300
@@ -452,22 +413,21 @@
30301
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
30302
30303
distdir: $(DISTFILES)
30304
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
30305
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
30306
- list='$(DISTFILES)'; for file in $$list; do \
30307
- case $$file in \
30308
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
30309
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
30310
- esac; \
30311
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
30312
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
30313
+ list='$(DISTFILES)'; \
30314
+ dist_files=`for file in $$list; do echo $$file; done | \
30315
+ sed -e "s|^$$srcdirstrip/||;t" \
30316
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
30317
+ case $$dist_files in \
30318
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
30319
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
30320
+ sort -u` ;; \
30321
+ esac; \
30322
+ for file in $$dist_files; do \
30323
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
30324
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
30325
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
30326
- dir="/$$dir"; \
30327
- $(mkdir_p) "$(distdir)$$dir"; \
30328
- else \
30329
- dir=''; \
30330
- fi; \
30331
if test -d $$d/$$file; then \
30332
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
30333
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
30334
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
30335
fi; \
30336
@@ -515,7 +475,7 @@
30337
-rm -rf ./$(DEPDIR)
30338
-rm -f Makefile
30339
distclean-am: clean-am distclean-compile distclean-generic \
30340
- distclean-libtool distclean-tags
30341
+ distclean-tags
30342
30343
dvi: dvi-am
30344
30345
@@ -529,12 +489,20 @@
30346
30347
install-data-am:
30348
30349
+install-dvi: install-dvi-am
30350
+
30351
install-exec-am:
30352
30353
+install-html: install-html-am
30354
+
30355
install-info: install-info-am
30356
30357
install-man:
30358
30359
+install-pdf: install-pdf-am
30360
+
30361
+install-ps: install-ps-am
30362
+
30363
installcheck-am:
30364
30365
maintainer-clean: maintainer-clean-am
30366
@@ -555,19 +523,22 @@
30367
30368
ps-am:
30369
30370
-uninstall-am: uninstall-info-am
30371
+uninstall-am:
30372
+
30373
+.MAKE: install-am install-strip
30374
30375
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
30376
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
30377
distclean-compile distclean-generic distclean-libtool \
30378
distclean-tags distdir dvi dvi-am html html-am info info-am \
30379
- install install-am install-data install-data-am install-exec \
30380
- install-exec-am install-info install-info-am install-man \
30381
+ install install-am install-data install-data-am install-dvi \
30382
+ install-dvi-am install-exec install-exec-am install-html \
30383
+ install-html-am install-info install-info-am install-man \
30384
+ install-pdf install-pdf-am install-ps install-ps-am \
30385
install-strip installcheck installcheck-am installdirs \
30386
maintainer-clean maintainer-clean-generic mostlyclean \
30387
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
30388
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
30389
- uninstall-info-am
30390
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
30391
30392
# Tell versions [3.59,3.63) of GNU make to not export all variables.
30393
# Otherwise a system limit (for SysV at least) may be exceeded.
30394
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/cut-n-paste/Makefile.in evince-2.21.1.new/cut-n-paste/Makefile.in
30395
--- evince-2.21.1/cut-n-paste/Makefile.in 2007-12-03 22:58:17.000000000 +0100
30396
+++ evince-2.21.1.new/cut-n-paste/Makefile.in 2007-12-05 00:07:24.000000000 +0100
30103
30397
@@ -1,8 +1,8 @@
30104
30398
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
30105
30399
+# Makefile.in generated by automake 1.10 from Makefile.am.
30127
30421
install_sh_DATA = $(install_sh) -c -m 644
30128
30422
install_sh_PROGRAM = $(install_sh) -c
30129
30423
install_sh_SCRIPT = $(install_sh) -c
30130
@@ -50,10 +46,13 @@
30424
@@ -48,10 +44,13 @@
30131
30425
DIST_SOURCES =
30132
30426
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
30133
30427
html-recursive info-recursive install-data-recursive \
30144
30438
+ distclean-recursive maintainer-clean-recursive
30145
30439
ETAGS = etags
30146
30440
CTAGS = ctags
30147
DIST_SUBDIRS = recent-files zoom-control toolbar-editor \
30148
@@ -62,8 +61,6 @@
30441
DIST_SUBDIRS = $(SUBDIRS)
30442
@@ -59,8 +58,6 @@
30149
30443
ACLOCAL = @ACLOCAL@
30150
30444
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
30151
30445
ALL_LINGUAS = @ALL_LINGUAS@
30154
30448
AMTAR = @AMTAR@
30155
30449
AR = @AR@
30156
30450
AUTOCONF = @AUTOCONF@
30157
@@ -92,8 +89,6 @@
30451
@@ -89,8 +86,6 @@
30158
30452
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
30159
30453
DBUS_CFLAGS = @DBUS_CFLAGS@
30160
30454
DBUS_LIBS = @DBUS_LIBS@
30163
30457
DEFS = @DEFS@
30164
30458
DEPDIR = @DEPDIR@
30165
30459
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
30166
@@ -105,30 +100,6 @@
30460
@@ -102,30 +97,6 @@
30167
30461
ECHO_N = @ECHO_N@
30168
30462
ECHO_T = @ECHO_T@
30169
30463
EGREP = @EGREP@
30194
30488
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
30195
30489
EXEEXT = @EXEEXT@
30196
30490
F77 = @F77@
30197
@@ -138,8 +109,6 @@
30491
@@ -135,8 +106,6 @@
30198
30492
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
30199
30493
FRONTEND_LIBS = @FRONTEND_LIBS@
30200
30494
GCONFTOOL = @GCONFTOOL@
30203
30497
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
30204
30498
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
30205
30499
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
30206
@@ -153,20 +122,17 @@
30500
@@ -150,16 +119,15 @@
30207
30501
GNOME_LIBS = @GNOME_LIBS@
30208
30502
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
30209
30503
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
30213
30507
+GTKDOC_CHECK = @GTKDOC_CHECK@
30214
30508
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
30215
30509
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
30216
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
30217
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
30218
30510
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
30219
30511
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
30220
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
30221
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
30222
30512
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
30223
30513
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
30224
30514
HELP_DIR = @HELP_DIR@
30229
30519
INSTALL_DATA = @INSTALL_DATA@
30230
30520
INSTALL_PROGRAM = @INSTALL_PROGRAM@
30231
30521
INSTALL_SCRIPT = @INSTALL_SCRIPT@
30232
@@ -177,14 +143,12 @@
30522
@@ -170,14 +138,12 @@
30233
30523
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
30234
30524
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
30235
30525
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
30245
30535
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
30246
30536
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
30247
30537
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
30248
@@ -196,7 +160,6 @@
30538
@@ -189,7 +155,6 @@
30249
30539
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
30250
30540
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
30251
30541
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
30253
30543
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
30254
30544
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
30255
30545
LDFLAGS = @LDFLAGS@
30256
@@ -208,9 +171,8 @@
30546
@@ -201,9 +166,8 @@
30257
30547
LN_S = @LN_S@
30258
30548
LTLIBOBJS = @LTLIBOBJS@
30259
30549
MAINT = @MAINT@
30264
30554
MKINSTALLDIRS = @MKINSTALLDIRS@
30265
30555
MSGFMT = @MSGFMT@
30266
30556
MSGFMT_OPTS = @MSGFMT_OPTS@
30267
@@ -245,26 +207,14 @@
30557
@@ -238,26 +202,14 @@
30268
30558
VERSION = @VERSION@
30269
30559
WARN_CFLAGS = @WARN_CFLAGS@
30270
30560
WARN_CXXFLAGS = @WARN_CXXFLAGS@
30295
30585
am__include = @am__include@
30296
30586
am__leading_dot = @am__leading_dot@
30297
30587
am__quote = @am__quote@
30298
@@ -276,28 +226,39 @@
30588
@@ -269,28 +221,39 @@
30299
30589
build_cpu = @build_cpu@
30300
30590
build_os = @build_os@
30301
30591
build_vendor = @build_vendor@
30332
30622
target_alias = @target_alias@
30333
30623
+top_builddir = @top_builddir@
30334
30624
+top_srcdir = @top_srcdir@
30335
SUBDIRS = $(am__append_1) $(am__append_2) zoom-control toolbar-editor \
30336
totem-screensaver
30625
SUBDIRS = zoom-control toolbar-editor totem-screensaver gedit-message-area
30337
30626
all: all-recursive
30338
@@ -339,10 +300,6 @@
30627
30628
@@ -331,10 +294,6 @@
30339
30629
clean-libtool:
30340
30630
-rm -rf .libs _libs
30341
30631
30346
30636
# This directory's subdirectories are mostly independent; you can cd
30347
30637
# into them and run `make' without going through this Makefile.
30348
30638
# To change the values of `make' variables: instead of editing Makefiles,
30349
@@ -374,8 +331,7 @@
30639
@@ -366,8 +325,7 @@
30350
30640
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
30351
30641
fi; test -z "$$fail"
30352
30642
30356
30646
@failcom='exit 1'; \
30357
30647
for f in x $$MAKEFLAGS; do \
30358
30648
case $$f in \
30359
@@ -476,22 +432,21 @@
30649
@@ -468,22 +426,21 @@
30360
30650
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
30361
30651
30362
30652
distdir: $(DISTFILES)
30392
30682
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
30393
30683
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
30394
30684
fi; \
30395
@@ -505,7 +460,7 @@
30685
@@ -497,7 +454,7 @@
30396
30686
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
30397
30687
if test "$$subdir" = .; then :; else \
30398
30688
test -d "$(distdir)/$$subdir" \
30401
30691
|| exit 1; \
30402
30692
distdir=`$(am__cd) $(distdir) && pwd`; \
30403
30693
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
30404
@@ -513,6 +468,8 @@
30694
@@ -505,6 +462,8 @@
30405
30695
$(MAKE) $(AM_MAKEFLAGS) \
30406
30696
top_distdir="$$top_distdir" \
30407
30697
distdir="$$distdir/$$subdir" \
30410
30700
distdir) \
30411
30701
|| exit 1; \
30412
30702
fi; \
30413
@@ -552,8 +509,7 @@
30703
@@ -544,8 +503,7 @@
30414
30704
30415
30705
distclean: distclean-recursive
30416
30706
-rm -f Makefile
30420
30710
30421
30711
dvi: dvi-recursive
30422
30712
30423
@@ -567,12 +523,20 @@
30713
@@ -559,12 +517,20 @@
30424
30714
30425
30715
install-data-am:
30426
30716
30441
30731
installcheck-am:
30442
30732
30443
30733
maintainer-clean: maintainer-clean-recursive
30444
@@ -591,22 +555,24 @@
30734
@@ -583,22 +549,24 @@
30445
30735
30446
30736
ps-am:
30447
30737
30478
30768
30479
30769
# Tell versions [3.59,3.63) of GNU make to not export all variables.
30480
30770
# Otherwise a system limit (for SysV at least) may be exceeded.
30481
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/cut-n-paste/recent-files/Makefile.in evince-2.20.2.new/cut-n-paste/recent-files/Makefile.in
30482
--- evince-2.20.2/cut-n-paste/recent-files/Makefile.in 2007-11-26 22:55:48.000000000 +0100
30483
+++ evince-2.20.2.new/cut-n-paste/recent-files/Makefile.in 2007-11-27 22:51:54.000000000 +0100
30484
@@ -1,8 +1,8 @@
30485
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
30486
+# Makefile.in generated by automake 1.10 from Makefile.am.
30487
# @configure_input@
30488
30489
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
30490
-# 2003, 2004, 2005 Free Software Foundation, Inc.
30491
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
30492
# This Makefile.in is free software; the Free Software Foundation
30493
# gives unlimited permission to copy and/or distribute it,
30494
# with or without modifications, as long as this notice is preserved.
30495
@@ -14,15 +14,11 @@
30496
30497
@SET_MAKE@
30498
30499
-srcdir = @srcdir@
30500
-top_srcdir = @top_srcdir@
30501
VPATH = @srcdir@
30502
pkgdatadir = $(datadir)/@PACKAGE@
30503
pkglibdir = $(libdir)/@PACKAGE@
30504
pkgincludedir = $(includedir)/@PACKAGE@
30505
-top_builddir = ../..
30506
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
30507
-INSTALL = @INSTALL@
30508
install_sh_DATA = $(install_sh) -c -m 644
30509
install_sh_PROGRAM = $(install_sh) -c
30510
install_sh_SCRIPT = $(install_sh) -c
30511
@@ -52,17 +48,18 @@
30512
egg-recent-util.lo
30513
am_librecent_la_OBJECTS = $(am__objects_1)
30514
librecent_la_OBJECTS = $(am_librecent_la_OBJECTS)
30515
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
30516
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
30517
depcomp = $(SHELL) $(top_srcdir)/depcomp
30518
am__depfiles_maybe = depfiles
30519
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
30520
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
30521
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
30522
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
30523
- $(AM_CFLAGS) $(CFLAGS)
30524
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
30525
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
30526
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
30527
CCLD = $(CC)
30528
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
30529
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
30530
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
30531
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
30532
+ $(LDFLAGS) -o $@
30533
SOURCES = $(librecent_la_SOURCES)
30534
DIST_SOURCES = $(librecent_la_SOURCES)
30535
ETAGS = etags
30536
@@ -71,8 +68,6 @@
30537
ACLOCAL = @ACLOCAL@
30538
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
30539
ALL_LINGUAS = @ALL_LINGUAS@
30540
-AMDEP_FALSE = @AMDEP_FALSE@
30541
-AMDEP_TRUE = @AMDEP_TRUE@
30542
AMTAR = @AMTAR@
30543
AR = @AR@
30544
AUTOCONF = @AUTOCONF@
30545
@@ -101,8 +96,6 @@
30546
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
30547
DBUS_CFLAGS = @DBUS_CFLAGS@
30548
DBUS_LIBS = @DBUS_LIBS@
30549
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
30550
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
30551
DEFS = @DEFS@
30552
DEPDIR = @DEPDIR@
30553
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
30554
@@ -114,30 +107,6 @@
30555
ECHO_N = @ECHO_N@
30556
ECHO_T = @ECHO_T@
30557
EGREP = @EGREP@
30558
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
30559
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
30560
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
30561
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
30562
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
30563
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
30564
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
30565
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
30566
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
30567
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
30568
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
30569
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
30570
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
30571
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
30572
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
30573
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
30574
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
30575
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
30576
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
30577
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
30578
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
30579
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
30580
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
30581
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
30582
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
30583
EXEEXT = @EXEEXT@
30584
F77 = @F77@
30585
@@ -147,8 +116,6 @@
30586
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
30587
FRONTEND_LIBS = @FRONTEND_LIBS@
30588
GCONFTOOL = @GCONFTOOL@
30589
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
30590
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
30591
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
30592
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
30593
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
30594
@@ -162,20 +129,17 @@
30595
GNOME_LIBS = @GNOME_LIBS@
30596
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
30597
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
30598
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
30599
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
30600
+GREP = @GREP@
30601
+GTKDOC_CHECK = @GTKDOC_CHECK@
30602
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
30603
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
30604
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
30605
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
30606
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
30607
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
30608
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
30609
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
30610
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
30611
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
30612
HELP_DIR = @HELP_DIR@
30613
+HILDON_CFLAGS = @HILDON_CFLAGS@
30614
+HILDON_LIBS = @HILDON_LIBS@
30615
HTML_DIR = @HTML_DIR@
30616
+INSTALL = @INSTALL@
30617
INSTALL_DATA = @INSTALL_DATA@
30618
INSTALL_PROGRAM = @INSTALL_PROGRAM@
30619
INSTALL_SCRIPT = @INSTALL_SCRIPT@
30620
@@ -186,14 +150,12 @@
30621
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
30622
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
30623
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
30624
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
30625
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
30626
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
30627
INTLTOOL_MERGE = @INTLTOOL_MERGE@
30628
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
30629
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
30630
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
30631
INTLTOOL_PERL = @INTLTOOL_PERL@
30632
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
30633
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
30634
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
30635
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
30636
@@ -205,7 +167,6 @@
30637
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
30638
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
30639
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
30640
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
30641
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
30642
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
30643
LDFLAGS = @LDFLAGS@
30644
@@ -217,9 +178,8 @@
30645
LN_S = @LN_S@
30646
LTLIBOBJS = @LTLIBOBJS@
30647
MAINT = @MAINT@
30648
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
30649
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
30650
MAKEINFO = @MAKEINFO@
30651
+MKDIR_P = @MKDIR_P@
30652
MKINSTALLDIRS = @MKINSTALLDIRS@
30653
MSGFMT = @MSGFMT@
30654
MSGFMT_OPTS = @MSGFMT_OPTS@
30655
@@ -254,26 +214,14 @@
30656
VERSION = @VERSION@
30657
WARN_CFLAGS = @WARN_CFLAGS@
30658
WARN_CXXFLAGS = @WARN_CXXFLAGS@
30659
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
30660
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
30661
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
30662
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
30663
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
30664
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
30665
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
30666
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
30667
XGETTEXT = @XGETTEXT@
30668
-ac_ct_AR = @ac_ct_AR@
30669
+abs_builddir = @abs_builddir@
30670
+abs_srcdir = @abs_srcdir@
30671
+abs_top_builddir = @abs_top_builddir@
30672
+abs_top_srcdir = @abs_top_srcdir@
30673
ac_ct_CC = @ac_ct_CC@
30674
ac_ct_CXX = @ac_ct_CXX@
30675
ac_ct_F77 = @ac_ct_F77@
30676
-ac_ct_RANLIB = @ac_ct_RANLIB@
30677
-ac_ct_STRIP = @ac_ct_STRIP@
30678
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
30679
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
30680
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
30681
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
30682
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
30683
am__include = @am__include@
30684
am__leading_dot = @am__leading_dot@
30685
am__quote = @am__quote@
30686
@@ -285,28 +233,39 @@
30687
build_cpu = @build_cpu@
30688
build_os = @build_os@
30689
build_vendor = @build_vendor@
30690
+builddir = @builddir@
30691
datadir = @datadir@
30692
+datarootdir = @datarootdir@
30693
+docdir = @docdir@
30694
+dvidir = @dvidir@
30695
exec_prefix = @exec_prefix@
30696
host = @host@
30697
host_alias = @host_alias@
30698
host_cpu = @host_cpu@
30699
host_os = @host_os@
30700
host_vendor = @host_vendor@
30701
+htmldir = @htmldir@
30702
includedir = @includedir@
30703
infodir = @infodir@
30704
install_sh = @install_sh@
30705
libdir = @libdir@
30706
libexecdir = @libexecdir@
30707
+localedir = @localedir@
30708
localstatedir = @localstatedir@
30709
mandir = @mandir@
30710
mkdir_p = @mkdir_p@
30711
oldincludedir = @oldincludedir@
30712
+pdfdir = @pdfdir@
30713
prefix = @prefix@
30714
program_transform_name = @program_transform_name@
30715
+psdir = @psdir@
30716
sbindir = @sbindir@
30717
sharedstatedir = @sharedstatedir@
30718
+srcdir = @srcdir@
30719
sysconfdir = @sysconfdir@
30720
target_alias = @target_alias@
30721
+top_builddir = @top_builddir@
30722
+top_srcdir = @top_srcdir@
30723
INCLUDES = \
30724
$(LIB_CFLAGS) \
30725
$(WARN_CFLAGS)
30726
@@ -371,7 +330,7 @@
30727
rm -f "$${dir}/so_locations"; \
30728
done
30729
librecent.la: $(librecent_la_OBJECTS) $(librecent_la_DEPENDENCIES)
30730
- $(LINK) $(librecent_la_LDFLAGS) $(librecent_la_OBJECTS) $(librecent_la_LIBADD) $(LIBS)
30731
+ $(LINK) $(librecent_la_OBJECTS) $(librecent_la_LIBADD) $(LIBS)
30732
30733
mostlyclean-compile:
30734
-rm -f *.$(OBJEXT)
30735
@@ -386,22 +345,22 @@
30736
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egg-recent-view.Plo@am__quote@
30737
30738
.c.o:
30739
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
30740
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
30741
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
30742
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
30743
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
30744
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30745
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
30746
30747
.c.obj:
30748
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
30749
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
30750
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
30751
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
30752
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
30753
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30754
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
30755
30756
.c.lo:
30757
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
30758
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
30759
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
30760
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
30761
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
30762
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30763
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
30764
@@ -412,10 +371,6 @@
30765
clean-libtool:
30766
-rm -rf .libs _libs
30767
30768
-distclean-libtool:
30769
- -rm -f libtool
30770
-uninstall-info-am:
30771
-
30772
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
30773
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
30774
unique=`for i in $$list; do \
30775
@@ -465,22 +420,21 @@
30776
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
30777
30778
distdir: $(DISTFILES)
30779
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
30780
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
30781
- list='$(DISTFILES)'; for file in $$list; do \
30782
- case $$file in \
30783
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
30784
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
30785
- esac; \
30786
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
30787
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
30788
+ list='$(DISTFILES)'; \
30789
+ dist_files=`for file in $$list; do echo $$file; done | \
30790
+ sed -e "s|^$$srcdirstrip/||;t" \
30791
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
30792
+ case $$dist_files in \
30793
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
30794
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
30795
+ sort -u` ;; \
30796
+ esac; \
30797
+ for file in $$dist_files; do \
30798
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
30799
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
30800
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
30801
- dir="/$$dir"; \
30802
- $(mkdir_p) "$(distdir)$$dir"; \
30803
- else \
30804
- dir=''; \
30805
- fi; \
30806
if test -d $$d/$$file; then \
30807
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
30808
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
30809
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
30810
fi; \
30811
@@ -528,7 +482,7 @@
30812
-rm -rf ./$(DEPDIR)
30813
-rm -f Makefile
30814
distclean-am: clean-am distclean-compile distclean-generic \
30815
- distclean-libtool distclean-tags
30816
+ distclean-tags
30817
30818
dvi: dvi-am
30819
30820
@@ -542,12 +496,20 @@
30821
30822
install-data-am:
30823
30824
+install-dvi: install-dvi-am
30825
+
30826
install-exec-am:
30827
30828
+install-html: install-html-am
30829
+
30830
install-info: install-info-am
30831
30832
install-man:
30833
30834
+install-pdf: install-pdf-am
30835
+
30836
+install-ps: install-ps-am
30837
+
30838
installcheck-am:
30839
30840
maintainer-clean: maintainer-clean-am
30841
@@ -568,19 +530,22 @@
30842
30843
ps-am:
30844
30845
-uninstall-am: uninstall-info-am
30846
+uninstall-am:
30847
+
30848
+.MAKE: install-am install-strip
30849
30850
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
30851
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
30852
distclean-compile distclean-generic distclean-libtool \
30853
distclean-tags distdir dvi dvi-am html html-am info info-am \
30854
- install install-am install-data install-data-am install-exec \
30855
- install-exec-am install-info install-info-am install-man \
30856
+ install install-am install-data install-data-am install-dvi \
30857
+ install-dvi-am install-exec install-exec-am install-html \
30858
+ install-html-am install-info install-info-am install-man \
30859
+ install-pdf install-pdf-am install-ps install-ps-am \
30860
install-strip installcheck installcheck-am installdirs \
30861
maintainer-clean maintainer-clean-generic mostlyclean \
30862
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
30863
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
30864
- uninstall-info-am
30865
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
30866
30867
regenerate-built-sources:
30868
EGGFILES="$(EGG_FILES)" EGGDIR="$(EGGDIR)" $(top_srcdir)/cut-n-paste/update-from-egg.sh
30869
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/cut-n-paste/toolbar-editor/Makefile.in evince-2.20.2.new/cut-n-paste/toolbar-editor/Makefile.in
30870
--- evince-2.20.2/cut-n-paste/toolbar-editor/Makefile.in 2007-11-26 22:55:49.000000000 +0100
30871
+++ evince-2.20.2.new/cut-n-paste/toolbar-editor/Makefile.in 2007-11-27 22:51:54.000000000 +0100
30771
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/cut-n-paste/toolbar-editor/Makefile.in evince-2.21.1.new/cut-n-paste/toolbar-editor/Makefile.in
30772
--- evince-2.21.1/cut-n-paste/toolbar-editor/Makefile.in 2007-12-03 22:58:18.000000000 +0100
30773
+++ evince-2.21.1.new/cut-n-paste/toolbar-editor/Makefile.in 2007-12-05 00:07:24.000000000 +0100
30872
30774
@@ -1,8 +1,8 @@
30873
30775
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
30874
30776
+# Makefile.in generated by automake 1.10 from Makefile.am.
30983
30885
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
30984
30886
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
30985
30887
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
30986
@@ -169,20 +140,17 @@
30888
@@ -169,16 +140,15 @@
30987
30889
GNOME_LIBS = @GNOME_LIBS@
30988
30890
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
30989
30891
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
30993
30895
+GTKDOC_CHECK = @GTKDOC_CHECK@
30994
30896
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
30995
30897
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
30996
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
30997
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
30998
30898
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
30999
30899
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
31000
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
31001
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
31002
30900
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
31003
30901
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
31004
30902
HELP_DIR = @HELP_DIR@
31009
30907
INSTALL_DATA = @INSTALL_DATA@
31010
30908
INSTALL_PROGRAM = @INSTALL_PROGRAM@
31011
30909
INSTALL_SCRIPT = @INSTALL_SCRIPT@
31012
@@ -193,14 +161,12 @@
30910
@@ -189,14 +159,12 @@
31013
30911
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
31014
30912
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
31015
30913
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
31025
30923
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
31026
30924
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
31027
30925
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
31028
@@ -212,7 +178,6 @@
30926
@@ -208,7 +176,6 @@
31029
30927
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
31030
30928
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
31031
30929
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
31033
30931
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
31034
30932
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
31035
30933
LDFLAGS = @LDFLAGS@
31036
@@ -224,9 +189,8 @@
30934
@@ -220,9 +187,8 @@
31037
30935
LN_S = @LN_S@
31038
30936
LTLIBOBJS = @LTLIBOBJS@
31039
30937
MAINT = @MAINT@
31044
30942
MKINSTALLDIRS = @MKINSTALLDIRS@
31045
30943
MSGFMT = @MSGFMT@
31046
30944
MSGFMT_OPTS = @MSGFMT_OPTS@
31047
@@ -261,26 +225,14 @@
30945
@@ -257,26 +223,14 @@
31048
30946
VERSION = @VERSION@
31049
30947
WARN_CFLAGS = @WARN_CFLAGS@
31050
30948
WARN_CXXFLAGS = @WARN_CXXFLAGS@
31075
30973
am__include = @am__include@
31076
30974
am__leading_dot = @am__leading_dot@
31077
30975
am__quote = @am__quote@
31078
@@ -292,28 +244,39 @@
30976
@@ -288,28 +242,39 @@
31079
30977
build_cpu = @build_cpu@
31080
30978
build_os = @build_os@
31081
30979
build_vendor = @build_vendor@
31115
31013
EGGSOURCES = \
31116
31014
egg-editable-toolbar.c \
31117
31015
egg-toolbars-model.c \
31118
@@ -409,7 +372,7 @@
31016
@@ -405,7 +370,7 @@
31119
31017
rm -f "$${dir}/so_locations"; \
31120
31018
done
31121
31019
libtoolbareditor.la: $(libtoolbareditor_la_OBJECTS) $(libtoolbareditor_la_DEPENDENCIES)
31124
31022
31125
31023
mostlyclean-compile:
31126
31024
-rm -f *.$(OBJEXT)
31127
@@ -424,60 +387,60 @@
31025
@@ -420,60 +385,60 @@
31128
31026
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtoolbareditor_la-eggtypebuiltins.Plo@am__quote@
31129
31027
31130
31028
.c.o:
31206
31104
31207
31105
mostlyclean-libtool:
31208
31106
-rm -f *.lo
31209
@@ -485,10 +448,6 @@
31107
@@ -481,10 +446,6 @@
31210
31108
clean-libtool:
31211
31109
-rm -rf .libs _libs
31212
31110
31217
31115
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
31218
31116
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
31219
31117
unique=`for i in $$list; do \
31220
@@ -538,22 +497,21 @@
31118
@@ -534,22 +495,21 @@
31221
31119
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
31222
31120
31223
31121
distdir: $(DISTFILES)
31253
31151
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
31254
31152
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
31255
31153
fi; \
31256
@@ -607,7 +565,7 @@
31154
@@ -603,7 +563,7 @@
31257
31155
-rm -rf ./$(DEPDIR)
31258
31156
-rm -f Makefile
31259
31157
distclean-am: clean-am distclean-compile distclean-generic \
31262
31160
31263
31161
dvi: dvi-am
31264
31162
31265
@@ -621,12 +579,20 @@
31163
@@ -617,12 +577,20 @@
31266
31164
31267
31165
install-data-am:
31268
31166
31283
31181
installcheck-am:
31284
31182
31285
31183
maintainer-clean: maintainer-clean-am
31286
@@ -647,19 +613,22 @@
31184
@@ -643,19 +611,22 @@
31287
31185
31288
31186
ps-am:
31289
31187
31311
31209
31312
31210
31313
31211
eggmarshalers.h: stamp-eggmarshalers.h
31314
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/cut-n-paste/totem-screensaver/Makefile.in evince-2.20.2.new/cut-n-paste/totem-screensaver/Makefile.in
31315
--- evince-2.20.2/cut-n-paste/totem-screensaver/Makefile.in 2007-11-26 22:55:49.000000000 +0100
31316
+++ evince-2.20.2.new/cut-n-paste/totem-screensaver/Makefile.in 2007-11-27 22:51:54.000000000 +0100
31212
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/cut-n-paste/totem-screensaver/Makefile.in evince-2.21.1.new/cut-n-paste/totem-screensaver/Makefile.in
31213
--- evince-2.21.1/cut-n-paste/totem-screensaver/Makefile.in 2007-12-03 22:58:19.000000000 +0100
31214
+++ evince-2.21.1.new/cut-n-paste/totem-screensaver/Makefile.in 2007-12-05 00:07:24.000000000 +0100
31317
31215
@@ -1,8 +1,8 @@
31318
31216
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
31319
31217
+# Makefile.in generated by automake 1.10 from Makefile.am.
31428
31326
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
31429
31327
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
31430
31328
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
31431
@@ -160,20 +131,17 @@
31329
@@ -160,16 +131,15 @@
31432
31330
GNOME_LIBS = @GNOME_LIBS@
31433
31331
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
31434
31332
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
31438
31336
+GTKDOC_CHECK = @GTKDOC_CHECK@
31439
31337
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
31440
31338
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
31441
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
31442
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
31443
31339
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
31444
31340
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
31445
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
31446
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
31447
31341
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
31448
31342
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
31449
31343
HELP_DIR = @HELP_DIR@
31454
31348
INSTALL_DATA = @INSTALL_DATA@
31455
31349
INSTALL_PROGRAM = @INSTALL_PROGRAM@
31456
31350
INSTALL_SCRIPT = @INSTALL_SCRIPT@
31457
@@ -184,14 +152,12 @@
31351
@@ -180,14 +150,12 @@
31458
31352
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
31459
31353
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
31460
31354
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
31470
31364
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
31471
31365
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
31472
31366
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
31473
@@ -203,7 +169,6 @@
31367
@@ -199,7 +167,6 @@
31474
31368
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
31475
31369
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
31476
31370
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
31478
31372
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
31479
31373
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
31480
31374
LDFLAGS = @LDFLAGS@
31481
@@ -215,9 +180,8 @@
31375
@@ -211,9 +178,8 @@
31482
31376
LN_S = @LN_S@
31483
31377
LTLIBOBJS = @LTLIBOBJS@
31484
31378
MAINT = @MAINT@
31489
31383
MKINSTALLDIRS = @MKINSTALLDIRS@
31490
31384
MSGFMT = @MSGFMT@
31491
31385
MSGFMT_OPTS = @MSGFMT_OPTS@
31492
@@ -252,26 +216,14 @@
31386
@@ -248,26 +214,14 @@
31493
31387
VERSION = @VERSION@
31494
31388
WARN_CFLAGS = @WARN_CFLAGS@
31495
31389
WARN_CXXFLAGS = @WARN_CXXFLAGS@
31520
31414
am__include = @am__include@
31521
31415
am__leading_dot = @am__leading_dot@
31522
31416
am__quote = @am__quote@
31523
@@ -283,28 +235,39 @@
31417
@@ -279,28 +233,39 @@
31524
31418
build_cpu = @build_cpu@
31525
31419
build_os = @build_os@
31526
31420
build_vendor = @build_vendor@
31560
31454
noinst_LTLIBRARIES = libtotemscrsaver.la
31561
31455
libtotemscrsaver_la_SOURCES = \
31562
31456
totem-scrsaver.h \
31563
@@ -360,7 +323,7 @@
31457
@@ -356,7 +321,7 @@
31564
31458
rm -f "$${dir}/so_locations"; \
31565
31459
done
31566
31460
libtotemscrsaver.la: $(libtotemscrsaver_la_OBJECTS) $(libtotemscrsaver_la_DEPENDENCIES)
31569
31463
31570
31464
mostlyclean-compile:
31571
31465
-rm -f *.$(OBJEXT)
31572
@@ -371,32 +334,32 @@
31466
@@ -367,32 +332,32 @@
31573
31467
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotemscrsaver_la-totem-scrsaver.Plo@am__quote@
31574
31468
31575
31469
.c.o:
31611
31505
31612
31506
mostlyclean-libtool:
31613
31507
-rm -f *.lo
31614
@@ -404,10 +367,6 @@
31508
@@ -400,10 +365,6 @@
31615
31509
clean-libtool:
31616
31510
-rm -rf .libs _libs
31617
31511
31622
31516
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
31623
31517
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
31624
31518
unique=`for i in $$list; do \
31625
@@ -457,22 +416,21 @@
31519
@@ -453,22 +414,21 @@
31626
31520
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
31627
31521
31628
31522
distdir: $(DISTFILES)
31658
31552
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
31659
31553
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
31660
31554
fi; \
31661
@@ -520,7 +478,7 @@
31555
@@ -516,7 +476,7 @@
31662
31556
-rm -rf ./$(DEPDIR)
31663
31557
-rm -f Makefile
31664
31558
distclean-am: clean-am distclean-compile distclean-generic \
31667
31561
31668
31562
dvi: dvi-am
31669
31563
31670
@@ -534,12 +492,20 @@
31564
@@ -530,12 +490,20 @@
31671
31565
31672
31566
install-data-am:
31673
31567
31688
31582
installcheck-am:
31689
31583
31690
31584
maintainer-clean: maintainer-clean-am
31691
@@ -560,19 +526,22 @@
31585
@@ -556,19 +524,22 @@
31692
31586
31693
31587
ps-am:
31694
31588
31716
31610
31717
31611
# Tell versions [3.59,3.63) of GNU make to not export all variables.
31718
31612
# Otherwise a system limit (for SysV at least) may be exceeded.
31719
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/cut-n-paste/zoom-control/Makefile.in evince-2.20.2.new/cut-n-paste/zoom-control/Makefile.in
31720
--- evince-2.20.2/cut-n-paste/zoom-control/Makefile.in 2007-11-26 22:55:50.000000000 +0100
31721
+++ evince-2.20.2.new/cut-n-paste/zoom-control/Makefile.in 2007-11-27 22:51:54.000000000 +0100
31613
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/cut-n-paste/zoom-control/Makefile.in evince-2.21.1.new/cut-n-paste/zoom-control/Makefile.in
31614
--- evince-2.21.1/cut-n-paste/zoom-control/Makefile.in 2007-12-03 22:58:19.000000000 +0100
31615
+++ evince-2.21.1.new/cut-n-paste/zoom-control/Makefile.in 2007-12-05 00:07:24.000000000 +0100
31722
31616
@@ -1,8 +1,8 @@
31723
31617
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
31724
31618
+# Makefile.in generated by automake 1.10 from Makefile.am.
31832
31726
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
31833
31727
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
31834
31728
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
31835
@@ -161,20 +131,17 @@
31729
@@ -161,16 +131,15 @@
31836
31730
GNOME_LIBS = @GNOME_LIBS@
31837
31731
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
31838
31732
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
31842
31736
+GTKDOC_CHECK = @GTKDOC_CHECK@
31843
31737
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
31844
31738
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
31845
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
31846
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
31847
31739
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
31848
31740
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
31849
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
31850
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
31851
31741
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
31852
31742
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
31853
31743
HELP_DIR = @HELP_DIR@
31858
31748
INSTALL_DATA = @INSTALL_DATA@
31859
31749
INSTALL_PROGRAM = @INSTALL_PROGRAM@
31860
31750
INSTALL_SCRIPT = @INSTALL_SCRIPT@
31861
@@ -185,14 +152,12 @@
31751
@@ -181,14 +150,12 @@
31862
31752
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
31863
31753
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
31864
31754
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
31874
31764
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
31875
31765
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
31876
31766
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
31877
@@ -204,7 +169,6 @@
31767
@@ -200,7 +167,6 @@
31878
31768
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
31879
31769
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
31880
31770
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
31882
31772
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
31883
31773
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
31884
31774
LDFLAGS = @LDFLAGS@
31885
@@ -216,9 +180,8 @@
31775
@@ -212,9 +178,8 @@
31886
31776
LN_S = @LN_S@
31887
31777
LTLIBOBJS = @LTLIBOBJS@
31888
31778
MAINT = @MAINT@
31893
31783
MKINSTALLDIRS = @MKINSTALLDIRS@
31894
31784
MSGFMT = @MSGFMT@
31895
31785
MSGFMT_OPTS = @MSGFMT_OPTS@
31896
@@ -253,26 +216,14 @@
31786
@@ -249,26 +214,14 @@
31897
31787
VERSION = @VERSION@
31898
31788
WARN_CFLAGS = @WARN_CFLAGS@
31899
31789
WARN_CXXFLAGS = @WARN_CXXFLAGS@
31924
31814
am__include = @am__include@
31925
31815
am__leading_dot = @am__leading_dot@
31926
31816
am__quote = @am__quote@
31927
@@ -284,28 +235,39 @@
31817
@@ -280,28 +233,39 @@
31928
31818
build_cpu = @build_cpu@
31929
31819
build_os = @build_os@
31930
31820
build_vendor = @build_vendor@
31964
31854
noinst_LTLIBRARIES = libephyzoom.la
31965
31855
libephyzoom_la_SOURCES = \
31966
31856
ephy-zoom-action.h \
31967
@@ -364,7 +326,7 @@
31857
@@ -360,7 +324,7 @@
31968
31858
rm -f "$${dir}/so_locations"; \
31969
31859
done
31970
31860
libephyzoom.la: $(libephyzoom_la_OBJECTS) $(libephyzoom_la_DEPENDENCIES)
31973
31863
31974
31864
mostlyclean-compile:
31975
31865
-rm -f *.$(OBJEXT)
31976
@@ -377,46 +339,46 @@
31866
@@ -373,46 +337,46 @@
31977
31867
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephyzoom_la-ephy-zoom.Plo@am__quote@
31978
31868
31979
31869
.c.o:
32035
31925
32036
31926
mostlyclean-libtool:
32037
31927
-rm -f *.lo
32038
@@ -424,10 +386,6 @@
31928
@@ -420,10 +384,6 @@
32039
31929
clean-libtool:
32040
31930
-rm -rf .libs _libs
32041
31931
32046
31936
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
32047
31937
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
32048
31938
unique=`for i in $$list; do \
32049
@@ -477,22 +435,21 @@
31939
@@ -473,22 +433,21 @@
32050
31940
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
32051
31941
32052
31942
distdir: $(DISTFILES)
32082
31972
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
32083
31973
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
32084
31974
fi; \
32085
@@ -540,7 +497,7 @@
31975
@@ -536,7 +495,7 @@
32086
31976
-rm -rf ./$(DEPDIR)
32087
31977
-rm -f Makefile
32088
31978
distclean-am: clean-am distclean-compile distclean-generic \
32091
31981
32092
31982
dvi: dvi-am
32093
31983
32094
@@ -554,12 +511,20 @@
31984
@@ -550,12 +509,20 @@
32095
31985
32096
31986
install-data-am:
32097
31987
32112
32002
installcheck-am:
32113
32003
32114
32004
maintainer-clean: maintainer-clean-am
32115
@@ -580,19 +545,22 @@
32005
@@ -576,19 +543,22 @@
32116
32006
32117
32007
ps-am:
32118
32008
32140
32030
32141
32031
# Tell versions [3.59,3.63) of GNU make to not export all variables.
32142
32032
# Otherwise a system limit (for SysV at least) may be exceeded.
32143
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/16x16/actions/Makefile.in evince-2.20.2.new/data/icons/16x16/actions/Makefile.in
32144
--- evince-2.20.2/data/icons/16x16/actions/Makefile.in 2007-11-26 22:55:51.000000000 +0100
32145
+++ evince-2.20.2.new/data/icons/16x16/actions/Makefile.in 2007-11-27 22:51:54.000000000 +0100
32146
@@ -1,8 +1,8 @@
32147
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
32148
+# Makefile.in generated by automake 1.10 from Makefile.am.
32149
# @configure_input@
32150
32151
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
32152
-# 2003, 2004, 2005 Free Software Foundation, Inc.
32153
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
32154
# This Makefile.in is free software; the Free Software Foundation
32155
# gives unlimited permission to copy and/or distribute it,
32156
# with or without modifications, as long as this notice is preserved.
32157
@@ -14,15 +14,11 @@
32158
32159
@SET_MAKE@
32160
32161
-srcdir = @srcdir@
32162
-top_srcdir = @top_srcdir@
32163
VPATH = @srcdir@
32164
pkgdatadir = $(datadir)/@PACKAGE@
32165
pkglibdir = $(libdir)/@PACKAGE@
32166
pkgincludedir = $(includedir)/@PACKAGE@
32167
-top_builddir = ../../../..
32168
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32169
-INSTALL = @INSTALL@
32170
install_sh_DATA = $(install_sh) -c -m 644
32171
install_sh_PROGRAM = $(install_sh) -c
32172
install_sh_SCRIPT = $(install_sh) -c
32173
@@ -60,8 +56,6 @@
32174
ACLOCAL = @ACLOCAL@
32175
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
32176
ALL_LINGUAS = @ALL_LINGUAS@
32177
-AMDEP_FALSE = @AMDEP_FALSE@
32178
-AMDEP_TRUE = @AMDEP_TRUE@
32179
AMTAR = @AMTAR@
32180
AR = @AR@
32181
AUTOCONF = @AUTOCONF@
32182
@@ -90,8 +84,6 @@
32183
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
32184
DBUS_CFLAGS = @DBUS_CFLAGS@
32185
DBUS_LIBS = @DBUS_LIBS@
32186
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
32187
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
32188
DEFS = @DEFS@
32189
DEPDIR = @DEPDIR@
32190
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
32191
@@ -103,30 +95,6 @@
32192
ECHO_N = @ECHO_N@
32193
ECHO_T = @ECHO_T@
32194
EGREP = @EGREP@
32195
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
32196
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
32197
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
32198
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
32199
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
32200
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
32201
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
32202
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
32203
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
32204
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
32205
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
32206
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
32207
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
32208
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
32209
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
32210
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
32211
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
32212
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
32213
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
32214
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
32215
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
32216
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
32217
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
32218
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
32219
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
32220
EXEEXT = @EXEEXT@
32221
F77 = @F77@
32222
@@ -136,8 +104,6 @@
32223
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
32224
FRONTEND_LIBS = @FRONTEND_LIBS@
32225
GCONFTOOL = @GCONFTOOL@
32226
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
32227
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
32228
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
32229
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
32230
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
32231
@@ -151,20 +117,17 @@
32232
GNOME_LIBS = @GNOME_LIBS@
32233
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
32234
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
32235
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
32236
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
32237
+GREP = @GREP@
32238
+GTKDOC_CHECK = @GTKDOC_CHECK@
32239
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
32240
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
32241
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
32242
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
32243
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
32244
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
32245
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
32246
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
32247
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
32248
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
32249
HELP_DIR = @HELP_DIR@
32250
+HILDON_CFLAGS = @HILDON_CFLAGS@
32251
+HILDON_LIBS = @HILDON_LIBS@
32252
HTML_DIR = @HTML_DIR@
32253
+INSTALL = @INSTALL@
32254
INSTALL_DATA = @INSTALL_DATA@
32255
INSTALL_PROGRAM = @INSTALL_PROGRAM@
32256
INSTALL_SCRIPT = @INSTALL_SCRIPT@
32257
@@ -175,14 +138,12 @@
32258
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
32259
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
32260
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
32261
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
32262
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
32263
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
32264
INTLTOOL_MERGE = @INTLTOOL_MERGE@
32265
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
32266
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
32267
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
32268
INTLTOOL_PERL = @INTLTOOL_PERL@
32269
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
32270
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
32271
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
32272
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
32273
@@ -194,7 +155,6 @@
32274
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
32275
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
32276
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
32277
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
32278
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
32279
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
32280
LDFLAGS = @LDFLAGS@
32281
@@ -206,9 +166,8 @@
32282
LN_S = @LN_S@
32283
LTLIBOBJS = @LTLIBOBJS@
32284
MAINT = @MAINT@
32285
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
32286
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
32287
MAKEINFO = @MAKEINFO@
32288
+MKDIR_P = @MKDIR_P@
32289
MKINSTALLDIRS = @MKINSTALLDIRS@
32290
MSGFMT = @MSGFMT@
32291
MSGFMT_OPTS = @MSGFMT_OPTS@
32292
@@ -243,26 +202,14 @@
32293
VERSION = @VERSION@
32294
WARN_CFLAGS = @WARN_CFLAGS@
32295
WARN_CXXFLAGS = @WARN_CXXFLAGS@
32296
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
32297
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
32298
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
32299
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
32300
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
32301
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
32302
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
32303
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
32304
XGETTEXT = @XGETTEXT@
32305
-ac_ct_AR = @ac_ct_AR@
32306
+abs_builddir = @abs_builddir@
32307
+abs_srcdir = @abs_srcdir@
32308
+abs_top_builddir = @abs_top_builddir@
32309
+abs_top_srcdir = @abs_top_srcdir@
32310
ac_ct_CC = @ac_ct_CC@
32311
ac_ct_CXX = @ac_ct_CXX@
32312
ac_ct_F77 = @ac_ct_F77@
32313
-ac_ct_RANLIB = @ac_ct_RANLIB@
32314
-ac_ct_STRIP = @ac_ct_STRIP@
32315
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
32316
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
32317
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
32318
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
32319
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
32320
am__include = @am__include@
32321
am__leading_dot = @am__leading_dot@
32322
am__quote = @am__quote@
32323
@@ -274,28 +221,39 @@
32324
build_cpu = @build_cpu@
32325
build_os = @build_os@
32326
build_vendor = @build_vendor@
32327
+builddir = @builddir@
32328
datadir = @datadir@
32329
+datarootdir = @datarootdir@
32330
+docdir = @docdir@
32331
+dvidir = @dvidir@
32332
exec_prefix = @exec_prefix@
32333
host = @host@
32334
host_alias = @host_alias@
32335
host_cpu = @host_cpu@
32336
host_os = @host_os@
32337
host_vendor = @host_vendor@
32338
+htmldir = @htmldir@
32339
includedir = @includedir@
32340
infodir = @infodir@
32341
install_sh = @install_sh@
32342
libdir = @libdir@
32343
libexecdir = @libexecdir@
32344
+localedir = @localedir@
32345
localstatedir = @localstatedir@
32346
mandir = @mandir@
32347
mkdir_p = @mkdir_p@
32348
oldincludedir = @oldincludedir@
32349
+pdfdir = @pdfdir@
32350
prefix = @prefix@
32351
program_transform_name = @program_transform_name@
32352
+psdir = @psdir@
32353
sbindir = @sbindir@
32354
sharedstatedir = @sharedstatedir@
32355
+srcdir = @srcdir@
32356
sysconfdir = @sysconfdir@
32357
target_alias = @target_alias@
32358
+top_builddir = @top_builddir@
32359
+top_srcdir = @top_srcdir@
32360
themedir = $(pkgdatadir)/icons/hicolor
32361
size = 16x16
32362
context = actions
32363
@@ -356,13 +314,9 @@
32364
32365
clean-libtool:
32366
-rm -rf .libs _libs
32367
-
32368
-distclean-libtool:
32369
- -rm -f libtool
32370
-uninstall-info-am:
32371
install-iconsDATA: $(icons_DATA)
32372
@$(NORMAL_INSTALL)
32373
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
32374
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
32375
@list='$(icons_DATA)'; for p in $$list; do \
32376
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
32377
f=$(am__strip_dir) \
32378
@@ -385,22 +339,21 @@
32379
32380
32381
distdir: $(DISTFILES)
32382
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
32383
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
32384
- list='$(DISTFILES)'; for file in $$list; do \
32385
- case $$file in \
32386
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
32387
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
32388
- esac; \
32389
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32390
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32391
+ list='$(DISTFILES)'; \
32392
+ dist_files=`for file in $$list; do echo $$file; done | \
32393
+ sed -e "s|^$$srcdirstrip/||;t" \
32394
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
32395
+ case $$dist_files in \
32396
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
32397
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
32398
+ sort -u` ;; \
32399
+ esac; \
32400
+ for file in $$dist_files; do \
32401
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
32402
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
32403
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
32404
- dir="/$$dir"; \
32405
- $(mkdir_p) "$(distdir)$$dir"; \
32406
- else \
32407
- dir=''; \
32408
- fi; \
32409
if test -d $$d/$$file; then \
32410
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
32411
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
32412
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
32413
fi; \
32414
@@ -416,7 +369,7 @@
32415
all-am: Makefile $(DATA)
32416
installdirs:
32417
for dir in "$(DESTDIR)$(iconsdir)"; do \
32418
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
32419
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
32420
done
32421
install: install-am
32422
install-exec: install-exec-am
32423
@@ -448,7 +401,7 @@
32424
32425
distclean: distclean-am
32426
-rm -f Makefile
32427
-distclean-am: clean-am distclean-generic distclean-libtool
32428
+distclean-am: clean-am distclean-generic
32429
32430
dvi: dvi-am
32431
32432
@@ -462,12 +415,20 @@
32433
32434
install-data-am: install-iconsDATA
32435
32436
+install-dvi: install-dvi-am
32437
+
32438
install-exec-am:
32439
32440
+install-html: install-html-am
32441
+
32442
install-info: install-info-am
32443
32444
install-man:
32445
32446
+install-pdf: install-pdf-am
32447
+
32448
+install-ps: install-ps-am
32449
+
32450
installcheck-am:
32451
32452
maintainer-clean: maintainer-clean-am
32453
@@ -486,17 +447,21 @@
32454
32455
ps-am:
32456
32457
-uninstall-am: uninstall-iconsDATA uninstall-info-am
32458
+uninstall-am: uninstall-iconsDATA
32459
+
32460
+.MAKE: install-am install-strip
32461
32462
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
32463
distclean distclean-generic distclean-libtool distdir dvi \
32464
dvi-am html html-am info info-am install install-am \
32465
- install-data install-data-am install-exec install-exec-am \
32466
+ install-data install-data-am install-dvi install-dvi-am \
32467
+ install-exec install-exec-am install-html install-html-am \
32468
install-iconsDATA install-info install-info-am install-man \
32469
+ install-pdf install-pdf-am install-ps install-ps-am \
32470
install-strip installcheck installcheck-am installdirs \
32471
maintainer-clean maintainer-clean-generic mostlyclean \
32472
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
32473
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
32474
+ uninstall uninstall-am uninstall-iconsDATA
32475
32476
# Tell versions [3.59,3.63) of GNU make to not export all variables.
32477
# Otherwise a system limit (for SysV at least) may be exceeded.
32478
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/16x16/apps/Makefile.in evince-2.20.2.new/data/icons/16x16/apps/Makefile.in
32479
--- evince-2.20.2/data/icons/16x16/apps/Makefile.in 2007-11-26 22:55:51.000000000 +0100
32480
+++ evince-2.20.2.new/data/icons/16x16/apps/Makefile.in 2007-11-27 22:51:54.000000000 +0100
32481
@@ -1,8 +1,8 @@
32482
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
32483
+# Makefile.in generated by automake 1.10 from Makefile.am.
32484
# @configure_input@
32485
32486
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
32487
-# 2003, 2004, 2005 Free Software Foundation, Inc.
32488
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
32489
# This Makefile.in is free software; the Free Software Foundation
32490
# gives unlimited permission to copy and/or distribute it,
32491
# with or without modifications, as long as this notice is preserved.
32492
@@ -14,15 +14,11 @@
32493
32494
@SET_MAKE@
32495
32496
-srcdir = @srcdir@
32497
-top_srcdir = @top_srcdir@
32498
VPATH = @srcdir@
32499
pkgdatadir = $(datadir)/@PACKAGE@
32500
pkglibdir = $(libdir)/@PACKAGE@
32501
pkgincludedir = $(includedir)/@PACKAGE@
32502
-top_builddir = ../../../..
32503
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32504
-INSTALL = @INSTALL@
32505
install_sh_DATA = $(install_sh) -c -m 644
32506
install_sh_PROGRAM = $(install_sh) -c
32507
install_sh_SCRIPT = $(install_sh) -c
32508
@@ -60,8 +56,6 @@
32509
ACLOCAL = @ACLOCAL@
32510
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
32511
ALL_LINGUAS = @ALL_LINGUAS@
32512
-AMDEP_FALSE = @AMDEP_FALSE@
32513
-AMDEP_TRUE = @AMDEP_TRUE@
32514
AMTAR = @AMTAR@
32515
AR = @AR@
32516
AUTOCONF = @AUTOCONF@
32517
@@ -90,8 +84,6 @@
32518
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
32519
DBUS_CFLAGS = @DBUS_CFLAGS@
32520
DBUS_LIBS = @DBUS_LIBS@
32521
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
32522
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
32523
DEFS = @DEFS@
32524
DEPDIR = @DEPDIR@
32525
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
32526
@@ -103,30 +95,6 @@
32527
ECHO_N = @ECHO_N@
32528
ECHO_T = @ECHO_T@
32529
EGREP = @EGREP@
32530
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
32531
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
32532
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
32533
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
32534
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
32535
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
32536
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
32537
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
32538
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
32539
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
32540
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
32541
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
32542
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
32543
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
32544
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
32545
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
32546
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
32547
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
32548
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
32549
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
32550
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
32551
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
32552
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
32553
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
32554
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
32555
EXEEXT = @EXEEXT@
32556
F77 = @F77@
32557
@@ -136,8 +104,6 @@
32558
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
32559
FRONTEND_LIBS = @FRONTEND_LIBS@
32560
GCONFTOOL = @GCONFTOOL@
32561
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
32562
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
32563
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
32564
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
32565
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
32566
@@ -151,20 +117,17 @@
32567
GNOME_LIBS = @GNOME_LIBS@
32568
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
32569
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
32570
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
32571
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
32572
+GREP = @GREP@
32573
+GTKDOC_CHECK = @GTKDOC_CHECK@
32574
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
32575
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
32576
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
32577
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
32578
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
32579
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
32580
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
32581
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
32582
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
32583
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
32584
HELP_DIR = @HELP_DIR@
32585
+HILDON_CFLAGS = @HILDON_CFLAGS@
32586
+HILDON_LIBS = @HILDON_LIBS@
32587
HTML_DIR = @HTML_DIR@
32588
+INSTALL = @INSTALL@
32589
INSTALL_DATA = @INSTALL_DATA@
32590
INSTALL_PROGRAM = @INSTALL_PROGRAM@
32591
INSTALL_SCRIPT = @INSTALL_SCRIPT@
32592
@@ -175,14 +138,12 @@
32593
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
32594
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
32595
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
32596
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
32597
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
32598
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
32599
INTLTOOL_MERGE = @INTLTOOL_MERGE@
32600
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
32601
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
32602
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
32603
INTLTOOL_PERL = @INTLTOOL_PERL@
32604
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
32605
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
32606
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
32607
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
32608
@@ -194,7 +155,6 @@
32609
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
32610
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
32611
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
32612
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
32613
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
32614
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
32615
LDFLAGS = @LDFLAGS@
32616
@@ -206,9 +166,8 @@
32617
LN_S = @LN_S@
32618
LTLIBOBJS = @LTLIBOBJS@
32619
MAINT = @MAINT@
32620
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
32621
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
32622
MAKEINFO = @MAKEINFO@
32623
+MKDIR_P = @MKDIR_P@
32624
MKINSTALLDIRS = @MKINSTALLDIRS@
32625
MSGFMT = @MSGFMT@
32626
MSGFMT_OPTS = @MSGFMT_OPTS@
32627
@@ -243,26 +202,14 @@
32628
VERSION = @VERSION@
32629
WARN_CFLAGS = @WARN_CFLAGS@
32630
WARN_CXXFLAGS = @WARN_CXXFLAGS@
32631
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
32632
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
32633
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
32634
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
32635
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
32636
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
32637
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
32638
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
32639
XGETTEXT = @XGETTEXT@
32640
-ac_ct_AR = @ac_ct_AR@
32641
+abs_builddir = @abs_builddir@
32642
+abs_srcdir = @abs_srcdir@
32643
+abs_top_builddir = @abs_top_builddir@
32644
+abs_top_srcdir = @abs_top_srcdir@
32645
ac_ct_CC = @ac_ct_CC@
32646
ac_ct_CXX = @ac_ct_CXX@
32647
ac_ct_F77 = @ac_ct_F77@
32648
-ac_ct_RANLIB = @ac_ct_RANLIB@
32649
-ac_ct_STRIP = @ac_ct_STRIP@
32650
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
32651
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
32652
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
32653
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
32654
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
32655
am__include = @am__include@
32656
am__leading_dot = @am__leading_dot@
32657
am__quote = @am__quote@
32658
@@ -274,28 +221,39 @@
32659
build_cpu = @build_cpu@
32660
build_os = @build_os@
32661
build_vendor = @build_vendor@
32662
+builddir = @builddir@
32663
datadir = @datadir@
32664
+datarootdir = @datarootdir@
32665
+docdir = @docdir@
32666
+dvidir = @dvidir@
32667
exec_prefix = @exec_prefix@
32668
host = @host@
32669
host_alias = @host_alias@
32670
host_cpu = @host_cpu@
32671
host_os = @host_os@
32672
host_vendor = @host_vendor@
32673
+htmldir = @htmldir@
32674
includedir = @includedir@
32675
infodir = @infodir@
32676
install_sh = @install_sh@
32677
libdir = @libdir@
32678
libexecdir = @libexecdir@
32679
+localedir = @localedir@
32680
localstatedir = @localstatedir@
32681
mandir = @mandir@
32682
mkdir_p = @mkdir_p@
32683
oldincludedir = @oldincludedir@
32684
+pdfdir = @pdfdir@
32685
prefix = @prefix@
32686
program_transform_name = @program_transform_name@
32687
+psdir = @psdir@
32688
sbindir = @sbindir@
32689
sharedstatedir = @sharedstatedir@
32690
+srcdir = @srcdir@
32691
sysconfdir = @sysconfdir@
32692
target_alias = @target_alias@
32693
+top_builddir = @top_builddir@
32694
+top_srcdir = @top_srcdir@
32695
themedir = $(datadir)/icons/hicolor
32696
size = 16x16
32697
context = apps
32698
@@ -346,13 +304,9 @@
32699
32700
clean-libtool:
32701
-rm -rf .libs _libs
32702
-
32703
-distclean-libtool:
32704
- -rm -f libtool
32705
-uninstall-info-am:
32706
install-iconsDATA: $(icons_DATA)
32707
@$(NORMAL_INSTALL)
32708
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
32709
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
32710
@list='$(icons_DATA)'; for p in $$list; do \
32711
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
32712
f=$(am__strip_dir) \
32713
@@ -375,22 +329,21 @@
32714
32715
32716
distdir: $(DISTFILES)
32717
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
32718
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
32719
- list='$(DISTFILES)'; for file in $$list; do \
32720
- case $$file in \
32721
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
32722
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
32723
- esac; \
32724
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32725
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32726
+ list='$(DISTFILES)'; \
32727
+ dist_files=`for file in $$list; do echo $$file; done | \
32728
+ sed -e "s|^$$srcdirstrip/||;t" \
32729
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
32730
+ case $$dist_files in \
32731
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
32732
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
32733
+ sort -u` ;; \
32734
+ esac; \
32735
+ for file in $$dist_files; do \
32736
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
32737
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
32738
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
32739
- dir="/$$dir"; \
32740
- $(mkdir_p) "$(distdir)$$dir"; \
32741
- else \
32742
- dir=''; \
32743
- fi; \
32744
if test -d $$d/$$file; then \
32745
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
32746
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
32747
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
32748
fi; \
32749
@@ -406,7 +359,7 @@
32750
all-am: Makefile $(DATA)
32751
installdirs:
32752
for dir in "$(DESTDIR)$(iconsdir)"; do \
32753
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
32754
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
32755
done
32756
install: install-am
32757
install-exec: install-exec-am
32758
@@ -438,7 +391,7 @@
32759
32760
distclean: distclean-am
32761
-rm -f Makefile
32762
-distclean-am: clean-am distclean-generic distclean-libtool
32763
+distclean-am: clean-am distclean-generic
32764
32765
dvi: dvi-am
32766
32767
@@ -452,12 +405,20 @@
32768
32769
install-data-am: install-iconsDATA
32770
32771
+install-dvi: install-dvi-am
32772
+
32773
install-exec-am:
32774
32775
+install-html: install-html-am
32776
+
32777
install-info: install-info-am
32778
32779
install-man:
32780
32781
+install-pdf: install-pdf-am
32782
+
32783
+install-ps: install-ps-am
32784
+
32785
installcheck-am:
32786
32787
maintainer-clean: maintainer-clean-am
32788
@@ -476,17 +437,21 @@
32789
32790
ps-am:
32791
32792
-uninstall-am: uninstall-iconsDATA uninstall-info-am
32793
+uninstall-am: uninstall-iconsDATA
32794
+
32795
+.MAKE: install-am install-strip
32796
32797
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
32798
distclean distclean-generic distclean-libtool distdir dvi \
32799
dvi-am html html-am info info-am install install-am \
32800
- install-data install-data-am install-exec install-exec-am \
32801
+ install-data install-data-am install-dvi install-dvi-am \
32802
+ install-exec install-exec-am install-html install-html-am \
32803
install-iconsDATA install-info install-info-am install-man \
32804
+ install-pdf install-pdf-am install-ps install-ps-am \
32805
install-strip installcheck installcheck-am installdirs \
32806
maintainer-clean maintainer-clean-generic mostlyclean \
32807
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
32808
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
32809
+ uninstall uninstall-am uninstall-iconsDATA
32810
32811
# Tell versions [3.59,3.63) of GNU make to not export all variables.
32812
# Otherwise a system limit (for SysV at least) may be exceeded.
32813
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/16x16/Makefile.in evince-2.20.2.new/data/icons/16x16/Makefile.in
32814
--- evince-2.20.2/data/icons/16x16/Makefile.in 2007-11-26 22:55:50.000000000 +0100
32815
+++ evince-2.20.2.new/data/icons/16x16/Makefile.in 2007-11-27 22:51:54.000000000 +0100
32816
@@ -1,8 +1,8 @@
32817
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
32818
+# Makefile.in generated by automake 1.10 from Makefile.am.
32819
# @configure_input@
32820
32821
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
32822
-# 2003, 2004, 2005 Free Software Foundation, Inc.
32823
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
32824
# This Makefile.in is free software; the Free Software Foundation
32825
# gives unlimited permission to copy and/or distribute it,
32826
# with or without modifications, as long as this notice is preserved.
32827
@@ -13,15 +13,11 @@
32828
# PARTICULAR PURPOSE.
32829
32830
@SET_MAKE@
32831
-srcdir = @srcdir@
32832
-top_srcdir = @top_srcdir@
32833
VPATH = @srcdir@
32834
pkgdatadir = $(datadir)/@PACKAGE@
32835
pkglibdir = $(libdir)/@PACKAGE@
32836
pkgincludedir = $(includedir)/@PACKAGE@
32837
-top_builddir = ../../..
32838
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32839
-INSTALL = @INSTALL@
32840
install_sh_DATA = $(install_sh) -c -m 644
32841
install_sh_PROGRAM = $(install_sh) -c
32842
install_sh_SCRIPT = $(install_sh) -c
32843
@@ -48,10 +44,13 @@
32844
DIST_SOURCES =
32845
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
32846
html-recursive info-recursive install-data-recursive \
32847
- install-exec-recursive install-info-recursive \
32848
- install-recursive installcheck-recursive installdirs-recursive \
32849
- pdf-recursive ps-recursive uninstall-info-recursive \
32850
- uninstall-recursive
32851
+ install-dvi-recursive install-exec-recursive \
32852
+ install-html-recursive install-info-recursive \
32853
+ install-pdf-recursive install-ps-recursive install-recursive \
32854
+ installcheck-recursive installdirs-recursive pdf-recursive \
32855
+ ps-recursive uninstall-recursive
32856
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
32857
+ distclean-recursive maintainer-clean-recursive
32858
ETAGS = etags
32859
CTAGS = ctags
32860
DIST_SUBDIRS = $(SUBDIRS)
32861
@@ -59,8 +58,6 @@
32862
ACLOCAL = @ACLOCAL@
32863
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
32864
ALL_LINGUAS = @ALL_LINGUAS@
32865
-AMDEP_FALSE = @AMDEP_FALSE@
32866
-AMDEP_TRUE = @AMDEP_TRUE@
32867
AMTAR = @AMTAR@
32868
AR = @AR@
32869
AUTOCONF = @AUTOCONF@
32870
@@ -89,8 +86,6 @@
32871
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
32872
DBUS_CFLAGS = @DBUS_CFLAGS@
32873
DBUS_LIBS = @DBUS_LIBS@
32874
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
32875
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
32876
DEFS = @DEFS@
32877
DEPDIR = @DEPDIR@
32878
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
32879
@@ -102,30 +97,6 @@
32880
ECHO_N = @ECHO_N@
32881
ECHO_T = @ECHO_T@
32882
EGREP = @EGREP@
32883
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
32884
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
32885
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
32886
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
32887
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
32888
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
32889
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
32890
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
32891
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
32892
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
32893
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
32894
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
32895
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
32896
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
32897
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
32898
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
32899
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
32900
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
32901
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
32902
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
32903
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
32904
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
32905
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
32906
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
32907
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
32908
EXEEXT = @EXEEXT@
32909
F77 = @F77@
32910
@@ -135,8 +106,6 @@
32911
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
32912
FRONTEND_LIBS = @FRONTEND_LIBS@
32913
GCONFTOOL = @GCONFTOOL@
32914
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
32915
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
32916
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
32917
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
32918
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
32919
@@ -150,20 +119,17 @@
32920
GNOME_LIBS = @GNOME_LIBS@
32921
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
32922
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
32923
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
32924
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
32925
+GREP = @GREP@
32926
+GTKDOC_CHECK = @GTKDOC_CHECK@
32927
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
32928
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
32929
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
32930
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
32931
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
32932
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
32933
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
32934
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
32935
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
32936
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
32937
HELP_DIR = @HELP_DIR@
32938
+HILDON_CFLAGS = @HILDON_CFLAGS@
32939
+HILDON_LIBS = @HILDON_LIBS@
32940
HTML_DIR = @HTML_DIR@
32941
+INSTALL = @INSTALL@
32942
INSTALL_DATA = @INSTALL_DATA@
32943
INSTALL_PROGRAM = @INSTALL_PROGRAM@
32944
INSTALL_SCRIPT = @INSTALL_SCRIPT@
32945
@@ -174,14 +140,12 @@
32946
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
32947
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
32948
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
32949
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
32950
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
32951
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
32952
INTLTOOL_MERGE = @INTLTOOL_MERGE@
32953
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
32954
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
32955
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
32956
INTLTOOL_PERL = @INTLTOOL_PERL@
32957
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
32958
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
32959
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
32960
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
32961
@@ -193,7 +157,6 @@
32962
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
32963
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
32964
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
32965
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
32966
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
32967
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
32968
LDFLAGS = @LDFLAGS@
32969
@@ -205,9 +168,8 @@
32970
LN_S = @LN_S@
32971
LTLIBOBJS = @LTLIBOBJS@
32972
MAINT = @MAINT@
32973
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
32974
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
32975
MAKEINFO = @MAKEINFO@
32976
+MKDIR_P = @MKDIR_P@
32977
MKINSTALLDIRS = @MKINSTALLDIRS@
32978
MSGFMT = @MSGFMT@
32979
MSGFMT_OPTS = @MSGFMT_OPTS@
32980
@@ -242,26 +204,14 @@
32981
VERSION = @VERSION@
32982
WARN_CFLAGS = @WARN_CFLAGS@
32983
WARN_CXXFLAGS = @WARN_CXXFLAGS@
32984
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
32985
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
32986
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
32987
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
32988
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
32989
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
32990
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
32991
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
32992
XGETTEXT = @XGETTEXT@
32993
-ac_ct_AR = @ac_ct_AR@
32994
+abs_builddir = @abs_builddir@
32995
+abs_srcdir = @abs_srcdir@
32996
+abs_top_builddir = @abs_top_builddir@
32997
+abs_top_srcdir = @abs_top_srcdir@
32998
ac_ct_CC = @ac_ct_CC@
32999
ac_ct_CXX = @ac_ct_CXX@
33000
ac_ct_F77 = @ac_ct_F77@
33001
-ac_ct_RANLIB = @ac_ct_RANLIB@
33002
-ac_ct_STRIP = @ac_ct_STRIP@
33003
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
33004
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
33005
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
33006
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
33007
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
33008
am__include = @am__include@
33009
am__leading_dot = @am__leading_dot@
33010
am__quote = @am__quote@
33011
@@ -273,28 +223,39 @@
33012
build_cpu = @build_cpu@
33013
build_os = @build_os@
33014
build_vendor = @build_vendor@
33015
+builddir = @builddir@
33016
datadir = @datadir@
33017
+datarootdir = @datarootdir@
33018
+docdir = @docdir@
33019
+dvidir = @dvidir@
33020
exec_prefix = @exec_prefix@
33021
host = @host@
33022
host_alias = @host_alias@
33023
host_cpu = @host_cpu@
33024
host_os = @host_os@
33025
host_vendor = @host_vendor@
33026
+htmldir = @htmldir@
33027
includedir = @includedir@
33028
infodir = @infodir@
33029
install_sh = @install_sh@
33030
libdir = @libdir@
33031
libexecdir = @libexecdir@
33032
+localedir = @localedir@
33033
localstatedir = @localstatedir@
33034
mandir = @mandir@
33035
mkdir_p = @mkdir_p@
33036
oldincludedir = @oldincludedir@
33037
+pdfdir = @pdfdir@
33038
prefix = @prefix@
33039
program_transform_name = @program_transform_name@
33040
+psdir = @psdir@
33041
sbindir = @sbindir@
33042
sharedstatedir = @sharedstatedir@
33043
+srcdir = @srcdir@
33044
sysconfdir = @sysconfdir@
33045
target_alias = @target_alias@
33046
+top_builddir = @top_builddir@
33047
+top_srcdir = @top_srcdir@
33048
SUBDIRS = actions apps
33049
all: all-recursive
33050
33051
@@ -335,10 +296,6 @@
33052
clean-libtool:
33053
-rm -rf .libs _libs
33054
33055
-distclean-libtool:
33056
- -rm -f libtool
33057
-uninstall-info-am:
33058
-
33059
# This directory's subdirectories are mostly independent; you can cd
33060
# into them and run `make' without going through this Makefile.
33061
# To change the values of `make' variables: instead of editing Makefiles,
33062
@@ -370,8 +327,7 @@
33063
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
33064
fi; test -z "$$fail"
33065
33066
-mostlyclean-recursive clean-recursive distclean-recursive \
33067
-maintainer-clean-recursive:
33068
+$(RECURSIVE_CLEAN_TARGETS):
33069
@failcom='exit 1'; \
33070
for f in x $$MAKEFLAGS; do \
33071
case $$f in \
33072
@@ -472,22 +428,21 @@
33073
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
33074
33075
distdir: $(DISTFILES)
33076
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
33077
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
33078
- list='$(DISTFILES)'; for file in $$list; do \
33079
- case $$file in \
33080
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
33081
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
33082
- esac; \
33083
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33084
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33085
+ list='$(DISTFILES)'; \
33086
+ dist_files=`for file in $$list; do echo $$file; done | \
33087
+ sed -e "s|^$$srcdirstrip/||;t" \
33088
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
33089
+ case $$dist_files in \
33090
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
33091
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
33092
+ sort -u` ;; \
33093
+ esac; \
33094
+ for file in $$dist_files; do \
33095
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
33096
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
33097
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
33098
- dir="/$$dir"; \
33099
- $(mkdir_p) "$(distdir)$$dir"; \
33100
- else \
33101
- dir=''; \
33102
- fi; \
33103
if test -d $$d/$$file; then \
33104
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
33105
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
33106
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
33107
fi; \
33108
@@ -501,7 +456,7 @@
33109
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
33110
if test "$$subdir" = .; then :; else \
33111
test -d "$(distdir)/$$subdir" \
33112
- || $(mkdir_p) "$(distdir)/$$subdir" \
33113
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
33114
|| exit 1; \
33115
distdir=`$(am__cd) $(distdir) && pwd`; \
33116
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
33117
@@ -509,6 +464,8 @@
33118
$(MAKE) $(AM_MAKEFLAGS) \
33119
top_distdir="$$top_distdir" \
33120
distdir="$$distdir/$$subdir" \
33121
+ am__remove_distdir=: \
33122
+ am__skip_length_check=: \
33123
distdir) \
33124
|| exit 1; \
33125
fi; \
33126
@@ -548,8 +505,7 @@
33127
33128
distclean: distclean-recursive
33129
-rm -f Makefile
33130
-distclean-am: clean-am distclean-generic distclean-libtool \
33131
- distclean-tags
33132
+distclean-am: clean-am distclean-generic distclean-tags
33133
33134
dvi: dvi-recursive
33135
33136
@@ -563,12 +519,20 @@
33137
33138
install-data-am:
33139
33140
+install-dvi: install-dvi-recursive
33141
+
33142
install-exec-am:
33143
33144
+install-html: install-html-recursive
33145
+
33146
install-info: install-info-recursive
33147
33148
install-man:
33149
33150
+install-pdf: install-pdf-recursive
33151
+
33152
+install-ps: install-ps-recursive
33153
+
33154
installcheck-am:
33155
33156
maintainer-clean: maintainer-clean-recursive
33157
@@ -587,22 +551,24 @@
33158
33159
ps-am:
33160
33161
-uninstall-am: uninstall-info-am
33162
+uninstall-am:
33163
33164
-uninstall-info: uninstall-info-recursive
33165
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
33166
+ install-strip
33167
33168
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
33169
- clean clean-generic clean-libtool clean-recursive ctags \
33170
- ctags-recursive distclean distclean-generic distclean-libtool \
33171
- distclean-recursive distclean-tags distdir dvi dvi-am html \
33172
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
33173
+ all all-am check check-am clean clean-generic clean-libtool \
33174
+ ctags ctags-recursive distclean distclean-generic \
33175
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
33176
html-am info info-am install install-am install-data \
33177
- install-data-am install-exec install-exec-am install-info \
33178
- install-info-am install-man install-strip installcheck \
33179
+ install-data-am install-dvi install-dvi-am install-exec \
33180
+ install-exec-am install-html install-html-am install-info \
33181
+ install-info-am install-man install-pdf install-pdf-am \
33182
+ install-ps install-ps-am install-strip installcheck \
33183
installcheck-am installdirs installdirs-am maintainer-clean \
33184
- maintainer-clean-generic maintainer-clean-recursive \
33185
- mostlyclean mostlyclean-generic mostlyclean-libtool \
33186
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
33187
- uninstall uninstall-am uninstall-info-am
33188
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
33189
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
33190
+ uninstall uninstall-am
33191
33192
# Tell versions [3.59,3.63) of GNU make to not export all variables.
33193
# Otherwise a system limit (for SysV at least) may be exceeded.
33194
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/22x22/actions/Makefile.in evince-2.20.2.new/data/icons/22x22/actions/Makefile.in
33195
--- evince-2.20.2/data/icons/22x22/actions/Makefile.in 2007-11-26 22:55:52.000000000 +0100
33196
+++ evince-2.20.2.new/data/icons/22x22/actions/Makefile.in 2007-11-27 22:51:54.000000000 +0100
33197
@@ -1,8 +1,8 @@
33198
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
33199
+# Makefile.in generated by automake 1.10 from Makefile.am.
33200
# @configure_input@
33201
33202
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
33203
-# 2003, 2004, 2005 Free Software Foundation, Inc.
33204
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
33205
# This Makefile.in is free software; the Free Software Foundation
33206
# gives unlimited permission to copy and/or distribute it,
33207
# with or without modifications, as long as this notice is preserved.
33208
@@ -14,15 +14,11 @@
33209
33210
@SET_MAKE@
33211
33212
-srcdir = @srcdir@
33213
-top_srcdir = @top_srcdir@
33214
VPATH = @srcdir@
33215
pkgdatadir = $(datadir)/@PACKAGE@
33216
pkglibdir = $(libdir)/@PACKAGE@
33217
pkgincludedir = $(includedir)/@PACKAGE@
33218
-top_builddir = ../../../..
33219
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
33220
-INSTALL = @INSTALL@
33221
install_sh_DATA = $(install_sh) -c -m 644
33222
install_sh_PROGRAM = $(install_sh) -c
33223
install_sh_SCRIPT = $(install_sh) -c
33224
@@ -60,8 +56,6 @@
33225
ACLOCAL = @ACLOCAL@
33226
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
33227
ALL_LINGUAS = @ALL_LINGUAS@
33228
-AMDEP_FALSE = @AMDEP_FALSE@
33229
-AMDEP_TRUE = @AMDEP_TRUE@
33230
AMTAR = @AMTAR@
33231
AR = @AR@
33232
AUTOCONF = @AUTOCONF@
33233
@@ -90,8 +84,6 @@
33234
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
33235
DBUS_CFLAGS = @DBUS_CFLAGS@
33236
DBUS_LIBS = @DBUS_LIBS@
33237
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
33238
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
33239
DEFS = @DEFS@
33240
DEPDIR = @DEPDIR@
33241
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
33242
@@ -103,30 +95,6 @@
33243
ECHO_N = @ECHO_N@
33244
ECHO_T = @ECHO_T@
33245
EGREP = @EGREP@
33246
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
33247
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
33248
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
33249
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
33250
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
33251
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
33252
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
33253
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
33254
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
33255
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
33256
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
33257
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
33258
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
33259
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
33260
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
33261
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
33262
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
33263
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
33264
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
33265
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
33266
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
33267
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
33268
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
33269
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
33270
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
33271
EXEEXT = @EXEEXT@
33272
F77 = @F77@
33273
@@ -136,8 +104,6 @@
33274
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
33275
FRONTEND_LIBS = @FRONTEND_LIBS@
33276
GCONFTOOL = @GCONFTOOL@
33277
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
33278
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
33279
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
33280
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
33281
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
33282
@@ -151,20 +117,17 @@
33283
GNOME_LIBS = @GNOME_LIBS@
33284
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
33285
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
33286
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
33287
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
33288
+GREP = @GREP@
33289
+GTKDOC_CHECK = @GTKDOC_CHECK@
33290
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
33291
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
33292
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
33293
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
33294
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
33295
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
33296
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
33297
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
33298
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
33299
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
33300
HELP_DIR = @HELP_DIR@
33301
+HILDON_CFLAGS = @HILDON_CFLAGS@
33302
+HILDON_LIBS = @HILDON_LIBS@
33303
HTML_DIR = @HTML_DIR@
33304
+INSTALL = @INSTALL@
33305
INSTALL_DATA = @INSTALL_DATA@
33306
INSTALL_PROGRAM = @INSTALL_PROGRAM@
33307
INSTALL_SCRIPT = @INSTALL_SCRIPT@
33308
@@ -175,14 +138,12 @@
33309
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
33310
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
33311
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
33312
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
33313
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
33314
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
33315
INTLTOOL_MERGE = @INTLTOOL_MERGE@
33316
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
33317
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
33318
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
33319
INTLTOOL_PERL = @INTLTOOL_PERL@
33320
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
33321
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
33322
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
33323
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
33324
@@ -194,7 +155,6 @@
33325
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
33326
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
33327
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
33328
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
33329
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
33330
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
33331
LDFLAGS = @LDFLAGS@
33332
@@ -206,9 +166,8 @@
33333
LN_S = @LN_S@
33334
LTLIBOBJS = @LTLIBOBJS@
33335
MAINT = @MAINT@
33336
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
33337
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
33338
MAKEINFO = @MAKEINFO@
33339
+MKDIR_P = @MKDIR_P@
33340
MKINSTALLDIRS = @MKINSTALLDIRS@
33341
MSGFMT = @MSGFMT@
33342
MSGFMT_OPTS = @MSGFMT_OPTS@
33343
@@ -243,26 +202,14 @@
33344
VERSION = @VERSION@
33345
WARN_CFLAGS = @WARN_CFLAGS@
33346
WARN_CXXFLAGS = @WARN_CXXFLAGS@
33347
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
33348
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
33349
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
33350
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
33351
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
33352
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
33353
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
33354
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
33355
XGETTEXT = @XGETTEXT@
33356
-ac_ct_AR = @ac_ct_AR@
33357
+abs_builddir = @abs_builddir@
33358
+abs_srcdir = @abs_srcdir@
33359
+abs_top_builddir = @abs_top_builddir@
33360
+abs_top_srcdir = @abs_top_srcdir@
33361
ac_ct_CC = @ac_ct_CC@
33362
ac_ct_CXX = @ac_ct_CXX@
33363
ac_ct_F77 = @ac_ct_F77@
33364
-ac_ct_RANLIB = @ac_ct_RANLIB@
33365
-ac_ct_STRIP = @ac_ct_STRIP@
33366
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
33367
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
33368
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
33369
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
33370
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
33371
am__include = @am__include@
33372
am__leading_dot = @am__leading_dot@
33373
am__quote = @am__quote@
33374
@@ -274,28 +221,39 @@
33375
build_cpu = @build_cpu@
33376
build_os = @build_os@
33377
build_vendor = @build_vendor@
33378
+builddir = @builddir@
33379
datadir = @datadir@
33380
+datarootdir = @datarootdir@
33381
+docdir = @docdir@
33382
+dvidir = @dvidir@
33383
exec_prefix = @exec_prefix@
33384
host = @host@
33385
host_alias = @host_alias@
33386
host_cpu = @host_cpu@
33387
host_os = @host_os@
33388
host_vendor = @host_vendor@
33389
+htmldir = @htmldir@
33390
includedir = @includedir@
33391
infodir = @infodir@
33392
install_sh = @install_sh@
33393
libdir = @libdir@
33394
libexecdir = @libexecdir@
33395
+localedir = @localedir@
33396
localstatedir = @localstatedir@
33397
mandir = @mandir@
33398
mkdir_p = @mkdir_p@
33399
oldincludedir = @oldincludedir@
33400
+pdfdir = @pdfdir@
33401
prefix = @prefix@
33402
program_transform_name = @program_transform_name@
33403
+psdir = @psdir@
33404
sbindir = @sbindir@
33405
sharedstatedir = @sharedstatedir@
33406
+srcdir = @srcdir@
33407
sysconfdir = @sysconfdir@
33408
target_alias = @target_alias@
33409
+top_builddir = @top_builddir@
33410
+top_srcdir = @top_srcdir@
33411
themedir = $(pkgdatadir)/icons/hicolor
33412
size = 22x22
33413
context = actions
33414
@@ -356,13 +314,9 @@
33415
33416
clean-libtool:
33417
-rm -rf .libs _libs
33418
-
33419
-distclean-libtool:
33420
- -rm -f libtool
33421
-uninstall-info-am:
33422
install-iconsDATA: $(icons_DATA)
33423
@$(NORMAL_INSTALL)
33424
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
33425
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
33426
@list='$(icons_DATA)'; for p in $$list; do \
33427
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
33428
f=$(am__strip_dir) \
33429
@@ -385,22 +339,21 @@
33430
33431
33432
distdir: $(DISTFILES)
33433
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
33434
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
33435
- list='$(DISTFILES)'; for file in $$list; do \
33436
- case $$file in \
33437
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
33438
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
33439
- esac; \
33440
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33441
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33442
+ list='$(DISTFILES)'; \
33443
+ dist_files=`for file in $$list; do echo $$file; done | \
33444
+ sed -e "s|^$$srcdirstrip/||;t" \
33445
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
33446
+ case $$dist_files in \
33447
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
33448
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
33449
+ sort -u` ;; \
33450
+ esac; \
33451
+ for file in $$dist_files; do \
33452
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
33453
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
33454
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
33455
- dir="/$$dir"; \
33456
- $(mkdir_p) "$(distdir)$$dir"; \
33457
- else \
33458
- dir=''; \
33459
- fi; \
33460
if test -d $$d/$$file; then \
33461
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
33462
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
33463
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
33464
fi; \
33465
@@ -416,7 +369,7 @@
33466
all-am: Makefile $(DATA)
33467
installdirs:
33468
for dir in "$(DESTDIR)$(iconsdir)"; do \
33469
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
33470
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
33471
done
33472
install: install-am
33473
install-exec: install-exec-am
33474
@@ -448,7 +401,7 @@
33475
33476
distclean: distclean-am
33477
-rm -f Makefile
33478
-distclean-am: clean-am distclean-generic distclean-libtool
33479
+distclean-am: clean-am distclean-generic
33480
33481
dvi: dvi-am
33482
33483
@@ -462,12 +415,20 @@
33484
33485
install-data-am: install-iconsDATA
33486
33487
+install-dvi: install-dvi-am
33488
+
33489
install-exec-am:
33490
33491
+install-html: install-html-am
33492
+
33493
install-info: install-info-am
33494
33495
install-man:
33496
33497
+install-pdf: install-pdf-am
33498
+
33499
+install-ps: install-ps-am
33500
+
33501
installcheck-am:
33502
33503
maintainer-clean: maintainer-clean-am
33504
@@ -486,17 +447,21 @@
33505
33506
ps-am:
33507
33508
-uninstall-am: uninstall-iconsDATA uninstall-info-am
33509
+uninstall-am: uninstall-iconsDATA
33510
+
33511
+.MAKE: install-am install-strip
33512
33513
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
33514
distclean distclean-generic distclean-libtool distdir dvi \
33515
dvi-am html html-am info info-am install install-am \
33516
- install-data install-data-am install-exec install-exec-am \
33517
+ install-data install-data-am install-dvi install-dvi-am \
33518
+ install-exec install-exec-am install-html install-html-am \
33519
install-iconsDATA install-info install-info-am install-man \
33520
+ install-pdf install-pdf-am install-ps install-ps-am \
33521
install-strip installcheck installcheck-am installdirs \
33522
maintainer-clean maintainer-clean-generic mostlyclean \
33523
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
33524
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
33525
+ uninstall uninstall-am uninstall-iconsDATA
33526
33527
# Tell versions [3.59,3.63) of GNU make to not export all variables.
33528
# Otherwise a system limit (for SysV at least) may be exceeded.
33529
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/22x22/apps/Makefile.in evince-2.20.2.new/data/icons/22x22/apps/Makefile.in
33530
--- evince-2.20.2/data/icons/22x22/apps/Makefile.in 2007-11-26 22:55:52.000000000 +0100
33531
+++ evince-2.20.2.new/data/icons/22x22/apps/Makefile.in 2007-11-27 22:51:54.000000000 +0100
33532
@@ -1,8 +1,8 @@
33533
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
33534
+# Makefile.in generated by automake 1.10 from Makefile.am.
33535
# @configure_input@
33536
33537
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
33538
-# 2003, 2004, 2005 Free Software Foundation, Inc.
33539
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
33540
# This Makefile.in is free software; the Free Software Foundation
33541
# gives unlimited permission to copy and/or distribute it,
33542
# with or without modifications, as long as this notice is preserved.
33543
@@ -14,15 +14,11 @@
33544
33545
@SET_MAKE@
33546
33547
-srcdir = @srcdir@
33548
-top_srcdir = @top_srcdir@
33549
VPATH = @srcdir@
33550
pkgdatadir = $(datadir)/@PACKAGE@
33551
pkglibdir = $(libdir)/@PACKAGE@
33552
pkgincludedir = $(includedir)/@PACKAGE@
33553
-top_builddir = ../../../..
33554
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
33555
-INSTALL = @INSTALL@
33556
install_sh_DATA = $(install_sh) -c -m 644
33557
install_sh_PROGRAM = $(install_sh) -c
33558
install_sh_SCRIPT = $(install_sh) -c
33559
@@ -60,8 +56,6 @@
33560
ACLOCAL = @ACLOCAL@
33561
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
33562
ALL_LINGUAS = @ALL_LINGUAS@
33563
-AMDEP_FALSE = @AMDEP_FALSE@
33564
-AMDEP_TRUE = @AMDEP_TRUE@
33565
AMTAR = @AMTAR@
33566
AR = @AR@
33567
AUTOCONF = @AUTOCONF@
33568
@@ -90,8 +84,6 @@
33569
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
33570
DBUS_CFLAGS = @DBUS_CFLAGS@
33571
DBUS_LIBS = @DBUS_LIBS@
33572
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
33573
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
33574
DEFS = @DEFS@
33575
DEPDIR = @DEPDIR@
33576
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
33577
@@ -103,30 +95,6 @@
33578
ECHO_N = @ECHO_N@
33579
ECHO_T = @ECHO_T@
33580
EGREP = @EGREP@
33581
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
33582
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
33583
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
33584
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
33585
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
33586
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
33587
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
33588
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
33589
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
33590
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
33591
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
33592
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
33593
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
33594
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
33595
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
33596
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
33597
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
33598
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
33599
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
33600
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
33601
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
33602
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
33603
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
33604
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
33605
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
33606
EXEEXT = @EXEEXT@
33607
F77 = @F77@
33608
@@ -136,8 +104,6 @@
33609
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
33610
FRONTEND_LIBS = @FRONTEND_LIBS@
33611
GCONFTOOL = @GCONFTOOL@
33612
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
33613
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
33614
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
33615
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
33616
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
33617
@@ -151,20 +117,17 @@
33618
GNOME_LIBS = @GNOME_LIBS@
33619
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
33620
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
33621
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
33622
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
33623
+GREP = @GREP@
33624
+GTKDOC_CHECK = @GTKDOC_CHECK@
33625
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
33626
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
33627
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
33628
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
33629
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
33630
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
33631
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
33632
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
33633
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
33634
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
33635
HELP_DIR = @HELP_DIR@
33636
+HILDON_CFLAGS = @HILDON_CFLAGS@
33637
+HILDON_LIBS = @HILDON_LIBS@
33638
HTML_DIR = @HTML_DIR@
33639
+INSTALL = @INSTALL@
33640
INSTALL_DATA = @INSTALL_DATA@
33641
INSTALL_PROGRAM = @INSTALL_PROGRAM@
33642
INSTALL_SCRIPT = @INSTALL_SCRIPT@
33643
@@ -175,14 +138,12 @@
33644
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
33645
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
33646
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
33647
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
33648
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
33649
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
33650
INTLTOOL_MERGE = @INTLTOOL_MERGE@
33651
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
33652
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
33653
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
33654
INTLTOOL_PERL = @INTLTOOL_PERL@
33655
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
33656
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
33657
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
33658
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
33659
@@ -194,7 +155,6 @@
33660
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
33661
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
33662
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
33663
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
33664
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
33665
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
33666
LDFLAGS = @LDFLAGS@
33667
@@ -206,9 +166,8 @@
33668
LN_S = @LN_S@
33669
LTLIBOBJS = @LTLIBOBJS@
33670
MAINT = @MAINT@
33671
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
33672
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
33673
MAKEINFO = @MAKEINFO@
33674
+MKDIR_P = @MKDIR_P@
33675
MKINSTALLDIRS = @MKINSTALLDIRS@
33676
MSGFMT = @MSGFMT@
33677
MSGFMT_OPTS = @MSGFMT_OPTS@
33678
@@ -243,26 +202,14 @@
33679
VERSION = @VERSION@
33680
WARN_CFLAGS = @WARN_CFLAGS@
33681
WARN_CXXFLAGS = @WARN_CXXFLAGS@
33682
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
33683
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
33684
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
33685
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
33686
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
33687
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
33688
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
33689
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
33690
XGETTEXT = @XGETTEXT@
33691
-ac_ct_AR = @ac_ct_AR@
33692
+abs_builddir = @abs_builddir@
33693
+abs_srcdir = @abs_srcdir@
33694
+abs_top_builddir = @abs_top_builddir@
33695
+abs_top_srcdir = @abs_top_srcdir@
33696
ac_ct_CC = @ac_ct_CC@
33697
ac_ct_CXX = @ac_ct_CXX@
33698
ac_ct_F77 = @ac_ct_F77@
33699
-ac_ct_RANLIB = @ac_ct_RANLIB@
33700
-ac_ct_STRIP = @ac_ct_STRIP@
33701
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
33702
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
33703
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
33704
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
33705
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
33706
am__include = @am__include@
33707
am__leading_dot = @am__leading_dot@
33708
am__quote = @am__quote@
33709
@@ -274,28 +221,39 @@
33710
build_cpu = @build_cpu@
33711
build_os = @build_os@
33712
build_vendor = @build_vendor@
33713
+builddir = @builddir@
33714
datadir = @datadir@
33715
+datarootdir = @datarootdir@
33716
+docdir = @docdir@
33717
+dvidir = @dvidir@
33718
exec_prefix = @exec_prefix@
33719
host = @host@
33720
host_alias = @host_alias@
33721
host_cpu = @host_cpu@
33722
host_os = @host_os@
33723
host_vendor = @host_vendor@
33724
+htmldir = @htmldir@
33725
includedir = @includedir@
33726
infodir = @infodir@
33727
install_sh = @install_sh@
33728
libdir = @libdir@
33729
libexecdir = @libexecdir@
33730
+localedir = @localedir@
33731
localstatedir = @localstatedir@
33732
mandir = @mandir@
33733
mkdir_p = @mkdir_p@
33734
oldincludedir = @oldincludedir@
33735
+pdfdir = @pdfdir@
33736
prefix = @prefix@
33737
program_transform_name = @program_transform_name@
33738
+psdir = @psdir@
33739
sbindir = @sbindir@
33740
sharedstatedir = @sharedstatedir@
33741
+srcdir = @srcdir@
33742
sysconfdir = @sysconfdir@
33743
target_alias = @target_alias@
33744
+top_builddir = @top_builddir@
33745
+top_srcdir = @top_srcdir@
33746
themedir = $(datadir)/icons/hicolor
33747
size = 22x22
33748
context = apps
33749
@@ -346,13 +304,9 @@
33750
33751
clean-libtool:
33752
-rm -rf .libs _libs
33753
-
33754
-distclean-libtool:
33755
- -rm -f libtool
33756
-uninstall-info-am:
33757
install-iconsDATA: $(icons_DATA)
33758
@$(NORMAL_INSTALL)
33759
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
33760
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
33761
@list='$(icons_DATA)'; for p in $$list; do \
33762
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
33763
f=$(am__strip_dir) \
33764
@@ -375,22 +329,21 @@
33765
33766
33767
distdir: $(DISTFILES)
33768
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
33769
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
33770
- list='$(DISTFILES)'; for file in $$list; do \
33771
- case $$file in \
33772
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
33773
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
33774
- esac; \
33775
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33776
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33777
+ list='$(DISTFILES)'; \
33778
+ dist_files=`for file in $$list; do echo $$file; done | \
33779
+ sed -e "s|^$$srcdirstrip/||;t" \
33780
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
33781
+ case $$dist_files in \
33782
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
33783
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
33784
+ sort -u` ;; \
33785
+ esac; \
33786
+ for file in $$dist_files; do \
33787
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
33788
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
33789
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
33790
- dir="/$$dir"; \
33791
- $(mkdir_p) "$(distdir)$$dir"; \
33792
- else \
33793
- dir=''; \
33794
- fi; \
33795
if test -d $$d/$$file; then \
33796
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
33797
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
33798
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
33799
fi; \
33800
@@ -406,7 +359,7 @@
33801
all-am: Makefile $(DATA)
33802
installdirs:
33803
for dir in "$(DESTDIR)$(iconsdir)"; do \
33804
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
33805
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
33806
done
33807
install: install-am
33808
install-exec: install-exec-am
33809
@@ -438,7 +391,7 @@
33810
33811
distclean: distclean-am
33812
-rm -f Makefile
33813
-distclean-am: clean-am distclean-generic distclean-libtool
33814
+distclean-am: clean-am distclean-generic
33815
33816
dvi: dvi-am
33817
33818
@@ -452,12 +405,20 @@
33819
33820
install-data-am: install-iconsDATA
33821
33822
+install-dvi: install-dvi-am
33823
+
33824
install-exec-am:
33825
33826
+install-html: install-html-am
33827
+
33828
install-info: install-info-am
33829
33830
install-man:
33831
33832
+install-pdf: install-pdf-am
33833
+
33834
+install-ps: install-ps-am
33835
+
33836
installcheck-am:
33837
33838
maintainer-clean: maintainer-clean-am
33839
@@ -476,17 +437,21 @@
33840
33841
ps-am:
33842
33843
-uninstall-am: uninstall-iconsDATA uninstall-info-am
33844
+uninstall-am: uninstall-iconsDATA
33845
+
33846
+.MAKE: install-am install-strip
33847
33848
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
33849
distclean distclean-generic distclean-libtool distdir dvi \
33850
dvi-am html html-am info info-am install install-am \
33851
- install-data install-data-am install-exec install-exec-am \
33852
+ install-data install-data-am install-dvi install-dvi-am \
33853
+ install-exec install-exec-am install-html install-html-am \
33854
install-iconsDATA install-info install-info-am install-man \
33855
+ install-pdf install-pdf-am install-ps install-ps-am \
33856
install-strip installcheck installcheck-am installdirs \
33857
maintainer-clean maintainer-clean-generic mostlyclean \
33858
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
33859
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
33860
+ uninstall uninstall-am uninstall-iconsDATA
33861
33862
# Tell versions [3.59,3.63) of GNU make to not export all variables.
33863
# Otherwise a system limit (for SysV at least) may be exceeded.
33864
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/22x22/Makefile.in evince-2.20.2.new/data/icons/22x22/Makefile.in
33865
--- evince-2.20.2/data/icons/22x22/Makefile.in 2007-11-26 22:55:51.000000000 +0100
33866
+++ evince-2.20.2.new/data/icons/22x22/Makefile.in 2007-11-27 22:51:54.000000000 +0100
33867
@@ -1,8 +1,8 @@
33868
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
33869
+# Makefile.in generated by automake 1.10 from Makefile.am.
33870
# @configure_input@
33871
33872
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
33873
-# 2003, 2004, 2005 Free Software Foundation, Inc.
33874
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
33875
# This Makefile.in is free software; the Free Software Foundation
33876
# gives unlimited permission to copy and/or distribute it,
33877
# with or without modifications, as long as this notice is preserved.
33878
@@ -13,15 +13,11 @@
33879
# PARTICULAR PURPOSE.
33880
33881
@SET_MAKE@
33882
-srcdir = @srcdir@
33883
-top_srcdir = @top_srcdir@
33884
VPATH = @srcdir@
33885
pkgdatadir = $(datadir)/@PACKAGE@
33886
pkglibdir = $(libdir)/@PACKAGE@
33887
pkgincludedir = $(includedir)/@PACKAGE@
33888
-top_builddir = ../../..
33889
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
33890
-INSTALL = @INSTALL@
33891
install_sh_DATA = $(install_sh) -c -m 644
33892
install_sh_PROGRAM = $(install_sh) -c
33893
install_sh_SCRIPT = $(install_sh) -c
33894
@@ -48,10 +44,13 @@
33895
DIST_SOURCES =
33896
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
33897
html-recursive info-recursive install-data-recursive \
33898
- install-exec-recursive install-info-recursive \
33899
- install-recursive installcheck-recursive installdirs-recursive \
33900
- pdf-recursive ps-recursive uninstall-info-recursive \
33901
- uninstall-recursive
33902
+ install-dvi-recursive install-exec-recursive \
33903
+ install-html-recursive install-info-recursive \
33904
+ install-pdf-recursive install-ps-recursive install-recursive \
33905
+ installcheck-recursive installdirs-recursive pdf-recursive \
33906
+ ps-recursive uninstall-recursive
33907
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
33908
+ distclean-recursive maintainer-clean-recursive
33909
ETAGS = etags
33910
CTAGS = ctags
33911
DIST_SUBDIRS = $(SUBDIRS)
33912
@@ -59,8 +58,6 @@
33913
ACLOCAL = @ACLOCAL@
33914
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
33915
ALL_LINGUAS = @ALL_LINGUAS@
33916
-AMDEP_FALSE = @AMDEP_FALSE@
33917
-AMDEP_TRUE = @AMDEP_TRUE@
33918
AMTAR = @AMTAR@
33919
AR = @AR@
33920
AUTOCONF = @AUTOCONF@
33921
@@ -89,8 +86,6 @@
33922
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
33923
DBUS_CFLAGS = @DBUS_CFLAGS@
33924
DBUS_LIBS = @DBUS_LIBS@
33925
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
33926
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
33927
DEFS = @DEFS@
33928
DEPDIR = @DEPDIR@
33929
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
33930
@@ -102,30 +97,6 @@
33931
ECHO_N = @ECHO_N@
33932
ECHO_T = @ECHO_T@
33933
EGREP = @EGREP@
33934
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
33935
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
33936
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
33937
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
33938
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
33939
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
33940
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
33941
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
33942
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
33943
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
33944
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
33945
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
33946
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
33947
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
33948
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
33949
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
33950
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
33951
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
33952
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
33953
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
33954
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
33955
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
33956
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
33957
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
33958
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
33959
EXEEXT = @EXEEXT@
33960
F77 = @F77@
33961
@@ -135,8 +106,6 @@
33962
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
33963
FRONTEND_LIBS = @FRONTEND_LIBS@
33964
GCONFTOOL = @GCONFTOOL@
33965
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
33966
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
33967
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
33968
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
33969
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
33970
@@ -150,20 +119,17 @@
33971
GNOME_LIBS = @GNOME_LIBS@
33972
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
33973
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
33974
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
33975
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
33976
+GREP = @GREP@
33977
+GTKDOC_CHECK = @GTKDOC_CHECK@
33978
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
33979
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
33980
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
33981
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
33982
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
33983
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
33984
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
33985
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
33986
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
33987
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
33988
HELP_DIR = @HELP_DIR@
33989
+HILDON_CFLAGS = @HILDON_CFLAGS@
33990
+HILDON_LIBS = @HILDON_LIBS@
33991
HTML_DIR = @HTML_DIR@
33992
+INSTALL = @INSTALL@
33993
INSTALL_DATA = @INSTALL_DATA@
33994
INSTALL_PROGRAM = @INSTALL_PROGRAM@
33995
INSTALL_SCRIPT = @INSTALL_SCRIPT@
33996
@@ -174,14 +140,12 @@
33997
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
33998
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
33999
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
34000
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
34001
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
34002
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
34003
INTLTOOL_MERGE = @INTLTOOL_MERGE@
34004
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
34005
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
34006
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
34007
INTLTOOL_PERL = @INTLTOOL_PERL@
34008
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
34009
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
34010
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
34011
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
34012
@@ -193,7 +157,6 @@
34013
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
34014
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
34015
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
34016
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
34017
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
34018
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
34019
LDFLAGS = @LDFLAGS@
34020
@@ -205,9 +168,8 @@
34021
LN_S = @LN_S@
34022
LTLIBOBJS = @LTLIBOBJS@
34023
MAINT = @MAINT@
34024
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
34025
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
34026
MAKEINFO = @MAKEINFO@
34027
+MKDIR_P = @MKDIR_P@
34028
MKINSTALLDIRS = @MKINSTALLDIRS@
34029
MSGFMT = @MSGFMT@
34030
MSGFMT_OPTS = @MSGFMT_OPTS@
34031
@@ -242,26 +204,14 @@
34032
VERSION = @VERSION@
34033
WARN_CFLAGS = @WARN_CFLAGS@
34034
WARN_CXXFLAGS = @WARN_CXXFLAGS@
34035
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
34036
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
34037
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
34038
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
34039
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
34040
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
34041
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
34042
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
34043
XGETTEXT = @XGETTEXT@
34044
-ac_ct_AR = @ac_ct_AR@
34045
+abs_builddir = @abs_builddir@
34046
+abs_srcdir = @abs_srcdir@
34047
+abs_top_builddir = @abs_top_builddir@
34048
+abs_top_srcdir = @abs_top_srcdir@
34049
ac_ct_CC = @ac_ct_CC@
34050
ac_ct_CXX = @ac_ct_CXX@
34051
ac_ct_F77 = @ac_ct_F77@
34052
-ac_ct_RANLIB = @ac_ct_RANLIB@
34053
-ac_ct_STRIP = @ac_ct_STRIP@
34054
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
34055
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
34056
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
34057
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
34058
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
34059
am__include = @am__include@
34060
am__leading_dot = @am__leading_dot@
34061
am__quote = @am__quote@
34062
@@ -273,28 +223,39 @@
34063
build_cpu = @build_cpu@
34064
build_os = @build_os@
34065
build_vendor = @build_vendor@
34066
+builddir = @builddir@
34067
datadir = @datadir@
34068
+datarootdir = @datarootdir@
34069
+docdir = @docdir@
34070
+dvidir = @dvidir@
34071
exec_prefix = @exec_prefix@
34072
host = @host@
34073
host_alias = @host_alias@
34074
host_cpu = @host_cpu@
34075
host_os = @host_os@
34076
host_vendor = @host_vendor@
34077
+htmldir = @htmldir@
34078
includedir = @includedir@
34079
infodir = @infodir@
34080
install_sh = @install_sh@
34081
libdir = @libdir@
34082
libexecdir = @libexecdir@
34083
+localedir = @localedir@
34084
localstatedir = @localstatedir@
34085
mandir = @mandir@
34086
mkdir_p = @mkdir_p@
34087
oldincludedir = @oldincludedir@
34088
+pdfdir = @pdfdir@
34089
prefix = @prefix@
34090
program_transform_name = @program_transform_name@
34091
+psdir = @psdir@
34092
sbindir = @sbindir@
34093
sharedstatedir = @sharedstatedir@
34094
+srcdir = @srcdir@
34095
sysconfdir = @sysconfdir@
34096
target_alias = @target_alias@
34097
+top_builddir = @top_builddir@
34098
+top_srcdir = @top_srcdir@
34099
SUBDIRS = actions apps
34100
all: all-recursive
34101
34102
@@ -335,10 +296,6 @@
34103
clean-libtool:
34104
-rm -rf .libs _libs
34105
34106
-distclean-libtool:
34107
- -rm -f libtool
34108
-uninstall-info-am:
34109
-
34110
# This directory's subdirectories are mostly independent; you can cd
34111
# into them and run `make' without going through this Makefile.
34112
# To change the values of `make' variables: instead of editing Makefiles,
34113
@@ -370,8 +327,7 @@
34114
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
34115
fi; test -z "$$fail"
34116
34117
-mostlyclean-recursive clean-recursive distclean-recursive \
34118
-maintainer-clean-recursive:
34119
+$(RECURSIVE_CLEAN_TARGETS):
34120
@failcom='exit 1'; \
34121
for f in x $$MAKEFLAGS; do \
34122
case $$f in \
34123
@@ -472,22 +428,21 @@
34124
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
34125
34126
distdir: $(DISTFILES)
34127
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
34128
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
34129
- list='$(DISTFILES)'; for file in $$list; do \
34130
- case $$file in \
34131
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
34132
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
34133
- esac; \
34134
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34135
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34136
+ list='$(DISTFILES)'; \
34137
+ dist_files=`for file in $$list; do echo $$file; done | \
34138
+ sed -e "s|^$$srcdirstrip/||;t" \
34139
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
34140
+ case $$dist_files in \
34141
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
34142
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
34143
+ sort -u` ;; \
34144
+ esac; \
34145
+ for file in $$dist_files; do \
34146
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
34147
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
34148
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
34149
- dir="/$$dir"; \
34150
- $(mkdir_p) "$(distdir)$$dir"; \
34151
- else \
34152
- dir=''; \
34153
- fi; \
34154
if test -d $$d/$$file; then \
34155
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
34156
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
34157
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
34158
fi; \
34159
@@ -501,7 +456,7 @@
34160
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
34161
if test "$$subdir" = .; then :; else \
34162
test -d "$(distdir)/$$subdir" \
34163
- || $(mkdir_p) "$(distdir)/$$subdir" \
34164
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
34165
|| exit 1; \
34166
distdir=`$(am__cd) $(distdir) && pwd`; \
34167
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
34168
@@ -509,6 +464,8 @@
34169
$(MAKE) $(AM_MAKEFLAGS) \
34170
top_distdir="$$top_distdir" \
34171
distdir="$$distdir/$$subdir" \
34172
+ am__remove_distdir=: \
34173
+ am__skip_length_check=: \
34174
distdir) \
34175
|| exit 1; \
34176
fi; \
34177
@@ -548,8 +505,7 @@
34178
34179
distclean: distclean-recursive
34180
-rm -f Makefile
34181
-distclean-am: clean-am distclean-generic distclean-libtool \
34182
- distclean-tags
34183
+distclean-am: clean-am distclean-generic distclean-tags
34184
34185
dvi: dvi-recursive
34186
34187
@@ -563,12 +519,20 @@
34188
34189
install-data-am:
34190
34191
+install-dvi: install-dvi-recursive
34192
+
34193
install-exec-am:
34194
34195
+install-html: install-html-recursive
34196
+
34197
install-info: install-info-recursive
34198
34199
install-man:
34200
34201
+install-pdf: install-pdf-recursive
34202
+
34203
+install-ps: install-ps-recursive
34204
+
34205
installcheck-am:
34206
34207
maintainer-clean: maintainer-clean-recursive
34208
@@ -587,22 +551,24 @@
34209
34210
ps-am:
34211
34212
-uninstall-am: uninstall-info-am
34213
+uninstall-am:
34214
34215
-uninstall-info: uninstall-info-recursive
34216
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
34217
+ install-strip
34218
34219
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
34220
- clean clean-generic clean-libtool clean-recursive ctags \
34221
- ctags-recursive distclean distclean-generic distclean-libtool \
34222
- distclean-recursive distclean-tags distdir dvi dvi-am html \
34223
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
34224
+ all all-am check check-am clean clean-generic clean-libtool \
34225
+ ctags ctags-recursive distclean distclean-generic \
34226
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
34227
html-am info info-am install install-am install-data \
34228
- install-data-am install-exec install-exec-am install-info \
34229
- install-info-am install-man install-strip installcheck \
34230
+ install-data-am install-dvi install-dvi-am install-exec \
34231
+ install-exec-am install-html install-html-am install-info \
34232
+ install-info-am install-man install-pdf install-pdf-am \
34233
+ install-ps install-ps-am install-strip installcheck \
34234
installcheck-am installdirs installdirs-am maintainer-clean \
34235
- maintainer-clean-generic maintainer-clean-recursive \
34236
- mostlyclean mostlyclean-generic mostlyclean-libtool \
34237
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
34238
- uninstall uninstall-am uninstall-info-am
34239
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
34240
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
34241
+ uninstall uninstall-am
34242
34243
# Tell versions [3.59,3.63) of GNU make to not export all variables.
34244
# Otherwise a system limit (for SysV at least) may be exceeded.
34245
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/24x24/actions/Makefile.in evince-2.20.2.new/data/icons/24x24/actions/Makefile.in
34246
--- evince-2.20.2/data/icons/24x24/actions/Makefile.in 2007-11-26 22:55:53.000000000 +0100
34247
+++ evince-2.20.2.new/data/icons/24x24/actions/Makefile.in 2007-11-27 22:51:54.000000000 +0100
34248
@@ -1,8 +1,8 @@
34249
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
34250
+# Makefile.in generated by automake 1.10 from Makefile.am.
34251
# @configure_input@
34252
34253
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
34254
-# 2003, 2004, 2005 Free Software Foundation, Inc.
34255
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
34256
# This Makefile.in is free software; the Free Software Foundation
34257
# gives unlimited permission to copy and/or distribute it,
34258
# with or without modifications, as long as this notice is preserved.
34259
@@ -14,15 +14,11 @@
34260
34261
@SET_MAKE@
34262
34263
-srcdir = @srcdir@
34264
-top_srcdir = @top_srcdir@
34265
VPATH = @srcdir@
34266
pkgdatadir = $(datadir)/@PACKAGE@
34267
pkglibdir = $(libdir)/@PACKAGE@
34268
pkgincludedir = $(includedir)/@PACKAGE@
34269
-top_builddir = ../../../..
34270
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
34271
-INSTALL = @INSTALL@
34272
install_sh_DATA = $(install_sh) -c -m 644
34273
install_sh_PROGRAM = $(install_sh) -c
34274
install_sh_SCRIPT = $(install_sh) -c
34275
@@ -60,8 +56,6 @@
34276
ACLOCAL = @ACLOCAL@
34277
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
34278
ALL_LINGUAS = @ALL_LINGUAS@
34279
-AMDEP_FALSE = @AMDEP_FALSE@
34280
-AMDEP_TRUE = @AMDEP_TRUE@
34281
AMTAR = @AMTAR@
34282
AR = @AR@
34283
AUTOCONF = @AUTOCONF@
34284
@@ -90,8 +84,6 @@
34285
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
34286
DBUS_CFLAGS = @DBUS_CFLAGS@
34287
DBUS_LIBS = @DBUS_LIBS@
34288
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
34289
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
34290
DEFS = @DEFS@
34291
DEPDIR = @DEPDIR@
34292
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
34293
@@ -103,30 +95,6 @@
34294
ECHO_N = @ECHO_N@
34295
ECHO_T = @ECHO_T@
34296
EGREP = @EGREP@
34297
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
34298
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
34299
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
34300
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
34301
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
34302
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
34303
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
34304
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
34305
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
34306
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
34307
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
34308
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
34309
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
34310
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
34311
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
34312
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
34313
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
34314
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
34315
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
34316
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
34317
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
34318
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
34319
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
34320
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
34321
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
34322
EXEEXT = @EXEEXT@
34323
F77 = @F77@
34324
@@ -136,8 +104,6 @@
34325
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
34326
FRONTEND_LIBS = @FRONTEND_LIBS@
34327
GCONFTOOL = @GCONFTOOL@
34328
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
34329
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
34330
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
34331
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
34332
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
34333
@@ -151,20 +117,17 @@
34334
GNOME_LIBS = @GNOME_LIBS@
34335
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
34336
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
34337
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
34338
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
34339
+GREP = @GREP@
34340
+GTKDOC_CHECK = @GTKDOC_CHECK@
34341
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
34342
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
34343
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
34344
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
34345
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
34346
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
34347
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
34348
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
34349
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
34350
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
34351
HELP_DIR = @HELP_DIR@
34352
+HILDON_CFLAGS = @HILDON_CFLAGS@
34353
+HILDON_LIBS = @HILDON_LIBS@
34354
HTML_DIR = @HTML_DIR@
34355
+INSTALL = @INSTALL@
34356
INSTALL_DATA = @INSTALL_DATA@
34357
INSTALL_PROGRAM = @INSTALL_PROGRAM@
34358
INSTALL_SCRIPT = @INSTALL_SCRIPT@
34359
@@ -175,14 +138,12 @@
34360
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
34361
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
34362
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
34363
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
34364
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
34365
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
34366
INTLTOOL_MERGE = @INTLTOOL_MERGE@
34367
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
34368
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
34369
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
34370
INTLTOOL_PERL = @INTLTOOL_PERL@
34371
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
34372
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
34373
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
34374
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
34375
@@ -194,7 +155,6 @@
34376
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
34377
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
34378
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
34379
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
34380
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
34381
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
34382
LDFLAGS = @LDFLAGS@
34383
@@ -206,9 +166,8 @@
34384
LN_S = @LN_S@
34385
LTLIBOBJS = @LTLIBOBJS@
34386
MAINT = @MAINT@
34387
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
34388
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
34389
MAKEINFO = @MAKEINFO@
34390
+MKDIR_P = @MKDIR_P@
34391
MKINSTALLDIRS = @MKINSTALLDIRS@
34392
MSGFMT = @MSGFMT@
34393
MSGFMT_OPTS = @MSGFMT_OPTS@
34394
@@ -243,26 +202,14 @@
34395
VERSION = @VERSION@
34396
WARN_CFLAGS = @WARN_CFLAGS@
34397
WARN_CXXFLAGS = @WARN_CXXFLAGS@
34398
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
34399
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
34400
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
34401
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
34402
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
34403
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
34404
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
34405
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
34406
XGETTEXT = @XGETTEXT@
34407
-ac_ct_AR = @ac_ct_AR@
34408
+abs_builddir = @abs_builddir@
34409
+abs_srcdir = @abs_srcdir@
34410
+abs_top_builddir = @abs_top_builddir@
34411
+abs_top_srcdir = @abs_top_srcdir@
34412
ac_ct_CC = @ac_ct_CC@
34413
ac_ct_CXX = @ac_ct_CXX@
34414
ac_ct_F77 = @ac_ct_F77@
34415
-ac_ct_RANLIB = @ac_ct_RANLIB@
34416
-ac_ct_STRIP = @ac_ct_STRIP@
34417
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
34418
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
34419
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
34420
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
34421
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
34422
am__include = @am__include@
34423
am__leading_dot = @am__leading_dot@
34424
am__quote = @am__quote@
34425
@@ -274,28 +221,39 @@
34426
build_cpu = @build_cpu@
34427
build_os = @build_os@
34428
build_vendor = @build_vendor@
34429
+builddir = @builddir@
34430
datadir = @datadir@
34431
+datarootdir = @datarootdir@
34432
+docdir = @docdir@
34433
+dvidir = @dvidir@
34434
exec_prefix = @exec_prefix@
34435
host = @host@
34436
host_alias = @host_alias@
34437
host_cpu = @host_cpu@
34438
host_os = @host_os@
34439
host_vendor = @host_vendor@
34440
+htmldir = @htmldir@
34441
includedir = @includedir@
34442
infodir = @infodir@
34443
install_sh = @install_sh@
34444
libdir = @libdir@
34445
libexecdir = @libexecdir@
34446
+localedir = @localedir@
34447
localstatedir = @localstatedir@
34448
mandir = @mandir@
34449
mkdir_p = @mkdir_p@
34450
oldincludedir = @oldincludedir@
34451
+pdfdir = @pdfdir@
34452
prefix = @prefix@
34453
program_transform_name = @program_transform_name@
34454
+psdir = @psdir@
34455
sbindir = @sbindir@
34456
sharedstatedir = @sharedstatedir@
34457
+srcdir = @srcdir@
34458
sysconfdir = @sysconfdir@
34459
target_alias = @target_alias@
34460
+top_builddir = @top_builddir@
34461
+top_srcdir = @top_srcdir@
34462
themedir = $(pkgdatadir)/icons/hicolor
34463
size = 24x24
34464
context = actions
34465
@@ -350,13 +308,9 @@
34466
34467
clean-libtool:
34468
-rm -rf .libs _libs
34469
-
34470
-distclean-libtool:
34471
- -rm -f libtool
34472
-uninstall-info-am:
34473
install-iconsDATA: $(icons_DATA)
34474
@$(NORMAL_INSTALL)
34475
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
34476
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
34477
@list='$(icons_DATA)'; for p in $$list; do \
34478
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
34479
f=$(am__strip_dir) \
34480
@@ -379,22 +333,21 @@
34481
34482
34483
distdir: $(DISTFILES)
34484
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
34485
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
34486
- list='$(DISTFILES)'; for file in $$list; do \
34487
- case $$file in \
34488
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
34489
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
34490
- esac; \
34491
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34492
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34493
+ list='$(DISTFILES)'; \
34494
+ dist_files=`for file in $$list; do echo $$file; done | \
34495
+ sed -e "s|^$$srcdirstrip/||;t" \
34496
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
34497
+ case $$dist_files in \
34498
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
34499
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
34500
+ sort -u` ;; \
34501
+ esac; \
34502
+ for file in $$dist_files; do \
34503
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
34504
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
34505
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
34506
- dir="/$$dir"; \
34507
- $(mkdir_p) "$(distdir)$$dir"; \
34508
- else \
34509
- dir=''; \
34510
- fi; \
34511
if test -d $$d/$$file; then \
34512
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
34513
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
34514
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
34515
fi; \
34516
@@ -410,7 +363,7 @@
34517
all-am: Makefile $(DATA)
34518
installdirs:
34519
for dir in "$(DESTDIR)$(iconsdir)"; do \
34520
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
34521
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
34522
done
34523
install: install-am
34524
install-exec: install-exec-am
34525
@@ -442,7 +395,7 @@
34526
34527
distclean: distclean-am
34528
-rm -f Makefile
34529
-distclean-am: clean-am distclean-generic distclean-libtool
34530
+distclean-am: clean-am distclean-generic
34531
34532
dvi: dvi-am
34533
34534
@@ -456,12 +409,20 @@
34535
34536
install-data-am: install-iconsDATA
34537
34538
+install-dvi: install-dvi-am
34539
+
34540
install-exec-am:
34541
34542
+install-html: install-html-am
34543
+
34544
install-info: install-info-am
34545
34546
install-man:
34547
34548
+install-pdf: install-pdf-am
34549
+
34550
+install-ps: install-ps-am
34551
+
34552
installcheck-am:
34553
34554
maintainer-clean: maintainer-clean-am
34555
@@ -480,17 +441,21 @@
34556
34557
ps-am:
34558
34559
-uninstall-am: uninstall-iconsDATA uninstall-info-am
34560
+uninstall-am: uninstall-iconsDATA
34561
+
34562
+.MAKE: install-am install-strip
34563
34564
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
34565
distclean distclean-generic distclean-libtool distdir dvi \
34566
dvi-am html html-am info info-am install install-am \
34567
- install-data install-data-am install-exec install-exec-am \
34568
+ install-data install-data-am install-dvi install-dvi-am \
34569
+ install-exec install-exec-am install-html install-html-am \
34570
install-iconsDATA install-info install-info-am install-man \
34571
+ install-pdf install-pdf-am install-ps install-ps-am \
34572
install-strip installcheck installcheck-am installdirs \
34573
maintainer-clean maintainer-clean-generic mostlyclean \
34574
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
34575
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
34576
+ uninstall uninstall-am uninstall-iconsDATA
34577
34578
# Tell versions [3.59,3.63) of GNU make to not export all variables.
34579
# Otherwise a system limit (for SysV at least) may be exceeded.
34580
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/24x24/apps/Makefile.in evince-2.20.2.new/data/icons/24x24/apps/Makefile.in
34581
--- evince-2.20.2/data/icons/24x24/apps/Makefile.in 2007-11-26 22:55:53.000000000 +0100
34582
+++ evince-2.20.2.new/data/icons/24x24/apps/Makefile.in 2007-11-27 22:51:54.000000000 +0100
34583
@@ -1,8 +1,8 @@
34584
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
34585
+# Makefile.in generated by automake 1.10 from Makefile.am.
34586
# @configure_input@
34587
34588
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
34589
-# 2003, 2004, 2005 Free Software Foundation, Inc.
34590
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
34591
# This Makefile.in is free software; the Free Software Foundation
34592
# gives unlimited permission to copy and/or distribute it,
34593
# with or without modifications, as long as this notice is preserved.
34594
@@ -14,15 +14,11 @@
34595
34596
@SET_MAKE@
34597
34598
-srcdir = @srcdir@
34599
-top_srcdir = @top_srcdir@
34600
VPATH = @srcdir@
34601
pkgdatadir = $(datadir)/@PACKAGE@
34602
pkglibdir = $(libdir)/@PACKAGE@
34603
pkgincludedir = $(includedir)/@PACKAGE@
34604
-top_builddir = ../../../..
34605
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
34606
-INSTALL = @INSTALL@
34607
install_sh_DATA = $(install_sh) -c -m 644
34608
install_sh_PROGRAM = $(install_sh) -c
34609
install_sh_SCRIPT = $(install_sh) -c
34610
@@ -60,8 +56,6 @@
34611
ACLOCAL = @ACLOCAL@
34612
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
34613
ALL_LINGUAS = @ALL_LINGUAS@
34614
-AMDEP_FALSE = @AMDEP_FALSE@
34615
-AMDEP_TRUE = @AMDEP_TRUE@
34616
AMTAR = @AMTAR@
34617
AR = @AR@
34618
AUTOCONF = @AUTOCONF@
34619
@@ -90,8 +84,6 @@
34620
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
34621
DBUS_CFLAGS = @DBUS_CFLAGS@
34622
DBUS_LIBS = @DBUS_LIBS@
34623
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
34624
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
34625
DEFS = @DEFS@
34626
DEPDIR = @DEPDIR@
34627
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
34628
@@ -103,30 +95,6 @@
34629
ECHO_N = @ECHO_N@
34630
ECHO_T = @ECHO_T@
34631
EGREP = @EGREP@
34632
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
34633
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
34634
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
34635
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
34636
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
34637
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
34638
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
34639
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
34640
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
34641
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
34642
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
34643
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
34644
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
34645
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
34646
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
34647
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
34648
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
34649
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
34650
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
34651
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
34652
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
34653
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
34654
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
34655
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
34656
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
34657
EXEEXT = @EXEEXT@
34658
F77 = @F77@
34659
@@ -136,8 +104,6 @@
34660
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
34661
FRONTEND_LIBS = @FRONTEND_LIBS@
34662
GCONFTOOL = @GCONFTOOL@
34663
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
34664
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
34665
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
34666
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
34667
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
34668
@@ -151,20 +117,17 @@
34669
GNOME_LIBS = @GNOME_LIBS@
34670
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
34671
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
34672
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
34673
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
34674
+GREP = @GREP@
34675
+GTKDOC_CHECK = @GTKDOC_CHECK@
34676
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
34677
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
34678
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
34679
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
34680
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
34681
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
34682
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
34683
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
34684
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
34685
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
34686
HELP_DIR = @HELP_DIR@
34687
+HILDON_CFLAGS = @HILDON_CFLAGS@
34688
+HILDON_LIBS = @HILDON_LIBS@
34689
HTML_DIR = @HTML_DIR@
34690
+INSTALL = @INSTALL@
34691
INSTALL_DATA = @INSTALL_DATA@
34692
INSTALL_PROGRAM = @INSTALL_PROGRAM@
34693
INSTALL_SCRIPT = @INSTALL_SCRIPT@
34694
@@ -175,14 +138,12 @@
34695
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
34696
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
34697
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
34698
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
34699
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
34700
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
34701
INTLTOOL_MERGE = @INTLTOOL_MERGE@
34702
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
34703
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
34704
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
34705
INTLTOOL_PERL = @INTLTOOL_PERL@
34706
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
34707
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
34708
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
34709
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
34710
@@ -194,7 +155,6 @@
34711
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
34712
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
34713
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
34714
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
34715
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
34716
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
34717
LDFLAGS = @LDFLAGS@
34718
@@ -206,9 +166,8 @@
34719
LN_S = @LN_S@
34720
LTLIBOBJS = @LTLIBOBJS@
34721
MAINT = @MAINT@
34722
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
34723
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
34724
MAKEINFO = @MAKEINFO@
34725
+MKDIR_P = @MKDIR_P@
34726
MKINSTALLDIRS = @MKINSTALLDIRS@
34727
MSGFMT = @MSGFMT@
34728
MSGFMT_OPTS = @MSGFMT_OPTS@
34729
@@ -243,26 +202,14 @@
34730
VERSION = @VERSION@
34731
WARN_CFLAGS = @WARN_CFLAGS@
34732
WARN_CXXFLAGS = @WARN_CXXFLAGS@
34733
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
34734
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
34735
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
34736
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
34737
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
34738
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
34739
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
34740
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
34741
XGETTEXT = @XGETTEXT@
34742
-ac_ct_AR = @ac_ct_AR@
34743
+abs_builddir = @abs_builddir@
34744
+abs_srcdir = @abs_srcdir@
34745
+abs_top_builddir = @abs_top_builddir@
34746
+abs_top_srcdir = @abs_top_srcdir@
34747
ac_ct_CC = @ac_ct_CC@
34748
ac_ct_CXX = @ac_ct_CXX@
34749
ac_ct_F77 = @ac_ct_F77@
34750
-ac_ct_RANLIB = @ac_ct_RANLIB@
34751
-ac_ct_STRIP = @ac_ct_STRIP@
34752
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
34753
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
34754
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
34755
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
34756
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
34757
am__include = @am__include@
34758
am__leading_dot = @am__leading_dot@
34759
am__quote = @am__quote@
34760
@@ -274,28 +221,39 @@
34761
build_cpu = @build_cpu@
34762
build_os = @build_os@
34763
build_vendor = @build_vendor@
34764
+builddir = @builddir@
34765
datadir = @datadir@
34766
+datarootdir = @datarootdir@
34767
+docdir = @docdir@
34768
+dvidir = @dvidir@
34769
exec_prefix = @exec_prefix@
34770
host = @host@
34771
host_alias = @host_alias@
34772
host_cpu = @host_cpu@
34773
host_os = @host_os@
34774
host_vendor = @host_vendor@
34775
+htmldir = @htmldir@
34776
includedir = @includedir@
34777
infodir = @infodir@
34778
install_sh = @install_sh@
34779
libdir = @libdir@
34780
libexecdir = @libexecdir@
34781
+localedir = @localedir@
34782
localstatedir = @localstatedir@
34783
mandir = @mandir@
34784
mkdir_p = @mkdir_p@
34785
oldincludedir = @oldincludedir@
34786
+pdfdir = @pdfdir@
34787
prefix = @prefix@
34788
program_transform_name = @program_transform_name@
34789
+psdir = @psdir@
34790
sbindir = @sbindir@
34791
sharedstatedir = @sharedstatedir@
34792
+srcdir = @srcdir@
34793
sysconfdir = @sysconfdir@
34794
target_alias = @target_alias@
34795
+top_builddir = @top_builddir@
34796
+top_srcdir = @top_srcdir@
34797
themedir = $(datadir)/icons/hicolor
34798
size = 24x24
34799
context = apps
34800
@@ -346,13 +304,9 @@
34801
34802
clean-libtool:
34803
-rm -rf .libs _libs
34804
-
34805
-distclean-libtool:
34806
- -rm -f libtool
34807
-uninstall-info-am:
34808
install-iconsDATA: $(icons_DATA)
34809
@$(NORMAL_INSTALL)
34810
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
34811
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
34812
@list='$(icons_DATA)'; for p in $$list; do \
34813
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
34814
f=$(am__strip_dir) \
34815
@@ -375,22 +329,21 @@
34816
34817
34818
distdir: $(DISTFILES)
34819
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
34820
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
34821
- list='$(DISTFILES)'; for file in $$list; do \
34822
- case $$file in \
34823
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
34824
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
34825
- esac; \
34826
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34827
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34828
+ list='$(DISTFILES)'; \
34829
+ dist_files=`for file in $$list; do echo $$file; done | \
34830
+ sed -e "s|^$$srcdirstrip/||;t" \
34831
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
34832
+ case $$dist_files in \
34833
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
34834
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
34835
+ sort -u` ;; \
34836
+ esac; \
34837
+ for file in $$dist_files; do \
34838
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
34839
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
34840
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
34841
- dir="/$$dir"; \
34842
- $(mkdir_p) "$(distdir)$$dir"; \
34843
- else \
34844
- dir=''; \
34845
- fi; \
34846
if test -d $$d/$$file; then \
34847
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
34848
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
34849
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
34850
fi; \
34851
@@ -406,7 +359,7 @@
34852
all-am: Makefile $(DATA)
34853
installdirs:
34854
for dir in "$(DESTDIR)$(iconsdir)"; do \
34855
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
34856
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
34857
done
34858
install: install-am
34859
install-exec: install-exec-am
34860
@@ -438,7 +391,7 @@
34861
34862
distclean: distclean-am
34863
-rm -f Makefile
34864
-distclean-am: clean-am distclean-generic distclean-libtool
34865
+distclean-am: clean-am distclean-generic
34866
34867
dvi: dvi-am
34868
34869
@@ -452,12 +405,20 @@
34870
34871
install-data-am: install-iconsDATA
34872
34873
+install-dvi: install-dvi-am
34874
+
34875
install-exec-am:
34876
34877
+install-html: install-html-am
34878
+
34879
install-info: install-info-am
34880
34881
install-man:
34882
34883
+install-pdf: install-pdf-am
34884
+
34885
+install-ps: install-ps-am
34886
+
34887
installcheck-am:
34888
34889
maintainer-clean: maintainer-clean-am
34890
@@ -476,17 +437,21 @@
34891
34892
ps-am:
34893
34894
-uninstall-am: uninstall-iconsDATA uninstall-info-am
34895
+uninstall-am: uninstall-iconsDATA
34896
+
34897
+.MAKE: install-am install-strip
34898
34899
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
34900
distclean distclean-generic distclean-libtool distdir dvi \
34901
dvi-am html html-am info info-am install install-am \
34902
- install-data install-data-am install-exec install-exec-am \
34903
+ install-data install-data-am install-dvi install-dvi-am \
34904
+ install-exec install-exec-am install-html install-html-am \
34905
install-iconsDATA install-info install-info-am install-man \
34906
+ install-pdf install-pdf-am install-ps install-ps-am \
34907
install-strip installcheck installcheck-am installdirs \
34908
maintainer-clean maintainer-clean-generic mostlyclean \
34909
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
34910
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
34911
+ uninstall uninstall-am uninstall-iconsDATA
34912
34913
# Tell versions [3.59,3.63) of GNU make to not export all variables.
34914
# Otherwise a system limit (for SysV at least) may be exceeded.
34915
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/24x24/Makefile.in evince-2.20.2.new/data/icons/24x24/Makefile.in
34916
--- evince-2.20.2/data/icons/24x24/Makefile.in 2007-11-26 22:55:52.000000000 +0100
34917
+++ evince-2.20.2.new/data/icons/24x24/Makefile.in 2007-11-27 22:51:54.000000000 +0100
34918
@@ -1,8 +1,8 @@
34919
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
34920
+# Makefile.in generated by automake 1.10 from Makefile.am.
34921
# @configure_input@
34922
34923
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
34924
-# 2003, 2004, 2005 Free Software Foundation, Inc.
34925
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
34926
# This Makefile.in is free software; the Free Software Foundation
34927
# gives unlimited permission to copy and/or distribute it,
34928
# with or without modifications, as long as this notice is preserved.
34929
@@ -13,15 +13,11 @@
34930
# PARTICULAR PURPOSE.
34931
34932
@SET_MAKE@
34933
-srcdir = @srcdir@
34934
-top_srcdir = @top_srcdir@
34935
VPATH = @srcdir@
34936
pkgdatadir = $(datadir)/@PACKAGE@
34937
pkglibdir = $(libdir)/@PACKAGE@
34938
pkgincludedir = $(includedir)/@PACKAGE@
34939
-top_builddir = ../../..
34940
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
34941
-INSTALL = @INSTALL@
34942
install_sh_DATA = $(install_sh) -c -m 644
34943
install_sh_PROGRAM = $(install_sh) -c
34944
install_sh_SCRIPT = $(install_sh) -c
34945
@@ -48,10 +44,13 @@
34946
DIST_SOURCES =
34947
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
34948
html-recursive info-recursive install-data-recursive \
34949
- install-exec-recursive install-info-recursive \
34950
- install-recursive installcheck-recursive installdirs-recursive \
34951
- pdf-recursive ps-recursive uninstall-info-recursive \
34952
- uninstall-recursive
34953
+ install-dvi-recursive install-exec-recursive \
34954
+ install-html-recursive install-info-recursive \
34955
+ install-pdf-recursive install-ps-recursive install-recursive \
34956
+ installcheck-recursive installdirs-recursive pdf-recursive \
34957
+ ps-recursive uninstall-recursive
34958
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
34959
+ distclean-recursive maintainer-clean-recursive
34960
ETAGS = etags
34961
CTAGS = ctags
34962
DIST_SUBDIRS = $(SUBDIRS)
34963
@@ -59,8 +58,6 @@
34964
ACLOCAL = @ACLOCAL@
34965
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
34966
ALL_LINGUAS = @ALL_LINGUAS@
34967
-AMDEP_FALSE = @AMDEP_FALSE@
34968
-AMDEP_TRUE = @AMDEP_TRUE@
34969
AMTAR = @AMTAR@
34970
AR = @AR@
34971
AUTOCONF = @AUTOCONF@
34972
@@ -89,8 +86,6 @@
34973
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
34974
DBUS_CFLAGS = @DBUS_CFLAGS@
34975
DBUS_LIBS = @DBUS_LIBS@
34976
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
34977
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
34978
DEFS = @DEFS@
34979
DEPDIR = @DEPDIR@
34980
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
34981
@@ -102,30 +97,6 @@
34982
ECHO_N = @ECHO_N@
34983
ECHO_T = @ECHO_T@
34984
EGREP = @EGREP@
34985
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
34986
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
34987
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
34988
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
34989
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
34990
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
34991
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
34992
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
34993
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
34994
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
34995
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
34996
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
34997
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
34998
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
34999
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
35000
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
35001
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
35002
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
35003
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
35004
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
35005
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
35006
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
35007
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
35008
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
35009
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
35010
EXEEXT = @EXEEXT@
35011
F77 = @F77@
35012
@@ -135,8 +106,6 @@
35013
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
35014
FRONTEND_LIBS = @FRONTEND_LIBS@
35015
GCONFTOOL = @GCONFTOOL@
35016
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
35017
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
35018
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
35019
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
35020
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
35021
@@ -150,20 +119,17 @@
35022
GNOME_LIBS = @GNOME_LIBS@
35023
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
35024
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
35025
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
35026
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
35027
+GREP = @GREP@
35028
+GTKDOC_CHECK = @GTKDOC_CHECK@
35029
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
35030
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
35031
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
35032
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
35033
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
35034
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
35035
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
35036
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
35037
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
35038
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
35039
HELP_DIR = @HELP_DIR@
35040
+HILDON_CFLAGS = @HILDON_CFLAGS@
35041
+HILDON_LIBS = @HILDON_LIBS@
35042
HTML_DIR = @HTML_DIR@
35043
+INSTALL = @INSTALL@
35044
INSTALL_DATA = @INSTALL_DATA@
35045
INSTALL_PROGRAM = @INSTALL_PROGRAM@
35046
INSTALL_SCRIPT = @INSTALL_SCRIPT@
35047
@@ -174,14 +140,12 @@
35048
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
35049
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
35050
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
35051
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
35052
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
35053
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
35054
INTLTOOL_MERGE = @INTLTOOL_MERGE@
35055
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
35056
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
35057
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
35058
INTLTOOL_PERL = @INTLTOOL_PERL@
35059
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
35060
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
35061
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
35062
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
35063
@@ -193,7 +157,6 @@
35064
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
35065
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
35066
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
35067
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
35068
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
35069
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
35070
LDFLAGS = @LDFLAGS@
35071
@@ -205,9 +168,8 @@
35072
LN_S = @LN_S@
35073
LTLIBOBJS = @LTLIBOBJS@
35074
MAINT = @MAINT@
35075
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
35076
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
35077
MAKEINFO = @MAKEINFO@
35078
+MKDIR_P = @MKDIR_P@
35079
MKINSTALLDIRS = @MKINSTALLDIRS@
35080
MSGFMT = @MSGFMT@
35081
MSGFMT_OPTS = @MSGFMT_OPTS@
35082
@@ -242,26 +204,14 @@
35083
VERSION = @VERSION@
35084
WARN_CFLAGS = @WARN_CFLAGS@
35085
WARN_CXXFLAGS = @WARN_CXXFLAGS@
35086
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
35087
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
35088
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
35089
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
35090
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
35091
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
35092
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
35093
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
35094
XGETTEXT = @XGETTEXT@
35095
-ac_ct_AR = @ac_ct_AR@
35096
+abs_builddir = @abs_builddir@
35097
+abs_srcdir = @abs_srcdir@
35098
+abs_top_builddir = @abs_top_builddir@
35099
+abs_top_srcdir = @abs_top_srcdir@
35100
ac_ct_CC = @ac_ct_CC@
35101
ac_ct_CXX = @ac_ct_CXX@
35102
ac_ct_F77 = @ac_ct_F77@
35103
-ac_ct_RANLIB = @ac_ct_RANLIB@
35104
-ac_ct_STRIP = @ac_ct_STRIP@
35105
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
35106
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
35107
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
35108
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
35109
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
35110
am__include = @am__include@
35111
am__leading_dot = @am__leading_dot@
35112
am__quote = @am__quote@
35113
@@ -273,28 +223,39 @@
35114
build_cpu = @build_cpu@
35115
build_os = @build_os@
35116
build_vendor = @build_vendor@
35117
+builddir = @builddir@
35118
datadir = @datadir@
35119
+datarootdir = @datarootdir@
35120
+docdir = @docdir@
35121
+dvidir = @dvidir@
35122
exec_prefix = @exec_prefix@
35123
host = @host@
35124
host_alias = @host_alias@
35125
host_cpu = @host_cpu@
35126
host_os = @host_os@
35127
host_vendor = @host_vendor@
35128
+htmldir = @htmldir@
35129
includedir = @includedir@
35130
infodir = @infodir@
35131
install_sh = @install_sh@
35132
libdir = @libdir@
35133
libexecdir = @libexecdir@
35134
+localedir = @localedir@
35135
localstatedir = @localstatedir@
35136
mandir = @mandir@
35137
mkdir_p = @mkdir_p@
35138
oldincludedir = @oldincludedir@
35139
+pdfdir = @pdfdir@
35140
prefix = @prefix@
35141
program_transform_name = @program_transform_name@
35142
+psdir = @psdir@
35143
sbindir = @sbindir@
35144
sharedstatedir = @sharedstatedir@
35145
+srcdir = @srcdir@
35146
sysconfdir = @sysconfdir@
35147
target_alias = @target_alias@
35148
+top_builddir = @top_builddir@
35149
+top_srcdir = @top_srcdir@
35150
SUBDIRS = actions apps
35151
all: all-recursive
35152
35153
@@ -335,10 +296,6 @@
35154
clean-libtool:
35155
-rm -rf .libs _libs
35156
35157
-distclean-libtool:
35158
- -rm -f libtool
35159
-uninstall-info-am:
35160
-
35161
# This directory's subdirectories are mostly independent; you can cd
35162
# into them and run `make' without going through this Makefile.
35163
# To change the values of `make' variables: instead of editing Makefiles,
35164
@@ -370,8 +327,7 @@
35165
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
35166
fi; test -z "$$fail"
35167
35168
-mostlyclean-recursive clean-recursive distclean-recursive \
35169
-maintainer-clean-recursive:
35170
+$(RECURSIVE_CLEAN_TARGETS):
35171
@failcom='exit 1'; \
35172
for f in x $$MAKEFLAGS; do \
35173
case $$f in \
35174
@@ -472,22 +428,21 @@
35175
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
35176
35177
distdir: $(DISTFILES)
35178
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
35179
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
35180
- list='$(DISTFILES)'; for file in $$list; do \
35181
- case $$file in \
35182
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
35183
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
35184
- esac; \
35185
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
35186
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
35187
+ list='$(DISTFILES)'; \
35188
+ dist_files=`for file in $$list; do echo $$file; done | \
35189
+ sed -e "s|^$$srcdirstrip/||;t" \
35190
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
35191
+ case $$dist_files in \
35192
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
35193
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
35194
+ sort -u` ;; \
35195
+ esac; \
35196
+ for file in $$dist_files; do \
35197
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
35198
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
35199
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
35200
- dir="/$$dir"; \
35201
- $(mkdir_p) "$(distdir)$$dir"; \
35202
- else \
35203
- dir=''; \
35204
- fi; \
35205
if test -d $$d/$$file; then \
35206
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
35207
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
35208
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
35209
fi; \
35210
@@ -501,7 +456,7 @@
35211
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
35212
if test "$$subdir" = .; then :; else \
35213
test -d "$(distdir)/$$subdir" \
35214
- || $(mkdir_p) "$(distdir)/$$subdir" \
35215
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
35216
|| exit 1; \
35217
distdir=`$(am__cd) $(distdir) && pwd`; \
35218
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
35219
@@ -509,6 +464,8 @@
35220
$(MAKE) $(AM_MAKEFLAGS) \
35221
top_distdir="$$top_distdir" \
35222
distdir="$$distdir/$$subdir" \
35223
+ am__remove_distdir=: \
35224
+ am__skip_length_check=: \
35225
distdir) \
35226
|| exit 1; \
35227
fi; \
35228
@@ -548,8 +505,7 @@
35229
35230
distclean: distclean-recursive
35231
-rm -f Makefile
35232
-distclean-am: clean-am distclean-generic distclean-libtool \
35233
- distclean-tags
35234
+distclean-am: clean-am distclean-generic distclean-tags
35235
35236
dvi: dvi-recursive
35237
35238
@@ -563,12 +519,20 @@
35239
35240
install-data-am:
35241
35242
+install-dvi: install-dvi-recursive
35243
+
35244
install-exec-am:
35245
35246
+install-html: install-html-recursive
35247
+
35248
install-info: install-info-recursive
35249
35250
install-man:
35251
35252
+install-pdf: install-pdf-recursive
35253
+
35254
+install-ps: install-ps-recursive
35255
+
35256
installcheck-am:
35257
35258
maintainer-clean: maintainer-clean-recursive
35259
@@ -587,22 +551,24 @@
35260
35261
ps-am:
35262
35263
-uninstall-am: uninstall-info-am
35264
+uninstall-am:
35265
35266
-uninstall-info: uninstall-info-recursive
35267
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
35268
+ install-strip
35269
35270
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
35271
- clean clean-generic clean-libtool clean-recursive ctags \
35272
- ctags-recursive distclean distclean-generic distclean-libtool \
35273
- distclean-recursive distclean-tags distdir dvi dvi-am html \
35274
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
35275
+ all all-am check check-am clean clean-generic clean-libtool \
35276
+ ctags ctags-recursive distclean distclean-generic \
35277
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
35278
html-am info info-am install install-am install-data \
35279
- install-data-am install-exec install-exec-am install-info \
35280
- install-info-am install-man install-strip installcheck \
35281
+ install-data-am install-dvi install-dvi-am install-exec \
35282
+ install-exec-am install-html install-html-am install-info \
35283
+ install-info-am install-man install-pdf install-pdf-am \
35284
+ install-ps install-ps-am install-strip installcheck \
35285
installcheck-am installdirs installdirs-am maintainer-clean \
35286
- maintainer-clean-generic maintainer-clean-recursive \
35287
- mostlyclean mostlyclean-generic mostlyclean-libtool \
35288
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
35289
- uninstall uninstall-am uninstall-info-am
35290
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
35291
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
35292
+ uninstall uninstall-am
35293
35294
# Tell versions [3.59,3.63) of GNU make to not export all variables.
35295
# Otherwise a system limit (for SysV at least) may be exceeded.
35296
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/32x32/actions/Makefile.in evince-2.20.2.new/data/icons/32x32/actions/Makefile.in
35297
--- evince-2.20.2/data/icons/32x32/actions/Makefile.in 2007-11-26 22:55:54.000000000 +0100
35298
+++ evince-2.20.2.new/data/icons/32x32/actions/Makefile.in 2007-11-27 22:51:54.000000000 +0100
35299
@@ -1,8 +1,8 @@
35300
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
35301
+# Makefile.in generated by automake 1.10 from Makefile.am.
35302
# @configure_input@
35303
35304
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
35305
-# 2003, 2004, 2005 Free Software Foundation, Inc.
35306
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
35307
# This Makefile.in is free software; the Free Software Foundation
35308
# gives unlimited permission to copy and/or distribute it,
35309
# with or without modifications, as long as this notice is preserved.
35310
@@ -14,15 +14,11 @@
35311
35312
@SET_MAKE@
35313
35314
-srcdir = @srcdir@
35315
-top_srcdir = @top_srcdir@
35316
VPATH = @srcdir@
35317
pkgdatadir = $(datadir)/@PACKAGE@
35318
pkglibdir = $(libdir)/@PACKAGE@
35319
pkgincludedir = $(includedir)/@PACKAGE@
35320
-top_builddir = ../../../..
35321
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
35322
-INSTALL = @INSTALL@
35323
install_sh_DATA = $(install_sh) -c -m 644
35324
install_sh_PROGRAM = $(install_sh) -c
35325
install_sh_SCRIPT = $(install_sh) -c
35326
@@ -60,8 +56,6 @@
35327
ACLOCAL = @ACLOCAL@
35328
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
35329
ALL_LINGUAS = @ALL_LINGUAS@
35330
-AMDEP_FALSE = @AMDEP_FALSE@
35331
-AMDEP_TRUE = @AMDEP_TRUE@
35332
AMTAR = @AMTAR@
35333
AR = @AR@
35334
AUTOCONF = @AUTOCONF@
35335
@@ -90,8 +84,6 @@
35336
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
35337
DBUS_CFLAGS = @DBUS_CFLAGS@
35338
DBUS_LIBS = @DBUS_LIBS@
35339
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
35340
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
35341
DEFS = @DEFS@
35342
DEPDIR = @DEPDIR@
35343
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
35344
@@ -103,30 +95,6 @@
35345
ECHO_N = @ECHO_N@
35346
ECHO_T = @ECHO_T@
35347
EGREP = @EGREP@
35348
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
35349
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
35350
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
35351
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
35352
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
35353
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
35354
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
35355
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
35356
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
35357
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
35358
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
35359
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
35360
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
35361
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
35362
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
35363
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
35364
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
35365
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
35366
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
35367
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
35368
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
35369
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
35370
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
35371
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
35372
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
35373
EXEEXT = @EXEEXT@
35374
F77 = @F77@
35375
@@ -136,8 +104,6 @@
35376
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
35377
FRONTEND_LIBS = @FRONTEND_LIBS@
35378
GCONFTOOL = @GCONFTOOL@
35379
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
35380
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
35381
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
35382
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
35383
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
35384
@@ -151,20 +117,17 @@
35385
GNOME_LIBS = @GNOME_LIBS@
35386
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
35387
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
35388
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
35389
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
35390
+GREP = @GREP@
35391
+GTKDOC_CHECK = @GTKDOC_CHECK@
35392
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
35393
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
35394
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
35395
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
35396
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
35397
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
35398
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
35399
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
35400
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
35401
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
35402
HELP_DIR = @HELP_DIR@
35403
+HILDON_CFLAGS = @HILDON_CFLAGS@
35404
+HILDON_LIBS = @HILDON_LIBS@
35405
HTML_DIR = @HTML_DIR@
35406
+INSTALL = @INSTALL@
35407
INSTALL_DATA = @INSTALL_DATA@
35408
INSTALL_PROGRAM = @INSTALL_PROGRAM@
35409
INSTALL_SCRIPT = @INSTALL_SCRIPT@
35410
@@ -175,14 +138,12 @@
35411
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
35412
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
35413
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
35414
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
35415
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
35416
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
35417
INTLTOOL_MERGE = @INTLTOOL_MERGE@
35418
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
35419
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
35420
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
35421
INTLTOOL_PERL = @INTLTOOL_PERL@
35422
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
35423
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
35424
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
35425
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
35426
@@ -194,7 +155,6 @@
35427
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
35428
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
35429
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
35430
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
35431
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
35432
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
35433
LDFLAGS = @LDFLAGS@
35434
@@ -206,9 +166,8 @@
35435
LN_S = @LN_S@
35436
LTLIBOBJS = @LTLIBOBJS@
35437
MAINT = @MAINT@
35438
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
35439
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
35440
MAKEINFO = @MAKEINFO@
35441
+MKDIR_P = @MKDIR_P@
35442
MKINSTALLDIRS = @MKINSTALLDIRS@
35443
MSGFMT = @MSGFMT@
35444
MSGFMT_OPTS = @MSGFMT_OPTS@
35445
@@ -243,26 +202,14 @@
35446
VERSION = @VERSION@
35447
WARN_CFLAGS = @WARN_CFLAGS@
35448
WARN_CXXFLAGS = @WARN_CXXFLAGS@
35449
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
35450
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
35451
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
35452
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
35453
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
35454
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
35455
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
35456
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
35457
XGETTEXT = @XGETTEXT@
35458
-ac_ct_AR = @ac_ct_AR@
35459
+abs_builddir = @abs_builddir@
35460
+abs_srcdir = @abs_srcdir@
35461
+abs_top_builddir = @abs_top_builddir@
35462
+abs_top_srcdir = @abs_top_srcdir@
35463
ac_ct_CC = @ac_ct_CC@
35464
ac_ct_CXX = @ac_ct_CXX@
35465
ac_ct_F77 = @ac_ct_F77@
35466
-ac_ct_RANLIB = @ac_ct_RANLIB@
35467
-ac_ct_STRIP = @ac_ct_STRIP@
35468
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
35469
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
35470
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
35471
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
35472
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
35473
am__include = @am__include@
35474
am__leading_dot = @am__leading_dot@
35475
am__quote = @am__quote@
35476
@@ -274,28 +221,39 @@
32033
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/16x16/actions/Makefile.in evince-2.21.1.new/data/icons/16x16/actions/Makefile.in
32034
--- evince-2.21.1/data/icons/16x16/actions/Makefile.in 2007-12-03 22:58:20.000000000 +0100
32035
+++ evince-2.21.1.new/data/icons/16x16/actions/Makefile.in 2007-12-05 00:07:24.000000000 +0100
32036
@@ -1,8 +1,8 @@
32037
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
32038
+# Makefile.in generated by automake 1.10 from Makefile.am.
32039
# @configure_input@
32040
32041
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
32042
-# 2003, 2004, 2005 Free Software Foundation, Inc.
32043
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
32044
# This Makefile.in is free software; the Free Software Foundation
32045
# gives unlimited permission to copy and/or distribute it,
32046
# with or without modifications, as long as this notice is preserved.
32047
@@ -14,15 +14,11 @@
32048
32049
@SET_MAKE@
32050
32051
-srcdir = @srcdir@
32052
-top_srcdir = @top_srcdir@
32053
VPATH = @srcdir@
32054
pkgdatadir = $(datadir)/@PACKAGE@
32055
pkglibdir = $(libdir)/@PACKAGE@
32056
pkgincludedir = $(includedir)/@PACKAGE@
32057
-top_builddir = ../../../..
32058
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32059
-INSTALL = @INSTALL@
32060
install_sh_DATA = $(install_sh) -c -m 644
32061
install_sh_PROGRAM = $(install_sh) -c
32062
install_sh_SCRIPT = $(install_sh) -c
32063
@@ -60,8 +56,6 @@
32064
ACLOCAL = @ACLOCAL@
32065
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
32066
ALL_LINGUAS = @ALL_LINGUAS@
32067
-AMDEP_FALSE = @AMDEP_FALSE@
32068
-AMDEP_TRUE = @AMDEP_TRUE@
32069
AMTAR = @AMTAR@
32070
AR = @AR@
32071
AUTOCONF = @AUTOCONF@
32072
@@ -90,8 +84,6 @@
32073
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
32074
DBUS_CFLAGS = @DBUS_CFLAGS@
32075
DBUS_LIBS = @DBUS_LIBS@
32076
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
32077
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
32078
DEFS = @DEFS@
32079
DEPDIR = @DEPDIR@
32080
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
32081
@@ -103,30 +95,6 @@
32082
ECHO_N = @ECHO_N@
32083
ECHO_T = @ECHO_T@
32084
EGREP = @EGREP@
32085
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
32086
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
32087
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
32088
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
32089
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
32090
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
32091
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
32092
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
32093
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
32094
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
32095
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
32096
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
32097
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
32098
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
32099
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
32100
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
32101
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
32102
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
32103
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
32104
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
32105
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
32106
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
32107
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
32108
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
32109
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
32110
EXEEXT = @EXEEXT@
32111
F77 = @F77@
32112
@@ -136,8 +104,6 @@
32113
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
32114
FRONTEND_LIBS = @FRONTEND_LIBS@
32115
GCONFTOOL = @GCONFTOOL@
32116
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
32117
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
32118
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
32119
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
32120
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
32121
@@ -151,16 +117,15 @@
32122
GNOME_LIBS = @GNOME_LIBS@
32123
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
32124
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
32125
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
32126
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
32127
+GREP = @GREP@
32128
+GTKDOC_CHECK = @GTKDOC_CHECK@
32129
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
32130
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
32131
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
32132
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
32133
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
32134
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
32135
HELP_DIR = @HELP_DIR@
32136
+HILDON_CFLAGS = @HILDON_CFLAGS@
32137
+HILDON_LIBS = @HILDON_LIBS@
32138
HTML_DIR = @HTML_DIR@
32139
+INSTALL = @INSTALL@
32140
INSTALL_DATA = @INSTALL_DATA@
32141
INSTALL_PROGRAM = @INSTALL_PROGRAM@
32142
INSTALL_SCRIPT = @INSTALL_SCRIPT@
32143
@@ -171,14 +136,12 @@
32144
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
32145
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
32146
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
32147
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
32148
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
32149
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
32150
INTLTOOL_MERGE = @INTLTOOL_MERGE@
32151
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
32152
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
32153
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
32154
INTLTOOL_PERL = @INTLTOOL_PERL@
32155
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
32156
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
32157
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
32158
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
32159
@@ -190,7 +153,6 @@
32160
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
32161
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
32162
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
32163
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
32164
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
32165
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
32166
LDFLAGS = @LDFLAGS@
32167
@@ -202,9 +164,8 @@
32168
LN_S = @LN_S@
32169
LTLIBOBJS = @LTLIBOBJS@
32170
MAINT = @MAINT@
32171
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
32172
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
32173
MAKEINFO = @MAKEINFO@
32174
+MKDIR_P = @MKDIR_P@
32175
MKINSTALLDIRS = @MKINSTALLDIRS@
32176
MSGFMT = @MSGFMT@
32177
MSGFMT_OPTS = @MSGFMT_OPTS@
32178
@@ -239,26 +200,14 @@
32179
VERSION = @VERSION@
32180
WARN_CFLAGS = @WARN_CFLAGS@
32181
WARN_CXXFLAGS = @WARN_CXXFLAGS@
32182
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
32183
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
32184
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
32185
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
32186
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
32187
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
32188
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
32189
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
32190
XGETTEXT = @XGETTEXT@
32191
-ac_ct_AR = @ac_ct_AR@
32192
+abs_builddir = @abs_builddir@
32193
+abs_srcdir = @abs_srcdir@
32194
+abs_top_builddir = @abs_top_builddir@
32195
+abs_top_srcdir = @abs_top_srcdir@
32196
ac_ct_CC = @ac_ct_CC@
32197
ac_ct_CXX = @ac_ct_CXX@
32198
ac_ct_F77 = @ac_ct_F77@
32199
-ac_ct_RANLIB = @ac_ct_RANLIB@
32200
-ac_ct_STRIP = @ac_ct_STRIP@
32201
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
32202
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
32203
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
32204
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
32205
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
32206
am__include = @am__include@
32207
am__leading_dot = @am__leading_dot@
32208
am__quote = @am__quote@
32209
@@ -270,28 +219,39 @@
32210
build_cpu = @build_cpu@
32211
build_os = @build_os@
32212
build_vendor = @build_vendor@
32213
+builddir = @builddir@
32214
datadir = @datadir@
32215
+datarootdir = @datarootdir@
32216
+docdir = @docdir@
32217
+dvidir = @dvidir@
32218
exec_prefix = @exec_prefix@
32219
host = @host@
32220
host_alias = @host_alias@
32221
host_cpu = @host_cpu@
32222
host_os = @host_os@
32223
host_vendor = @host_vendor@
32224
+htmldir = @htmldir@
32225
includedir = @includedir@
32226
infodir = @infodir@
32227
install_sh = @install_sh@
32228
libdir = @libdir@
32229
libexecdir = @libexecdir@
32230
+localedir = @localedir@
32231
localstatedir = @localstatedir@
32232
mandir = @mandir@
32233
mkdir_p = @mkdir_p@
32234
oldincludedir = @oldincludedir@
32235
+pdfdir = @pdfdir@
32236
prefix = @prefix@
32237
program_transform_name = @program_transform_name@
32238
+psdir = @psdir@
32239
sbindir = @sbindir@
32240
sharedstatedir = @sharedstatedir@
32241
+srcdir = @srcdir@
32242
sysconfdir = @sysconfdir@
32243
target_alias = @target_alias@
32244
+top_builddir = @top_builddir@
32245
+top_srcdir = @top_srcdir@
32246
themedir = $(pkgdatadir)/icons/hicolor
32247
size = 16x16
32248
context = actions
32249
@@ -352,13 +312,9 @@
32250
32251
clean-libtool:
32252
-rm -rf .libs _libs
32253
-
32254
-distclean-libtool:
32255
- -rm -f libtool
32256
-uninstall-info-am:
32257
install-iconsDATA: $(icons_DATA)
32258
@$(NORMAL_INSTALL)
32259
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
32260
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
32261
@list='$(icons_DATA)'; for p in $$list; do \
32262
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
32263
f=$(am__strip_dir) \
32264
@@ -381,22 +337,21 @@
32265
32266
32267
distdir: $(DISTFILES)
32268
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
32269
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
32270
- list='$(DISTFILES)'; for file in $$list; do \
32271
- case $$file in \
32272
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
32273
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
32274
- esac; \
32275
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32276
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32277
+ list='$(DISTFILES)'; \
32278
+ dist_files=`for file in $$list; do echo $$file; done | \
32279
+ sed -e "s|^$$srcdirstrip/||;t" \
32280
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
32281
+ case $$dist_files in \
32282
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
32283
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
32284
+ sort -u` ;; \
32285
+ esac; \
32286
+ for file in $$dist_files; do \
32287
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
32288
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
32289
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
32290
- dir="/$$dir"; \
32291
- $(mkdir_p) "$(distdir)$$dir"; \
32292
- else \
32293
- dir=''; \
32294
- fi; \
32295
if test -d $$d/$$file; then \
32296
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
32297
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
32298
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
32299
fi; \
32300
@@ -412,7 +367,7 @@
32301
all-am: Makefile $(DATA)
32302
installdirs:
32303
for dir in "$(DESTDIR)$(iconsdir)"; do \
32304
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
32305
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
32306
done
32307
install: install-am
32308
install-exec: install-exec-am
32309
@@ -444,7 +399,7 @@
32310
32311
distclean: distclean-am
32312
-rm -f Makefile
32313
-distclean-am: clean-am distclean-generic distclean-libtool
32314
+distclean-am: clean-am distclean-generic
32315
32316
dvi: dvi-am
32317
32318
@@ -458,12 +413,20 @@
32319
32320
install-data-am: install-iconsDATA
32321
32322
+install-dvi: install-dvi-am
32323
+
32324
install-exec-am:
32325
32326
+install-html: install-html-am
32327
+
32328
install-info: install-info-am
32329
32330
install-man:
32331
32332
+install-pdf: install-pdf-am
32333
+
32334
+install-ps: install-ps-am
32335
+
32336
installcheck-am:
32337
32338
maintainer-clean: maintainer-clean-am
32339
@@ -482,17 +445,21 @@
32340
32341
ps-am:
32342
32343
-uninstall-am: uninstall-iconsDATA uninstall-info-am
32344
+uninstall-am: uninstall-iconsDATA
32345
+
32346
+.MAKE: install-am install-strip
32347
32348
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
32349
distclean distclean-generic distclean-libtool distdir dvi \
32350
dvi-am html html-am info info-am install install-am \
32351
- install-data install-data-am install-exec install-exec-am \
32352
+ install-data install-data-am install-dvi install-dvi-am \
32353
+ install-exec install-exec-am install-html install-html-am \
32354
install-iconsDATA install-info install-info-am install-man \
32355
+ install-pdf install-pdf-am install-ps install-ps-am \
32356
install-strip installcheck installcheck-am installdirs \
32357
maintainer-clean maintainer-clean-generic mostlyclean \
32358
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
32359
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
32360
+ uninstall uninstall-am uninstall-iconsDATA
32361
32362
# Tell versions [3.59,3.63) of GNU make to not export all variables.
32363
# Otherwise a system limit (for SysV at least) may be exceeded.
32364
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/16x16/apps/Makefile.in evince-2.21.1.new/data/icons/16x16/apps/Makefile.in
32365
--- evince-2.21.1/data/icons/16x16/apps/Makefile.in 2007-12-03 22:58:21.000000000 +0100
32366
+++ evince-2.21.1.new/data/icons/16x16/apps/Makefile.in 2007-12-05 00:07:24.000000000 +0100
32367
@@ -1,8 +1,8 @@
32368
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
32369
+# Makefile.in generated by automake 1.10 from Makefile.am.
32370
# @configure_input@
32371
32372
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
32373
-# 2003, 2004, 2005 Free Software Foundation, Inc.
32374
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
32375
# This Makefile.in is free software; the Free Software Foundation
32376
# gives unlimited permission to copy and/or distribute it,
32377
# with or without modifications, as long as this notice is preserved.
32378
@@ -14,15 +14,11 @@
32379
32380
@SET_MAKE@
32381
32382
-srcdir = @srcdir@
32383
-top_srcdir = @top_srcdir@
32384
VPATH = @srcdir@
32385
pkgdatadir = $(datadir)/@PACKAGE@
32386
pkglibdir = $(libdir)/@PACKAGE@
32387
pkgincludedir = $(includedir)/@PACKAGE@
32388
-top_builddir = ../../../..
32389
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32390
-INSTALL = @INSTALL@
32391
install_sh_DATA = $(install_sh) -c -m 644
32392
install_sh_PROGRAM = $(install_sh) -c
32393
install_sh_SCRIPT = $(install_sh) -c
32394
@@ -60,8 +56,6 @@
32395
ACLOCAL = @ACLOCAL@
32396
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
32397
ALL_LINGUAS = @ALL_LINGUAS@
32398
-AMDEP_FALSE = @AMDEP_FALSE@
32399
-AMDEP_TRUE = @AMDEP_TRUE@
32400
AMTAR = @AMTAR@
32401
AR = @AR@
32402
AUTOCONF = @AUTOCONF@
32403
@@ -90,8 +84,6 @@
32404
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
32405
DBUS_CFLAGS = @DBUS_CFLAGS@
32406
DBUS_LIBS = @DBUS_LIBS@
32407
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
32408
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
32409
DEFS = @DEFS@
32410
DEPDIR = @DEPDIR@
32411
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
32412
@@ -103,30 +95,6 @@
32413
ECHO_N = @ECHO_N@
32414
ECHO_T = @ECHO_T@
32415
EGREP = @EGREP@
32416
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
32417
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
32418
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
32419
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
32420
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
32421
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
32422
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
32423
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
32424
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
32425
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
32426
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
32427
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
32428
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
32429
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
32430
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
32431
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
32432
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
32433
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
32434
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
32435
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
32436
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
32437
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
32438
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
32439
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
32440
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
32441
EXEEXT = @EXEEXT@
32442
F77 = @F77@
32443
@@ -136,8 +104,6 @@
32444
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
32445
FRONTEND_LIBS = @FRONTEND_LIBS@
32446
GCONFTOOL = @GCONFTOOL@
32447
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
32448
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
32449
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
32450
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
32451
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
32452
@@ -151,16 +117,15 @@
32453
GNOME_LIBS = @GNOME_LIBS@
32454
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
32455
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
32456
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
32457
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
32458
+GREP = @GREP@
32459
+GTKDOC_CHECK = @GTKDOC_CHECK@
32460
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
32461
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
32462
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
32463
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
32464
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
32465
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
32466
HELP_DIR = @HELP_DIR@
32467
+HILDON_CFLAGS = @HILDON_CFLAGS@
32468
+HILDON_LIBS = @HILDON_LIBS@
32469
HTML_DIR = @HTML_DIR@
32470
+INSTALL = @INSTALL@
32471
INSTALL_DATA = @INSTALL_DATA@
32472
INSTALL_PROGRAM = @INSTALL_PROGRAM@
32473
INSTALL_SCRIPT = @INSTALL_SCRIPT@
32474
@@ -171,14 +136,12 @@
32475
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
32476
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
32477
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
32478
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
32479
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
32480
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
32481
INTLTOOL_MERGE = @INTLTOOL_MERGE@
32482
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
32483
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
32484
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
32485
INTLTOOL_PERL = @INTLTOOL_PERL@
32486
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
32487
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
32488
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
32489
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
32490
@@ -190,7 +153,6 @@
32491
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
32492
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
32493
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
32494
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
32495
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
32496
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
32497
LDFLAGS = @LDFLAGS@
32498
@@ -202,9 +164,8 @@
32499
LN_S = @LN_S@
32500
LTLIBOBJS = @LTLIBOBJS@
32501
MAINT = @MAINT@
32502
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
32503
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
32504
MAKEINFO = @MAKEINFO@
32505
+MKDIR_P = @MKDIR_P@
32506
MKINSTALLDIRS = @MKINSTALLDIRS@
32507
MSGFMT = @MSGFMT@
32508
MSGFMT_OPTS = @MSGFMT_OPTS@
32509
@@ -239,26 +200,14 @@
32510
VERSION = @VERSION@
32511
WARN_CFLAGS = @WARN_CFLAGS@
32512
WARN_CXXFLAGS = @WARN_CXXFLAGS@
32513
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
32514
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
32515
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
32516
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
32517
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
32518
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
32519
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
32520
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
32521
XGETTEXT = @XGETTEXT@
32522
-ac_ct_AR = @ac_ct_AR@
32523
+abs_builddir = @abs_builddir@
32524
+abs_srcdir = @abs_srcdir@
32525
+abs_top_builddir = @abs_top_builddir@
32526
+abs_top_srcdir = @abs_top_srcdir@
32527
ac_ct_CC = @ac_ct_CC@
32528
ac_ct_CXX = @ac_ct_CXX@
32529
ac_ct_F77 = @ac_ct_F77@
32530
-ac_ct_RANLIB = @ac_ct_RANLIB@
32531
-ac_ct_STRIP = @ac_ct_STRIP@
32532
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
32533
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
32534
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
32535
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
32536
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
32537
am__include = @am__include@
32538
am__leading_dot = @am__leading_dot@
32539
am__quote = @am__quote@
32540
@@ -270,28 +219,39 @@
32541
build_cpu = @build_cpu@
32542
build_os = @build_os@
32543
build_vendor = @build_vendor@
32544
+builddir = @builddir@
32545
datadir = @datadir@
32546
+datarootdir = @datarootdir@
32547
+docdir = @docdir@
32548
+dvidir = @dvidir@
32549
exec_prefix = @exec_prefix@
32550
host = @host@
32551
host_alias = @host_alias@
32552
host_cpu = @host_cpu@
32553
host_os = @host_os@
32554
host_vendor = @host_vendor@
32555
+htmldir = @htmldir@
32556
includedir = @includedir@
32557
infodir = @infodir@
32558
install_sh = @install_sh@
32559
libdir = @libdir@
32560
libexecdir = @libexecdir@
32561
+localedir = @localedir@
32562
localstatedir = @localstatedir@
32563
mandir = @mandir@
32564
mkdir_p = @mkdir_p@
32565
oldincludedir = @oldincludedir@
32566
+pdfdir = @pdfdir@
32567
prefix = @prefix@
32568
program_transform_name = @program_transform_name@
32569
+psdir = @psdir@
32570
sbindir = @sbindir@
32571
sharedstatedir = @sharedstatedir@
32572
+srcdir = @srcdir@
32573
sysconfdir = @sysconfdir@
32574
target_alias = @target_alias@
32575
+top_builddir = @top_builddir@
32576
+top_srcdir = @top_srcdir@
32577
themedir = $(datadir)/icons/hicolor
32578
size = 16x16
32579
context = apps
32580
@@ -342,13 +302,9 @@
32581
32582
clean-libtool:
32583
-rm -rf .libs _libs
32584
-
32585
-distclean-libtool:
32586
- -rm -f libtool
32587
-uninstall-info-am:
32588
install-iconsDATA: $(icons_DATA)
32589
@$(NORMAL_INSTALL)
32590
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
32591
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
32592
@list='$(icons_DATA)'; for p in $$list; do \
32593
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
32594
f=$(am__strip_dir) \
32595
@@ -371,22 +327,21 @@
32596
32597
32598
distdir: $(DISTFILES)
32599
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
32600
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
32601
- list='$(DISTFILES)'; for file in $$list; do \
32602
- case $$file in \
32603
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
32604
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
32605
- esac; \
32606
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32607
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32608
+ list='$(DISTFILES)'; \
32609
+ dist_files=`for file in $$list; do echo $$file; done | \
32610
+ sed -e "s|^$$srcdirstrip/||;t" \
32611
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
32612
+ case $$dist_files in \
32613
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
32614
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
32615
+ sort -u` ;; \
32616
+ esac; \
32617
+ for file in $$dist_files; do \
32618
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
32619
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
32620
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
32621
- dir="/$$dir"; \
32622
- $(mkdir_p) "$(distdir)$$dir"; \
32623
- else \
32624
- dir=''; \
32625
- fi; \
32626
if test -d $$d/$$file; then \
32627
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
32628
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
32629
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
32630
fi; \
32631
@@ -402,7 +357,7 @@
32632
all-am: Makefile $(DATA)
32633
installdirs:
32634
for dir in "$(DESTDIR)$(iconsdir)"; do \
32635
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
32636
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
32637
done
32638
install: install-am
32639
install-exec: install-exec-am
32640
@@ -434,7 +389,7 @@
32641
32642
distclean: distclean-am
32643
-rm -f Makefile
32644
-distclean-am: clean-am distclean-generic distclean-libtool
32645
+distclean-am: clean-am distclean-generic
32646
32647
dvi: dvi-am
32648
32649
@@ -448,12 +403,20 @@
32650
32651
install-data-am: install-iconsDATA
32652
32653
+install-dvi: install-dvi-am
32654
+
32655
install-exec-am:
32656
32657
+install-html: install-html-am
32658
+
32659
install-info: install-info-am
32660
32661
install-man:
32662
32663
+install-pdf: install-pdf-am
32664
+
32665
+install-ps: install-ps-am
32666
+
32667
installcheck-am:
32668
32669
maintainer-clean: maintainer-clean-am
32670
@@ -472,17 +435,21 @@
32671
32672
ps-am:
32673
32674
-uninstall-am: uninstall-iconsDATA uninstall-info-am
32675
+uninstall-am: uninstall-iconsDATA
32676
+
32677
+.MAKE: install-am install-strip
32678
32679
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
32680
distclean distclean-generic distclean-libtool distdir dvi \
32681
dvi-am html html-am info info-am install install-am \
32682
- install-data install-data-am install-exec install-exec-am \
32683
+ install-data install-data-am install-dvi install-dvi-am \
32684
+ install-exec install-exec-am install-html install-html-am \
32685
install-iconsDATA install-info install-info-am install-man \
32686
+ install-pdf install-pdf-am install-ps install-ps-am \
32687
install-strip installcheck installcheck-am installdirs \
32688
maintainer-clean maintainer-clean-generic mostlyclean \
32689
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
32690
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
32691
+ uninstall uninstall-am uninstall-iconsDATA
32692
32693
# Tell versions [3.59,3.63) of GNU make to not export all variables.
32694
# Otherwise a system limit (for SysV at least) may be exceeded.
32695
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/16x16/Makefile.in evince-2.21.1.new/data/icons/16x16/Makefile.in
32696
--- evince-2.21.1/data/icons/16x16/Makefile.in 2007-12-03 22:58:20.000000000 +0100
32697
+++ evince-2.21.1.new/data/icons/16x16/Makefile.in 2007-12-05 00:07:24.000000000 +0100
32698
@@ -1,8 +1,8 @@
32699
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
32700
+# Makefile.in generated by automake 1.10 from Makefile.am.
32701
# @configure_input@
32702
32703
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
32704
-# 2003, 2004, 2005 Free Software Foundation, Inc.
32705
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
32706
# This Makefile.in is free software; the Free Software Foundation
32707
# gives unlimited permission to copy and/or distribute it,
32708
# with or without modifications, as long as this notice is preserved.
32709
@@ -13,15 +13,11 @@
32710
# PARTICULAR PURPOSE.
32711
32712
@SET_MAKE@
32713
-srcdir = @srcdir@
32714
-top_srcdir = @top_srcdir@
32715
VPATH = @srcdir@
32716
pkgdatadir = $(datadir)/@PACKAGE@
32717
pkglibdir = $(libdir)/@PACKAGE@
32718
pkgincludedir = $(includedir)/@PACKAGE@
32719
-top_builddir = ../../..
32720
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32721
-INSTALL = @INSTALL@
32722
install_sh_DATA = $(install_sh) -c -m 644
32723
install_sh_PROGRAM = $(install_sh) -c
32724
install_sh_SCRIPT = $(install_sh) -c
32725
@@ -48,10 +44,13 @@
32726
DIST_SOURCES =
32727
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
32728
html-recursive info-recursive install-data-recursive \
32729
- install-exec-recursive install-info-recursive \
32730
- install-recursive installcheck-recursive installdirs-recursive \
32731
- pdf-recursive ps-recursive uninstall-info-recursive \
32732
- uninstall-recursive
32733
+ install-dvi-recursive install-exec-recursive \
32734
+ install-html-recursive install-info-recursive \
32735
+ install-pdf-recursive install-ps-recursive install-recursive \
32736
+ installcheck-recursive installdirs-recursive pdf-recursive \
32737
+ ps-recursive uninstall-recursive
32738
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
32739
+ distclean-recursive maintainer-clean-recursive
32740
ETAGS = etags
32741
CTAGS = ctags
32742
DIST_SUBDIRS = $(SUBDIRS)
32743
@@ -59,8 +58,6 @@
32744
ACLOCAL = @ACLOCAL@
32745
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
32746
ALL_LINGUAS = @ALL_LINGUAS@
32747
-AMDEP_FALSE = @AMDEP_FALSE@
32748
-AMDEP_TRUE = @AMDEP_TRUE@
32749
AMTAR = @AMTAR@
32750
AR = @AR@
32751
AUTOCONF = @AUTOCONF@
32752
@@ -89,8 +86,6 @@
32753
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
32754
DBUS_CFLAGS = @DBUS_CFLAGS@
32755
DBUS_LIBS = @DBUS_LIBS@
32756
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
32757
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
32758
DEFS = @DEFS@
32759
DEPDIR = @DEPDIR@
32760
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
32761
@@ -102,30 +97,6 @@
32762
ECHO_N = @ECHO_N@
32763
ECHO_T = @ECHO_T@
32764
EGREP = @EGREP@
32765
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
32766
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
32767
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
32768
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
32769
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
32770
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
32771
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
32772
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
32773
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
32774
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
32775
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
32776
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
32777
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
32778
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
32779
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
32780
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
32781
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
32782
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
32783
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
32784
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
32785
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
32786
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
32787
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
32788
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
32789
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
32790
EXEEXT = @EXEEXT@
32791
F77 = @F77@
32792
@@ -135,8 +106,6 @@
32793
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
32794
FRONTEND_LIBS = @FRONTEND_LIBS@
32795
GCONFTOOL = @GCONFTOOL@
32796
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
32797
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
32798
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
32799
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
32800
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
32801
@@ -150,16 +119,15 @@
32802
GNOME_LIBS = @GNOME_LIBS@
32803
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
32804
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
32805
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
32806
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
32807
+GREP = @GREP@
32808
+GTKDOC_CHECK = @GTKDOC_CHECK@
32809
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
32810
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
32811
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
32812
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
32813
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
32814
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
32815
HELP_DIR = @HELP_DIR@
32816
+HILDON_CFLAGS = @HILDON_CFLAGS@
32817
+HILDON_LIBS = @HILDON_LIBS@
32818
HTML_DIR = @HTML_DIR@
32819
+INSTALL = @INSTALL@
32820
INSTALL_DATA = @INSTALL_DATA@
32821
INSTALL_PROGRAM = @INSTALL_PROGRAM@
32822
INSTALL_SCRIPT = @INSTALL_SCRIPT@
32823
@@ -170,14 +138,12 @@
32824
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
32825
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
32826
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
32827
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
32828
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
32829
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
32830
INTLTOOL_MERGE = @INTLTOOL_MERGE@
32831
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
32832
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
32833
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
32834
INTLTOOL_PERL = @INTLTOOL_PERL@
32835
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
32836
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
32837
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
32838
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
32839
@@ -189,7 +155,6 @@
32840
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
32841
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
32842
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
32843
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
32844
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
32845
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
32846
LDFLAGS = @LDFLAGS@
32847
@@ -201,9 +166,8 @@
32848
LN_S = @LN_S@
32849
LTLIBOBJS = @LTLIBOBJS@
32850
MAINT = @MAINT@
32851
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
32852
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
32853
MAKEINFO = @MAKEINFO@
32854
+MKDIR_P = @MKDIR_P@
32855
MKINSTALLDIRS = @MKINSTALLDIRS@
32856
MSGFMT = @MSGFMT@
32857
MSGFMT_OPTS = @MSGFMT_OPTS@
32858
@@ -238,26 +202,14 @@
32859
VERSION = @VERSION@
32860
WARN_CFLAGS = @WARN_CFLAGS@
32861
WARN_CXXFLAGS = @WARN_CXXFLAGS@
32862
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
32863
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
32864
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
32865
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
32866
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
32867
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
32868
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
32869
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
32870
XGETTEXT = @XGETTEXT@
32871
-ac_ct_AR = @ac_ct_AR@
32872
+abs_builddir = @abs_builddir@
32873
+abs_srcdir = @abs_srcdir@
32874
+abs_top_builddir = @abs_top_builddir@
32875
+abs_top_srcdir = @abs_top_srcdir@
32876
ac_ct_CC = @ac_ct_CC@
32877
ac_ct_CXX = @ac_ct_CXX@
32878
ac_ct_F77 = @ac_ct_F77@
32879
-ac_ct_RANLIB = @ac_ct_RANLIB@
32880
-ac_ct_STRIP = @ac_ct_STRIP@
32881
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
32882
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
32883
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
32884
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
32885
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
32886
am__include = @am__include@
32887
am__leading_dot = @am__leading_dot@
32888
am__quote = @am__quote@
32889
@@ -269,28 +221,39 @@
32890
build_cpu = @build_cpu@
32891
build_os = @build_os@
32892
build_vendor = @build_vendor@
32893
+builddir = @builddir@
32894
datadir = @datadir@
32895
+datarootdir = @datarootdir@
32896
+docdir = @docdir@
32897
+dvidir = @dvidir@
32898
exec_prefix = @exec_prefix@
32899
host = @host@
32900
host_alias = @host_alias@
32901
host_cpu = @host_cpu@
32902
host_os = @host_os@
32903
host_vendor = @host_vendor@
32904
+htmldir = @htmldir@
32905
includedir = @includedir@
32906
infodir = @infodir@
32907
install_sh = @install_sh@
32908
libdir = @libdir@
32909
libexecdir = @libexecdir@
32910
+localedir = @localedir@
32911
localstatedir = @localstatedir@
32912
mandir = @mandir@
32913
mkdir_p = @mkdir_p@
32914
oldincludedir = @oldincludedir@
32915
+pdfdir = @pdfdir@
32916
prefix = @prefix@
32917
program_transform_name = @program_transform_name@
32918
+psdir = @psdir@
32919
sbindir = @sbindir@
32920
sharedstatedir = @sharedstatedir@
32921
+srcdir = @srcdir@
32922
sysconfdir = @sysconfdir@
32923
target_alias = @target_alias@
32924
+top_builddir = @top_builddir@
32925
+top_srcdir = @top_srcdir@
32926
SUBDIRS = actions apps
32927
all: all-recursive
32928
32929
@@ -331,10 +294,6 @@
32930
clean-libtool:
32931
-rm -rf .libs _libs
32932
32933
-distclean-libtool:
32934
- -rm -f libtool
32935
-uninstall-info-am:
32936
-
32937
# This directory's subdirectories are mostly independent; you can cd
32938
# into them and run `make' without going through this Makefile.
32939
# To change the values of `make' variables: instead of editing Makefiles,
32940
@@ -366,8 +325,7 @@
32941
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
32942
fi; test -z "$$fail"
32943
32944
-mostlyclean-recursive clean-recursive distclean-recursive \
32945
-maintainer-clean-recursive:
32946
+$(RECURSIVE_CLEAN_TARGETS):
32947
@failcom='exit 1'; \
32948
for f in x $$MAKEFLAGS; do \
32949
case $$f in \
32950
@@ -468,22 +426,21 @@
32951
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
32952
32953
distdir: $(DISTFILES)
32954
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
32955
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
32956
- list='$(DISTFILES)'; for file in $$list; do \
32957
- case $$file in \
32958
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
32959
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
32960
- esac; \
32961
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32962
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32963
+ list='$(DISTFILES)'; \
32964
+ dist_files=`for file in $$list; do echo $$file; done | \
32965
+ sed -e "s|^$$srcdirstrip/||;t" \
32966
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
32967
+ case $$dist_files in \
32968
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
32969
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
32970
+ sort -u` ;; \
32971
+ esac; \
32972
+ for file in $$dist_files; do \
32973
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
32974
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
32975
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
32976
- dir="/$$dir"; \
32977
- $(mkdir_p) "$(distdir)$$dir"; \
32978
- else \
32979
- dir=''; \
32980
- fi; \
32981
if test -d $$d/$$file; then \
32982
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
32983
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
32984
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
32985
fi; \
32986
@@ -497,7 +454,7 @@
32987
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
32988
if test "$$subdir" = .; then :; else \
32989
test -d "$(distdir)/$$subdir" \
32990
- || $(mkdir_p) "$(distdir)/$$subdir" \
32991
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
32992
|| exit 1; \
32993
distdir=`$(am__cd) $(distdir) && pwd`; \
32994
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
32995
@@ -505,6 +462,8 @@
32996
$(MAKE) $(AM_MAKEFLAGS) \
32997
top_distdir="$$top_distdir" \
32998
distdir="$$distdir/$$subdir" \
32999
+ am__remove_distdir=: \
33000
+ am__skip_length_check=: \
33001
distdir) \
33002
|| exit 1; \
33003
fi; \
33004
@@ -544,8 +503,7 @@
33005
33006
distclean: distclean-recursive
33007
-rm -f Makefile
33008
-distclean-am: clean-am distclean-generic distclean-libtool \
33009
- distclean-tags
33010
+distclean-am: clean-am distclean-generic distclean-tags
33011
33012
dvi: dvi-recursive
33013
33014
@@ -559,12 +517,20 @@
33015
33016
install-data-am:
33017
33018
+install-dvi: install-dvi-recursive
33019
+
33020
install-exec-am:
33021
33022
+install-html: install-html-recursive
33023
+
33024
install-info: install-info-recursive
33025
33026
install-man:
33027
33028
+install-pdf: install-pdf-recursive
33029
+
33030
+install-ps: install-ps-recursive
33031
+
33032
installcheck-am:
33033
33034
maintainer-clean: maintainer-clean-recursive
33035
@@ -583,22 +549,24 @@
33036
33037
ps-am:
33038
33039
-uninstall-am: uninstall-info-am
33040
+uninstall-am:
33041
33042
-uninstall-info: uninstall-info-recursive
33043
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
33044
+ install-strip
33045
33046
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
33047
- clean clean-generic clean-libtool clean-recursive ctags \
33048
- ctags-recursive distclean distclean-generic distclean-libtool \
33049
- distclean-recursive distclean-tags distdir dvi dvi-am html \
33050
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
33051
+ all all-am check check-am clean clean-generic clean-libtool \
33052
+ ctags ctags-recursive distclean distclean-generic \
33053
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
33054
html-am info info-am install install-am install-data \
33055
- install-data-am install-exec install-exec-am install-info \
33056
- install-info-am install-man install-strip installcheck \
33057
+ install-data-am install-dvi install-dvi-am install-exec \
33058
+ install-exec-am install-html install-html-am install-info \
33059
+ install-info-am install-man install-pdf install-pdf-am \
33060
+ install-ps install-ps-am install-strip installcheck \
33061
installcheck-am installdirs installdirs-am maintainer-clean \
33062
- maintainer-clean-generic maintainer-clean-recursive \
33063
- mostlyclean mostlyclean-generic mostlyclean-libtool \
33064
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
33065
- uninstall uninstall-am uninstall-info-am
33066
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
33067
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
33068
+ uninstall uninstall-am
33069
33070
# Tell versions [3.59,3.63) of GNU make to not export all variables.
33071
# Otherwise a system limit (for SysV at least) may be exceeded.
33072
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/22x22/actions/Makefile.in evince-2.21.1.new/data/icons/22x22/actions/Makefile.in
33073
--- evince-2.21.1/data/icons/22x22/actions/Makefile.in 2007-12-03 22:58:21.000000000 +0100
33074
+++ evince-2.21.1.new/data/icons/22x22/actions/Makefile.in 2007-12-05 00:07:24.000000000 +0100
33075
@@ -1,8 +1,8 @@
33076
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
33077
+# Makefile.in generated by automake 1.10 from Makefile.am.
33078
# @configure_input@
33079
33080
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
33081
-# 2003, 2004, 2005 Free Software Foundation, Inc.
33082
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
33083
# This Makefile.in is free software; the Free Software Foundation
33084
# gives unlimited permission to copy and/or distribute it,
33085
# with or without modifications, as long as this notice is preserved.
33086
@@ -14,15 +14,11 @@
33087
33088
@SET_MAKE@
33089
33090
-srcdir = @srcdir@
33091
-top_srcdir = @top_srcdir@
33092
VPATH = @srcdir@
33093
pkgdatadir = $(datadir)/@PACKAGE@
33094
pkglibdir = $(libdir)/@PACKAGE@
33095
pkgincludedir = $(includedir)/@PACKAGE@
33096
-top_builddir = ../../../..
33097
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
33098
-INSTALL = @INSTALL@
33099
install_sh_DATA = $(install_sh) -c -m 644
33100
install_sh_PROGRAM = $(install_sh) -c
33101
install_sh_SCRIPT = $(install_sh) -c
33102
@@ -60,8 +56,6 @@
33103
ACLOCAL = @ACLOCAL@
33104
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
33105
ALL_LINGUAS = @ALL_LINGUAS@
33106
-AMDEP_FALSE = @AMDEP_FALSE@
33107
-AMDEP_TRUE = @AMDEP_TRUE@
33108
AMTAR = @AMTAR@
33109
AR = @AR@
33110
AUTOCONF = @AUTOCONF@
33111
@@ -90,8 +84,6 @@
33112
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
33113
DBUS_CFLAGS = @DBUS_CFLAGS@
33114
DBUS_LIBS = @DBUS_LIBS@
33115
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
33116
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
33117
DEFS = @DEFS@
33118
DEPDIR = @DEPDIR@
33119
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
33120
@@ -103,30 +95,6 @@
33121
ECHO_N = @ECHO_N@
33122
ECHO_T = @ECHO_T@
33123
EGREP = @EGREP@
33124
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
33125
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
33126
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
33127
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
33128
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
33129
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
33130
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
33131
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
33132
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
33133
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
33134
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
33135
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
33136
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
33137
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
33138
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
33139
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
33140
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
33141
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
33142
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
33143
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
33144
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
33145
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
33146
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
33147
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
33148
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
33149
EXEEXT = @EXEEXT@
33150
F77 = @F77@
33151
@@ -136,8 +104,6 @@
33152
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
33153
FRONTEND_LIBS = @FRONTEND_LIBS@
33154
GCONFTOOL = @GCONFTOOL@
33155
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
33156
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
33157
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
33158
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
33159
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
33160
@@ -151,16 +117,15 @@
33161
GNOME_LIBS = @GNOME_LIBS@
33162
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
33163
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
33164
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
33165
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
33166
+GREP = @GREP@
33167
+GTKDOC_CHECK = @GTKDOC_CHECK@
33168
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
33169
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
33170
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
33171
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
33172
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
33173
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
33174
HELP_DIR = @HELP_DIR@
33175
+HILDON_CFLAGS = @HILDON_CFLAGS@
33176
+HILDON_LIBS = @HILDON_LIBS@
33177
HTML_DIR = @HTML_DIR@
33178
+INSTALL = @INSTALL@
33179
INSTALL_DATA = @INSTALL_DATA@
33180
INSTALL_PROGRAM = @INSTALL_PROGRAM@
33181
INSTALL_SCRIPT = @INSTALL_SCRIPT@
33182
@@ -171,14 +136,12 @@
33183
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
33184
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
33185
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
33186
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
33187
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
33188
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
33189
INTLTOOL_MERGE = @INTLTOOL_MERGE@
33190
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
33191
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
33192
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
33193
INTLTOOL_PERL = @INTLTOOL_PERL@
33194
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
33195
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
33196
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
33197
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
33198
@@ -190,7 +153,6 @@
33199
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
33200
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
33201
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
33202
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
33203
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
33204
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
33205
LDFLAGS = @LDFLAGS@
33206
@@ -202,9 +164,8 @@
33207
LN_S = @LN_S@
33208
LTLIBOBJS = @LTLIBOBJS@
33209
MAINT = @MAINT@
33210
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
33211
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
33212
MAKEINFO = @MAKEINFO@
33213
+MKDIR_P = @MKDIR_P@
33214
MKINSTALLDIRS = @MKINSTALLDIRS@
33215
MSGFMT = @MSGFMT@
33216
MSGFMT_OPTS = @MSGFMT_OPTS@
33217
@@ -239,26 +200,14 @@
33218
VERSION = @VERSION@
33219
WARN_CFLAGS = @WARN_CFLAGS@
33220
WARN_CXXFLAGS = @WARN_CXXFLAGS@
33221
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
33222
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
33223
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
33224
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
33225
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
33226
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
33227
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
33228
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
33229
XGETTEXT = @XGETTEXT@
33230
-ac_ct_AR = @ac_ct_AR@
33231
+abs_builddir = @abs_builddir@
33232
+abs_srcdir = @abs_srcdir@
33233
+abs_top_builddir = @abs_top_builddir@
33234
+abs_top_srcdir = @abs_top_srcdir@
33235
ac_ct_CC = @ac_ct_CC@
33236
ac_ct_CXX = @ac_ct_CXX@
33237
ac_ct_F77 = @ac_ct_F77@
33238
-ac_ct_RANLIB = @ac_ct_RANLIB@
33239
-ac_ct_STRIP = @ac_ct_STRIP@
33240
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
33241
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
33242
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
33243
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
33244
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
33245
am__include = @am__include@
33246
am__leading_dot = @am__leading_dot@
33247
am__quote = @am__quote@
33248
@@ -270,28 +219,39 @@
33249
build_cpu = @build_cpu@
33250
build_os = @build_os@
33251
build_vendor = @build_vendor@
33252
+builddir = @builddir@
33253
datadir = @datadir@
33254
+datarootdir = @datarootdir@
33255
+docdir = @docdir@
33256
+dvidir = @dvidir@
33257
exec_prefix = @exec_prefix@
33258
host = @host@
33259
host_alias = @host_alias@
33260
host_cpu = @host_cpu@
33261
host_os = @host_os@
33262
host_vendor = @host_vendor@
33263
+htmldir = @htmldir@
33264
includedir = @includedir@
33265
infodir = @infodir@
33266
install_sh = @install_sh@
33267
libdir = @libdir@
33268
libexecdir = @libexecdir@
33269
+localedir = @localedir@
33270
localstatedir = @localstatedir@
33271
mandir = @mandir@
33272
mkdir_p = @mkdir_p@
33273
oldincludedir = @oldincludedir@
33274
+pdfdir = @pdfdir@
33275
prefix = @prefix@
33276
program_transform_name = @program_transform_name@
33277
+psdir = @psdir@
33278
sbindir = @sbindir@
33279
sharedstatedir = @sharedstatedir@
33280
+srcdir = @srcdir@
33281
sysconfdir = @sysconfdir@
33282
target_alias = @target_alias@
33283
+top_builddir = @top_builddir@
33284
+top_srcdir = @top_srcdir@
33285
themedir = $(pkgdatadir)/icons/hicolor
33286
size = 22x22
33287
context = actions
33288
@@ -352,13 +312,9 @@
33289
33290
clean-libtool:
33291
-rm -rf .libs _libs
33292
-
33293
-distclean-libtool:
33294
- -rm -f libtool
33295
-uninstall-info-am:
33296
install-iconsDATA: $(icons_DATA)
33297
@$(NORMAL_INSTALL)
33298
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
33299
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
33300
@list='$(icons_DATA)'; for p in $$list; do \
33301
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
33302
f=$(am__strip_dir) \
33303
@@ -381,22 +337,21 @@
33304
33305
33306
distdir: $(DISTFILES)
33307
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
33308
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
33309
- list='$(DISTFILES)'; for file in $$list; do \
33310
- case $$file in \
33311
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
33312
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
33313
- esac; \
33314
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33315
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33316
+ list='$(DISTFILES)'; \
33317
+ dist_files=`for file in $$list; do echo $$file; done | \
33318
+ sed -e "s|^$$srcdirstrip/||;t" \
33319
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
33320
+ case $$dist_files in \
33321
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
33322
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
33323
+ sort -u` ;; \
33324
+ esac; \
33325
+ for file in $$dist_files; do \
33326
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
33327
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
33328
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
33329
- dir="/$$dir"; \
33330
- $(mkdir_p) "$(distdir)$$dir"; \
33331
- else \
33332
- dir=''; \
33333
- fi; \
33334
if test -d $$d/$$file; then \
33335
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
33336
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
33337
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
33338
fi; \
33339
@@ -412,7 +367,7 @@
33340
all-am: Makefile $(DATA)
33341
installdirs:
33342
for dir in "$(DESTDIR)$(iconsdir)"; do \
33343
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
33344
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
33345
done
33346
install: install-am
33347
install-exec: install-exec-am
33348
@@ -444,7 +399,7 @@
33349
33350
distclean: distclean-am
33351
-rm -f Makefile
33352
-distclean-am: clean-am distclean-generic distclean-libtool
33353
+distclean-am: clean-am distclean-generic
33354
33355
dvi: dvi-am
33356
33357
@@ -458,12 +413,20 @@
33358
33359
install-data-am: install-iconsDATA
33360
33361
+install-dvi: install-dvi-am
33362
+
33363
install-exec-am:
33364
33365
+install-html: install-html-am
33366
+
33367
install-info: install-info-am
33368
33369
install-man:
33370
33371
+install-pdf: install-pdf-am
33372
+
33373
+install-ps: install-ps-am
33374
+
33375
installcheck-am:
33376
33377
maintainer-clean: maintainer-clean-am
33378
@@ -482,17 +445,21 @@
33379
33380
ps-am:
33381
33382
-uninstall-am: uninstall-iconsDATA uninstall-info-am
33383
+uninstall-am: uninstall-iconsDATA
33384
+
33385
+.MAKE: install-am install-strip
33386
33387
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
33388
distclean distclean-generic distclean-libtool distdir dvi \
33389
dvi-am html html-am info info-am install install-am \
33390
- install-data install-data-am install-exec install-exec-am \
33391
+ install-data install-data-am install-dvi install-dvi-am \
33392
+ install-exec install-exec-am install-html install-html-am \
33393
install-iconsDATA install-info install-info-am install-man \
33394
+ install-pdf install-pdf-am install-ps install-ps-am \
33395
install-strip installcheck installcheck-am installdirs \
33396
maintainer-clean maintainer-clean-generic mostlyclean \
33397
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
33398
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
33399
+ uninstall uninstall-am uninstall-iconsDATA
33400
33401
# Tell versions [3.59,3.63) of GNU make to not export all variables.
33402
# Otherwise a system limit (for SysV at least) may be exceeded.
33403
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/22x22/apps/Makefile.in evince-2.21.1.new/data/icons/22x22/apps/Makefile.in
33404
--- evince-2.21.1/data/icons/22x22/apps/Makefile.in 2007-12-03 22:58:21.000000000 +0100
33405
+++ evince-2.21.1.new/data/icons/22x22/apps/Makefile.in 2007-12-05 00:07:24.000000000 +0100
33406
@@ -1,8 +1,8 @@
33407
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
33408
+# Makefile.in generated by automake 1.10 from Makefile.am.
33409
# @configure_input@
33410
33411
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
33412
-# 2003, 2004, 2005 Free Software Foundation, Inc.
33413
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
33414
# This Makefile.in is free software; the Free Software Foundation
33415
# gives unlimited permission to copy and/or distribute it,
33416
# with or without modifications, as long as this notice is preserved.
33417
@@ -14,15 +14,11 @@
33418
33419
@SET_MAKE@
33420
33421
-srcdir = @srcdir@
33422
-top_srcdir = @top_srcdir@
33423
VPATH = @srcdir@
33424
pkgdatadir = $(datadir)/@PACKAGE@
33425
pkglibdir = $(libdir)/@PACKAGE@
33426
pkgincludedir = $(includedir)/@PACKAGE@
33427
-top_builddir = ../../../..
33428
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
33429
-INSTALL = @INSTALL@
33430
install_sh_DATA = $(install_sh) -c -m 644
33431
install_sh_PROGRAM = $(install_sh) -c
33432
install_sh_SCRIPT = $(install_sh) -c
33433
@@ -60,8 +56,6 @@
33434
ACLOCAL = @ACLOCAL@
33435
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
33436
ALL_LINGUAS = @ALL_LINGUAS@
33437
-AMDEP_FALSE = @AMDEP_FALSE@
33438
-AMDEP_TRUE = @AMDEP_TRUE@
33439
AMTAR = @AMTAR@
33440
AR = @AR@
33441
AUTOCONF = @AUTOCONF@
33442
@@ -90,8 +84,6 @@
33443
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
33444
DBUS_CFLAGS = @DBUS_CFLAGS@
33445
DBUS_LIBS = @DBUS_LIBS@
33446
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
33447
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
33448
DEFS = @DEFS@
33449
DEPDIR = @DEPDIR@
33450
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
33451
@@ -103,30 +95,6 @@
33452
ECHO_N = @ECHO_N@
33453
ECHO_T = @ECHO_T@
33454
EGREP = @EGREP@
33455
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
33456
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
33457
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
33458
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
33459
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
33460
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
33461
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
33462
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
33463
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
33464
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
33465
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
33466
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
33467
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
33468
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
33469
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
33470
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
33471
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
33472
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
33473
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
33474
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
33475
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
33476
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
33477
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
33478
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
33479
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
33480
EXEEXT = @EXEEXT@
33481
F77 = @F77@
33482
@@ -136,8 +104,6 @@
33483
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
33484
FRONTEND_LIBS = @FRONTEND_LIBS@
33485
GCONFTOOL = @GCONFTOOL@
33486
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
33487
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
33488
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
33489
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
33490
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
33491
@@ -151,16 +117,15 @@
33492
GNOME_LIBS = @GNOME_LIBS@
33493
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
33494
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
33495
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
33496
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
33497
+GREP = @GREP@
33498
+GTKDOC_CHECK = @GTKDOC_CHECK@
33499
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
33500
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
33501
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
33502
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
33503
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
33504
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
33505
HELP_DIR = @HELP_DIR@
33506
+HILDON_CFLAGS = @HILDON_CFLAGS@
33507
+HILDON_LIBS = @HILDON_LIBS@
33508
HTML_DIR = @HTML_DIR@
33509
+INSTALL = @INSTALL@
33510
INSTALL_DATA = @INSTALL_DATA@
33511
INSTALL_PROGRAM = @INSTALL_PROGRAM@
33512
INSTALL_SCRIPT = @INSTALL_SCRIPT@
33513
@@ -171,14 +136,12 @@
33514
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
33515
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
33516
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
33517
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
33518
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
33519
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
33520
INTLTOOL_MERGE = @INTLTOOL_MERGE@
33521
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
33522
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
33523
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
33524
INTLTOOL_PERL = @INTLTOOL_PERL@
33525
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
33526
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
33527
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
33528
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
33529
@@ -190,7 +153,6 @@
33530
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
33531
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
33532
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
33533
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
33534
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
33535
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
33536
LDFLAGS = @LDFLAGS@
33537
@@ -202,9 +164,8 @@
33538
LN_S = @LN_S@
33539
LTLIBOBJS = @LTLIBOBJS@
33540
MAINT = @MAINT@
33541
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
33542
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
33543
MAKEINFO = @MAKEINFO@
33544
+MKDIR_P = @MKDIR_P@
33545
MKINSTALLDIRS = @MKINSTALLDIRS@
33546
MSGFMT = @MSGFMT@
33547
MSGFMT_OPTS = @MSGFMT_OPTS@
33548
@@ -239,26 +200,14 @@
33549
VERSION = @VERSION@
33550
WARN_CFLAGS = @WARN_CFLAGS@
33551
WARN_CXXFLAGS = @WARN_CXXFLAGS@
33552
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
33553
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
33554
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
33555
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
33556
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
33557
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
33558
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
33559
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
33560
XGETTEXT = @XGETTEXT@
33561
-ac_ct_AR = @ac_ct_AR@
33562
+abs_builddir = @abs_builddir@
33563
+abs_srcdir = @abs_srcdir@
33564
+abs_top_builddir = @abs_top_builddir@
33565
+abs_top_srcdir = @abs_top_srcdir@
33566
ac_ct_CC = @ac_ct_CC@
33567
ac_ct_CXX = @ac_ct_CXX@
33568
ac_ct_F77 = @ac_ct_F77@
33569
-ac_ct_RANLIB = @ac_ct_RANLIB@
33570
-ac_ct_STRIP = @ac_ct_STRIP@
33571
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
33572
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
33573
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
33574
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
33575
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
33576
am__include = @am__include@
33577
am__leading_dot = @am__leading_dot@
33578
am__quote = @am__quote@
33579
@@ -270,28 +219,39 @@
33580
build_cpu = @build_cpu@
33581
build_os = @build_os@
33582
build_vendor = @build_vendor@
33583
+builddir = @builddir@
33584
datadir = @datadir@
33585
+datarootdir = @datarootdir@
33586
+docdir = @docdir@
33587
+dvidir = @dvidir@
33588
exec_prefix = @exec_prefix@
33589
host = @host@
33590
host_alias = @host_alias@
33591
host_cpu = @host_cpu@
33592
host_os = @host_os@
33593
host_vendor = @host_vendor@
33594
+htmldir = @htmldir@
33595
includedir = @includedir@
33596
infodir = @infodir@
33597
install_sh = @install_sh@
33598
libdir = @libdir@
33599
libexecdir = @libexecdir@
33600
+localedir = @localedir@
33601
localstatedir = @localstatedir@
33602
mandir = @mandir@
33603
mkdir_p = @mkdir_p@
33604
oldincludedir = @oldincludedir@
33605
+pdfdir = @pdfdir@
33606
prefix = @prefix@
33607
program_transform_name = @program_transform_name@
33608
+psdir = @psdir@
33609
sbindir = @sbindir@
33610
sharedstatedir = @sharedstatedir@
33611
+srcdir = @srcdir@
33612
sysconfdir = @sysconfdir@
33613
target_alias = @target_alias@
33614
+top_builddir = @top_builddir@
33615
+top_srcdir = @top_srcdir@
33616
themedir = $(datadir)/icons/hicolor
33617
size = 22x22
33618
context = apps
33619
@@ -342,13 +302,9 @@
33620
33621
clean-libtool:
33622
-rm -rf .libs _libs
33623
-
33624
-distclean-libtool:
33625
- -rm -f libtool
33626
-uninstall-info-am:
33627
install-iconsDATA: $(icons_DATA)
33628
@$(NORMAL_INSTALL)
33629
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
33630
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
33631
@list='$(icons_DATA)'; for p in $$list; do \
33632
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
33633
f=$(am__strip_dir) \
33634
@@ -371,22 +327,21 @@
33635
33636
33637
distdir: $(DISTFILES)
33638
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
33639
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
33640
- list='$(DISTFILES)'; for file in $$list; do \
33641
- case $$file in \
33642
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
33643
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
33644
- esac; \
33645
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33646
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33647
+ list='$(DISTFILES)'; \
33648
+ dist_files=`for file in $$list; do echo $$file; done | \
33649
+ sed -e "s|^$$srcdirstrip/||;t" \
33650
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
33651
+ case $$dist_files in \
33652
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
33653
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
33654
+ sort -u` ;; \
33655
+ esac; \
33656
+ for file in $$dist_files; do \
33657
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
33658
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
33659
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
33660
- dir="/$$dir"; \
33661
- $(mkdir_p) "$(distdir)$$dir"; \
33662
- else \
33663
- dir=''; \
33664
- fi; \
33665
if test -d $$d/$$file; then \
33666
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
33667
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
33668
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
33669
fi; \
33670
@@ -402,7 +357,7 @@
33671
all-am: Makefile $(DATA)
33672
installdirs:
33673
for dir in "$(DESTDIR)$(iconsdir)"; do \
33674
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
33675
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
33676
done
33677
install: install-am
33678
install-exec: install-exec-am
33679
@@ -434,7 +389,7 @@
33680
33681
distclean: distclean-am
33682
-rm -f Makefile
33683
-distclean-am: clean-am distclean-generic distclean-libtool
33684
+distclean-am: clean-am distclean-generic
33685
33686
dvi: dvi-am
33687
33688
@@ -448,12 +403,20 @@
33689
33690
install-data-am: install-iconsDATA
33691
33692
+install-dvi: install-dvi-am
33693
+
33694
install-exec-am:
33695
33696
+install-html: install-html-am
33697
+
33698
install-info: install-info-am
33699
33700
install-man:
33701
33702
+install-pdf: install-pdf-am
33703
+
33704
+install-ps: install-ps-am
33705
+
33706
installcheck-am:
33707
33708
maintainer-clean: maintainer-clean-am
33709
@@ -472,17 +435,21 @@
33710
33711
ps-am:
33712
33713
-uninstall-am: uninstall-iconsDATA uninstall-info-am
33714
+uninstall-am: uninstall-iconsDATA
33715
+
33716
+.MAKE: install-am install-strip
33717
33718
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
33719
distclean distclean-generic distclean-libtool distdir dvi \
33720
dvi-am html html-am info info-am install install-am \
33721
- install-data install-data-am install-exec install-exec-am \
33722
+ install-data install-data-am install-dvi install-dvi-am \
33723
+ install-exec install-exec-am install-html install-html-am \
33724
install-iconsDATA install-info install-info-am install-man \
33725
+ install-pdf install-pdf-am install-ps install-ps-am \
33726
install-strip installcheck installcheck-am installdirs \
33727
maintainer-clean maintainer-clean-generic mostlyclean \
33728
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
33729
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
33730
+ uninstall uninstall-am uninstall-iconsDATA
33731
33732
# Tell versions [3.59,3.63) of GNU make to not export all variables.
33733
# Otherwise a system limit (for SysV at least) may be exceeded.
33734
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/22x22/Makefile.in evince-2.21.1.new/data/icons/22x22/Makefile.in
33735
--- evince-2.21.1/data/icons/22x22/Makefile.in 2007-12-03 22:58:21.000000000 +0100
33736
+++ evince-2.21.1.new/data/icons/22x22/Makefile.in 2007-12-05 00:07:24.000000000 +0100
33737
@@ -1,8 +1,8 @@
33738
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
33739
+# Makefile.in generated by automake 1.10 from Makefile.am.
33740
# @configure_input@
33741
33742
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
33743
-# 2003, 2004, 2005 Free Software Foundation, Inc.
33744
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
33745
# This Makefile.in is free software; the Free Software Foundation
33746
# gives unlimited permission to copy and/or distribute it,
33747
# with or without modifications, as long as this notice is preserved.
33748
@@ -13,15 +13,11 @@
33749
# PARTICULAR PURPOSE.
33750
33751
@SET_MAKE@
33752
-srcdir = @srcdir@
33753
-top_srcdir = @top_srcdir@
33754
VPATH = @srcdir@
33755
pkgdatadir = $(datadir)/@PACKAGE@
33756
pkglibdir = $(libdir)/@PACKAGE@
33757
pkgincludedir = $(includedir)/@PACKAGE@
33758
-top_builddir = ../../..
33759
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
33760
-INSTALL = @INSTALL@
33761
install_sh_DATA = $(install_sh) -c -m 644
33762
install_sh_PROGRAM = $(install_sh) -c
33763
install_sh_SCRIPT = $(install_sh) -c
33764
@@ -48,10 +44,13 @@
33765
DIST_SOURCES =
33766
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
33767
html-recursive info-recursive install-data-recursive \
33768
- install-exec-recursive install-info-recursive \
33769
- install-recursive installcheck-recursive installdirs-recursive \
33770
- pdf-recursive ps-recursive uninstall-info-recursive \
33771
- uninstall-recursive
33772
+ install-dvi-recursive install-exec-recursive \
33773
+ install-html-recursive install-info-recursive \
33774
+ install-pdf-recursive install-ps-recursive install-recursive \
33775
+ installcheck-recursive installdirs-recursive pdf-recursive \
33776
+ ps-recursive uninstall-recursive
33777
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
33778
+ distclean-recursive maintainer-clean-recursive
33779
ETAGS = etags
33780
CTAGS = ctags
33781
DIST_SUBDIRS = $(SUBDIRS)
33782
@@ -59,8 +58,6 @@
33783
ACLOCAL = @ACLOCAL@
33784
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
33785
ALL_LINGUAS = @ALL_LINGUAS@
33786
-AMDEP_FALSE = @AMDEP_FALSE@
33787
-AMDEP_TRUE = @AMDEP_TRUE@
33788
AMTAR = @AMTAR@
33789
AR = @AR@
33790
AUTOCONF = @AUTOCONF@
33791
@@ -89,8 +86,6 @@
33792
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
33793
DBUS_CFLAGS = @DBUS_CFLAGS@
33794
DBUS_LIBS = @DBUS_LIBS@
33795
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
33796
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
33797
DEFS = @DEFS@
33798
DEPDIR = @DEPDIR@
33799
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
33800
@@ -102,30 +97,6 @@
33801
ECHO_N = @ECHO_N@
33802
ECHO_T = @ECHO_T@
33803
EGREP = @EGREP@
33804
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
33805
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
33806
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
33807
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
33808
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
33809
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
33810
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
33811
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
33812
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
33813
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
33814
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
33815
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
33816
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
33817
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
33818
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
33819
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
33820
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
33821
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
33822
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
33823
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
33824
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
33825
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
33826
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
33827
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
33828
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
33829
EXEEXT = @EXEEXT@
33830
F77 = @F77@
33831
@@ -135,8 +106,6 @@
33832
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
33833
FRONTEND_LIBS = @FRONTEND_LIBS@
33834
GCONFTOOL = @GCONFTOOL@
33835
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
33836
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
33837
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
33838
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
33839
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
33840
@@ -150,16 +119,15 @@
33841
GNOME_LIBS = @GNOME_LIBS@
33842
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
33843
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
33844
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
33845
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
33846
+GREP = @GREP@
33847
+GTKDOC_CHECK = @GTKDOC_CHECK@
33848
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
33849
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
33850
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
33851
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
33852
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
33853
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
33854
HELP_DIR = @HELP_DIR@
33855
+HILDON_CFLAGS = @HILDON_CFLAGS@
33856
+HILDON_LIBS = @HILDON_LIBS@
33857
HTML_DIR = @HTML_DIR@
33858
+INSTALL = @INSTALL@
33859
INSTALL_DATA = @INSTALL_DATA@
33860
INSTALL_PROGRAM = @INSTALL_PROGRAM@
33861
INSTALL_SCRIPT = @INSTALL_SCRIPT@
33862
@@ -170,14 +138,12 @@
33863
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
33864
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
33865
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
33866
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
33867
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
33868
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
33869
INTLTOOL_MERGE = @INTLTOOL_MERGE@
33870
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
33871
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
33872
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
33873
INTLTOOL_PERL = @INTLTOOL_PERL@
33874
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
33875
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
33876
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
33877
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
33878
@@ -189,7 +155,6 @@
33879
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
33880
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
33881
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
33882
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
33883
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
33884
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
33885
LDFLAGS = @LDFLAGS@
33886
@@ -201,9 +166,8 @@
33887
LN_S = @LN_S@
33888
LTLIBOBJS = @LTLIBOBJS@
33889
MAINT = @MAINT@
33890
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
33891
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
33892
MAKEINFO = @MAKEINFO@
33893
+MKDIR_P = @MKDIR_P@
33894
MKINSTALLDIRS = @MKINSTALLDIRS@
33895
MSGFMT = @MSGFMT@
33896
MSGFMT_OPTS = @MSGFMT_OPTS@
33897
@@ -238,26 +202,14 @@
33898
VERSION = @VERSION@
33899
WARN_CFLAGS = @WARN_CFLAGS@
33900
WARN_CXXFLAGS = @WARN_CXXFLAGS@
33901
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
33902
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
33903
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
33904
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
33905
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
33906
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
33907
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
33908
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
33909
XGETTEXT = @XGETTEXT@
33910
-ac_ct_AR = @ac_ct_AR@
33911
+abs_builddir = @abs_builddir@
33912
+abs_srcdir = @abs_srcdir@
33913
+abs_top_builddir = @abs_top_builddir@
33914
+abs_top_srcdir = @abs_top_srcdir@
33915
ac_ct_CC = @ac_ct_CC@
33916
ac_ct_CXX = @ac_ct_CXX@
33917
ac_ct_F77 = @ac_ct_F77@
33918
-ac_ct_RANLIB = @ac_ct_RANLIB@
33919
-ac_ct_STRIP = @ac_ct_STRIP@
33920
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
33921
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
33922
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
33923
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
33924
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
33925
am__include = @am__include@
33926
am__leading_dot = @am__leading_dot@
33927
am__quote = @am__quote@
33928
@@ -269,28 +221,39 @@
33929
build_cpu = @build_cpu@
33930
build_os = @build_os@
33931
build_vendor = @build_vendor@
33932
+builddir = @builddir@
33933
datadir = @datadir@
33934
+datarootdir = @datarootdir@
33935
+docdir = @docdir@
33936
+dvidir = @dvidir@
33937
exec_prefix = @exec_prefix@
33938
host = @host@
33939
host_alias = @host_alias@
33940
host_cpu = @host_cpu@
33941
host_os = @host_os@
33942
host_vendor = @host_vendor@
33943
+htmldir = @htmldir@
33944
includedir = @includedir@
33945
infodir = @infodir@
33946
install_sh = @install_sh@
33947
libdir = @libdir@
33948
libexecdir = @libexecdir@
33949
+localedir = @localedir@
33950
localstatedir = @localstatedir@
33951
mandir = @mandir@
33952
mkdir_p = @mkdir_p@
33953
oldincludedir = @oldincludedir@
33954
+pdfdir = @pdfdir@
33955
prefix = @prefix@
33956
program_transform_name = @program_transform_name@
33957
+psdir = @psdir@
33958
sbindir = @sbindir@
33959
sharedstatedir = @sharedstatedir@
33960
+srcdir = @srcdir@
33961
sysconfdir = @sysconfdir@
33962
target_alias = @target_alias@
33963
+top_builddir = @top_builddir@
33964
+top_srcdir = @top_srcdir@
33965
SUBDIRS = actions apps
33966
all: all-recursive
33967
33968
@@ -331,10 +294,6 @@
33969
clean-libtool:
33970
-rm -rf .libs _libs
33971
33972
-distclean-libtool:
33973
- -rm -f libtool
33974
-uninstall-info-am:
33975
-
33976
# This directory's subdirectories are mostly independent; you can cd
33977
# into them and run `make' without going through this Makefile.
33978
# To change the values of `make' variables: instead of editing Makefiles,
33979
@@ -366,8 +325,7 @@
33980
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
33981
fi; test -z "$$fail"
33982
33983
-mostlyclean-recursive clean-recursive distclean-recursive \
33984
-maintainer-clean-recursive:
33985
+$(RECURSIVE_CLEAN_TARGETS):
33986
@failcom='exit 1'; \
33987
for f in x $$MAKEFLAGS; do \
33988
case $$f in \
33989
@@ -468,22 +426,21 @@
33990
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
33991
33992
distdir: $(DISTFILES)
33993
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
33994
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
33995
- list='$(DISTFILES)'; for file in $$list; do \
33996
- case $$file in \
33997
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
33998
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
33999
- esac; \
34000
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34001
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34002
+ list='$(DISTFILES)'; \
34003
+ dist_files=`for file in $$list; do echo $$file; done | \
34004
+ sed -e "s|^$$srcdirstrip/||;t" \
34005
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
34006
+ case $$dist_files in \
34007
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
34008
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
34009
+ sort -u` ;; \
34010
+ esac; \
34011
+ for file in $$dist_files; do \
34012
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
34013
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
34014
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
34015
- dir="/$$dir"; \
34016
- $(mkdir_p) "$(distdir)$$dir"; \
34017
- else \
34018
- dir=''; \
34019
- fi; \
34020
if test -d $$d/$$file; then \
34021
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
34022
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
34023
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
34024
fi; \
34025
@@ -497,7 +454,7 @@
34026
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
34027
if test "$$subdir" = .; then :; else \
34028
test -d "$(distdir)/$$subdir" \
34029
- || $(mkdir_p) "$(distdir)/$$subdir" \
34030
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
34031
|| exit 1; \
34032
distdir=`$(am__cd) $(distdir) && pwd`; \
34033
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
34034
@@ -505,6 +462,8 @@
34035
$(MAKE) $(AM_MAKEFLAGS) \
34036
top_distdir="$$top_distdir" \
34037
distdir="$$distdir/$$subdir" \
34038
+ am__remove_distdir=: \
34039
+ am__skip_length_check=: \
34040
distdir) \
34041
|| exit 1; \
34042
fi; \
34043
@@ -544,8 +503,7 @@
34044
34045
distclean: distclean-recursive
34046
-rm -f Makefile
34047
-distclean-am: clean-am distclean-generic distclean-libtool \
34048
- distclean-tags
34049
+distclean-am: clean-am distclean-generic distclean-tags
34050
34051
dvi: dvi-recursive
34052
34053
@@ -559,12 +517,20 @@
34054
34055
install-data-am:
34056
34057
+install-dvi: install-dvi-recursive
34058
+
34059
install-exec-am:
34060
34061
+install-html: install-html-recursive
34062
+
34063
install-info: install-info-recursive
34064
34065
install-man:
34066
34067
+install-pdf: install-pdf-recursive
34068
+
34069
+install-ps: install-ps-recursive
34070
+
34071
installcheck-am:
34072
34073
maintainer-clean: maintainer-clean-recursive
34074
@@ -583,22 +549,24 @@
34075
34076
ps-am:
34077
34078
-uninstall-am: uninstall-info-am
34079
+uninstall-am:
34080
34081
-uninstall-info: uninstall-info-recursive
34082
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
34083
+ install-strip
34084
34085
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
34086
- clean clean-generic clean-libtool clean-recursive ctags \
34087
- ctags-recursive distclean distclean-generic distclean-libtool \
34088
- distclean-recursive distclean-tags distdir dvi dvi-am html \
34089
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
34090
+ all all-am check check-am clean clean-generic clean-libtool \
34091
+ ctags ctags-recursive distclean distclean-generic \
34092
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
34093
html-am info info-am install install-am install-data \
34094
- install-data-am install-exec install-exec-am install-info \
34095
- install-info-am install-man install-strip installcheck \
34096
+ install-data-am install-dvi install-dvi-am install-exec \
34097
+ install-exec-am install-html install-html-am install-info \
34098
+ install-info-am install-man install-pdf install-pdf-am \
34099
+ install-ps install-ps-am install-strip installcheck \
34100
installcheck-am installdirs installdirs-am maintainer-clean \
34101
- maintainer-clean-generic maintainer-clean-recursive \
34102
- mostlyclean mostlyclean-generic mostlyclean-libtool \
34103
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
34104
- uninstall uninstall-am uninstall-info-am
34105
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
34106
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
34107
+ uninstall uninstall-am
34108
34109
# Tell versions [3.59,3.63) of GNU make to not export all variables.
34110
# Otherwise a system limit (for SysV at least) may be exceeded.
34111
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/24x24/actions/Makefile.in evince-2.21.1.new/data/icons/24x24/actions/Makefile.in
34112
--- evince-2.21.1/data/icons/24x24/actions/Makefile.in 2007-12-03 22:58:22.000000000 +0100
34113
+++ evince-2.21.1.new/data/icons/24x24/actions/Makefile.in 2007-12-05 00:07:24.000000000 +0100
34114
@@ -1,8 +1,8 @@
34115
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
34116
+# Makefile.in generated by automake 1.10 from Makefile.am.
34117
# @configure_input@
34118
34119
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
34120
-# 2003, 2004, 2005 Free Software Foundation, Inc.
34121
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
34122
# This Makefile.in is free software; the Free Software Foundation
34123
# gives unlimited permission to copy and/or distribute it,
34124
# with or without modifications, as long as this notice is preserved.
34125
@@ -14,15 +14,11 @@
34126
34127
@SET_MAKE@
34128
34129
-srcdir = @srcdir@
34130
-top_srcdir = @top_srcdir@
34131
VPATH = @srcdir@
34132
pkgdatadir = $(datadir)/@PACKAGE@
34133
pkglibdir = $(libdir)/@PACKAGE@
34134
pkgincludedir = $(includedir)/@PACKAGE@
34135
-top_builddir = ../../../..
34136
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
34137
-INSTALL = @INSTALL@
34138
install_sh_DATA = $(install_sh) -c -m 644
34139
install_sh_PROGRAM = $(install_sh) -c
34140
install_sh_SCRIPT = $(install_sh) -c
34141
@@ -60,8 +56,6 @@
34142
ACLOCAL = @ACLOCAL@
34143
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
34144
ALL_LINGUAS = @ALL_LINGUAS@
34145
-AMDEP_FALSE = @AMDEP_FALSE@
34146
-AMDEP_TRUE = @AMDEP_TRUE@
34147
AMTAR = @AMTAR@
34148
AR = @AR@
34149
AUTOCONF = @AUTOCONF@
34150
@@ -90,8 +84,6 @@
34151
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
34152
DBUS_CFLAGS = @DBUS_CFLAGS@
34153
DBUS_LIBS = @DBUS_LIBS@
34154
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
34155
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
34156
DEFS = @DEFS@
34157
DEPDIR = @DEPDIR@
34158
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
34159
@@ -103,30 +95,6 @@
34160
ECHO_N = @ECHO_N@
34161
ECHO_T = @ECHO_T@
34162
EGREP = @EGREP@
34163
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
34164
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
34165
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
34166
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
34167
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
34168
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
34169
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
34170
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
34171
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
34172
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
34173
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
34174
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
34175
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
34176
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
34177
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
34178
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
34179
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
34180
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
34181
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
34182
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
34183
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
34184
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
34185
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
34186
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
34187
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
34188
EXEEXT = @EXEEXT@
34189
F77 = @F77@
34190
@@ -136,8 +104,6 @@
34191
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
34192
FRONTEND_LIBS = @FRONTEND_LIBS@
34193
GCONFTOOL = @GCONFTOOL@
34194
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
34195
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
34196
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
34197
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
34198
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
34199
@@ -151,16 +117,15 @@
34200
GNOME_LIBS = @GNOME_LIBS@
34201
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
34202
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
34203
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
34204
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
34205
+GREP = @GREP@
34206
+GTKDOC_CHECK = @GTKDOC_CHECK@
34207
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
34208
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
34209
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
34210
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
34211
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
34212
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
34213
HELP_DIR = @HELP_DIR@
34214
+HILDON_CFLAGS = @HILDON_CFLAGS@
34215
+HILDON_LIBS = @HILDON_LIBS@
34216
HTML_DIR = @HTML_DIR@
34217
+INSTALL = @INSTALL@
34218
INSTALL_DATA = @INSTALL_DATA@
34219
INSTALL_PROGRAM = @INSTALL_PROGRAM@
34220
INSTALL_SCRIPT = @INSTALL_SCRIPT@
34221
@@ -171,14 +136,12 @@
34222
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
34223
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
34224
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
34225
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
34226
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
34227
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
34228
INTLTOOL_MERGE = @INTLTOOL_MERGE@
34229
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
34230
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
34231
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
34232
INTLTOOL_PERL = @INTLTOOL_PERL@
34233
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
34234
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
34235
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
34236
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
34237
@@ -190,7 +153,6 @@
34238
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
34239
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
34240
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
34241
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
34242
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
34243
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
34244
LDFLAGS = @LDFLAGS@
34245
@@ -202,9 +164,8 @@
34246
LN_S = @LN_S@
34247
LTLIBOBJS = @LTLIBOBJS@
34248
MAINT = @MAINT@
34249
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
34250
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
34251
MAKEINFO = @MAKEINFO@
34252
+MKDIR_P = @MKDIR_P@
34253
MKINSTALLDIRS = @MKINSTALLDIRS@
34254
MSGFMT = @MSGFMT@
34255
MSGFMT_OPTS = @MSGFMT_OPTS@
34256
@@ -239,26 +200,14 @@
34257
VERSION = @VERSION@
34258
WARN_CFLAGS = @WARN_CFLAGS@
34259
WARN_CXXFLAGS = @WARN_CXXFLAGS@
34260
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
34261
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
34262
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
34263
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
34264
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
34265
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
34266
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
34267
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
34268
XGETTEXT = @XGETTEXT@
34269
-ac_ct_AR = @ac_ct_AR@
34270
+abs_builddir = @abs_builddir@
34271
+abs_srcdir = @abs_srcdir@
34272
+abs_top_builddir = @abs_top_builddir@
34273
+abs_top_srcdir = @abs_top_srcdir@
34274
ac_ct_CC = @ac_ct_CC@
34275
ac_ct_CXX = @ac_ct_CXX@
34276
ac_ct_F77 = @ac_ct_F77@
34277
-ac_ct_RANLIB = @ac_ct_RANLIB@
34278
-ac_ct_STRIP = @ac_ct_STRIP@
34279
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
34280
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
34281
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
34282
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
34283
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
34284
am__include = @am__include@
34285
am__leading_dot = @am__leading_dot@
34286
am__quote = @am__quote@
34287
@@ -270,28 +219,39 @@
34288
build_cpu = @build_cpu@
34289
build_os = @build_os@
34290
build_vendor = @build_vendor@
34291
+builddir = @builddir@
34292
datadir = @datadir@
34293
+datarootdir = @datarootdir@
34294
+docdir = @docdir@
34295
+dvidir = @dvidir@
34296
exec_prefix = @exec_prefix@
34297
host = @host@
34298
host_alias = @host_alias@
34299
host_cpu = @host_cpu@
34300
host_os = @host_os@
34301
host_vendor = @host_vendor@
34302
+htmldir = @htmldir@
34303
includedir = @includedir@
34304
infodir = @infodir@
34305
install_sh = @install_sh@
34306
libdir = @libdir@
34307
libexecdir = @libexecdir@
34308
+localedir = @localedir@
34309
localstatedir = @localstatedir@
34310
mandir = @mandir@
34311
mkdir_p = @mkdir_p@
34312
oldincludedir = @oldincludedir@
34313
+pdfdir = @pdfdir@
34314
prefix = @prefix@
34315
program_transform_name = @program_transform_name@
34316
+psdir = @psdir@
34317
sbindir = @sbindir@
34318
sharedstatedir = @sharedstatedir@
34319
+srcdir = @srcdir@
34320
sysconfdir = @sysconfdir@
34321
target_alias = @target_alias@
34322
+top_builddir = @top_builddir@
34323
+top_srcdir = @top_srcdir@
34324
themedir = $(pkgdatadir)/icons/hicolor
34325
size = 24x24
34326
context = actions
34327
@@ -346,13 +306,9 @@
34328
34329
clean-libtool:
34330
-rm -rf .libs _libs
34331
-
34332
-distclean-libtool:
34333
- -rm -f libtool
34334
-uninstall-info-am:
34335
install-iconsDATA: $(icons_DATA)
34336
@$(NORMAL_INSTALL)
34337
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
34338
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
34339
@list='$(icons_DATA)'; for p in $$list; do \
34340
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
34341
f=$(am__strip_dir) \
34342
@@ -375,22 +331,21 @@
34343
34344
34345
distdir: $(DISTFILES)
34346
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
34347
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
34348
- list='$(DISTFILES)'; for file in $$list; do \
34349
- case $$file in \
34350
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
34351
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
34352
- esac; \
34353
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34354
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34355
+ list='$(DISTFILES)'; \
34356
+ dist_files=`for file in $$list; do echo $$file; done | \
34357
+ sed -e "s|^$$srcdirstrip/||;t" \
34358
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
34359
+ case $$dist_files in \
34360
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
34361
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
34362
+ sort -u` ;; \
34363
+ esac; \
34364
+ for file in $$dist_files; do \
34365
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
34366
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
34367
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
34368
- dir="/$$dir"; \
34369
- $(mkdir_p) "$(distdir)$$dir"; \
34370
- else \
34371
- dir=''; \
34372
- fi; \
34373
if test -d $$d/$$file; then \
34374
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
34375
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
34376
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
34377
fi; \
34378
@@ -406,7 +361,7 @@
34379
all-am: Makefile $(DATA)
34380
installdirs:
34381
for dir in "$(DESTDIR)$(iconsdir)"; do \
34382
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
34383
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
34384
done
34385
install: install-am
34386
install-exec: install-exec-am
34387
@@ -438,7 +393,7 @@
34388
34389
distclean: distclean-am
34390
-rm -f Makefile
34391
-distclean-am: clean-am distclean-generic distclean-libtool
34392
+distclean-am: clean-am distclean-generic
34393
34394
dvi: dvi-am
34395
34396
@@ -452,12 +407,20 @@
34397
34398
install-data-am: install-iconsDATA
34399
34400
+install-dvi: install-dvi-am
34401
+
34402
install-exec-am:
34403
34404
+install-html: install-html-am
34405
+
34406
install-info: install-info-am
34407
34408
install-man:
34409
34410
+install-pdf: install-pdf-am
34411
+
34412
+install-ps: install-ps-am
34413
+
34414
installcheck-am:
34415
34416
maintainer-clean: maintainer-clean-am
34417
@@ -476,17 +439,21 @@
34418
34419
ps-am:
34420
34421
-uninstall-am: uninstall-iconsDATA uninstall-info-am
34422
+uninstall-am: uninstall-iconsDATA
34423
+
34424
+.MAKE: install-am install-strip
34425
34426
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
34427
distclean distclean-generic distclean-libtool distdir dvi \
34428
dvi-am html html-am info info-am install install-am \
34429
- install-data install-data-am install-exec install-exec-am \
34430
+ install-data install-data-am install-dvi install-dvi-am \
34431
+ install-exec install-exec-am install-html install-html-am \
34432
install-iconsDATA install-info install-info-am install-man \
34433
+ install-pdf install-pdf-am install-ps install-ps-am \
34434
install-strip installcheck installcheck-am installdirs \
34435
maintainer-clean maintainer-clean-generic mostlyclean \
34436
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
34437
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
34438
+ uninstall uninstall-am uninstall-iconsDATA
34439
34440
# Tell versions [3.59,3.63) of GNU make to not export all variables.
34441
# Otherwise a system limit (for SysV at least) may be exceeded.
34442
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/24x24/apps/Makefile.in evince-2.21.1.new/data/icons/24x24/apps/Makefile.in
34443
--- evince-2.21.1/data/icons/24x24/apps/Makefile.in 2007-12-03 22:58:22.000000000 +0100
34444
+++ evince-2.21.1.new/data/icons/24x24/apps/Makefile.in 2007-12-05 00:07:24.000000000 +0100
34445
@@ -1,8 +1,8 @@
34446
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
34447
+# Makefile.in generated by automake 1.10 from Makefile.am.
34448
# @configure_input@
34449
34450
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
34451
-# 2003, 2004, 2005 Free Software Foundation, Inc.
34452
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
34453
# This Makefile.in is free software; the Free Software Foundation
34454
# gives unlimited permission to copy and/or distribute it,
34455
# with or without modifications, as long as this notice is preserved.
34456
@@ -14,15 +14,11 @@
34457
34458
@SET_MAKE@
34459
34460
-srcdir = @srcdir@
34461
-top_srcdir = @top_srcdir@
34462
VPATH = @srcdir@
34463
pkgdatadir = $(datadir)/@PACKAGE@
34464
pkglibdir = $(libdir)/@PACKAGE@
34465
pkgincludedir = $(includedir)/@PACKAGE@
34466
-top_builddir = ../../../..
34467
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
34468
-INSTALL = @INSTALL@
34469
install_sh_DATA = $(install_sh) -c -m 644
34470
install_sh_PROGRAM = $(install_sh) -c
34471
install_sh_SCRIPT = $(install_sh) -c
34472
@@ -60,8 +56,6 @@
34473
ACLOCAL = @ACLOCAL@
34474
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
34475
ALL_LINGUAS = @ALL_LINGUAS@
34476
-AMDEP_FALSE = @AMDEP_FALSE@
34477
-AMDEP_TRUE = @AMDEP_TRUE@
34478
AMTAR = @AMTAR@
34479
AR = @AR@
34480
AUTOCONF = @AUTOCONF@
34481
@@ -90,8 +84,6 @@
34482
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
34483
DBUS_CFLAGS = @DBUS_CFLAGS@
34484
DBUS_LIBS = @DBUS_LIBS@
34485
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
34486
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
34487
DEFS = @DEFS@
34488
DEPDIR = @DEPDIR@
34489
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
34490
@@ -103,30 +95,6 @@
34491
ECHO_N = @ECHO_N@
34492
ECHO_T = @ECHO_T@
34493
EGREP = @EGREP@
34494
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
34495
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
34496
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
34497
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
34498
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
34499
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
34500
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
34501
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
34502
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
34503
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
34504
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
34505
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
34506
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
34507
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
34508
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
34509
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
34510
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
34511
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
34512
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
34513
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
34514
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
34515
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
34516
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
34517
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
34518
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
34519
EXEEXT = @EXEEXT@
34520
F77 = @F77@
34521
@@ -136,8 +104,6 @@
34522
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
34523
FRONTEND_LIBS = @FRONTEND_LIBS@
34524
GCONFTOOL = @GCONFTOOL@
34525
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
34526
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
34527
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
34528
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
34529
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
34530
@@ -151,16 +117,15 @@
34531
GNOME_LIBS = @GNOME_LIBS@
34532
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
34533
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
34534
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
34535
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
34536
+GREP = @GREP@
34537
+GTKDOC_CHECK = @GTKDOC_CHECK@
34538
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
34539
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
34540
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
34541
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
34542
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
34543
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
34544
HELP_DIR = @HELP_DIR@
34545
+HILDON_CFLAGS = @HILDON_CFLAGS@
34546
+HILDON_LIBS = @HILDON_LIBS@
34547
HTML_DIR = @HTML_DIR@
34548
+INSTALL = @INSTALL@
34549
INSTALL_DATA = @INSTALL_DATA@
34550
INSTALL_PROGRAM = @INSTALL_PROGRAM@
34551
INSTALL_SCRIPT = @INSTALL_SCRIPT@
34552
@@ -171,14 +136,12 @@
34553
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
34554
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
34555
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
34556
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
34557
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
34558
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
34559
INTLTOOL_MERGE = @INTLTOOL_MERGE@
34560
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
34561
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
34562
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
34563
INTLTOOL_PERL = @INTLTOOL_PERL@
34564
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
34565
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
34566
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
34567
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
34568
@@ -190,7 +153,6 @@
34569
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
34570
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
34571
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
34572
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
34573
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
34574
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
34575
LDFLAGS = @LDFLAGS@
34576
@@ -202,9 +164,8 @@
34577
LN_S = @LN_S@
34578
LTLIBOBJS = @LTLIBOBJS@
34579
MAINT = @MAINT@
34580
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
34581
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
34582
MAKEINFO = @MAKEINFO@
34583
+MKDIR_P = @MKDIR_P@
34584
MKINSTALLDIRS = @MKINSTALLDIRS@
34585
MSGFMT = @MSGFMT@
34586
MSGFMT_OPTS = @MSGFMT_OPTS@
34587
@@ -239,26 +200,14 @@
34588
VERSION = @VERSION@
34589
WARN_CFLAGS = @WARN_CFLAGS@
34590
WARN_CXXFLAGS = @WARN_CXXFLAGS@
34591
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
34592
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
34593
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
34594
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
34595
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
34596
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
34597
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
34598
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
34599
XGETTEXT = @XGETTEXT@
34600
-ac_ct_AR = @ac_ct_AR@
34601
+abs_builddir = @abs_builddir@
34602
+abs_srcdir = @abs_srcdir@
34603
+abs_top_builddir = @abs_top_builddir@
34604
+abs_top_srcdir = @abs_top_srcdir@
34605
ac_ct_CC = @ac_ct_CC@
34606
ac_ct_CXX = @ac_ct_CXX@
34607
ac_ct_F77 = @ac_ct_F77@
34608
-ac_ct_RANLIB = @ac_ct_RANLIB@
34609
-ac_ct_STRIP = @ac_ct_STRIP@
34610
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
34611
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
34612
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
34613
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
34614
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
34615
am__include = @am__include@
34616
am__leading_dot = @am__leading_dot@
34617
am__quote = @am__quote@
34618
@@ -270,28 +219,39 @@
34619
build_cpu = @build_cpu@
34620
build_os = @build_os@
34621
build_vendor = @build_vendor@
34622
+builddir = @builddir@
34623
datadir = @datadir@
34624
+datarootdir = @datarootdir@
34625
+docdir = @docdir@
34626
+dvidir = @dvidir@
34627
exec_prefix = @exec_prefix@
34628
host = @host@
34629
host_alias = @host_alias@
34630
host_cpu = @host_cpu@
34631
host_os = @host_os@
34632
host_vendor = @host_vendor@
34633
+htmldir = @htmldir@
34634
includedir = @includedir@
34635
infodir = @infodir@
34636
install_sh = @install_sh@
34637
libdir = @libdir@
34638
libexecdir = @libexecdir@
34639
+localedir = @localedir@
34640
localstatedir = @localstatedir@
34641
mandir = @mandir@
34642
mkdir_p = @mkdir_p@
34643
oldincludedir = @oldincludedir@
34644
+pdfdir = @pdfdir@
34645
prefix = @prefix@
34646
program_transform_name = @program_transform_name@
34647
+psdir = @psdir@
34648
sbindir = @sbindir@
34649
sharedstatedir = @sharedstatedir@
34650
+srcdir = @srcdir@
34651
sysconfdir = @sysconfdir@
34652
target_alias = @target_alias@
34653
+top_builddir = @top_builddir@
34654
+top_srcdir = @top_srcdir@
34655
themedir = $(datadir)/icons/hicolor
34656
size = 24x24
34657
context = apps
34658
@@ -342,13 +302,9 @@
34659
34660
clean-libtool:
34661
-rm -rf .libs _libs
34662
-
34663
-distclean-libtool:
34664
- -rm -f libtool
34665
-uninstall-info-am:
34666
install-iconsDATA: $(icons_DATA)
34667
@$(NORMAL_INSTALL)
34668
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
34669
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
34670
@list='$(icons_DATA)'; for p in $$list; do \
34671
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
34672
f=$(am__strip_dir) \
34673
@@ -371,22 +327,21 @@
34674
34675
34676
distdir: $(DISTFILES)
34677
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
34678
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
34679
- list='$(DISTFILES)'; for file in $$list; do \
34680
- case $$file in \
34681
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
34682
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
34683
- esac; \
34684
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34685
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
34686
+ list='$(DISTFILES)'; \
34687
+ dist_files=`for file in $$list; do echo $$file; done | \
34688
+ sed -e "s|^$$srcdirstrip/||;t" \
34689
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
34690
+ case $$dist_files in \
34691
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
34692
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
34693
+ sort -u` ;; \
34694
+ esac; \
34695
+ for file in $$dist_files; do \
34696
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
34697
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
34698
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
34699
- dir="/$$dir"; \
34700
- $(mkdir_p) "$(distdir)$$dir"; \
34701
- else \
34702
- dir=''; \
34703
- fi; \
34704
if test -d $$d/$$file; then \
34705
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
34706
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
34707
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
34708
fi; \
34709
@@ -402,7 +357,7 @@
34710
all-am: Makefile $(DATA)
34711
installdirs:
34712
for dir in "$(DESTDIR)$(iconsdir)"; do \
34713
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
34714
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
34715
done
34716
install: install-am
34717
install-exec: install-exec-am
34718
@@ -434,7 +389,7 @@
34719
34720
distclean: distclean-am
34721
-rm -f Makefile
34722
-distclean-am: clean-am distclean-generic distclean-libtool
34723
+distclean-am: clean-am distclean-generic
34724
34725
dvi: dvi-am
34726
34727
@@ -448,12 +403,20 @@
34728
34729
install-data-am: install-iconsDATA
34730
34731
+install-dvi: install-dvi-am
34732
+
34733
install-exec-am:
34734
34735
+install-html: install-html-am
34736
+
34737
install-info: install-info-am
34738
34739
install-man:
34740
34741
+install-pdf: install-pdf-am
34742
+
34743
+install-ps: install-ps-am
34744
+
34745
installcheck-am:
34746
34747
maintainer-clean: maintainer-clean-am
34748
@@ -472,17 +435,21 @@
34749
34750
ps-am:
34751
34752
-uninstall-am: uninstall-iconsDATA uninstall-info-am
34753
+uninstall-am: uninstall-iconsDATA
34754
+
34755
+.MAKE: install-am install-strip
34756
34757
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
34758
distclean distclean-generic distclean-libtool distdir dvi \
34759
dvi-am html html-am info info-am install install-am \
34760
- install-data install-data-am install-exec install-exec-am \
34761
+ install-data install-data-am install-dvi install-dvi-am \
34762
+ install-exec install-exec-am install-html install-html-am \
34763
install-iconsDATA install-info install-info-am install-man \
34764
+ install-pdf install-pdf-am install-ps install-ps-am \
34765
install-strip installcheck installcheck-am installdirs \
34766
maintainer-clean maintainer-clean-generic mostlyclean \
34767
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
34768
- uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
34769
+ uninstall uninstall-am uninstall-iconsDATA
34770
34771
# Tell versions [3.59,3.63) of GNU make to not export all variables.
34772
# Otherwise a system limit (for SysV at least) may be exceeded.
34773
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/24x24/Makefile.in evince-2.21.1.new/data/icons/24x24/Makefile.in
34774
--- evince-2.21.1/data/icons/24x24/Makefile.in 2007-12-03 22:58:22.000000000 +0100
34775
+++ evince-2.21.1.new/data/icons/24x24/Makefile.in 2007-12-05 00:07:24.000000000 +0100
34776
@@ -1,8 +1,8 @@
34777
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
34778
+# Makefile.in generated by automake 1.10 from Makefile.am.
34779
# @configure_input@
34780
34781
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
34782
-# 2003, 2004, 2005 Free Software Foundation, Inc.
34783
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
34784
# This Makefile.in is free software; the Free Software Foundation
34785
# gives unlimited permission to copy and/or distribute it,
34786
# with or without modifications, as long as this notice is preserved.
34787
@@ -13,15 +13,11 @@
34788
# PARTICULAR PURPOSE.
34789
34790
@SET_MAKE@
34791
-srcdir = @srcdir@
34792
-top_srcdir = @top_srcdir@
34793
VPATH = @srcdir@
34794
pkgdatadir = $(datadir)/@PACKAGE@
34795
pkglibdir = $(libdir)/@PACKAGE@
34796
pkgincludedir = $(includedir)/@PACKAGE@
34797
-top_builddir = ../../..
34798
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
34799
-INSTALL = @INSTALL@
34800
install_sh_DATA = $(install_sh) -c -m 644
34801
install_sh_PROGRAM = $(install_sh) -c
34802
install_sh_SCRIPT = $(install_sh) -c
34803
@@ -48,10 +44,13 @@
34804
DIST_SOURCES =
34805
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
34806
html-recursive info-recursive install-data-recursive \
34807
- install-exec-recursive install-info-recursive \
34808
- install-recursive installcheck-recursive installdirs-recursive \
34809
- pdf-recursive ps-recursive uninstall-info-recursive \
34810
- uninstall-recursive
34811
+ install-dvi-recursive install-exec-recursive \
34812
+ install-html-recursive install-info-recursive \
34813
+ install-pdf-recursive install-ps-recursive install-recursive \
34814
+ installcheck-recursive installdirs-recursive pdf-recursive \
34815
+ ps-recursive uninstall-recursive
34816
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
34817
+ distclean-recursive maintainer-clean-recursive
34818
ETAGS = etags
34819
CTAGS = ctags
34820
DIST_SUBDIRS = $(SUBDIRS)
34821
@@ -59,8 +58,6 @@
34822
ACLOCAL = @ACLOCAL@
34823
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
34824
ALL_LINGUAS = @ALL_LINGUAS@
34825
-AMDEP_FALSE = @AMDEP_FALSE@
34826
-AMDEP_TRUE = @AMDEP_TRUE@
34827
AMTAR = @AMTAR@
34828
AR = @AR@
34829
AUTOCONF = @AUTOCONF@
34830
@@ -89,8 +86,6 @@
34831
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
34832
DBUS_CFLAGS = @DBUS_CFLAGS@
34833
DBUS_LIBS = @DBUS_LIBS@
34834
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
34835
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
34836
DEFS = @DEFS@
34837
DEPDIR = @DEPDIR@
34838
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
34839
@@ -102,30 +97,6 @@
34840
ECHO_N = @ECHO_N@
34841
ECHO_T = @ECHO_T@
34842
EGREP = @EGREP@
34843
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
34844
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
34845
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
34846
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
34847
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
34848
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
34849
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
34850
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
34851
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
34852
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
34853
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
34854
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
34855
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
34856
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
34857
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
34858
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
34859
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
34860
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
34861
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
34862
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
34863
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
34864
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
34865
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
34866
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
34867
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
34868
EXEEXT = @EXEEXT@
34869
F77 = @F77@
34870
@@ -135,8 +106,6 @@
34871
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
34872
FRONTEND_LIBS = @FRONTEND_LIBS@
34873
GCONFTOOL = @GCONFTOOL@
34874
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
34875
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
34876
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
34877
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
34878
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
34879
@@ -150,16 +119,15 @@
34880
GNOME_LIBS = @GNOME_LIBS@
34881
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
34882
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
34883
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
34884
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
34885
+GREP = @GREP@
34886
+GTKDOC_CHECK = @GTKDOC_CHECK@
34887
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
34888
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
34889
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
34890
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
34891
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
34892
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
34893
HELP_DIR = @HELP_DIR@
34894
+HILDON_CFLAGS = @HILDON_CFLAGS@
34895
+HILDON_LIBS = @HILDON_LIBS@
34896
HTML_DIR = @HTML_DIR@
34897
+INSTALL = @INSTALL@
34898
INSTALL_DATA = @INSTALL_DATA@
34899
INSTALL_PROGRAM = @INSTALL_PROGRAM@
34900
INSTALL_SCRIPT = @INSTALL_SCRIPT@
34901
@@ -170,14 +138,12 @@
34902
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
34903
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
34904
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
34905
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
34906
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
34907
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
34908
INTLTOOL_MERGE = @INTLTOOL_MERGE@
34909
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
34910
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
34911
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
34912
INTLTOOL_PERL = @INTLTOOL_PERL@
34913
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
34914
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
34915
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
34916
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
34917
@@ -189,7 +155,6 @@
34918
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
34919
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
34920
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
34921
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
34922
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
34923
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
34924
LDFLAGS = @LDFLAGS@
34925
@@ -201,9 +166,8 @@
34926
LN_S = @LN_S@
34927
LTLIBOBJS = @LTLIBOBJS@
34928
MAINT = @MAINT@
34929
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
34930
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
34931
MAKEINFO = @MAKEINFO@
34932
+MKDIR_P = @MKDIR_P@
34933
MKINSTALLDIRS = @MKINSTALLDIRS@
34934
MSGFMT = @MSGFMT@
34935
MSGFMT_OPTS = @MSGFMT_OPTS@
34936
@@ -238,26 +202,14 @@
34937
VERSION = @VERSION@
34938
WARN_CFLAGS = @WARN_CFLAGS@
34939
WARN_CXXFLAGS = @WARN_CXXFLAGS@
34940
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
34941
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
34942
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
34943
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
34944
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
34945
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
34946
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
34947
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
34948
XGETTEXT = @XGETTEXT@
34949
-ac_ct_AR = @ac_ct_AR@
34950
+abs_builddir = @abs_builddir@
34951
+abs_srcdir = @abs_srcdir@
34952
+abs_top_builddir = @abs_top_builddir@
34953
+abs_top_srcdir = @abs_top_srcdir@
34954
ac_ct_CC = @ac_ct_CC@
34955
ac_ct_CXX = @ac_ct_CXX@
34956
ac_ct_F77 = @ac_ct_F77@
34957
-ac_ct_RANLIB = @ac_ct_RANLIB@
34958
-ac_ct_STRIP = @ac_ct_STRIP@
34959
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
34960
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
34961
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
34962
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
34963
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
34964
am__include = @am__include@
34965
am__leading_dot = @am__leading_dot@
34966
am__quote = @am__quote@
34967
@@ -269,28 +221,39 @@
34968
build_cpu = @build_cpu@
34969
build_os = @build_os@
34970
build_vendor = @build_vendor@
34971
+builddir = @builddir@
34972
datadir = @datadir@
34973
+datarootdir = @datarootdir@
34974
+docdir = @docdir@
34975
+dvidir = @dvidir@
34976
exec_prefix = @exec_prefix@
34977
host = @host@
34978
host_alias = @host_alias@
34979
host_cpu = @host_cpu@
34980
host_os = @host_os@
34981
host_vendor = @host_vendor@
34982
+htmldir = @htmldir@
34983
includedir = @includedir@
34984
infodir = @infodir@
34985
install_sh = @install_sh@
34986
libdir = @libdir@
34987
libexecdir = @libexecdir@
34988
+localedir = @localedir@
34989
localstatedir = @localstatedir@
34990
mandir = @mandir@
34991
mkdir_p = @mkdir_p@
34992
oldincludedir = @oldincludedir@
34993
+pdfdir = @pdfdir@
34994
prefix = @prefix@
34995
program_transform_name = @program_transform_name@
34996
+psdir = @psdir@
34997
sbindir = @sbindir@
34998
sharedstatedir = @sharedstatedir@
34999
+srcdir = @srcdir@
35000
sysconfdir = @sysconfdir@
35001
target_alias = @target_alias@
35002
+top_builddir = @top_builddir@
35003
+top_srcdir = @top_srcdir@
35004
SUBDIRS = actions apps
35005
all: all-recursive
35006
35007
@@ -331,10 +294,6 @@
35008
clean-libtool:
35009
-rm -rf .libs _libs
35010
35011
-distclean-libtool:
35012
- -rm -f libtool
35013
-uninstall-info-am:
35014
-
35015
# This directory's subdirectories are mostly independent; you can cd
35016
# into them and run `make' without going through this Makefile.
35017
# To change the values of `make' variables: instead of editing Makefiles,
35018
@@ -366,8 +325,7 @@
35019
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
35020
fi; test -z "$$fail"
35021
35022
-mostlyclean-recursive clean-recursive distclean-recursive \
35023
-maintainer-clean-recursive:
35024
+$(RECURSIVE_CLEAN_TARGETS):
35025
@failcom='exit 1'; \
35026
for f in x $$MAKEFLAGS; do \
35027
case $$f in \
35028
@@ -468,22 +426,21 @@
35029
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
35030
35031
distdir: $(DISTFILES)
35032
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
35033
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
35034
- list='$(DISTFILES)'; for file in $$list; do \
35035
- case $$file in \
35036
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
35037
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
35038
- esac; \
35039
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
35040
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
35041
+ list='$(DISTFILES)'; \
35042
+ dist_files=`for file in $$list; do echo $$file; done | \
35043
+ sed -e "s|^$$srcdirstrip/||;t" \
35044
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
35045
+ case $$dist_files in \
35046
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
35047
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
35048
+ sort -u` ;; \
35049
+ esac; \
35050
+ for file in $$dist_files; do \
35051
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
35052
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
35053
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
35054
- dir="/$$dir"; \
35055
- $(mkdir_p) "$(distdir)$$dir"; \
35056
- else \
35057
- dir=''; \
35058
- fi; \
35059
if test -d $$d/$$file; then \
35060
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
35061
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
35062
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
35063
fi; \
35064
@@ -497,7 +454,7 @@
35065
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
35066
if test "$$subdir" = .; then :; else \
35067
test -d "$(distdir)/$$subdir" \
35068
- || $(mkdir_p) "$(distdir)/$$subdir" \
35069
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
35070
|| exit 1; \
35071
distdir=`$(am__cd) $(distdir) && pwd`; \
35072
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
35073
@@ -505,6 +462,8 @@
35074
$(MAKE) $(AM_MAKEFLAGS) \
35075
top_distdir="$$top_distdir" \
35076
distdir="$$distdir/$$subdir" \
35077
+ am__remove_distdir=: \
35078
+ am__skip_length_check=: \
35079
distdir) \
35080
|| exit 1; \
35081
fi; \
35082
@@ -544,8 +503,7 @@
35083
35084
distclean: distclean-recursive
35085
-rm -f Makefile
35086
-distclean-am: clean-am distclean-generic distclean-libtool \
35087
- distclean-tags
35088
+distclean-am: clean-am distclean-generic distclean-tags
35089
35090
dvi: dvi-recursive
35091
35092
@@ -559,12 +517,20 @@
35093
35094
install-data-am:
35095
35096
+install-dvi: install-dvi-recursive
35097
+
35098
install-exec-am:
35099
35100
+install-html: install-html-recursive
35101
+
35102
install-info: install-info-recursive
35103
35104
install-man:
35105
35106
+install-pdf: install-pdf-recursive
35107
+
35108
+install-ps: install-ps-recursive
35109
+
35110
installcheck-am:
35111
35112
maintainer-clean: maintainer-clean-recursive
35113
@@ -583,22 +549,24 @@
35114
35115
ps-am:
35116
35117
-uninstall-am: uninstall-info-am
35118
+uninstall-am:
35119
35120
-uninstall-info: uninstall-info-recursive
35121
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
35122
+ install-strip
35123
35124
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
35125
- clean clean-generic clean-libtool clean-recursive ctags \
35126
- ctags-recursive distclean distclean-generic distclean-libtool \
35127
- distclean-recursive distclean-tags distdir dvi dvi-am html \
35128
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
35129
+ all all-am check check-am clean clean-generic clean-libtool \
35130
+ ctags ctags-recursive distclean distclean-generic \
35131
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
35132
html-am info info-am install install-am install-data \
35133
- install-data-am install-exec install-exec-am install-info \
35134
- install-info-am install-man install-strip installcheck \
35135
+ install-data-am install-dvi install-dvi-am install-exec \
35136
+ install-exec-am install-html install-html-am install-info \
35137
+ install-info-am install-man install-pdf install-pdf-am \
35138
+ install-ps install-ps-am install-strip installcheck \
35139
installcheck-am installdirs installdirs-am maintainer-clean \
35140
- maintainer-clean-generic maintainer-clean-recursive \
35141
- mostlyclean mostlyclean-generic mostlyclean-libtool \
35142
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
35143
- uninstall uninstall-am uninstall-info-am
35144
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
35145
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
35146
+ uninstall uninstall-am
35147
35148
# Tell versions [3.59,3.63) of GNU make to not export all variables.
35149
# Otherwise a system limit (for SysV at least) may be exceeded.
35150
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/32x32/actions/Makefile.in evince-2.21.1.new/data/icons/32x32/actions/Makefile.in
35151
--- evince-2.21.1/data/icons/32x32/actions/Makefile.in 2007-12-03 22:58:23.000000000 +0100
35152
+++ evince-2.21.1.new/data/icons/32x32/actions/Makefile.in 2007-12-05 00:07:24.000000000 +0100
35153
@@ -1,8 +1,8 @@
35154
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
35155
+# Makefile.in generated by automake 1.10 from Makefile.am.
35156
# @configure_input@
35157
35158
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
35159
-# 2003, 2004, 2005 Free Software Foundation, Inc.
35160
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
35161
# This Makefile.in is free software; the Free Software Foundation
35162
# gives unlimited permission to copy and/or distribute it,
35163
# with or without modifications, as long as this notice is preserved.
35164
@@ -14,15 +14,11 @@
35165
35166
@SET_MAKE@
35167
35168
-srcdir = @srcdir@
35169
-top_srcdir = @top_srcdir@
35170
VPATH = @srcdir@
35171
pkgdatadir = $(datadir)/@PACKAGE@
35172
pkglibdir = $(libdir)/@PACKAGE@
35173
pkgincludedir = $(includedir)/@PACKAGE@
35174
-top_builddir = ../../../..
35175
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
35176
-INSTALL = @INSTALL@
35177
install_sh_DATA = $(install_sh) -c -m 644
35178
install_sh_PROGRAM = $(install_sh) -c
35179
install_sh_SCRIPT = $(install_sh) -c
35180
@@ -60,8 +56,6 @@
35181
ACLOCAL = @ACLOCAL@
35182
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
35183
ALL_LINGUAS = @ALL_LINGUAS@
35184
-AMDEP_FALSE = @AMDEP_FALSE@
35185
-AMDEP_TRUE = @AMDEP_TRUE@
35186
AMTAR = @AMTAR@
35187
AR = @AR@
35188
AUTOCONF = @AUTOCONF@
35189
@@ -90,8 +84,6 @@
35190
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
35191
DBUS_CFLAGS = @DBUS_CFLAGS@
35192
DBUS_LIBS = @DBUS_LIBS@
35193
-DBUS_TOOL_NO_PREFIX_FALSE = @DBUS_TOOL_NO_PREFIX_FALSE@
35194
-DBUS_TOOL_NO_PREFIX_TRUE = @DBUS_TOOL_NO_PREFIX_TRUE@
35195
DEFS = @DEFS@
35196
DEPDIR = @DEPDIR@
35197
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
35198
@@ -103,30 +95,6 @@
35199
ECHO_N = @ECHO_N@
35200
ECHO_T = @ECHO_T@
35201
EGREP = @EGREP@
35202
-ENABLE_COMICS_FALSE = @ENABLE_COMICS_FALSE@
35203
-ENABLE_COMICS_TRUE = @ENABLE_COMICS_TRUE@
35204
-ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
35205
-ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
35206
-ENABLE_DJVU_FALSE = @ENABLE_DJVU_FALSE@
35207
-ENABLE_DJVU_TRUE = @ENABLE_DJVU_TRUE@
35208
-ENABLE_DVI_FALSE = @ENABLE_DVI_FALSE@
35209
-ENABLE_DVI_TRUE = @ENABLE_DVI_TRUE@
35210
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
35211
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
35212
-ENABLE_IMPRESS_FALSE = @ENABLE_IMPRESS_FALSE@
35213
-ENABLE_IMPRESS_TRUE = @ENABLE_IMPRESS_TRUE@
35214
-ENABLE_PDF_FALSE = @ENABLE_PDF_FALSE@
35215
-ENABLE_PDF_TRUE = @ENABLE_PDF_TRUE@
35216
-ENABLE_PIXBUF_FALSE = @ENABLE_PIXBUF_FALSE@
35217
-ENABLE_PIXBUF_TRUE = @ENABLE_PIXBUF_TRUE@
35218
-ENABLE_PS_FALSE = @ENABLE_PS_FALSE@
35219
-ENABLE_PS_TRUE = @ENABLE_PS_TRUE@
35220
-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
35221
-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
35222
-ENABLE_THUMBNAILER_FALSE = @ENABLE_THUMBNAILER_FALSE@
35223
-ENABLE_THUMBNAILER_TRUE = @ENABLE_THUMBNAILER_TRUE@
35224
-ENABLE_TIFF_FALSE = @ENABLE_TIFF_FALSE@
35225
-ENABLE_TIFF_TRUE = @ENABLE_TIFF_TRUE@
35226
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
35227
EXEEXT = @EXEEXT@
35228
F77 = @F77@
35229
@@ -136,8 +104,6 @@
35230
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
35231
FRONTEND_LIBS = @FRONTEND_LIBS@
35232
GCONFTOOL = @GCONFTOOL@
35233
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
35234
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
35235
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
35236
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
35237
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
35238
@@ -151,16 +117,15 @@
35239
GNOME_LIBS = @GNOME_LIBS@
35240
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
35241
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
35242
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
35243
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
35244
+GREP = @GREP@
35245
+GTKDOC_CHECK = @GTKDOC_CHECK@
35246
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
35247
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
35248
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
35249
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
35250
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
35251
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
35252
HELP_DIR = @HELP_DIR@
35253
+HILDON_CFLAGS = @HILDON_CFLAGS@
35254
+HILDON_LIBS = @HILDON_LIBS@
35255
HTML_DIR = @HTML_DIR@
35256
+INSTALL = @INSTALL@
35257
INSTALL_DATA = @INSTALL_DATA@
35258
INSTALL_PROGRAM = @INSTALL_PROGRAM@
35259
INSTALL_SCRIPT = @INSTALL_SCRIPT@
35260
@@ -171,14 +136,12 @@
35261
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
35262
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
35263
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
35264
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
35265
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
35266
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
35267
INTLTOOL_MERGE = @INTLTOOL_MERGE@
35268
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
35269
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
35270
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
35271
INTLTOOL_PERL = @INTLTOOL_PERL@
35272
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
35273
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
35274
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
35275
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
35276
@@ -190,7 +153,6 @@
35277
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
35278
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
35279
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
35280
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
35281
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
35282
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
35283
LDFLAGS = @LDFLAGS@
35284
@@ -202,9 +164,8 @@
35285
LN_S = @LN_S@
35286
LTLIBOBJS = @LTLIBOBJS@
35287
MAINT = @MAINT@
35288
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
35289
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
35290
MAKEINFO = @MAKEINFO@
35291
+MKDIR_P = @MKDIR_P@
35292
MKINSTALLDIRS = @MKINSTALLDIRS@
35293
MSGFMT = @MSGFMT@
35294
MSGFMT_OPTS = @MSGFMT_OPTS@
35295
@@ -239,26 +200,14 @@
35296
VERSION = @VERSION@
35297
WARN_CFLAGS = @WARN_CFLAGS@
35298
WARN_CXXFLAGS = @WARN_CXXFLAGS@
35299
-WITH_GNOME_FALSE = @WITH_GNOME_FALSE@
35300
-WITH_GNOME_PRINT_FALSE = @WITH_GNOME_PRINT_FALSE@
35301
-WITH_GNOME_PRINT_TRUE = @WITH_GNOME_PRINT_TRUE@
35302
-WITH_GNOME_TRUE = @WITH_GNOME_TRUE@
35303
-WITH_GTK_PRINT_FALSE = @WITH_GTK_PRINT_FALSE@
35304
-WITH_GTK_PRINT_TRUE = @WITH_GTK_PRINT_TRUE@
35305
-WITH_TYPE1_FONTS_FALSE = @WITH_TYPE1_FONTS_FALSE@
35306
-WITH_TYPE1_FONTS_TRUE = @WITH_TYPE1_FONTS_TRUE@
35307
XGETTEXT = @XGETTEXT@
35308
-ac_ct_AR = @ac_ct_AR@
35309
+abs_builddir = @abs_builddir@
35310
+abs_srcdir = @abs_srcdir@
35311
+abs_top_builddir = @abs_top_builddir@
35312
+abs_top_srcdir = @abs_top_srcdir@
35313
ac_ct_CC = @ac_ct_CC@
35314
ac_ct_CXX = @ac_ct_CXX@
35315
ac_ct_F77 = @ac_ct_F77@
35316
-ac_ct_RANLIB = @ac_ct_RANLIB@
35317
-ac_ct_STRIP = @ac_ct_STRIP@
35318
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
35319
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
35320
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
35321
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
35322
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
35323
am__include = @am__include@
35324
am__leading_dot = @am__leading_dot@
35325
am__quote = @am__quote@
35326
@@ -270,28 +219,39 @@
35477
35327
build_cpu = @build_cpu@
35478
35328
build_os = @build_os@
35479
35329
build_vendor = @build_vendor@
35513
35363
themedir = $(pkgdatadir)/icons/hicolor
35514
35364
size = 32x32
35515
35365
context = actions
35516
@@ -347,13 +305,9 @@
35366
@@ -343,13 +303,9 @@
35517
35367
35518
35368
clean-libtool:
35519
35369
-rm -rf .libs _libs
35528
35378
@list='$(icons_DATA)'; for p in $$list; do \
35529
35379
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
35530
35380
f=$(am__strip_dir) \
35531
@@ -376,22 +330,21 @@
35381
@@ -372,22 +328,21 @@
35532
35382
35533
35383
35534
35384
distdir: $(DISTFILES)
35564
35414
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
35565
35415
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
35566
35416
fi; \
35567
@@ -407,7 +360,7 @@
35417
@@ -403,7 +358,7 @@
35568
35418
all-am: Makefile $(DATA)
35569
35419
installdirs:
35570
35420
for dir in "$(DESTDIR)$(iconsdir)"; do \
35573
35423
done
35574
35424
install: install-am
35575
35425
install-exec: install-exec-am
35576
@@ -439,7 +392,7 @@
35426
@@ -435,7 +390,7 @@
35577
35427
35578
35428
distclean: distclean-am
35579
35429
-rm -f Makefile
35582
35432
35583
35433
dvi: dvi-am
35584
35434
35585
@@ -453,12 +406,20 @@
35435
@@ -449,12 +404,20 @@
35586
35436
35587
35437
install-data-am: install-iconsDATA
35588
35438
35603
35453
installcheck-am:
35604
35454
35605
35455
maintainer-clean: maintainer-clean-am
35606
@@ -477,17 +438,21 @@
35456
@@ -473,17 +436,21 @@
35607
35457
35608
35458
ps-am:
35609
35459
35628
35478
35629
35479
# Tell versions [3.59,3.63) of GNU make to not export all variables.
35630
35480
# Otherwise a system limit (for SysV at least) may be exceeded.
35631
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/32x32/Makefile.in evince-2.20.2.new/data/icons/32x32/Makefile.in
35632
--- evince-2.20.2/data/icons/32x32/Makefile.in 2007-11-26 22:55:53.000000000 +0100
35633
+++ evince-2.20.2.new/data/icons/32x32/Makefile.in 2007-11-27 22:51:54.000000000 +0100
35481
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/32x32/Makefile.in evince-2.21.1.new/data/icons/32x32/Makefile.in
35482
--- evince-2.21.1/data/icons/32x32/Makefile.in 2007-12-03 22:58:23.000000000 +0100
35483
+++ evince-2.21.1.new/data/icons/32x32/Makefile.in 2007-12-05 00:07:24.000000000 +0100
35634
35484
@@ -1,8 +1,8 @@
35635
35485
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
35636
35486
+# Makefile.in generated by automake 1.10 from Makefile.am.
35734
35584
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
35735
35585
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
35736
35586
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
35737
@@ -150,20 +119,17 @@
35587
@@ -150,16 +119,15 @@
35738
35588
GNOME_LIBS = @GNOME_LIBS@
35739
35589
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
35740
35590
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
35744
35594
+GTKDOC_CHECK = @GTKDOC_CHECK@
35745
35595
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
35746
35596
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
35747
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
35748
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
35749
35597
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
35750
35598
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
35751
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
35752
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
35753
35599
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
35754
35600
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
35755
35601
HELP_DIR = @HELP_DIR@
35760
35606
INSTALL_DATA = @INSTALL_DATA@
35761
35607
INSTALL_PROGRAM = @INSTALL_PROGRAM@
35762
35608
INSTALL_SCRIPT = @INSTALL_SCRIPT@
35763
@@ -174,14 +140,12 @@
35609
@@ -170,14 +138,12 @@
35764
35610
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
35765
35611
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
35766
35612
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
35776
35622
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
35777
35623
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
35778
35624
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
35779
@@ -193,7 +157,6 @@
35625
@@ -189,7 +155,6 @@
35780
35626
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
35781
35627
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
35782
35628
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
35784
35630
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
35785
35631
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
35786
35632
LDFLAGS = @LDFLAGS@
35787
@@ -205,9 +168,8 @@
35633
@@ -201,9 +166,8 @@
35788
35634
LN_S = @LN_S@
35789
35635
LTLIBOBJS = @LTLIBOBJS@
35790
35636
MAINT = @MAINT@
35795
35641
MKINSTALLDIRS = @MKINSTALLDIRS@
35796
35642
MSGFMT = @MSGFMT@
35797
35643
MSGFMT_OPTS = @MSGFMT_OPTS@
35798
@@ -242,26 +204,14 @@
35644
@@ -238,26 +202,14 @@
35799
35645
VERSION = @VERSION@
35800
35646
WARN_CFLAGS = @WARN_CFLAGS@
35801
35647
WARN_CXXFLAGS = @WARN_CXXFLAGS@
35826
35672
am__include = @am__include@
35827
35673
am__leading_dot = @am__leading_dot@
35828
35674
am__quote = @am__quote@
35829
@@ -273,28 +223,39 @@
35675
@@ -269,28 +221,39 @@
35830
35676
build_cpu = @build_cpu@
35831
35677
build_os = @build_os@
35832
35678
build_vendor = @build_vendor@
35866
35712
SUBDIRS = actions
35867
35713
all: all-recursive
35868
35714
35869
@@ -335,10 +296,6 @@
35715
@@ -331,10 +294,6 @@
35870
35716
clean-libtool:
35871
35717
-rm -rf .libs _libs
35872
35718
35877
35723
# This directory's subdirectories are mostly independent; you can cd
35878
35724
# into them and run `make' without going through this Makefile.
35879
35725
# To change the values of `make' variables: instead of editing Makefiles,
35880
@@ -370,8 +327,7 @@
35726
@@ -366,8 +325,7 @@
35881
35727
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
35882
35728
fi; test -z "$$fail"
35883
35729
35887
35733
@failcom='exit 1'; \
35888
35734
for f in x $$MAKEFLAGS; do \
35889
35735
case $$f in \
35890
@@ -472,22 +428,21 @@
35736
@@ -468,22 +426,21 @@
35891
35737
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
35892
35738
35893
35739
distdir: $(DISTFILES)
35923
35769
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
35924
35770
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
35925
35771
fi; \
35926
@@ -501,7 +456,7 @@
35772
@@ -497,7 +454,7 @@
35927
35773
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
35928
35774
if test "$$subdir" = .; then :; else \
35929
35775
test -d "$(distdir)/$$subdir" \
35932
35778
|| exit 1; \
35933
35779
distdir=`$(am__cd) $(distdir) && pwd`; \
35934
35780
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
35935
@@ -509,6 +464,8 @@
35781
@@ -505,6 +462,8 @@
35936
35782
$(MAKE) $(AM_MAKEFLAGS) \
35937
35783
top_distdir="$$top_distdir" \
35938
35784
distdir="$$distdir/$$subdir" \
35941
35787
distdir) \
35942
35788
|| exit 1; \
35943
35789
fi; \
35944
@@ -548,8 +505,7 @@
35790
@@ -544,8 +503,7 @@
35945
35791
35946
35792
distclean: distclean-recursive
35947
35793
-rm -f Makefile
35951
35797
35952
35798
dvi: dvi-recursive
35953
35799
35954
@@ -563,12 +519,20 @@
35800
@@ -559,12 +517,20 @@
35955
35801
35956
35802
install-data-am:
35957
35803
35972
35818
installcheck-am:
35973
35819
35974
35820
maintainer-clean: maintainer-clean-recursive
35975
@@ -587,22 +551,24 @@
35821
@@ -583,22 +549,24 @@
35976
35822
35977
35823
ps-am:
35978
35824
36009
35855
36010
35856
# Tell versions [3.59,3.63) of GNU make to not export all variables.
36011
35857
# Otherwise a system limit (for SysV at least) may be exceeded.
36012
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/48x48/actions/Makefile.in evince-2.20.2.new/data/icons/48x48/actions/Makefile.in
36013
--- evince-2.20.2/data/icons/48x48/actions/Makefile.in 2007-11-26 22:55:54.000000000 +0100
36014
+++ evince-2.20.2.new/data/icons/48x48/actions/Makefile.in 2007-11-27 22:51:54.000000000 +0100
35858
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/48x48/actions/Makefile.in evince-2.21.1.new/data/icons/48x48/actions/Makefile.in
35859
--- evince-2.21.1/data/icons/48x48/actions/Makefile.in 2007-12-03 22:58:24.000000000 +0100
35860
+++ evince-2.21.1.new/data/icons/48x48/actions/Makefile.in 2007-12-05 00:07:24.000000000 +0100
36015
35861
@@ -1,8 +1,8 @@
36016
35862
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
36017
35863
+# Makefile.in generated by automake 1.10 from Makefile.am.
36097
35943
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
36098
35944
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
36099
35945
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
36100
@@ -151,20 +117,17 @@
35946
@@ -151,16 +117,15 @@
36101
35947
GNOME_LIBS = @GNOME_LIBS@
36102
35948
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
36103
35949
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
36107
35953
+GTKDOC_CHECK = @GTKDOC_CHECK@
36108
35954
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
36109
35955
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
36110
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
36111
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
36112
35956
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
36113
35957
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
36114
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
36115
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
36116
35958
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
36117
35959
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
36118
35960
HELP_DIR = @HELP_DIR@
36123
35965
INSTALL_DATA = @INSTALL_DATA@
36124
35966
INSTALL_PROGRAM = @INSTALL_PROGRAM@
36125
35967
INSTALL_SCRIPT = @INSTALL_SCRIPT@
36126
@@ -175,14 +138,12 @@
35968
@@ -171,14 +136,12 @@
36127
35969
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
36128
35970
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
36129
35971
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
36139
35981
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
36140
35982
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
36141
35983
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
36142
@@ -194,7 +155,6 @@
35984
@@ -190,7 +153,6 @@
36143
35985
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
36144
35986
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
36145
35987
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
36147
35989
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
36148
35990
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
36149
35991
LDFLAGS = @LDFLAGS@
36150
@@ -206,9 +166,8 @@
35992
@@ -202,9 +164,8 @@
36151
35993
LN_S = @LN_S@
36152
35994
LTLIBOBJS = @LTLIBOBJS@
36153
35995
MAINT = @MAINT@
36158
36000
MKINSTALLDIRS = @MKINSTALLDIRS@
36159
36001
MSGFMT = @MSGFMT@
36160
36002
MSGFMT_OPTS = @MSGFMT_OPTS@
36161
@@ -243,26 +202,14 @@
36003
@@ -239,26 +200,14 @@
36162
36004
VERSION = @VERSION@
36163
36005
WARN_CFLAGS = @WARN_CFLAGS@
36164
36006
WARN_CXXFLAGS = @WARN_CXXFLAGS@
36189
36031
am__include = @am__include@
36190
36032
am__leading_dot = @am__leading_dot@
36191
36033
am__quote = @am__quote@
36192
@@ -274,28 +221,39 @@
36034
@@ -270,28 +219,39 @@
36193
36035
build_cpu = @build_cpu@
36194
36036
build_os = @build_os@
36195
36037
build_vendor = @build_vendor@
36229
36071
themedir = $(pkgdatadir)/icons/hicolor
36230
36072
size = 48x48
36231
36073
context = actions
36232
@@ -347,13 +305,9 @@
36074
@@ -343,13 +303,9 @@
36233
36075
36234
36076
clean-libtool:
36235
36077
-rm -rf .libs _libs
36244
36086
@list='$(icons_DATA)'; for p in $$list; do \
36245
36087
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
36246
36088
f=$(am__strip_dir) \
36247
@@ -376,22 +330,21 @@
36089
@@ -372,22 +328,21 @@
36248
36090
36249
36091
36250
36092
distdir: $(DISTFILES)
36280
36122
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
36281
36123
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
36282
36124
fi; \
36283
@@ -407,7 +360,7 @@
36125
@@ -403,7 +358,7 @@
36284
36126
all-am: Makefile $(DATA)
36285
36127
installdirs:
36286
36128
for dir in "$(DESTDIR)$(iconsdir)"; do \
36289
36131
done
36290
36132
install: install-am
36291
36133
install-exec: install-exec-am
36292
@@ -439,7 +392,7 @@
36134
@@ -435,7 +390,7 @@
36293
36135
36294
36136
distclean: distclean-am
36295
36137
-rm -f Makefile
36298
36140
36299
36141
dvi: dvi-am
36300
36142
36301
@@ -453,12 +406,20 @@
36143
@@ -449,12 +404,20 @@
36302
36144
36303
36145
install-data-am: install-iconsDATA
36304
36146
36319
36161
installcheck-am:
36320
36162
36321
36163
maintainer-clean: maintainer-clean-am
36322
@@ -477,17 +438,21 @@
36164
@@ -473,17 +436,21 @@
36323
36165
36324
36166
ps-am:
36325
36167
36344
36186
36345
36187
# Tell versions [3.59,3.63) of GNU make to not export all variables.
36346
36188
# Otherwise a system limit (for SysV at least) may be exceeded.
36347
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/48x48/apps/Makefile.in evince-2.20.2.new/data/icons/48x48/apps/Makefile.in
36348
--- evince-2.20.2/data/icons/48x48/apps/Makefile.in 2007-11-26 22:55:55.000000000 +0100
36349
+++ evince-2.20.2.new/data/icons/48x48/apps/Makefile.in 2007-11-27 22:51:54.000000000 +0100
36189
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/48x48/apps/Makefile.in evince-2.21.1.new/data/icons/48x48/apps/Makefile.in
36190
--- evince-2.21.1/data/icons/48x48/apps/Makefile.in 2007-12-03 22:58:24.000000000 +0100
36191
+++ evince-2.21.1.new/data/icons/48x48/apps/Makefile.in 2007-12-05 00:07:24.000000000 +0100
36350
36192
@@ -1,8 +1,8 @@
36351
36193
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
36352
36194
+# Makefile.in generated by automake 1.10 from Makefile.am.
36432
36274
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
36433
36275
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
36434
36276
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
36435
@@ -151,20 +117,17 @@
36277
@@ -151,16 +117,15 @@
36436
36278
GNOME_LIBS = @GNOME_LIBS@
36437
36279
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
36438
36280
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
36442
36284
+GTKDOC_CHECK = @GTKDOC_CHECK@
36443
36285
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
36444
36286
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
36445
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
36446
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
36447
36287
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
36448
36288
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
36449
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
36450
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
36451
36289
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
36452
36290
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
36453
36291
HELP_DIR = @HELP_DIR@
36458
36296
INSTALL_DATA = @INSTALL_DATA@
36459
36297
INSTALL_PROGRAM = @INSTALL_PROGRAM@
36460
36298
INSTALL_SCRIPT = @INSTALL_SCRIPT@
36461
@@ -175,14 +138,12 @@
36299
@@ -171,14 +136,12 @@
36462
36300
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
36463
36301
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
36464
36302
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
36474
36312
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
36475
36313
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
36476
36314
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
36477
@@ -194,7 +155,6 @@
36315
@@ -190,7 +153,6 @@
36478
36316
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
36479
36317
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
36480
36318
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
36482
36320
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
36483
36321
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
36484
36322
LDFLAGS = @LDFLAGS@
36485
@@ -206,9 +166,8 @@
36323
@@ -202,9 +164,8 @@
36486
36324
LN_S = @LN_S@
36487
36325
LTLIBOBJS = @LTLIBOBJS@
36488
36326
MAINT = @MAINT@
36493
36331
MKINSTALLDIRS = @MKINSTALLDIRS@
36494
36332
MSGFMT = @MSGFMT@
36495
36333
MSGFMT_OPTS = @MSGFMT_OPTS@
36496
@@ -243,26 +202,14 @@
36334
@@ -239,26 +200,14 @@
36497
36335
VERSION = @VERSION@
36498
36336
WARN_CFLAGS = @WARN_CFLAGS@
36499
36337
WARN_CXXFLAGS = @WARN_CXXFLAGS@
36524
36362
am__include = @am__include@
36525
36363
am__leading_dot = @am__leading_dot@
36526
36364
am__quote = @am__quote@
36527
@@ -274,28 +221,39 @@
36365
@@ -270,28 +219,39 @@
36528
36366
build_cpu = @build_cpu@
36529
36367
build_os = @build_os@
36530
36368
build_vendor = @build_vendor@
36564
36402
themedir = $(datadir)/icons/hicolor
36565
36403
size = 48x48
36566
36404
context = apps
36567
@@ -346,13 +304,9 @@
36405
@@ -342,13 +302,9 @@
36568
36406
36569
36407
clean-libtool:
36570
36408
-rm -rf .libs _libs
36579
36417
@list='$(icons_DATA)'; for p in $$list; do \
36580
36418
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
36581
36419
f=$(am__strip_dir) \
36582
@@ -375,22 +329,21 @@
36420
@@ -371,22 +327,21 @@
36583
36421
36584
36422
36585
36423
distdir: $(DISTFILES)
36615
36453
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
36616
36454
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
36617
36455
fi; \
36618
@@ -406,7 +359,7 @@
36456
@@ -402,7 +357,7 @@
36619
36457
all-am: Makefile $(DATA)
36620
36458
installdirs:
36621
36459
for dir in "$(DESTDIR)$(iconsdir)"; do \
36624
36462
done
36625
36463
install: install-am
36626
36464
install-exec: install-exec-am
36627
@@ -438,7 +391,7 @@
36465
@@ -434,7 +389,7 @@
36628
36466
36629
36467
distclean: distclean-am
36630
36468
-rm -f Makefile
36633
36471
36634
36472
dvi: dvi-am
36635
36473
36636
@@ -452,12 +405,20 @@
36474
@@ -448,12 +403,20 @@
36637
36475
36638
36476
install-data-am: install-iconsDATA
36639
36477
36654
36492
installcheck-am:
36655
36493
36656
36494
maintainer-clean: maintainer-clean-am
36657
@@ -476,17 +437,21 @@
36495
@@ -472,17 +435,21 @@
36658
36496
36659
36497
ps-am:
36660
36498
36679
36517
36680
36518
# Tell versions [3.59,3.63) of GNU make to not export all variables.
36681
36519
# Otherwise a system limit (for SysV at least) may be exceeded.
36682
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/48x48/Makefile.in evince-2.20.2.new/data/icons/48x48/Makefile.in
36683
--- evince-2.20.2/data/icons/48x48/Makefile.in 2007-11-26 22:55:54.000000000 +0100
36684
+++ evince-2.20.2.new/data/icons/48x48/Makefile.in 2007-11-27 22:51:54.000000000 +0100
36520
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/48x48/Makefile.in evince-2.21.1.new/data/icons/48x48/Makefile.in
36521
--- evince-2.21.1/data/icons/48x48/Makefile.in 2007-12-03 22:58:23.000000000 +0100
36522
+++ evince-2.21.1.new/data/icons/48x48/Makefile.in 2007-12-05 00:07:24.000000000 +0100
36685
36523
@@ -1,8 +1,8 @@
36686
36524
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
36687
36525
+# Makefile.in generated by automake 1.10 from Makefile.am.
36785
36623
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
36786
36624
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
36787
36625
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
36788
@@ -150,20 +119,17 @@
36626
@@ -150,16 +119,15 @@
36789
36627
GNOME_LIBS = @GNOME_LIBS@
36790
36628
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
36791
36629
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
36795
36633
+GTKDOC_CHECK = @GTKDOC_CHECK@
36796
36634
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
36797
36635
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
36798
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
36799
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
36800
36636
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
36801
36637
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
36802
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
36803
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
36804
36638
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
36805
36639
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
36806
36640
HELP_DIR = @HELP_DIR@
36811
36645
INSTALL_DATA = @INSTALL_DATA@
36812
36646
INSTALL_PROGRAM = @INSTALL_PROGRAM@
36813
36647
INSTALL_SCRIPT = @INSTALL_SCRIPT@
36814
@@ -174,14 +140,12 @@
36648
@@ -170,14 +138,12 @@
36815
36649
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
36816
36650
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
36817
36651
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
36827
36661
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
36828
36662
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
36829
36663
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
36830
@@ -193,7 +157,6 @@
36664
@@ -189,7 +155,6 @@
36831
36665
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
36832
36666
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
36833
36667
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
36835
36669
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
36836
36670
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
36837
36671
LDFLAGS = @LDFLAGS@
36838
@@ -205,9 +168,8 @@
36672
@@ -201,9 +166,8 @@
36839
36673
LN_S = @LN_S@
36840
36674
LTLIBOBJS = @LTLIBOBJS@
36841
36675
MAINT = @MAINT@
36846
36680
MKINSTALLDIRS = @MKINSTALLDIRS@
36847
36681
MSGFMT = @MSGFMT@
36848
36682
MSGFMT_OPTS = @MSGFMT_OPTS@
36849
@@ -242,26 +204,14 @@
36683
@@ -238,26 +202,14 @@
36850
36684
VERSION = @VERSION@
36851
36685
WARN_CFLAGS = @WARN_CFLAGS@
36852
36686
WARN_CXXFLAGS = @WARN_CXXFLAGS@
36877
36711
am__include = @am__include@
36878
36712
am__leading_dot = @am__leading_dot@
36879
36713
am__quote = @am__quote@
36880
@@ -273,28 +223,39 @@
36714
@@ -269,28 +221,39 @@
36881
36715
build_cpu = @build_cpu@
36882
36716
build_os = @build_os@
36883
36717
build_vendor = @build_vendor@
36917
36751
SUBDIRS = actions apps
36918
36752
all: all-recursive
36919
36753
36920
@@ -335,10 +296,6 @@
36754
@@ -331,10 +294,6 @@
36921
36755
clean-libtool:
36922
36756
-rm -rf .libs _libs
36923
36757
36928
36762
# This directory's subdirectories are mostly independent; you can cd
36929
36763
# into them and run `make' without going through this Makefile.
36930
36764
# To change the values of `make' variables: instead of editing Makefiles,
36931
@@ -370,8 +327,7 @@
36765
@@ -366,8 +325,7 @@
36932
36766
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
36933
36767
fi; test -z "$$fail"
36934
36768
36938
36772
@failcom='exit 1'; \
36939
36773
for f in x $$MAKEFLAGS; do \
36940
36774
case $$f in \
36941
@@ -472,22 +428,21 @@
36775
@@ -468,22 +426,21 @@
36942
36776
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
36943
36777
36944
36778
distdir: $(DISTFILES)
36974
36808
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
36975
36809
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
36976
36810
fi; \
36977
@@ -501,7 +456,7 @@
36811
@@ -497,7 +454,7 @@
36978
36812
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
36979
36813
if test "$$subdir" = .; then :; else \
36980
36814
test -d "$(distdir)/$$subdir" \
36983
36817
|| exit 1; \
36984
36818
distdir=`$(am__cd) $(distdir) && pwd`; \
36985
36819
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
36986
@@ -509,6 +464,8 @@
36820
@@ -505,6 +462,8 @@
36987
36821
$(MAKE) $(AM_MAKEFLAGS) \
36988
36822
top_distdir="$$top_distdir" \
36989
36823
distdir="$$distdir/$$subdir" \
36992
36826
distdir) \
36993
36827
|| exit 1; \
36994
36828
fi; \
36995
@@ -548,8 +505,7 @@
36829
@@ -544,8 +503,7 @@
36996
36830
36997
36831
distclean: distclean-recursive
36998
36832
-rm -f Makefile
37002
36836
37003
36837
dvi: dvi-recursive
37004
36838
37005
@@ -563,12 +519,20 @@
36839
@@ -559,12 +517,20 @@
37006
36840
37007
36841
install-data-am:
37008
36842
37023
36857
installcheck-am:
37024
36858
37025
36859
maintainer-clean: maintainer-clean-recursive
37026
@@ -587,22 +551,24 @@
36860
@@ -583,22 +549,24 @@
37027
36861
37028
36862
ps-am:
37029
36863
37060
36894
37061
36895
# Tell versions [3.59,3.63) of GNU make to not export all variables.
37062
36896
# Otherwise a system limit (for SysV at least) may be exceeded.
37063
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/Makefile.in evince-2.20.2.new/data/icons/Makefile.in
37064
--- evince-2.20.2/data/icons/Makefile.in 2007-11-26 22:55:55.000000000 +0100
37065
+++ evince-2.20.2.new/data/icons/Makefile.in 2007-11-27 22:51:54.000000000 +0100
36897
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/Makefile.in evince-2.21.1.new/data/icons/Makefile.in
36898
--- evince-2.21.1/data/icons/Makefile.in 2007-12-03 22:58:24.000000000 +0100
36899
+++ evince-2.21.1.new/data/icons/Makefile.in 2007-12-05 00:07:24.000000000 +0100
37066
36900
@@ -1,8 +1,8 @@
37067
36901
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
37068
36902
+# Makefile.in generated by automake 1.10 from Makefile.am.
37166
37000
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
37167
37001
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
37168
37002
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
37169
@@ -150,20 +119,17 @@
37003
@@ -150,16 +119,15 @@
37170
37004
GNOME_LIBS = @GNOME_LIBS@
37171
37005
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
37172
37006
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
37176
37010
+GTKDOC_CHECK = @GTKDOC_CHECK@
37177
37011
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
37178
37012
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
37179
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
37180
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
37181
37013
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
37182
37014
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
37183
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
37184
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
37185
37015
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
37186
37016
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
37187
37017
HELP_DIR = @HELP_DIR@
37192
37022
INSTALL_DATA = @INSTALL_DATA@
37193
37023
INSTALL_PROGRAM = @INSTALL_PROGRAM@
37194
37024
INSTALL_SCRIPT = @INSTALL_SCRIPT@
37195
@@ -174,14 +140,12 @@
37025
@@ -170,14 +138,12 @@
37196
37026
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
37197
37027
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
37198
37028
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
37208
37038
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
37209
37039
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
37210
37040
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
37211
@@ -193,7 +157,6 @@
37041
@@ -189,7 +155,6 @@
37212
37042
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
37213
37043
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
37214
37044
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
37216
37046
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
37217
37047
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
37218
37048
LDFLAGS = @LDFLAGS@
37219
@@ -205,9 +168,8 @@
37049
@@ -201,9 +166,8 @@
37220
37050
LN_S = @LN_S@
37221
37051
LTLIBOBJS = @LTLIBOBJS@
37222
37052
MAINT = @MAINT@
37227
37057
MKINSTALLDIRS = @MKINSTALLDIRS@
37228
37058
MSGFMT = @MSGFMT@
37229
37059
MSGFMT_OPTS = @MSGFMT_OPTS@
37230
@@ -242,26 +204,14 @@
37060
@@ -238,26 +202,14 @@
37231
37061
VERSION = @VERSION@
37232
37062
WARN_CFLAGS = @WARN_CFLAGS@
37233
37063
WARN_CXXFLAGS = @WARN_CXXFLAGS@
37258
37088
am__include = @am__include@
37259
37089
am__leading_dot = @am__leading_dot@
37260
37090
am__quote = @am__quote@
37261
@@ -273,28 +223,39 @@
37091
@@ -269,28 +221,39 @@
37262
37092
build_cpu = @build_cpu@
37263
37093
build_os = @build_os@
37264
37094
build_vendor = @build_vendor@
37298
37128
SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
37299
37129
all: all-recursive
37300
37130
37301
@@ -335,10 +296,6 @@
37131
@@ -331,10 +294,6 @@
37302
37132
clean-libtool:
37303
37133
-rm -rf .libs _libs
37304
37134
37309
37139
# This directory's subdirectories are mostly independent; you can cd
37310
37140
# into them and run `make' without going through this Makefile.
37311
37141
# To change the values of `make' variables: instead of editing Makefiles,
37312
@@ -370,8 +327,7 @@
37142
@@ -366,8 +325,7 @@
37313
37143
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
37314
37144
fi; test -z "$$fail"
37315
37145
37319
37149
@failcom='exit 1'; \
37320
37150
for f in x $$MAKEFLAGS; do \
37321
37151
case $$f in \
37322
@@ -472,22 +428,21 @@
37152
@@ -468,22 +426,21 @@
37323
37153
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
37324
37154
37325
37155
distdir: $(DISTFILES)
37355
37185
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
37356
37186
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
37357
37187
fi; \
37358
@@ -501,7 +456,7 @@
37188
@@ -497,7 +454,7 @@
37359
37189
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
37360
37190
if test "$$subdir" = .; then :; else \
37361
37191
test -d "$(distdir)/$$subdir" \
37364
37194
|| exit 1; \
37365
37195
distdir=`$(am__cd) $(distdir) && pwd`; \
37366
37196
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
37367
@@ -509,6 +464,8 @@
37197
@@ -505,6 +462,8 @@
37368
37198
$(MAKE) $(AM_MAKEFLAGS) \
37369
37199
top_distdir="$$top_distdir" \
37370
37200
distdir="$$distdir/$$subdir" \
37373
37203
distdir) \
37374
37204
|| exit 1; \
37375
37205
fi; \
37376
@@ -548,8 +505,7 @@
37206
@@ -544,8 +503,7 @@
37377
37207
37378
37208
distclean: distclean-recursive
37379
37209
-rm -f Makefile
37383
37213
37384
37214
dvi: dvi-recursive
37385
37215
37386
@@ -563,12 +519,20 @@
37216
@@ -559,12 +517,20 @@
37387
37217
37388
37218
install-data-am:
37389
37219
37404
37234
installcheck-am:
37405
37235
37406
37236
maintainer-clean: maintainer-clean-recursive
37407
@@ -587,22 +551,24 @@
37237
@@ -583,22 +549,24 @@
37408
37238
37409
37239
ps-am:
37410
37240
37441
37271
37442
37272
# Tell versions [3.59,3.63) of GNU make to not export all variables.
37443
37273
# Otherwise a system limit (for SysV at least) may be exceeded.
37444
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/scalable/apps/Makefile.in evince-2.20.2.new/data/icons/scalable/apps/Makefile.in
37445
--- evince-2.20.2/data/icons/scalable/apps/Makefile.in 2007-11-26 22:55:56.000000000 +0100
37446
+++ evince-2.20.2.new/data/icons/scalable/apps/Makefile.in 2007-11-27 22:51:54.000000000 +0100
37274
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/scalable/apps/Makefile.in evince-2.21.1.new/data/icons/scalable/apps/Makefile.in
37275
--- evince-2.21.1/data/icons/scalable/apps/Makefile.in 2007-12-03 22:58:25.000000000 +0100
37276
+++ evince-2.21.1.new/data/icons/scalable/apps/Makefile.in 2007-12-05 00:07:24.000000000 +0100
37447
37277
@@ -1,8 +1,8 @@
37448
37278
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
37449
37279
+# Makefile.in generated by automake 1.10 from Makefile.am.
37529
37359
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
37530
37360
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
37531
37361
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
37532
@@ -151,20 +117,17 @@
37362
@@ -151,16 +117,15 @@
37533
37363
GNOME_LIBS = @GNOME_LIBS@
37534
37364
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
37535
37365
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
37539
37369
+GTKDOC_CHECK = @GTKDOC_CHECK@
37540
37370
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
37541
37371
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
37542
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
37543
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
37544
37372
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
37545
37373
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
37546
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
37547
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
37548
37374
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
37549
37375
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
37550
37376
HELP_DIR = @HELP_DIR@
37555
37381
INSTALL_DATA = @INSTALL_DATA@
37556
37382
INSTALL_PROGRAM = @INSTALL_PROGRAM@
37557
37383
INSTALL_SCRIPT = @INSTALL_SCRIPT@
37558
@@ -175,14 +138,12 @@
37384
@@ -171,14 +136,12 @@
37559
37385
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
37560
37386
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
37561
37387
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
37571
37397
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
37572
37398
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
37573
37399
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
37574
@@ -194,7 +155,6 @@
37400
@@ -190,7 +153,6 @@
37575
37401
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
37576
37402
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
37577
37403
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
37579
37405
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
37580
37406
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
37581
37407
LDFLAGS = @LDFLAGS@
37582
@@ -206,9 +166,8 @@
37408
@@ -202,9 +164,8 @@
37583
37409
LN_S = @LN_S@
37584
37410
LTLIBOBJS = @LTLIBOBJS@
37585
37411
MAINT = @MAINT@
37590
37416
MKINSTALLDIRS = @MKINSTALLDIRS@
37591
37417
MSGFMT = @MSGFMT@
37592
37418
MSGFMT_OPTS = @MSGFMT_OPTS@
37593
@@ -243,26 +202,14 @@
37419
@@ -239,26 +200,14 @@
37594
37420
VERSION = @VERSION@
37595
37421
WARN_CFLAGS = @WARN_CFLAGS@
37596
37422
WARN_CXXFLAGS = @WARN_CXXFLAGS@
37621
37447
am__include = @am__include@
37622
37448
am__leading_dot = @am__leading_dot@
37623
37449
am__quote = @am__quote@
37624
@@ -274,28 +221,39 @@
37450
@@ -270,28 +219,39 @@
37625
37451
build_cpu = @build_cpu@
37626
37452
build_os = @build_os@
37627
37453
build_vendor = @build_vendor@
37661
37487
themedir = $(datadir)/icons/hicolor
37662
37488
size = scalable
37663
37489
context = apps
37664
@@ -346,13 +304,9 @@
37490
@@ -342,13 +302,9 @@
37665
37491
37666
37492
clean-libtool:
37667
37493
-rm -rf .libs _libs
37676
37502
@list='$(icons_DATA)'; for p in $$list; do \
37677
37503
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
37678
37504
f=$(am__strip_dir) \
37679
@@ -375,22 +329,21 @@
37505
@@ -371,22 +327,21 @@
37680
37506
37681
37507
37682
37508
distdir: $(DISTFILES)
37712
37538
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
37713
37539
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
37714
37540
fi; \
37715
@@ -406,7 +359,7 @@
37541
@@ -402,7 +357,7 @@
37716
37542
all-am: Makefile $(DATA)
37717
37543
installdirs:
37718
37544
for dir in "$(DESTDIR)$(iconsdir)"; do \
37721
37547
done
37722
37548
install: install-am
37723
37549
install-exec: install-exec-am
37724
@@ -438,7 +391,7 @@
37550
@@ -434,7 +389,7 @@
37725
37551
37726
37552
distclean: distclean-am
37727
37553
-rm -f Makefile
37730
37556
37731
37557
dvi: dvi-am
37732
37558
37733
@@ -452,12 +405,20 @@
37559
@@ -448,12 +403,20 @@
37734
37560
37735
37561
install-data-am: install-iconsDATA
37736
37562
37751
37577
installcheck-am:
37752
37578
37753
37579
maintainer-clean: maintainer-clean-am
37754
@@ -476,17 +437,21 @@
37580
@@ -472,17 +435,21 @@
37755
37581
37756
37582
ps-am:
37757
37583
37776
37602
37777
37603
# Tell versions [3.59,3.63) of GNU make to not export all variables.
37778
37604
# Otherwise a system limit (for SysV at least) may be exceeded.
37779
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/icons/scalable/Makefile.in evince-2.20.2.new/data/icons/scalable/Makefile.in
37780
--- evince-2.20.2/data/icons/scalable/Makefile.in 2007-11-26 22:55:55.000000000 +0100
37781
+++ evince-2.20.2.new/data/icons/scalable/Makefile.in 2007-11-27 22:51:54.000000000 +0100
37605
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/icons/scalable/Makefile.in evince-2.21.1.new/data/icons/scalable/Makefile.in
37606
--- evince-2.21.1/data/icons/scalable/Makefile.in 2007-12-03 22:58:25.000000000 +0100
37607
+++ evince-2.21.1.new/data/icons/scalable/Makefile.in 2007-12-05 00:07:24.000000000 +0100
37782
37608
@@ -1,8 +1,8 @@
37783
37609
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
37784
37610
+# Makefile.in generated by automake 1.10 from Makefile.am.
37882
37708
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
37883
37709
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
37884
37710
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
37885
@@ -150,20 +119,17 @@
37711
@@ -150,16 +119,15 @@
37886
37712
GNOME_LIBS = @GNOME_LIBS@
37887
37713
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
37888
37714
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
37892
37718
+GTKDOC_CHECK = @GTKDOC_CHECK@
37893
37719
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
37894
37720
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
37895
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
37896
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
37897
37721
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
37898
37722
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
37899
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
37900
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
37901
37723
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
37902
37724
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
37903
37725
HELP_DIR = @HELP_DIR@
37908
37730
INSTALL_DATA = @INSTALL_DATA@
37909
37731
INSTALL_PROGRAM = @INSTALL_PROGRAM@
37910
37732
INSTALL_SCRIPT = @INSTALL_SCRIPT@
37911
@@ -174,14 +140,12 @@
37733
@@ -170,14 +138,12 @@
37912
37734
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
37913
37735
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
37914
37736
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
37924
37746
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
37925
37747
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
37926
37748
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
37927
@@ -193,7 +157,6 @@
37749
@@ -189,7 +155,6 @@
37928
37750
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
37929
37751
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
37930
37752
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
37932
37754
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
37933
37755
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
37934
37756
LDFLAGS = @LDFLAGS@
37935
@@ -205,9 +168,8 @@
37757
@@ -201,9 +166,8 @@
37936
37758
LN_S = @LN_S@
37937
37759
LTLIBOBJS = @LTLIBOBJS@
37938
37760
MAINT = @MAINT@
37943
37765
MKINSTALLDIRS = @MKINSTALLDIRS@
37944
37766
MSGFMT = @MSGFMT@
37945
37767
MSGFMT_OPTS = @MSGFMT_OPTS@
37946
@@ -242,26 +204,14 @@
37768
@@ -238,26 +202,14 @@
37947
37769
VERSION = @VERSION@
37948
37770
WARN_CFLAGS = @WARN_CFLAGS@
37949
37771
WARN_CXXFLAGS = @WARN_CXXFLAGS@
37974
37796
am__include = @am__include@
37975
37797
am__leading_dot = @am__leading_dot@
37976
37798
am__quote = @am__quote@
37977
@@ -273,28 +223,39 @@
37799
@@ -269,28 +221,39 @@
37978
37800
build_cpu = @build_cpu@
37979
37801
build_os = @build_os@
37980
37802
build_vendor = @build_vendor@
38014
37836
SUBDIRS = apps
38015
37837
all: all-recursive
38016
37838
38017
@@ -335,10 +296,6 @@
37839
@@ -331,10 +294,6 @@
38018
37840
clean-libtool:
38019
37841
-rm -rf .libs _libs
38020
37842
38025
37847
# This directory's subdirectories are mostly independent; you can cd
38026
37848
# into them and run `make' without going through this Makefile.
38027
37849
# To change the values of `make' variables: instead of editing Makefiles,
38028
@@ -370,8 +327,7 @@
37850
@@ -366,8 +325,7 @@
38029
37851
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
38030
37852
fi; test -z "$$fail"
38031
37853
38035
37857
@failcom='exit 1'; \
38036
37858
for f in x $$MAKEFLAGS; do \
38037
37859
case $$f in \
38038
@@ -472,22 +428,21 @@
37860
@@ -468,22 +426,21 @@
38039
37861
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
38040
37862
38041
37863
distdir: $(DISTFILES)
38071
37893
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
38072
37894
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
38073
37895
fi; \
38074
@@ -501,7 +456,7 @@
37896
@@ -497,7 +454,7 @@
38075
37897
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
38076
37898
if test "$$subdir" = .; then :; else \
38077
37899
test -d "$(distdir)/$$subdir" \
38080
37902
|| exit 1; \
38081
37903
distdir=`$(am__cd) $(distdir) && pwd`; \
38082
37904
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
38083
@@ -509,6 +464,8 @@
37905
@@ -505,6 +462,8 @@
38084
37906
$(MAKE) $(AM_MAKEFLAGS) \
38085
37907
top_distdir="$$top_distdir" \
38086
37908
distdir="$$distdir/$$subdir" \
38089
37911
distdir) \
38090
37912
|| exit 1; \
38091
37913
fi; \
38092
@@ -548,8 +505,7 @@
37914
@@ -544,8 +503,7 @@
38093
37915
38094
37916
distclean: distclean-recursive
38095
37917
-rm -f Makefile
38099
37921
38100
37922
dvi: dvi-recursive
38101
37923
38102
@@ -563,12 +519,20 @@
37924
@@ -559,12 +517,20 @@
38103
37925
38104
37926
install-data-am:
38105
37927
38120
37942
installcheck-am:
38121
37943
38122
37944
maintainer-clean: maintainer-clean-recursive
38123
@@ -587,22 +551,24 @@
37945
@@ -583,22 +549,24 @@
38124
37946
38125
37947
ps-am:
38126
37948
38157
37979
38158
37980
# Tell versions [3.59,3.63) of GNU make to not export all variables.
38159
37981
# Otherwise a system limit (for SysV at least) may be exceeded.
38160
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/data/Makefile.in evince-2.20.2.new/data/Makefile.in
38161
--- evince-2.20.2/data/Makefile.in 2007-11-26 22:55:50.000000000 +0100
38162
+++ evince-2.20.2.new/data/Makefile.in 2007-11-27 22:51:54.000000000 +0100
37982
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/data/Makefile.in evince-2.21.1.new/data/Makefile.in
37983
--- evince-2.21.1/data/Makefile.in 2007-12-03 22:58:20.000000000 +0100
37984
+++ evince-2.21.1.new/data/Makefile.in 2007-12-05 00:07:24.000000000 +0100
38163
37985
@@ -1,8 +1,8 @@
38164
37986
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
38165
37987
+# Makefile.in generated by automake 1.10 from Makefile.am.
38282
38104
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
38283
38105
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
38284
38106
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
38285
@@ -169,20 +141,17 @@
38107
@@ -169,16 +141,15 @@
38286
38108
GNOME_LIBS = @GNOME_LIBS@
38287
38109
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
38288
38110
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
38292
38114
+GTKDOC_CHECK = @GTKDOC_CHECK@
38293
38115
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
38294
38116
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
38295
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
38296
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
38297
38117
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
38298
38118
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
38299
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
38300
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
38301
38119
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
38302
38120
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
38303
38121
HELP_DIR = @HELP_DIR@
38308
38126
INSTALL_DATA = @INSTALL_DATA@
38309
38127
INSTALL_PROGRAM = @INSTALL_PROGRAM@
38310
38128
INSTALL_SCRIPT = @INSTALL_SCRIPT@
38311
@@ -193,14 +162,12 @@
38129
@@ -189,14 +160,12 @@
38312
38130
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
38313
38131
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
38314
38132
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
38324
38142
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
38325
38143
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
38326
38144
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
38327
@@ -212,7 +179,6 @@
38145
@@ -208,7 +177,6 @@
38328
38146
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
38329
38147
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
38330
38148
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
38332
38150
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
38333
38151
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
38334
38152
LDFLAGS = @LDFLAGS@
38335
@@ -224,9 +190,8 @@
38153
@@ -220,9 +188,8 @@
38336
38154
LN_S = @LN_S@
38337
38155
LTLIBOBJS = @LTLIBOBJS@
38338
38156
MAINT = @MAINT@
38343
38161
MKINSTALLDIRS = @MKINSTALLDIRS@
38344
38162
MSGFMT = @MSGFMT@
38345
38163
MSGFMT_OPTS = @MSGFMT_OPTS@
38346
@@ -261,26 +226,14 @@
38164
@@ -257,26 +224,14 @@
38347
38165
VERSION = @VERSION@
38348
38166
WARN_CFLAGS = @WARN_CFLAGS@
38349
38167
WARN_CXXFLAGS = @WARN_CXXFLAGS@
38374
38192
am__include = @am__include@
38375
38193
am__leading_dot = @am__leading_dot@
38376
38194
am__quote = @am__quote@
38377
@@ -292,28 +245,39 @@
38195
@@ -288,28 +243,39 @@
38378
38196
build_cpu = @build_cpu@
38379
38197
build_os = @build_os@
38380
38198
build_vendor = @build_vendor@
38414
38232
SUBDIRS = icons
38415
38233
NULL =
38416
38234
38417
@@ -326,11 +290,17 @@
38235
@@ -322,11 +288,17 @@
38418
38236
# UI descriptions
38419
38237
#
38420
38238
uidir = $(pkgdatadir)
38437
38255
38438
38256
38439
38257
#
38440
@@ -343,9 +313,15 @@
38258
@@ -339,9 +311,15 @@
38441
38259
$(NULL)
38442
38260
38443
38261
DESKTOP_IN_FILES = evince.desktop.in.in
38454
38272
schema_in_files = evince.schemas.in
38455
38273
schemadir = $(GCONF_SCHEMA_FILE_DIR)
38456
38274
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
38457
@@ -364,6 +340,7 @@
38275
@@ -360,6 +338,7 @@
38458
38276
$(DESKTOP_IN_FILES) \
38459
38277
$(schema_in_files) \
38460
38278
$(man_MANS) \
38462
38280
$(NULL)
38463
38281
38464
38282
38465
@@ -414,13 +391,9 @@
38283
@@ -410,13 +389,9 @@
38466
38284
38467
38285
clean-libtool:
38468
38286
-rm -rf .libs _libs
38477
38295
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
38478
38296
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
38479
38297
for i in $$l2; do \
38480
@@ -463,9 +436,26 @@
38298
@@ -459,9 +434,26 @@
38481
38299
echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
38482
38300
rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
38483
38301
done
38505
38323
@list='$(desktop_DATA)'; for p in $$list; do \
38506
38324
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
38507
38325
f=$(am__strip_dir) \
38508
@@ -482,7 +472,7 @@
38326
@@ -478,7 +470,7 @@
38509
38327
done
38510
38328
install-gladeDATA: $(glade_DATA)
38511
38329
@$(NORMAL_INSTALL)
38514
38332
@list='$(glade_DATA)'; for p in $$list; do \
38515
38333
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
38516
38334
f=$(am__strip_dir) \
38517
@@ -499,7 +489,7 @@
38335
@@ -495,7 +487,7 @@
38518
38336
done
38519
38337
install-schemaDATA: $(schema_DATA)
38520
38338
@$(NORMAL_INSTALL)
38523
38341
@list='$(schema_DATA)'; for p in $$list; do \
38524
38342
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
38525
38343
f=$(am__strip_dir) \
38526
@@ -516,7 +506,7 @@
38344
@@ -512,7 +504,7 @@
38527
38345
done
38528
38346
install-uiDATA: $(ui_DATA)
38529
38347
@$(NORMAL_INSTALL)
38532
38350
@list='$(ui_DATA)'; for p in $$list; do \
38533
38351
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
38534
38352
f=$(am__strip_dir) \
38535
@@ -563,8 +553,7 @@
38353
@@ -559,8 +551,7 @@
38536
38354
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
38537
38355
fi; test -z "$$fail"
38538
38356
38542
38360
@failcom='exit 1'; \
38543
38361
for f in x $$MAKEFLAGS; do \
38544
38362
case $$f in \
38545
@@ -665,22 +654,21 @@
38363
@@ -661,22 +652,21 @@
38546
38364
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
38547
38365
38548
38366
distdir: $(DISTFILES)
38578
38396
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
38579
38397
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
38580
38398
fi; \
38581
@@ -694,7 +682,7 @@
38399
@@ -690,7 +680,7 @@
38582
38400
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
38583
38401
if test "$$subdir" = .; then :; else \
38584
38402
test -d "$(distdir)/$$subdir" \
38587
38405
|| exit 1; \
38588
38406
distdir=`$(am__cd) $(distdir) && pwd`; \
38589
38407
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
38590
@@ -702,6 +690,8 @@
38408
@@ -698,6 +688,8 @@
38591
38409
$(MAKE) $(AM_MAKEFLAGS) \
38592
38410
top_distdir="$$top_distdir" \
38593
38411
distdir="$$distdir/$$subdir" \
38596
38414
distdir) \
38597
38415
|| exit 1; \
38598
38416
fi; \
38599
@@ -711,8 +701,8 @@
38417
@@ -707,8 +699,8 @@
38600
38418
all-am: Makefile $(MANS) $(DATA)
38601
38419
installdirs: installdirs-recursive
38602
38420
installdirs-am:
38607
38425
done
38608
38426
install: install-recursive
38609
38427
install-exec: install-exec-recursive
38610
@@ -745,8 +735,7 @@
38428
@@ -741,8 +733,7 @@
38611
38429
38612
38430
distclean: distclean-recursive
38613
38431
-rm -f Makefile
38617
38435
38618
38436
dvi: dvi-recursive
38619
38437
38620
@@ -758,18 +747,26 @@
38438
@@ -754,18 +745,26 @@
38621
38439
38622
38440
info-am:
38623
38441
38647
38465
installcheck-am:
38648
38466
38649
38467
maintainer-clean: maintainer-clean-recursive
38650
@@ -788,33 +785,36 @@
38468
@@ -784,33 +783,36 @@
38651
38469
38652
38470
ps-am:
38653
38471
38701
38519
38702
38520
38703
38521
install-data-local: install-schemas update-icon-cache
38704
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/help/Makefile.in evince-2.20.2.new/help/Makefile.in
38705
--- evince-2.20.2/help/Makefile.in 2007-11-26 22:55:56.000000000 +0100
38706
+++ evince-2.20.2.new/help/Makefile.in 2007-11-27 22:51:54.000000000 +0100
38522
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/help/Makefile.in evince-2.21.1.new/help/Makefile.in
38523
--- evince-2.21.1/help/Makefile.in 2007-12-03 22:58:26.000000000 +0100
38524
+++ evince-2.21.1.new/help/Makefile.in 2007-12-05 00:07:24.000000000 +0100
38707
38525
@@ -1,8 +1,8 @@
38708
38526
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
38709
38527
+# Makefile.in generated by automake 1.10 from Makefile.am.
38807
38625
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
38808
38626
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
38809
38627
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
38810
@@ -175,20 +144,17 @@
38628
@@ -175,16 +144,15 @@
38811
38629
GNOME_LIBS = @GNOME_LIBS@
38812
38630
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
38813
38631
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
38817
38635
+GTKDOC_CHECK = @GTKDOC_CHECK@
38818
38636
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
38819
38637
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
38820
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
38821
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
38822
38638
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
38823
38639
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
38824
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
38825
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
38826
38640
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
38827
38641
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
38828
38642
HELP_DIR = @HELP_DIR@
38833
38647
INSTALL_DATA = @INSTALL_DATA@
38834
38648
INSTALL_PROGRAM = @INSTALL_PROGRAM@
38835
38649
INSTALL_SCRIPT = @INSTALL_SCRIPT@
38836
@@ -199,14 +165,12 @@
38650
@@ -195,14 +163,12 @@
38837
38651
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
38838
38652
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
38839
38653
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
38849
38663
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
38850
38664
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
38851
38665
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
38852
@@ -218,7 +182,6 @@
38666
@@ -214,7 +180,6 @@
38853
38667
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
38854
38668
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
38855
38669
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
38857
38671
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
38858
38672
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
38859
38673
LDFLAGS = @LDFLAGS@
38860
@@ -230,9 +193,8 @@
38674
@@ -226,9 +191,8 @@
38861
38675
LN_S = @LN_S@
38862
38676
LTLIBOBJS = @LTLIBOBJS@
38863
38677
MAINT = @MAINT@
38868
38682
MKINSTALLDIRS = @MKINSTALLDIRS@
38869
38683
MSGFMT = @MSGFMT@
38870
38684
MSGFMT_OPTS = @MSGFMT_OPTS@
38871
@@ -267,26 +229,14 @@
38685
@@ -263,26 +227,14 @@
38872
38686
VERSION = @VERSION@
38873
38687
WARN_CFLAGS = @WARN_CFLAGS@
38874
38688
WARN_CXXFLAGS = @WARN_CXXFLAGS@
38899
38713
am__include = @am__include@
38900
38714
am__leading_dot = @am__leading_dot@
38901
38715
am__quote = @am__quote@
38902
@@ -298,28 +248,39 @@
38716
@@ -294,28 +246,39 @@
38903
38717
build_cpu = @build_cpu@
38904
38718
build_os = @build_os@
38905
38719
build_vendor = @build_vendor@
38939
38753
SUBDIRS = reference
38940
38754
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
38941
38755
_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
38942
@@ -466,10 +427,6 @@
38756
@@ -462,10 +425,6 @@
38943
38757
clean-libtool:
38944
38758
-rm -rf .libs _libs
38945
38759
38950
38764
# This directory's subdirectories are mostly independent; you can cd
38951
38765
# into them and run `make' without going through this Makefile.
38952
38766
# To change the values of `make' variables: instead of editing Makefiles,
38953
@@ -501,8 +458,7 @@
38767
@@ -497,8 +456,7 @@
38954
38768
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
38955
38769
fi; test -z "$$fail"
38956
38770
38960
38774
@failcom='exit 1'; \
38961
38775
for f in x $$MAKEFLAGS; do \
38962
38776
case $$f in \
38963
@@ -603,23 +559,21 @@
38777
@@ -599,23 +557,21 @@
38964
38778
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
38965
38779
38966
38780
distdir: $(DISTFILES)
38997
38811
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
38998
38812
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
38999
38813
fi; \
39000
@@ -633,7 +587,7 @@
38814
@@ -629,7 +585,7 @@
39001
38815
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
39002
38816
if test "$$subdir" = .; then :; else \
39003
38817
test -d "$(distdir)/$$subdir" \
39006
38820
|| exit 1; \
39007
38821
distdir=`$(am__cd) $(distdir) && pwd`; \
39008
38822
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
39009
@@ -641,6 +595,8 @@
38823
@@ -637,6 +593,8 @@
39010
38824
$(MAKE) $(AM_MAKEFLAGS) \
39011
38825
top_distdir="$$top_distdir" \
39012
38826
distdir="$$distdir/$$subdir" \
39015
38829
distdir) \
39016
38830
|| exit 1; \
39017
38831
fi; \
39018
@@ -683,8 +639,8 @@
38832
@@ -679,8 +637,8 @@
39019
38833
39020
38834
distclean: distclean-recursive
39021
38835
-rm -f Makefile
39026
38840
39027
38841
dvi: dvi-recursive
39028
38842
39029
@@ -698,12 +654,20 @@
38843
@@ -694,12 +652,20 @@
39030
38844
39031
38845
install-data-am: install-data-local
39032
38846
39047
38861
installcheck-am:
39048
38862
39049
38863
maintainer-clean: maintainer-clean-recursive
39050
@@ -724,24 +688,26 @@
38864
@@ -720,24 +686,26 @@
39051
38865
39052
38866
ps-am:
39053
38867
39087
38901
39088
38902
39089
38903
DOC_H_FILE ?=
39090
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/help/reference/Makefile.in evince-2.20.2.new/help/reference/Makefile.in
39091
--- evince-2.20.2/help/reference/Makefile.in 2007-11-26 22:55:57.000000000 +0100
39092
+++ evince-2.20.2.new/help/reference/Makefile.in 2007-11-27 22:51:54.000000000 +0100
38904
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/help/reference/Makefile.in evince-2.21.1.new/help/reference/Makefile.in
38905
--- evince-2.21.1/help/reference/Makefile.in 2007-12-03 23:10:12.000000000 +0100
38906
+++ evince-2.21.1.new/help/reference/Makefile.in 2007-12-05 00:07:24.000000000 +0100
39093
38907
@@ -1,8 +1,8 @@
39094
38908
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
39095
38909
+# Makefile.in generated by automake 1.10 from Makefile.am.
39117
38931
install_sh_DATA = $(install_sh) -c -m 644
39118
38932
install_sh_PROGRAM = $(install_sh) -c
39119
38933
install_sh_SCRIPT = $(install_sh) -c
39120
@@ -62,8 +58,6 @@
38934
@@ -60,8 +56,6 @@
39121
38935
ACLOCAL = @ACLOCAL@
39122
38936
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
39123
38937
ALL_LINGUAS = @ALL_LINGUAS@
39126
38940
AMTAR = @AMTAR@
39127
38941
AR = @AR@
39128
38942
AUTOCONF = @AUTOCONF@
39129
@@ -92,8 +86,6 @@
38943
@@ -90,8 +84,6 @@
39130
38944
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
39131
38945
DBUS_CFLAGS = @DBUS_CFLAGS@
39132
38946
DBUS_LIBS = @DBUS_LIBS@
39135
38949
DEFS = @DEFS@
39136
38950
DEPDIR = @DEPDIR@
39137
38951
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
39138
@@ -105,30 +97,6 @@
38952
@@ -103,30 +95,6 @@
39139
38953
ECHO_N = @ECHO_N@
39140
38954
ECHO_T = @ECHO_T@
39141
38955
EGREP = @EGREP@
39166
38980
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
39167
38981
EXEEXT = @EXEEXT@
39168
38982
F77 = @F77@
39169
@@ -138,8 +106,6 @@
38983
@@ -136,8 +104,6 @@
39170
38984
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
39171
38985
FRONTEND_LIBS = @FRONTEND_LIBS@
39172
38986
GCONFTOOL = @GCONFTOOL@
39175
38989
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
39176
38990
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
39177
38991
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
39178
@@ -153,20 +119,17 @@
38992
@@ -151,16 +117,15 @@
39179
38993
GNOME_LIBS = @GNOME_LIBS@
39180
38994
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
39181
38995
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
39185
38999
+GTKDOC_CHECK = @GTKDOC_CHECK@
39186
39000
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
39187
39001
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
39188
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
39189
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
39190
39002
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
39191
39003
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
39192
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
39193
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
39194
39004
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
39195
39005
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
39196
39006
HELP_DIR = @HELP_DIR@
39201
39011
INSTALL_DATA = @INSTALL_DATA@
39202
39012
INSTALL_PROGRAM = @INSTALL_PROGRAM@
39203
39013
INSTALL_SCRIPT = @INSTALL_SCRIPT@
39204
@@ -177,14 +140,12 @@
39014
@@ -171,14 +136,12 @@
39205
39015
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
39206
39016
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
39207
39017
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
39217
39027
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
39218
39028
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
39219
39029
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
39220
@@ -196,7 +157,6 @@
39030
@@ -190,7 +153,6 @@
39221
39031
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
39222
39032
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
39223
39033
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
39225
39035
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
39226
39036
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
39227
39037
LDFLAGS = @LDFLAGS@
39228
@@ -208,9 +168,8 @@
39038
@@ -202,9 +164,8 @@
39229
39039
LN_S = @LN_S@
39230
39040
LTLIBOBJS = @LTLIBOBJS@
39231
39041
MAINT = @MAINT@
39236
39046
MKINSTALLDIRS = @MKINSTALLDIRS@
39237
39047
MSGFMT = @MSGFMT@
39238
39048
MSGFMT_OPTS = @MSGFMT_OPTS@
39239
@@ -245,26 +204,14 @@
39049
@@ -239,26 +200,14 @@
39240
39050
VERSION = @VERSION@
39241
39051
WARN_CFLAGS = @WARN_CFLAGS@
39242
39052
WARN_CXXFLAGS = @WARN_CXXFLAGS@
39267
39077
am__include = @am__include@
39268
39078
am__leading_dot = @am__leading_dot@
39269
39079
am__quote = @am__quote@
39270
@@ -276,28 +223,39 @@
39080
@@ -270,28 +219,39 @@
39271
39081
build_cpu = @build_cpu@
39272
39082
build_os = @build_os@
39273
39083
build_vendor = @build_vendor@
39307
39117
39308
39118
# We require automake 1.6 at least.
39309
39119
AUTOMAKE_OPTIONS = 1.6
39310
@@ -469,10 +427,6 @@
39120
@@ -463,10 +423,6 @@
39311
39121
39312
39122
clean-libtool:
39313
39123
-rm -rf .libs _libs
39318
39128
tags: TAGS
39319
39129
TAGS:
39320
39130
39321
@@ -481,23 +435,21 @@
39131
@@ -475,23 +431,21 @@
39322
39132
39323
39133
39324
39134
distdir: $(DISTFILES)
39355
39165
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
39356
39166
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
39357
39167
fi; \
39358
@@ -546,7 +498,7 @@
39168
@@ -540,7 +494,7 @@
39359
39169
39360
39170
distclean: distclean-am
39361
39171
-rm -f Makefile
39364
39174
39365
39175
dvi: dvi-am
39366
39176
39367
@@ -560,12 +512,20 @@
39177
@@ -554,12 +508,20 @@
39368
39178
39369
39179
install-data-am: install-data-local
39370
39180
39385
39195
installcheck-am:
39386
39196
39387
39197
maintainer-clean: maintainer-clean-am
39388
@@ -585,19 +545,22 @@
39198
@@ -579,19 +541,22 @@
39389
39199
39390
39200
ps-am:
39391
39201
39416
39226
39417
39227
39418
39228
@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
39419
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/intltool-extract.in evince-2.20.2.new/intltool-extract.in
39420
--- evince-2.20.2/intltool-extract.in 2007-11-26 22:55:07.000000000 +0100
39421
+++ evince-2.20.2.new/intltool-extract.in 2007-11-27 22:51:58.000000000 +0100
39229
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/intltool-extract.in evince-2.21.1.new/intltool-extract.in
39230
--- evince-2.21.1/intltool-extract.in 2007-12-03 22:57:39.000000000 +0100
39231
+++ evince-2.21.1.new/intltool-extract.in 2007-12-05 00:07:29.000000000 +0100
39422
39232
@@ -32,7 +32,7 @@
39423
39233
## Release information
39424
39234
my $PROGRAM = "intltool-extract";
39439
39249
39440
39250
return $_;
39441
39251
}
39442
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/intltool-merge.in evince-2.20.2.new/intltool-merge.in
39443
--- evince-2.20.2/intltool-merge.in 2007-11-26 22:55:07.000000000 +0100
39444
+++ evince-2.20.2.new/intltool-merge.in 2007-11-27 22:51:58.000000000 +0100
39252
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/intltool-merge.in evince-2.21.1.new/intltool-merge.in
39253
--- evince-2.21.1/intltool-merge.in 2007-12-03 22:57:39.000000000 +0100
39254
+++ evince-2.21.1.new/intltool-merge.in 2007-12-05 00:07:29.000000000 +0100
39445
39255
@@ -35,7 +35,7 @@
39446
39256
## Release information
39447
39257
my $PROGRAM = "intltool-merge";
39541
39351
39542
39352
return $_;
39543
39353
}
39544
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/intltool-update.in evince-2.20.2.new/intltool-update.in
39545
--- evince-2.20.2/intltool-update.in 2007-11-26 22:55:07.000000000 +0100
39546
+++ evince-2.20.2.new/intltool-update.in 2007-11-27 22:51:58.000000000 +0100
39354
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/intltool-update.in evince-2.21.1.new/intltool-update.in
39355
--- evince-2.21.1/intltool-update.in 2007-12-03 22:57:39.000000000 +0100
39356
+++ evince-2.21.1.new/intltool-update.in 2007-12-05 00:07:29.000000000 +0100
39547
39357
@@ -30,7 +30,7 @@
39548
39358
39549
39359
## Release information
39774
39584
}
39775
39585
else
39776
39586
{
39777
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/libdocument/Makefile.in evince-2.20.2.new/libdocument/Makefile.in
39778
--- evince-2.20.2/libdocument/Makefile.in 2007-11-26 22:55:57.000000000 +0100
39779
+++ evince-2.20.2.new/libdocument/Makefile.in 2007-11-27 22:51:54.000000000 +0100
39587
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/libdocument/Makefile.in evince-2.21.1.new/libdocument/Makefile.in
39588
--- evince-2.21.1/libdocument/Makefile.in 2007-12-03 22:58:27.000000000 +0100
39589
+++ evince-2.21.1.new/libdocument/Makefile.in 2007-12-05 00:07:24.000000000 +0100
39780
39590
@@ -1,8 +1,8 @@
39781
39591
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
39782
39592
+# Makefile.in generated by automake 1.10 from Makefile.am.
39913
39723
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
39914
39724
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
39915
39725
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
39916
@@ -210,20 +164,17 @@
39726
@@ -210,16 +164,15 @@
39917
39727
GNOME_LIBS = @GNOME_LIBS@
39918
39728
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
39919
39729
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
39923
39733
+GTKDOC_CHECK = @GTKDOC_CHECK@
39924
39734
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
39925
39735
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
39926
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
39927
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
39928
39736
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
39929
39737
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
39930
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
39931
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
39932
39738
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
39933
39739
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
39934
39740
HELP_DIR = @HELP_DIR@
39939
39745
INSTALL_DATA = @INSTALL_DATA@
39940
39746
INSTALL_PROGRAM = @INSTALL_PROGRAM@
39941
39747
INSTALL_SCRIPT = @INSTALL_SCRIPT@
39942
@@ -234,14 +185,12 @@
39748
@@ -230,14 +183,12 @@
39943
39749
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
39944
39750
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
39945
39751
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
39955
39761
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
39956
39762
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
39957
39763
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
39958
@@ -253,7 +202,6 @@
39764
@@ -249,7 +200,6 @@
39959
39765
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
39960
39766
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
39961
39767
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
39963
39769
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
39964
39770
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
39965
39771
LDFLAGS = @LDFLAGS@
39966
@@ -265,9 +213,8 @@
39772
@@ -261,9 +211,8 @@
39967
39773
LN_S = @LN_S@
39968
39774
LTLIBOBJS = @LTLIBOBJS@
39969
39775
MAINT = @MAINT@
39974
39780
MKINSTALLDIRS = @MKINSTALLDIRS@
39975
39781
MSGFMT = @MSGFMT@
39976
39782
MSGFMT_OPTS = @MSGFMT_OPTS@
39977
@@ -302,26 +249,14 @@
39783
@@ -298,26 +247,14 @@
39978
39784
VERSION = @VERSION@
39979
39785
WARN_CFLAGS = @WARN_CFLAGS@
39980
39786
WARN_CXXFLAGS = @WARN_CXXFLAGS@
40005
39811
am__include = @am__include@
40006
39812
am__leading_dot = @am__leading_dot@
40007
39813
am__quote = @am__quote@
40008
@@ -333,28 +268,39 @@
39814
@@ -329,28 +266,39 @@
40009
39815
build_cpu = @build_cpu@
40010
39816
build_os = @build_os@
40011
39817
build_vendor = @build_vendor@
40045
39851
INCLUDES = \
40046
39852
-DEVINCE_UIDIR=\"$(pkgdatadir)\" \
40047
39853
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
40048
@@ -477,7 +423,7 @@
39854
@@ -473,7 +421,7 @@
40049
39855
rm -f "$${dir}/so_locations"; \
40050
39856
done
40051
39857
libevbackend.la: $(libevbackend_la_OBJECTS) $(libevbackend_la_DEPENDENCIES)
40054
39860
40055
39861
mostlyclean-compile:
40056
39862
-rm -f *.$(OBJEXT)
40057
@@ -510,22 +456,22 @@
39863
@@ -506,22 +454,22 @@
40058
39864
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ev-selection.Plo@am__quote@
40059
39865
40060
39866
.c.o:
40083
39889
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
40084
39890
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
40085
39891
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
40086
@@ -536,10 +482,6 @@
39892
@@ -532,10 +480,6 @@
40087
39893
clean-libtool:
40088
39894
-rm -rf .libs _libs
40089
39895
40094
39900
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
40095
39901
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
40096
39902
unique=`for i in $$list; do \
40097
@@ -589,22 +531,21 @@
39903
@@ -585,22 +529,21 @@
40098
39904
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
40099
39905
40100
39906
distdir: $(DISTFILES)
40130
39936
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
40131
39937
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
40132
39938
fi; \
40133
@@ -656,7 +597,7 @@
39939
@@ -652,7 +595,7 @@
40134
39940
-rm -rf ./$(DEPDIR)
40135
39941
-rm -f Makefile
40136
39942
distclean-am: clean-am distclean-compile distclean-generic \
40139
39945
40140
39946
dvi: dvi-am
40141
39947
40142
@@ -670,12 +611,20 @@
39948
@@ -666,12 +609,20 @@
40143
39949
40144
39950
install-data-am:
40145
39951
40160
39966
installcheck-am:
40161
39967
40162
39968
maintainer-clean: maintainer-clean-am
40163
@@ -696,19 +645,22 @@
39969
@@ -692,19 +643,22 @@
40164
39970
40165
39971
ps-am:
40166
39972
40188
39994
40189
39995
40190
39996
ev-backend-marshalers.h: ev-backend-marshalers.list
40191
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/Makefile.in evince-2.20.2.new/Makefile.in
40192
--- evince-2.20.2/Makefile.in 2007-11-26 22:55:59.000000000 +0100
40193
+++ evince-2.20.2.new/Makefile.in 2007-11-27 22:51:54.000000000 +0100
39997
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/Makefile.in evince-2.21.1.new/Makefile.in
39998
--- evince-2.21.1/Makefile.in 2007-12-03 22:58:29.000000000 +0100
39999
+++ evince-2.21.1.new/Makefile.in 2007-12-05 00:07:24.000000000 +0100
40194
40000
@@ -1,8 +1,8 @@
40195
40001
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
40196
40002
+# Makefile.in generated by automake 1.10 from Makefile.am.
40315
40121
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
40316
40122
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
40317
40123
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
40318
@@ -167,20 +136,17 @@
40124
@@ -167,16 +136,15 @@
40319
40125
GNOME_LIBS = @GNOME_LIBS@
40320
40126
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
40321
40127
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
40325
40131
+GTKDOC_CHECK = @GTKDOC_CHECK@
40326
40132
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
40327
40133
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
40328
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
40329
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
40330
40134
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
40331
40135
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
40332
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
40333
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
40334
40136
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
40335
40137
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
40336
40138
HELP_DIR = @HELP_DIR@
40341
40143
INSTALL_DATA = @INSTALL_DATA@
40342
40144
INSTALL_PROGRAM = @INSTALL_PROGRAM@
40343
40145
INSTALL_SCRIPT = @INSTALL_SCRIPT@
40344
@@ -191,14 +157,12 @@
40146
@@ -187,14 +155,12 @@
40345
40147
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
40346
40148
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
40347
40149
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
40357
40159
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
40358
40160
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
40359
40161
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
40360
@@ -210,7 +174,6 @@
40162
@@ -206,7 +172,6 @@
40361
40163
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
40362
40164
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
40363
40165
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
40365
40167
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
40366
40168
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
40367
40169
LDFLAGS = @LDFLAGS@
40368
@@ -222,9 +185,8 @@
40170
@@ -218,9 +183,8 @@
40369
40171
LN_S = @LN_S@
40370
40172
LTLIBOBJS = @LTLIBOBJS@
40371
40173
MAINT = @MAINT@
40376
40178
MKINSTALLDIRS = @MKINSTALLDIRS@
40377
40179
MSGFMT = @MSGFMT@
40378
40180
MSGFMT_OPTS = @MSGFMT_OPTS@
40379
@@ -259,26 +221,14 @@
40181
@@ -255,26 +219,14 @@
40380
40182
VERSION = @VERSION@
40381
40183
WARN_CFLAGS = @WARN_CFLAGS@
40382
40184
WARN_CXXFLAGS = @WARN_CXXFLAGS@
40407
40209
am__include = @am__include@
40408
40210
am__leading_dot = @am__leading_dot@
40409
40211
am__quote = @am__quote@
40410
@@ -290,28 +240,39 @@
40212
@@ -286,28 +238,39 @@
40411
40213
build_cpu = @build_cpu@
40412
40214
build_os = @build_os@
40413
40215
build_vendor = @build_vendor@
40447
40249
SUBDIRS = cut-n-paste data backend libdocument properties shell po \
40448
40250
help test $(am__append_1)
40449
40251
40450
@@ -369,7 +330,7 @@
40252
@@ -365,7 +328,7 @@
40451
40253
config.h: stamp-h1
40452
40254
@if test ! -f $@; then \
40453
40255
rm -f stamp-h1; \
40456
40258
else :; fi
40457
40259
40458
40260
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
40459
@@ -391,7 +352,6 @@
40261
@@ -387,7 +350,6 @@
40460
40262
40461
40263
distclean-libtool:
40462
40264
-rm -f libtool
40464
40266
40465
40267
# This directory's subdirectories are mostly independent; you can cd
40466
40268
# into them and run `make' without going through this Makefile.
40467
@@ -424,8 +384,7 @@
40269
@@ -420,8 +382,7 @@
40468
40270
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
40469
40271
fi; test -z "$$fail"
40470
40272
40474
40276
@failcom='exit 1'; \
40475
40277
for f in x $$MAKEFLAGS; do \
40476
40278
case $$f in \
40477
@@ -527,24 +486,22 @@
40279
@@ -523,24 +484,22 @@
40478
40280
40479
40281
distdir: $(DISTFILES)
40480
40282
$(am__remove_distdir)
40513
40315
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
40514
40316
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
40515
40317
fi; \
40516
@@ -558,7 +515,7 @@
40318
@@ -554,7 +513,7 @@
40517
40319
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
40518
40320
if test "$$subdir" = .; then :; else \
40519
40321
test -d "$(distdir)/$$subdir" \
40522
40324
|| exit 1; \
40523
40325
distdir=`$(am__cd) $(distdir) && pwd`; \
40524
40326
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
40525
@@ -566,6 +523,8 @@
40327
@@ -562,6 +521,8 @@
40526
40328
$(MAKE) $(AM_MAKEFLAGS) \
40527
40329
top_distdir="$$top_distdir" \
40528
40330
distdir="$$distdir/$$subdir" \
40531
40333
distdir) \
40532
40334
|| exit 1; \
40533
40335
fi; \
40534
@@ -573,7 +532,7 @@
40336
@@ -569,7 +530,7 @@
40535
40337
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
40536
40338
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
40537
40339
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
40540
40342
|| chmod -R a+r $(distdir)
40541
40343
dist-gzip: distdir
40542
40344
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
40543
@@ -647,7 +606,7 @@
40345
@@ -643,7 +604,7 @@
40544
40346
$(am__remove_distdir)
40545
40347
@(echo "$(distdir) archives ready for distribution: "; \
40546
40348
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
40549
40351
distuninstallcheck:
40550
40352
@cd $(distuninstallcheck_dir) \
40551
40353
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
40552
@@ -718,12 +677,20 @@
40354
@@ -714,12 +675,20 @@
40553
40355
40554
40356
install-data-am:
40555
40357
40570
40372
installcheck-am:
40571
40373
40572
40374
maintainer-clean: maintainer-clean-recursive
40573
@@ -744,24 +711,26 @@
40375
@@ -740,24 +709,26 @@
40574
40376
40575
40377
ps-am:
40576
40378
40612
40414
40613
40415
# Tell versions [3.59,3.63) of GNU make to not export all variables.
40614
40416
# Otherwise a system limit (for SysV at least) may be exceeded.
40615
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/po/Makefile.in.in evince-2.20.2.new/po/Makefile.in.in
40616
--- evince-2.20.2/po/Makefile.in.in 2007-11-26 22:55:07.000000000 +0100
40617
+++ evince-2.20.2.new/po/Makefile.in.in 2007-11-27 22:51:58.000000000 +0100
40417
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/po/Makefile.in.in evince-2.21.1.new/po/Makefile.in.in
40418
--- evince-2.21.1/po/Makefile.in.in 2007-12-03 22:57:39.000000000 +0100
40419
+++ evince-2.21.1.new/po/Makefile.in.in 2007-12-05 00:07:29.000000000 +0100
40618
40420
@@ -133,7 +133,7 @@
40619
40421
dvi info tags TAGS ID:
40620
40422
40624
40426
40625
40427
uninstall:
40626
40428
linguas="$(USE_LINGUAS)"; \
40627
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/properties/Makefile.in evince-2.20.2.new/properties/Makefile.in
40628
--- evince-2.20.2/properties/Makefile.in 2007-11-26 22:55:57.000000000 +0100
40629
+++ evince-2.20.2.new/properties/Makefile.in 2007-11-27 22:51:54.000000000 +0100
40429
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/properties/Makefile.in evince-2.21.1.new/properties/Makefile.in
40430
--- evince-2.21.1/properties/Makefile.in 2007-12-03 22:58:27.000000000 +0100
40431
+++ evince-2.21.1.new/properties/Makefile.in 2007-12-05 00:07:24.000000000 +0100
40630
40432
@@ -1,8 +1,8 @@
40631
40433
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
40632
40434
+# Makefile.in generated by automake 1.10 from Makefile.am.
40746
40548
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
40747
40549
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
40748
40550
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
40749
@@ -185,20 +156,17 @@
40551
@@ -185,16 +156,15 @@
40750
40552
GNOME_LIBS = @GNOME_LIBS@
40751
40553
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
40752
40554
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
40756
40558
+GTKDOC_CHECK = @GTKDOC_CHECK@
40757
40559
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
40758
40560
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
40759
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
40760
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
40761
40561
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
40762
40562
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
40763
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
40764
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
40765
40563
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
40766
40564
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
40767
40565
HELP_DIR = @HELP_DIR@
40772
40570
INSTALL_DATA = @INSTALL_DATA@
40773
40571
INSTALL_PROGRAM = @INSTALL_PROGRAM@
40774
40572
INSTALL_SCRIPT = @INSTALL_SCRIPT@
40775
@@ -209,14 +177,12 @@
40573
@@ -205,14 +175,12 @@
40776
40574
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
40777
40575
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
40778
40576
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
40788
40586
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
40789
40587
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
40790
40588
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
40791
@@ -228,7 +194,6 @@
40589
@@ -224,7 +192,6 @@
40792
40590
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
40793
40591
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
40794
40592
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
40796
40594
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
40797
40595
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
40798
40596
LDFLAGS = @LDFLAGS@
40799
@@ -240,9 +205,8 @@
40597
@@ -236,9 +203,8 @@
40800
40598
LN_S = @LN_S@
40801
40599
LTLIBOBJS = @LTLIBOBJS@
40802
40600
MAINT = @MAINT@
40807
40605
MKINSTALLDIRS = @MKINSTALLDIRS@
40808
40606
MSGFMT = @MSGFMT@
40809
40607
MSGFMT_OPTS = @MSGFMT_OPTS@
40810
@@ -277,26 +241,14 @@
40608
@@ -273,26 +239,14 @@
40811
40609
VERSION = @VERSION@
40812
40610
WARN_CFLAGS = @WARN_CFLAGS@
40813
40611
WARN_CXXFLAGS = @WARN_CXXFLAGS@
40838
40636
am__include = @am__include@
40839
40637
am__leading_dot = @am__leading_dot@
40840
40638
am__quote = @am__quote@
40841
@@ -308,28 +260,39 @@
40639
@@ -304,28 +258,39 @@
40842
40640
build_cpu = @build_cpu@
40843
40641
build_os = @build_os@
40844
40642
build_vendor = @build_vendor@
40878
40676
INCLUDES = \
40879
40677
-DDATADIR=\"$(pkgdatadir)\" \
40880
40678
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
40881
@@ -392,7 +355,7 @@
40679
@@ -388,7 +353,7 @@
40882
40680
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
40883
40681
install-nautilusLTLIBRARIES: $(nautilus_LTLIBRARIES)
40884
40682
@$(NORMAL_INSTALL)
40887
40685
@list='$(nautilus_LTLIBRARIES)'; for p in $$list; do \
40888
40686
if test -f $$p; then \
40889
40687
f=$(am__strip_dir) \
40890
@@ -403,7 +366,7 @@
40688
@@ -399,7 +364,7 @@
40891
40689
40892
40690
uninstall-nautilusLTLIBRARIES:
40893
40691
@$(NORMAL_UNINSTALL)
40896
40694
p=$(am__strip_dir) \
40897
40695
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nautilusdir)/$$p'"; \
40898
40696
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nautilusdir)/$$p"; \
40899
@@ -427,9 +390,9 @@
40697
@@ -423,9 +388,9 @@
40900
40698
rm -f "$${dir}/so_locations"; \
40901
40699
done
40902
40700
libevince-properties-page.la: $(libevince_properties_page_la_OBJECTS) $(libevince_properties_page_la_DEPENDENCIES)
40908
40706
40909
40707
mostlyclean-compile:
40910
40708
-rm -f *.$(OBJEXT)
40911
@@ -441,32 +404,32 @@
40709
@@ -437,32 +402,32 @@
40912
40710
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libevince_properties_page_la-ev-properties-main.Plo@am__quote@
40913
40711
40914
40712
.c.o:
40950
40748
40951
40749
mostlyclean-libtool:
40952
40750
-rm -f *.lo
40953
@@ -474,10 +437,6 @@
40751
@@ -470,10 +435,6 @@
40954
40752
clean-libtool:
40955
40753
-rm -rf .libs _libs
40956
40754
40961
40759
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
40962
40760
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
40963
40761
unique=`for i in $$list; do \
40964
@@ -527,22 +486,21 @@
40762
@@ -523,22 +484,21 @@
40965
40763
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
40966
40764
40967
40765
distdir: $(DISTFILES)
40997
40795
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
40998
40796
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
40999
40797
fi; \
41000
@@ -558,7 +516,7 @@
40798
@@ -554,7 +514,7 @@
41001
40799
all-am: Makefile $(LTLIBRARIES)
41002
40800
installdirs:
41003
40801
for dir in "$(DESTDIR)$(nautilusdir)"; do \
41006
40804
done
41007
40805
install: install-am
41008
40806
install-exec: install-exec-am
41009
@@ -593,7 +551,7 @@
40807
@@ -589,7 +549,7 @@
41010
40808
-rm -rf ./$(DEPDIR)
41011
40809
-rm -f Makefile
41012
40810
distclean-am: clean-am distclean-compile distclean-generic \
41015
40813
41016
40814
dvi: dvi-am
41017
40815
41018
@@ -607,12 +565,20 @@
40816
@@ -603,12 +563,20 @@
41019
40817
41020
40818
install-data-am: install-nautilusLTLIBRARIES
41021
40819
41036
40834
installcheck-am:
41037
40835
41038
40836
maintainer-clean: maintainer-clean-am
41039
@@ -633,21 +599,24 @@
40837
@@ -629,21 +597,24 @@
41040
40838
41041
40839
ps-am:
41042
40840
41066
40864
41067
40865
# Tell versions [3.59,3.63) of GNU make to not export all variables.
41068
40866
# Otherwise a system limit (for SysV at least) may be exceeded.
41069
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/shell/Makefile.in evince-2.20.2.new/shell/Makefile.in
41070
--- evince-2.20.2/shell/Makefile.in 2007-11-26 22:55:58.000000000 +0100
41071
+++ evince-2.20.2.new/shell/Makefile.in 2007-11-27 22:51:54.000000000 +0100
40867
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/shell/Makefile.in evince-2.21.1.new/shell/Makefile.in
40868
--- evince-2.21.1/shell/Makefile.in 2007-12-03 22:58:28.000000000 +0100
40869
+++ evince-2.21.1.new/shell/Makefile.in 2007-12-05 00:07:24.000000000 +0100
41072
40870
@@ -1,8 +1,8 @@
41073
40871
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
41074
40872
+# Makefile.in generated by automake 1.10 from Makefile.am.
41096
40894
install_sh_DATA = $(install_sh) -c -m 644
41097
40895
install_sh_PROGRAM = $(install_sh) -c
41098
40896
install_sh_SCRIPT = $(install_sh) -c
41099
@@ -101,8 +97,7 @@
41100
xdg-user-dir-lookup.$(OBJEXT) $(am__objects_1)
41101
evince_OBJECTS = $(am_evince_OBJECTS)
41102
am__DEPENDENCIES_1 =
41103
-@HAVE_GTK_RECENT_FALSE@am__DEPENDENCIES_2 = $(top_builddir)/cut-n-paste/recent-files/librecent.la
41104
-@ENABLE_DJVU_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
41105
+@ENABLE_DJVU_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
41106
evince_DEPENDENCIES = \
41107
$(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \
41108
$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \
41109
@@ -110,20 +105,21 @@
40897
@@ -108,19 +104,20 @@
41110
40898
$(top_builddir)/properties/libevproperties.la \
41111
40899
$(top_builddir)/libdocument/libevbackend.la \
41112
40900
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
41113
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
41114
- $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \
41115
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__append_5) \
41116
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
41117
$(am__DEPENDENCIES_1)
40901
- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
40902
- $(am__DEPENDENCIES_1)
41118
40903
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
40904
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
40905
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
41119
40906
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
41120
40907
depcomp = $(SHELL) $(top_srcdir)/depcomp
41121
40908
am__depfiles_maybe = depfiles
41136
40923
SOURCES = $(evince_SOURCES)
41137
40924
DIST_SOURCES = $(am__evince_SOURCES_DIST)
41138
40925
ETAGS = etags
41139
@@ -132,8 +128,6 @@
40926
@@ -129,8 +126,6 @@
41140
40927
ACLOCAL = @ACLOCAL@
41141
40928
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
41142
40929
ALL_LINGUAS = @ALL_LINGUAS@
41145
40932
AMTAR = @AMTAR@
41146
40933
AR = @AR@
41147
40934
AUTOCONF = @AUTOCONF@
41148
@@ -162,8 +156,6 @@
40935
@@ -159,8 +154,6 @@
41149
40936
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
41150
40937
DBUS_CFLAGS = @DBUS_CFLAGS@
41151
40938
DBUS_LIBS = @DBUS_LIBS@
41154
40941
DEFS = @DEFS@
41155
40942
DEPDIR = @DEPDIR@
41156
40943
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
41157
@@ -175,30 +167,6 @@
40944
@@ -172,30 +165,6 @@
41158
40945
ECHO_N = @ECHO_N@
41159
40946
ECHO_T = @ECHO_T@
41160
40947
EGREP = @EGREP@
41185
40972
EVINCE_MIME_TYPES = @EVINCE_MIME_TYPES@
41186
40973
EXEEXT = @EXEEXT@
41187
40974
F77 = @F77@
41188
@@ -208,8 +176,6 @@
40975
@@ -205,8 +174,6 @@
41189
40976
FRONTEND_CORE_LIBS = @FRONTEND_CORE_LIBS@
41190
40977
FRONTEND_LIBS = @FRONTEND_LIBS@
41191
40978
GCONFTOOL = @GCONFTOOL@
41194
40981
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
41195
40982
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
41196
40983
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
41197
@@ -223,20 +189,17 @@
40984
@@ -220,16 +187,15 @@
41198
40985
GNOME_LIBS = @GNOME_LIBS@
41199
40986
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
41200
40987
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
41204
40991
+GTKDOC_CHECK = @GTKDOC_CHECK@
41205
40992
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
41206
40993
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
41207
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
41208
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
41209
40994
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
41210
40995
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
41211
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
41212
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
41213
40996
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
41214
40997
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
41215
40998
HELP_DIR = @HELP_DIR@
41220
41003
INSTALL_DATA = @INSTALL_DATA@
41221
41004
INSTALL_PROGRAM = @INSTALL_PROGRAM@
41222
41005
INSTALL_SCRIPT = @INSTALL_SCRIPT@
41223
@@ -247,14 +210,12 @@
41006
@@ -240,14 +206,12 @@
41224
41007
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
41225
41008
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
41226
41009
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
41236
41019
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
41237
41020
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
41238
41021
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
41239
@@ -266,7 +227,6 @@
41022
@@ -259,7 +223,6 @@
41240
41023
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
41241
41024
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
41242
41025
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
41244
41027
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
41245
41028
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
41246
41029
LDFLAGS = @LDFLAGS@
41247
@@ -278,9 +238,8 @@
41030
@@ -271,9 +234,8 @@
41248
41031
LN_S = @LN_S@
41249
41032
LTLIBOBJS = @LTLIBOBJS@
41250
41033
MAINT = @MAINT@
41255
41038
MKINSTALLDIRS = @MKINSTALLDIRS@
41256
41039
MSGFMT = @MSGFMT@
41257
41040
MSGFMT_OPTS = @MSGFMT_OPTS@
41258
@@ -315,26 +274,14 @@
41041
@@ -308,26 +270,14 @@
41259
41042
VERSION = @VERSION@
41260
41043
WARN_CFLAGS = @WARN_CFLAGS@
41261
41044
WARN_CXXFLAGS = @WARN_CXXFLAGS@
41286
41069
am__include = @am__include@
41287
41070
am__leading_dot = @am__leading_dot@
41288
41071
am__quote = @am__quote@
41289
@@ -346,28 +293,39 @@
41072
@@ -339,28 +289,39 @@
41290
41073
build_cpu = @build_cpu@
41291
41074
build_os = @build_os@
41292
41075
build_vendor = @build_vendor@
41323
41106
target_alias = @target_alias@
41324
41107
+top_builddir = @top_builddir@
41325
41108
+top_srcdir = @top_srcdir@
41326
INCLUDES = -DDATADIR=\"$(pkgdatadir)\" -DGNOMEDATADIR=\"$(datadir)\" \
41327
-I$(top_srcdir)/cut-n-paste/zoom-control/ \
41328
-I$(top_srcdir)/cut-n-paste/toolbar-editor/ \
41329
@@ -376,7 +334,8 @@
41330
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
41331
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" $(SHELL_CFLAGS) \
41332
$(WARN_CFLAGS) $(DISABLE_DEPRECATED) $(GNOME_PRINT_CFLAGS) \
41333
- $(GTK_PRINT_CFLAGS) $(am__append_1) $(am__append_2)
41334
+ $(GTK_PRINT_CFLAGS) $(HILDON_CFLAGS) $(am__append_1) \
41335
+ $(am__append_2)
41109
INCLUDES = \
41110
-DDATADIR=\"$(pkgdatadir)\" \
41111
-DGNOMEDATADIR=\"$(datadir)\" \
41112
@@ -376,7 +337,8 @@
41113
$(WARN_CFLAGS) \
41114
$(DISABLE_DEPRECATED) \
41115
$(GNOME_PRINT_CFLAGS) \
41116
- $(GTK_PRINT_CFLAGS)
41117
+ $(GTK_PRINT_CFLAGS) \
41118
+ $(HILDON_CFLAGS)
41119
41336
41120
evince_SOURCES = eggfindbar.c eggfindbar.h ev-application.c \
41337
41121
ev-application.h ev-job-queue.h ev-job-queue.c ev-jobs.h \
41338
ev-jobs.c ev-history.c ev-history.h ev-marshal.c ev-marshal.h \
41339
@@ -404,8 +363,9 @@
41340
$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \
41122
@@ -408,8 +370,8 @@
41123
$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la \
41341
41124
$(top_builddir)/properties/libevproperties.la \
41342
41125
$(top_builddir)/libdocument/libevbackend.la $(SHELL_LIBS) \
41343
- $(GNOME_PRINT_LIBS) $(am__append_4) $(am__append_5) \
41344
- $(am__append_6) $(am__append_7) $(am__append_8)
41345
+ $(GNOME_PRINT_LIBS) $(HILDON_LIBS) $(am__append_4) \
41346
+ $(am__append_5) $(am__append_6) $(am__append_7) \
41347
+ $(am__append_8)
41348
BUILT_SOURCES = ev-marshal.h ev-marshal.c $(am__append_9)
41126
- $(GNOME_PRINT_LIBS) $(am__append_2) $(am__append_3) \
41127
- $(am__append_4)
41128
+ $(GNOME_PRINT_LIBS) $(HILDON_LIBS) $(am__append_2) \
41129
+ $(am__append_3) $(am__append_4)
41130
BUILT_SOURCES = ev-marshal.h ev-marshal.c $(am__append_5)
41349
41131
EXTRA_DIST = ev-marshal.list \
41350
41132
ev-application-service.xml
41351
@@ -449,7 +409,7 @@
41133
@@ -453,7 +415,7 @@
41352
41134
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
41353
41135
install-binPROGRAMS: $(bin_PROGRAMS)
41354
41136
@$(NORMAL_INSTALL)
41357
41139
@list='$(bin_PROGRAMS)'; for p in $$list; do \
41358
41140
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
41359
41141
if test -f $$p \
41360
@@ -477,7 +437,7 @@
41142
@@ -481,7 +443,7 @@
41361
41143
done
41362
41144
evince$(EXEEXT): $(evince_OBJECTS) $(evince_DEPENDENCIES)
41363
41145
@rm -f evince$(EXEEXT)
41366
41148
41367
41149
mostlyclean-compile:
41368
41150
-rm -f *.$(OBJEXT)
41369
@@ -519,22 +479,22 @@
41151
@@ -525,22 +487,22 @@
41370
41152
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-user-dir-lookup.Po@am__quote@
41371
41153
41372
41154
.c.o:
41395
41177
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
41396
41178
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
41397
41179
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
41398
@@ -545,10 +505,6 @@
41180
@@ -551,10 +513,6 @@
41399
41181
clean-libtool:
41400
41182
-rm -rf .libs _libs
41401
41183
41406
41188
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
41407
41189
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
41408
41190
unique=`for i in $$list; do \
41409
@@ -598,22 +554,21 @@
41191
@@ -604,22 +562,21 @@
41410
41192
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
41411
41193
41412
41194
distdir: $(DISTFILES)
41442
41224
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
41443
41225
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
41444
41226
fi; \
41445
@@ -630,7 +585,7 @@
41227
@@ -636,7 +593,7 @@
41446
41228
all-am: Makefile $(PROGRAMS)
41447
41229
installdirs:
41448
41230
for dir in "$(DESTDIR)$(bindir)"; do \
41451
41233
done
41452
41234
install: $(BUILT_SOURCES)
41453
41235
$(MAKE) $(AM_MAKEFLAGS) install-am
41454
@@ -667,7 +622,7 @@
41236
@@ -673,7 +630,7 @@
41455
41237
-rm -rf ./$(DEPDIR)
41456
41238
-rm -f Makefile
41457
41239
distclean-am: clean-am distclean-compile distclean-generic \
41460
41242
41461
41243
dvi: dvi-am
41462
41244
41463
@@ -681,12 +636,20 @@
41245
@@ -687,12 +644,20 @@
41464
41246
41465
41247
install-data-am:
41466
41248
41481
41263
installcheck-am:
41482
41264
41483
41265
maintainer-clean: maintainer-clean-am
41484
@@ -707,19 +670,23 @@
41266
@@ -713,19 +678,23 @@
41485
41267
41486
41268
ps-am:
41487
41269
41509
41291
41510
41292
41511
41293
ev-marshal.h: $(srcdir)/ev-marshal.list
41512
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/test/Makefile.in evince-2.20.2.new/test/Makefile.in
41513
--- evince-2.20.2/test/Makefile.in 2007-11-26 22:55:58.000000000 +0100
41514
+++ evince-2.20.2.new/test/Makefile.in 2007-11-27 22:51:54.000000000 +0100
41294
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/test/Makefile.in evince-2.21.1.new/test/Makefile.in
41295
--- evince-2.21.1/test/Makefile.in 2007-12-03 22:58:28.000000000 +0100
41296
+++ evince-2.21.1.new/test/Makefile.in 2007-12-05 00:07:24.000000000 +0100
41515
41297
@@ -1,8 +1,8 @@
41516
41298
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
41517
41299
+# Makefile.in generated by automake 1.10 from Makefile.am.
41597
41379
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
41598
41380
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
41599
41381
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
41600
@@ -142,20 +108,17 @@
41382
@@ -142,16 +108,15 @@
41601
41383
GNOME_LIBS = @GNOME_LIBS@
41602
41384
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
41603
41385
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
41607
41389
+GTKDOC_CHECK = @GTKDOC_CHECK@
41608
41390
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
41609
41391
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
41610
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
41611
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
41612
41392
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
41613
41393
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
41614
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
41615
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
41616
41394
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
41617
41395
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
41618
41396
HELP_DIR = @HELP_DIR@
41623
41401
INSTALL_DATA = @INSTALL_DATA@
41624
41402
INSTALL_PROGRAM = @INSTALL_PROGRAM@
41625
41403
INSTALL_SCRIPT = @INSTALL_SCRIPT@
41626
@@ -166,14 +129,12 @@
41404
@@ -162,14 +127,12 @@
41627
41405
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
41628
41406
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
41629
41407
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
41639
41417
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
41640
41418
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
41641
41419
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
41642
@@ -185,7 +146,6 @@
41420
@@ -181,7 +144,6 @@
41643
41421
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
41644
41422
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
41645
41423
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
41647
41425
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
41648
41426
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
41649
41427
LDFLAGS = @LDFLAGS@
41650
@@ -197,9 +157,8 @@
41428
@@ -193,9 +155,8 @@
41651
41429
LN_S = @LN_S@
41652
41430
LTLIBOBJS = @LTLIBOBJS@
41653
41431
MAINT = @MAINT@
41658
41436
MKINSTALLDIRS = @MKINSTALLDIRS@
41659
41437
MSGFMT = @MSGFMT@
41660
41438
MSGFMT_OPTS = @MSGFMT_OPTS@
41661
@@ -234,26 +193,14 @@
41439
@@ -230,26 +191,14 @@
41662
41440
VERSION = @VERSION@
41663
41441
WARN_CFLAGS = @WARN_CFLAGS@
41664
41442
WARN_CXXFLAGS = @WARN_CXXFLAGS@
41689
41467
am__include = @am__include@
41690
41468
am__leading_dot = @am__leading_dot@
41691
41469
am__quote = @am__quote@
41692
@@ -265,28 +212,39 @@
41470
@@ -261,28 +210,39 @@
41693
41471
build_cpu = @build_cpu@
41694
41472
build_os = @build_os@
41695
41473
build_vendor = @build_vendor@
41729
41507
dist_check_SCRIPTS = test1.py test2.py test3.py test4.py
41730
41508
TESTS = $(dist_check_SCRIPTS)
41731
41509
EXTRA_DIST = test-encrypt.pdf test-links.pdf test-mime.bin
41732
@@ -328,10 +286,6 @@
41510
@@ -324,10 +284,6 @@
41733
41511
41734
41512
clean-libtool:
41735
41513
-rm -rf .libs _libs
41740
41518
tags: TAGS
41741
41519
TAGS:
41742
41520
41743
@@ -340,9 +294,9 @@
41521
@@ -336,9 +292,9 @@
41744
41522
41745
41523
41746
41524
check-TESTS: $(TESTS)
41752
41530
if test -n "$$list"; then \
41753
41531
for tst in $$list; do \
41754
41532
if test -f ./$$tst; then dir=./; \
41755
@@ -351,7 +305,7 @@
41533
@@ -347,7 +303,7 @@
41756
41534
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
41757
41535
all=`expr $$all + 1`; \
41758
41536
case " $(XFAIL_TESTS) " in \
41761
41539
xpass=`expr $$xpass + 1`; \
41762
41540
failed=`expr $$failed + 1`; \
41763
41541
echo "XPASS: $$tst"; \
41764
@@ -363,7 +317,7 @@
41542
@@ -359,7 +315,7 @@
41765
41543
elif test $$? -ne 77; then \
41766
41544
all=`expr $$all + 1`; \
41767
41545
case " $(XFAIL_TESTS) " in \
41770
41548
xfail=`expr $$xfail + 1`; \
41771
41549
echo "XFAIL: $$tst"; \
41772
41550
;; \
41773
@@ -413,22 +367,21 @@
41551
@@ -409,22 +365,21 @@
41774
41552
else :; fi
41775
41553
41776
41554
distdir: $(DISTFILES)
41806
41584
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
41807
41585
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
41808
41586
fi; \
41809
@@ -475,7 +428,7 @@
41587
@@ -471,7 +426,7 @@
41810
41588
41811
41589
distclean: distclean-am
41812
41590
-rm -f Makefile
41815
41593
41816
41594
dvi: dvi-am
41817
41595
41818
@@ -489,12 +442,20 @@
41596
@@ -485,12 +440,20 @@
41819
41597
41820
41598
install-data-am:
41821
41599
41836
41614
installcheck-am:
41837
41615
41838
41616
maintainer-clean: maintainer-clean-am
41839
@@ -513,17 +474,21 @@
41617
@@ -509,17 +472,21 @@
41840
41618
41841
41619
ps-am:
41842
41620
41862
41640
41863
41641
# Tell versions [3.59,3.63) of GNU make to not export all variables.
41864
41642
# Otherwise a system limit (for SysV at least) may be exceeded.
41865
diff -Nur -x '*.orig' -x '*~' evince-2.20.2/thumbnailer/Makefile.in evince-2.20.2.new/thumbnailer/Makefile.in
41866
--- evince-2.20.2/thumbnailer/Makefile.in 2007-11-26 22:55:59.000000000 +0100
41867
+++ evince-2.20.2.new/thumbnailer/Makefile.in 2007-11-27 22:51:54.000000000 +0100
41643
diff -Nur -x '*.orig' -x '*~' evince-2.21.1/thumbnailer/Makefile.in evince-2.21.1.new/thumbnailer/Makefile.in
41644
--- evince-2.21.1/thumbnailer/Makefile.in 2007-12-03 22:58:29.000000000 +0100
41645
+++ evince-2.21.1.new/thumbnailer/Makefile.in 2007-12-05 00:07:24.000000000 +0100
41868
41646
@@ -1,8 +1,8 @@
41869
41647
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
41870
41648
+# Makefile.in generated by automake 1.10 from Makefile.am.
41975
41753
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
41976
41754
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
41977
41755
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
41978
@@ -185,20 +152,17 @@
41756
@@ -185,16 +152,15 @@
41979
41757
GNOME_LIBS = @GNOME_LIBS@
41980
41758
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
41981
41759
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
41985
41763
+GTKDOC_CHECK = @GTKDOC_CHECK@
41986
41764
GTK_PRINT_CFLAGS = @GTK_PRINT_CFLAGS@
41987
41765
GTK_PRINT_LIBS = @GTK_PRINT_LIBS@
41988
GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@
41989
GTK_RECENT_LIBS = @GTK_RECENT_LIBS@
41990
41766
-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
41991
41767
-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
41992
-HAVE_GTK_RECENT_FALSE = @HAVE_GTK_RECENT_FALSE@
41993
-HAVE_GTK_RECENT_TRUE = @HAVE_GTK_RECENT_TRUE@
41994
41768
-HAVE_NAUTILUS_FALSE = @HAVE_NAUTILUS_FALSE@
41995
41769
-HAVE_NAUTILUS_TRUE = @HAVE_NAUTILUS_TRUE@
41996
41770
HELP_DIR = @HELP_DIR@
42001
41775
INSTALL_DATA = @INSTALL_DATA@
42002
41776
INSTALL_PROGRAM = @INSTALL_PROGRAM@
42003
41777
INSTALL_SCRIPT = @INSTALL_SCRIPT@
42004
@@ -209,14 +173,12 @@
41778
@@ -205,14 +171,12 @@
42005
41779
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
42006
41780
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
42007
41781
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
42017
41791
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
42018
41792
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
42019
41793
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
42020
@@ -228,7 +190,6 @@
41794
@@ -224,7 +188,6 @@
42021
41795
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
42022
41796
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
42023
41797
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
42025
41799
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
42026
41800
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
42027
41801
LDFLAGS = @LDFLAGS@
42028
@@ -240,9 +201,8 @@
41802
@@ -236,9 +199,8 @@
42029
41803
LN_S = @LN_S@
42030
41804
LTLIBOBJS = @LTLIBOBJS@
42031
41805
MAINT = @MAINT@
42036
41810
MKINSTALLDIRS = @MKINSTALLDIRS@
42037
41811
MSGFMT = @MSGFMT@
42038
41812
MSGFMT_OPTS = @MSGFMT_OPTS@
42039
@@ -277,26 +237,14 @@
41813
@@ -273,26 +235,14 @@
42040
41814
VERSION = @VERSION@
42041
41815
WARN_CFLAGS = @WARN_CFLAGS@
42042
41816
WARN_CXXFLAGS = @WARN_CXXFLAGS@
42067
41841
am__include = @am__include@
42068
41842
am__leading_dot = @am__leading_dot@
42069
41843
am__quote = @am__quote@
42070
@@ -308,28 +256,39 @@
41844
@@ -304,28 +254,39 @@
42071
41845
build_cpu = @build_cpu@
42072
41846
build_os = @build_os@
42073
41847
build_vendor = @build_vendor@
42107
41881
INCLUDES = \
42108
41882
-DDATADIR=\"$(pkgdatadir)\" \
42109
41883
-I$(top_srcdir)/libdocument \
42110
@@ -396,7 +355,7 @@
41884
@@ -392,7 +353,7 @@
42111
41885
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
42112
41886
install-binPROGRAMS: $(bin_PROGRAMS)
42113
41887
@$(NORMAL_INSTALL)
42116
41890
@list='$(bin_PROGRAMS)'; for p in $$list; do \
42117
41891
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
42118
41892
if test -f $$p \
42119
@@ -424,7 +383,7 @@
41893
@@ -420,7 +381,7 @@
42120
41894
done
42121
41895
evince-thumbnailer$(EXEEXT): $(evince_thumbnailer_OBJECTS) $(evince_thumbnailer_DEPENDENCIES)
42122
41896
@rm -f evince-thumbnailer$(EXEEXT)
42125
41899
42126
41900
mostlyclean-compile:
42127
41901
-rm -f *.$(OBJEXT)
42128
@@ -435,22 +394,22 @@
41902
@@ -431,22 +392,22 @@
42129
41903
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evince-thumbnailer.Po@am__quote@
42130
41904
42131
41905
.c.o:
42154
41928
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
42155
41929
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
42156
41930
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
42157
@@ -460,13 +419,9 @@
41931
@@ -456,13 +417,9 @@
42158
41932
42159
41933
clean-libtool:
42160
41934
-rm -rf .libs _libs
42169
41943
@list='$(schema_DATA)'; for p in $$list; do \
42170
41944
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
42171
41945
f=$(am__strip_dir) \
42172
@@ -531,22 +486,21 @@
41946
@@ -527,22 +484,21 @@
42173
41947
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
42174
41948
42175
41949
distdir: $(DISTFILES)
42205
41979
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
42206
41980
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
42207
41981
fi; \
42208
@@ -562,7 +516,7 @@
41982
@@ -558,7 +514,7 @@
42209
41983
all-am: Makefile $(PROGRAMS) $(DATA)
42210
41984
installdirs:
42211
41985
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(schemadir)"; do \
42214
41988
done
42215
41989
install: install-am
42216
41990
install-exec: install-exec-am
42217
@@ -597,7 +551,7 @@
41991
@@ -593,7 +549,7 @@
42218
41992
-rm -rf ./$(DEPDIR)
42219
41993
-rm -f Makefile
42220
41994
distclean-am: clean-am distclean-compile distclean-generic \
42223
41997
42224
41998
dvi: dvi-am
42225
41999
42226
@@ -611,12 +565,20 @@
42000
@@ -607,12 +563,20 @@
42227
42001
42228
42002
install-data-am: install-data-local install-schemaDATA
42229
42003
42244
42018
installcheck-am:
42245
42019
42246
42020
maintainer-clean: maintainer-clean-am
42247
@@ -637,21 +599,24 @@
42021
@@ -633,21 +597,24 @@
42248
42022
42249
42023
ps-am:
42250
42024
Loggerhead is a web-based interface for Breezy
Version: 2.0.1