Merge lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.2-0ubuntu1 into lp:ubuntu/oneiric/inkscape

Proposed by Alex Valavanis on 2011-07-10
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: not available
Proposed branch: lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.2-0ubuntu1
Merge into: lp:ubuntu/oneiric/inkscape
Diff against target: 99212 lines (+46210/-23783)
335 files modified
Info.plist (+3/-3)
Makefile.in (+4/-0)
aclocal.m4 (+8/-6)
build.xml (+6/-2)
config.guess (+120/-105)
config.h.in (+6/-0)
config.sub (+101/-55)
configure (+565/-356)
configure.ac (+33/-5)
debian/changelog (+22/-0)
debian/patches/00list (+0/-5)
debian/patches/01-libwpg0.2.dpatch (+0/-99)
debian/patches/03-add-missing-mimetypes.dpatch (+0/-20)
debian/patches/04-fix-build-with-gcc4.6.dpatch (+0/-18)
debian/patches/05-add-missing-includes.dpatch (+0/-799)
debian/patches/fix-fontforge-glyph-template.dpatch (+0/-82)
doc/Makefile.am (+2/-6)
doc/Makefile.in (+6/-6)
doc/keys-html.xsl (+0/-208)
doc/keys-svg.xsl (+0/-1315)
doc/keys.README (+3/-26)
doc/keys.de.xml (+0/-1107)
doc/keys.en.html (+8794/-0)
doc/keys.fr.html (+8787/-1110)
doc/keys.fr.xml (+0/-1135)
doc/keys.html (+0/-1415)
doc/keys.ja.html (+8787/-0)
doc/keys.xml (+0/-1429)
inkscape.1 (+3/-3)
inkscape.desktop.in (+1/-1)
inkscape.fr.1 (+3/-3)
inkscape.spec (+1/-1)
po/br.po (+13/-13)
po/fa.po (+2096/-2460)
po/gl.po (+1956/-653)
po/id.po (+2398/-1401)
po/ja.po (+6508/-5750)
po/nl.po (+2/-2)
share/Makefile.in (+4/-0)
share/clipart/Makefile.in (+4/-0)
share/examples/Makefile.in (+4/-0)
share/extensions/Barcode/Makefile.in (+4/-0)
share/extensions/Makefile.in (+4/-0)
share/extensions/Poly3DObjects/Makefile.in (+4/-0)
share/extensions/alphabet_soup/Makefile.in (+4/-0)
share/extensions/dxf_input.py (+87/-28)
share/extensions/dxf_outlines.py (+36/-20)
share/extensions/funcplot.py (+8/-4)
share/extensions/interp.py (+4/-1)
share/extensions/polyhedron_3d.inx (+2/-2)
share/extensions/restack.py (+25/-17)
share/extensions/svg2xaml.xsl (+2125/-659)
share/extensions/test/Makefile.in (+4/-0)
share/extensions/xaml2svg/Makefile.in (+4/-0)
share/filters/Makefile.in (+4/-0)
share/filters/filters.svg (+2/-2)
share/fonts/Makefile.in (+4/-0)
share/gradients/Makefile.in (+4/-0)
share/icons/Makefile.in (+4/-0)
share/icons/application/16x16/Makefile.in (+4/-0)
share/icons/application/22x22/Makefile.in (+4/-0)
share/icons/application/24x24/Makefile.in (+4/-0)
share/icons/application/256x256/Makefile.in (+4/-0)
share/icons/application/32x32/Makefile.in (+4/-0)
share/icons/application/48x48/Makefile.in (+4/-0)
share/icons/application/Makefile.in (+4/-0)
share/keys/Makefile.in (+4/-0)
share/markers/Makefile.in (+4/-0)
share/palettes/Makefile.in (+4/-0)
share/patterns/Makefile.in (+4/-0)
share/screens/Makefile.in (+4/-0)
share/templates/Makefile.in (+4/-0)
share/templates/fontforge_glyph.svg (+22/-26)
share/tutorials/Makefile.in (+4/-0)
share/tutorials/tutorial-advanced.ja.svg (+235/-251)
share/tutorials/tutorial-basic.ja.svg (+305/-320)
share/tutorials/tutorial-calligraphy.ja.svg (+427/-443)
share/tutorials/tutorial-elements.ja.svg (+242/-257)
share/tutorials/tutorial-elements.sk.svg (+198/-214)
share/tutorials/tutorial-shapes.ja.svg (+495/-510)
share/tutorials/tutorial-shapes.sk.svg (+446/-462)
share/tutorials/tutorial-tips.ja.svg (+351/-367)
share/tutorials/tutorial-tracing.ja.svg (+105/-120)
share/ui/Makefile.in (+4/-0)
src/2geom/convex-cover.cpp (+1/-1)
src/2geom/utils.h (+1/-0)
src/Makefile.am (+4/-0)
src/Makefile.in (+26/-19)
src/Makefile_insert (+1/-0)
src/arc-context.h (+1/-0)
src/box3d-context.h (+1/-0)
src/color-profile.cpp (+1/-1)
src/color.h (+1/-1)
src/conn-avoid-ref.cpp (+1/-0)
src/conn-avoid-ref.h (+1/-0)
src/connection-pool.h (+1/-0)
src/connector-context.h (+1/-0)
src/context-fns.h (+1/-1)
src/debug/gdk-event-latency-tracker.h (+1/-1)
src/debug/log-display-config.cpp (+1/-2)
src/desktop-events.h (+2/-2)
src/desktop-style.cpp (+1/-1)
src/desktop.h (+3/-2)
src/device-manager.cpp (+1/-1)
src/dialogs/clonetiler.h (+1/-1)
src/dialogs/dialog-events.h (+1/-2)
src/dialogs/find.h (+1/-1)
src/dialogs/item-properties.cpp (+0/-9)
src/dialogs/item-properties.h (+1/-1)
src/dialogs/object-attributes.cpp (+1/-0)
src/dialogs/object-attributes.h (+1/-1)
src/dialogs/spellcheck.h (+1/-1)
src/display/canvas-arena.cpp (+1/-1)
src/display/canvas-temporary-item.cpp (+1/-1)
src/display/canvas-temporary-item.h (+1/-0)
src/display/nr-3dutils.h (+1/-1)
src/display/nr-arena-glyphs.cpp (+1/-0)
src/display/nr-arena-glyphs.h (+1/-1)
src/display/nr-arena.cpp (+1/-0)
src/display/nr-arena.h (+2/-1)
src/display/nr-filter-diffuselighting.h (+1/-1)
src/display/nr-filter-specularlighting.h (+1/-1)
src/display/nr-light.h (+1/-1)
src/display/sodipodi-ctrl.h (+2/-2)
src/display/sp-canvas.cpp (+1/-3)
src/display/sp-canvas.h (+2/-4)
src/document-private.h (+1/-0)
src/document-subset.h (+1/-0)
src/document.cpp (+1/-1)
src/document.h (+2/-1)
src/draw-context.h (+1/-0)
src/ege-adjustment-action.cpp (+0/-13)
src/ege-adjustment-action.h (+1/-1)
src/ege-color-prof-tracker.cpp (+1/-3)
src/ege-output-action.cpp (+1/-3)
src/ege-output-action.h (+1/-1)
src/ege-select-one-action.cpp (+0/-9)
src/ege-select-one-action.h (+1/-2)
src/event-context.cpp (+1/-2)
src/event-context.h (+1/-2)
src/extension/effect.h (+1/-1)
src/extension/implementation/implementation.h (+1/-1)
src/extension/input.h (+1/-1)
src/extension/internal/cairo-render-context.cpp (+6/-3)
src/extension/internal/cairo-renderer-pdf-out.cpp (+7/-4)
src/extension/internal/cairo-renderer.cpp (+10/-8)
src/extension/internal/emf-win32-inout.cpp (+178/-53)
src/extension/internal/emf-win32-print.cpp (+2/-4)
src/extension/internal/latex-text-renderer.cpp (+23/-17)
src/extension/internal/pdfinput/pdf-input.cpp (+1/-1)
src/extension/internal/wpg-input.cpp (+21/-1)
src/extension/output.h (+1/-1)
src/extension/timer.h (+1/-0)
src/file.cpp (+1/-1)
src/file.h (+1/-1)
src/flood-context.h (+1/-0)
src/forward.h (+0/-3)
src/gc-alloc.h (+1/-0)
src/gc-finalized.h (+1/-0)
src/gc.cpp (+1/-0)
src/gradient-context.h (+1/-0)
src/gradient-drag.h (+1/-0)
src/help.h (+1/-1)
src/helper/sp-marshal.cpp (+2/-0)
src/helper/unit-menu.cpp (+1/-4)
src/helper/unit-menu.h (+1/-1)
src/helper/unit-tracker.cpp (+1/-1)
src/helper/unit-tracker.h (+1/-2)
src/helper/window.cpp (+1/-1)
src/helper/window.h (+1/-1)
src/icon-size.h (+1/-1)
src/id-clash.cpp (+1/-0)
src/ink-action.cpp (+2/-7)
src/ink-action.h (+1/-3)
src/ink-comboboxentry-action.cpp (+0/-3)
src/ink-comboboxentry-action.h (+1/-2)
src/inkscape-version.cpp (+1/-1)
src/inkscape.cpp (+2/-3)
src/inkview.cpp (+1/-5)
src/interface.h (+1/-1)
src/io/sys.cpp (+1/-1)
src/knot.h (+2/-1)
src/libavoid/geomtypes.h (+1/-0)
src/libavoid/orthogonal.cpp (+1/-1)
src/libgdl/gdl-dock-bar.h (+1/-1)
src/libgdl/gdl-dock-item-grip.c (+1/-3)
src/libgdl/gdl-dock-item-grip.h (+1/-1)
src/libgdl/gdl-dock-master.h (+1/-1)
src/libgdl/gdl-dock-object.h (+1/-1)
src/libgdl/gdl-dock-paned.c (+1/-2)
src/libgdl/gdl-stock.c (+0/-1)
src/libgdl/gdl-switcher.c (+0/-4)
src/libgdl/gdl-switcher.h (+1/-1)
src/libgdl/gdl-tools.h (+1/-1)
src/libnrtype/Layout-TNG-Input.cpp (+1/-1)
src/live_effects/lpeobject-reference.h (+1/-0)
src/live_effects/parameter/path-reference.h (+1/-0)
src/live_effects/parameter/path.cpp (+1/-1)
src/live_effects/parameter/path.h (+1/-0)
src/main.cpp (+2/-6)
src/message-stack.h (+1/-0)
src/modifier-fns.h (+1/-1)
src/object-hierarchy.h (+1/-0)
src/persp3d-reference.h (+1/-0)
src/rect-context.h (+1/-0)
src/selcue.h (+1/-0)
src/select-context.h (+1/-1)
src/selection-describer.h (+1/-0)
src/selection.h (+1/-0)
src/seltrans-handles.h (+1/-0)
src/seltrans.h (+1/-0)
src/shortcuts.cpp (+1/-1)
src/sp-conn-end-pair.cpp (+1/-1)
src/sp-conn-end-pair.h (+1/-0)
src/sp-conn-end.h (+1/-0)
src/sp-gradient.cpp (+5/-5)
src/sp-gradient.h (+2/-1)
src/sp-image.cpp (+1/-1)
src/sp-object.cpp (+1/-0)
src/sp-object.h (+1/-0)
src/sp-offset.h (+1/-0)
src/sp-paint-server-reference.h (+43/-0)
src/sp-paint-server.cpp (+18/-5)
src/sp-paint-server.h (+4/-19)
src/sp-pattern.cpp (+6/-9)
src/sp-pattern.h (+2/-1)
src/sp-shape.cpp (+7/-6)
src/sp-shape.h (+1/-0)
src/sp-switch.h (+1/-0)
src/sp-text.h (+1/-0)
src/sp-tref-reference.h (+1/-0)
src/sp-use-reference.h (+1/-0)
src/sp-use.h (+1/-0)
src/spiral-context.h (+2/-1)
src/splivarot.cpp (+20/-15)
src/star-context.h (+1/-0)
src/style.h (+2/-1)
src/svg-view-widget.cpp (+1/-1)
src/text-context.cpp (+1/-2)
src/text-context.h (+2/-2)
src/ui/context-menu.cpp (+1/-1)
src/ui/context-menu.h (+1/-1)
src/ui/dialog/aboutbox.cpp (+2/-1)
src/ui/dialog/color-item.cpp (+1/-1)
src/ui/dialog/desktop-tracker.h (+1/-0)
src/ui/dialog/document-metadata.h (+1/-0)
src/ui/dialog/document-properties.h (+1/-0)
src/ui/dialog/extensions.cpp (+1/-1)
src/ui/dialog/filedialogimpl-gtkmm.h (+1/-5)
src/ui/dialog/filedialogimpl-win32.cpp (+11/-0)
src/ui/dialog/glyphs.cpp (+1/-3)
src/ui/dialog/inkscape-preferences.cpp (+1/-1)
src/ui/dialog/inkscape-preferences.h (+1/-0)
src/ui/dialog/layers.cpp (+1/-2)
src/ui/dialog/ocaldialogs.cpp (+1/-1)
src/ui/dialog/ocaldialogs.h (+1/-3)
src/ui/dialog/print.h (+1/-1)
src/ui/dialog/svg-fonts-dialog.cpp (+4/-1)
src/ui/dialog/swatches.cpp (+87/-8)
src/ui/dialog/swatches.h (+3/-0)
src/ui/dialog/tile.cpp (+1/-2)
src/ui/dialog/tracedialog.cpp (+1/-1)
src/ui/dialog/undo-history.cpp (+2/-1)
src/ui/tool/control-point-selection.h (+1/-0)
src/ui/tool/control-point.h (+1/-0)
src/ui/tool/manipulator.h (+1/-0)
src/ui/tool/multi-path-manipulator.h (+1/-0)
src/ui/tool/node-tool.h (+1/-0)
src/ui/tool/node.h (+1/-0)
src/ui/view/edit-widget.cpp (+1/-3)
src/ui/view/view-widget.h (+1/-1)
src/ui/view/view.h (+2/-1)
src/ui/widget/color-picker.h (+1/-0)
src/ui/widget/combo-text.cpp (+1/-1)
src/ui/widget/layer-selector.cpp (+4/-0)
src/ui/widget/page-sizer.cpp (+17/-13)
src/ui/widget/page-sizer.h (+2/-0)
src/ui/widget/panel.cpp (+1/-1)
src/ui/widget/preferences-widget.h (+1/-0)
src/ui/widget/selected-style.cpp (+1/-1)
src/ui/widget/selected-style.h (+1/-0)
src/ui/widget/style-subject.h (+1/-0)
src/ui/widget/toolbox.cpp (+1/-1)
src/uri-references.h (+1/-0)
src/util/forward-pointer-iterator.h (+1/-0)
src/util/share.h (+1/-0)
src/util/unordered-containers.h (+2/-0)
src/verbs.cpp (+1/-1)
src/widgets/button.cpp (+1/-0)
src/widgets/button.h (+1/-3)
src/widgets/desktop-widget.cpp (+1/-1)
src/widgets/desktop-widget.h (+2/-2)
src/widgets/eek-preview.h (+2/-2)
src/widgets/fill-style.cpp (+1/-1)
src/widgets/font-selector.cpp (+0/-7)
src/widgets/font-selector.h (+1/-1)
src/widgets/gradient-image.h (+2/-1)
src/widgets/gradient-selector.cpp (+1/-5)
src/widgets/gradient-selector.h (+1/-1)
src/widgets/gradient-toolbar.h (+1/-1)
src/widgets/gradient-vector.h (+2/-1)
src/widgets/icon.h (+1/-1)
src/widgets/paint-selector.cpp (+1/-8)
src/widgets/paint-selector.h (+1/-1)
src/widgets/ruler.h (+1/-1)
src/widgets/select-toolbar.cpp (+0/-1)
src/widgets/select-toolbar.h (+1/-2)
src/widgets/shrink-wrap-button.cpp (+1/-1)
src/widgets/sp-attribute-widget.cpp (+1/-2)
src/widgets/sp-attribute-widget.h (+2/-2)
src/widgets/sp-color-gtkselector.h (+1/-1)
src/widgets/sp-color-icc-selector.cpp (+0/-6)
src/widgets/sp-color-icc-selector.h (+1/-2)
src/widgets/sp-color-notebook.cpp (+1/-0)
src/widgets/sp-color-notebook.h (+1/-3)
src/widgets/sp-color-preview.h (+1/-1)
src/widgets/sp-color-scales.h (+1/-2)
src/widgets/sp-color-selector.cpp (+1/-1)
src/widgets/sp-color-selector.h (+1/-1)
src/widgets/sp-color-slider.cpp (+1/-2)
src/widgets/sp-color-slider.h (+1/-1)
src/widgets/sp-color-wheel-selector.cpp (+1/-4)
src/widgets/sp-color-wheel-selector.h (+1/-2)
src/widgets/sp-color-wheel.cpp (+1/-1)
src/widgets/sp-color-wheel.h (+1/-1)
src/widgets/sp-widget.h (+1/-1)
src/widgets/sp-xmlview-attr-list.h (+0/-1)
src/widgets/sp-xmlview-content.h (+1/-1)
src/widgets/sp-xmlview-tree.h (+1/-1)
src/widgets/spinbutton-events.cpp (+1/-0)
src/widgets/spinbutton-events.h (+1/-2)
src/widgets/spw-utilities.h (+2/-1)
src/widgets/toolbox.cpp (+4/-2)
src/widgets/toolbox.h (+1/-2)
src/xml/helper-observer.h (+1/-0)
To merge this branch: bzr merge lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.2-0ubuntu1
Reviewer Review Type Date Requested Status
Bryce Harrington packaging Approve on 2011-07-11
Ubuntu branches 2011-07-10 Pending
Review via email: mp+67452@code.launchpad.net

Description of the change

Here is an updated version of the Ubuntu package, that contains several upstream bug fixes. I have also submitted a request to Debian, but we may want to go ahead with an Ubuntu upgrade while we wait for the Debian maintainer to push the changes through.

To post a comment you must log in.
Bryce Harrington (bryce) wrote :

Looks good, thanks!

Upload sponsored for oneiric.

review: Approve (packaging)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Info.plist'
2--- Info.plist 2011-02-20 12:07:30 +0000
3+++ Info.plist 2011-07-10 11:35:55 +0000
4@@ -7,7 +7,7 @@
5 <key>CFBundleExecutable</key>
6 <string>Inkscape</string>
7 <key>CFBundleGetInfoString</key>
8- <string>0.48.1, Copyright 2003-2009 Inkscape Developers</string>
9+ <string>0.48.2, Copyright 2003-2009 Inkscape Developers</string>
10 <key>CFBundleIconFile</key>
11 <string>Inkscape.icns</string>
12 <key>CFBundleIdentifier</key>
13@@ -323,11 +323,11 @@
14 <key>CFBundlePackageType</key>
15 <string>APPL</string>
16 <key>CFBundleShortVersionString</key>
17- <string>0.48.1</string>
18+ <string>0.48.2</string>
19 <key>CFBundleSignature</key>
20 <string>Inks</string>
21 <key>CFBundleVersion</key>
22- <string>0.48.1</string>
23+ <string>0.48.2</string>
24 <key>NSHumanReadableCopyright</key>
25 <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string>
26 <key>LSMinimumSystemVersion</key>
27
28=== modified file 'Makefile.in'
29--- Makefile.in 2011-02-20 12:07:30 +0000
30+++ Makefile.in 2011-07-10 11:35:55 +0000
31@@ -259,6 +259,10 @@
32 LDFLAGS = @LDFLAGS@
33 LIBOBJS = @LIBOBJS@
34 LIBS = @LIBS@
35+LIBWPG01_CFLAGS = @LIBWPG01_CFLAGS@
36+LIBWPG01_LIBS = @LIBWPG01_LIBS@
37+LIBWPG02_CFLAGS = @LIBWPG02_CFLAGS@
38+LIBWPG02_LIBS = @LIBWPG02_LIBS@
39 LIBWPG_CFLAGS = @LIBWPG_CFLAGS@
40 LIBWPG_LIBS = @LIBWPG_LIBS@
41 LTLIBOBJS = @LTLIBOBJS@
42
43=== modified file 'aclocal.m4'
44--- aclocal.m4 2011-02-20 12:07:30 +0000
45+++ aclocal.m4 2011-07-10 11:35:55 +0000
46@@ -13,8 +13,8 @@
47
48 m4_ifndef([AC_AUTOCONF_VERSION],
49 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
50-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
51-[m4_warning([this file was generated for autoconf 2.67.
52+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
53+[m4_warning([this file was generated for autoconf 2.68.
54 You have another version of autoconf. It may work, but is not guaranteed to.
55 If you have problems, you may need to regenerate the build system entirely.
56 To do so, use the procedure documented by the package, typically `autoreconf'.])])
57@@ -707,7 +707,8 @@
58 # ----------------------------------
59 AC_DEFUN([PKG_PROG_PKG_CONFIG],
60 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
61-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
62+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
63+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
64 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
65 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
66 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
67@@ -753,7 +754,8 @@
68 pkg_cv_[]$1="$$1"
69 elif test -n "$PKG_CONFIG"; then
70 PKG_CHECK_EXISTS([$3],
71- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
72+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
73+ test "x$?" != "x0" && pkg_failed=yes ],
74 [pkg_failed=yes])
75 else
76 pkg_failed=untried
77@@ -801,9 +803,9 @@
78 AC_MSG_RESULT([no])
79 _PKG_SHORT_ERRORS_SUPPORTED
80 if test $_pkg_short_errors_supported = yes; then
81- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
82+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
83 else
84- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
85+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
86 fi
87 # Put the nasty error message in config.log where it belongs
88 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
89
90=== modified file 'build.xml'
91--- build.xml 2011-02-01 12:53:34 +0000
92+++ build.xml 2011-07-10 11:35:55 +0000
93@@ -42,7 +42,7 @@
94 </description>
95
96 <!-- set global properties for this build -->
97- <property name="version" value="0.48.1"/>
98+ <property name="version" value="0.48.2"/>
99 <property name="src" location="src"/>
100 <property name="lib" location="lib"/>
101 <property name="build" location="build"/>
102@@ -186,6 +186,9 @@
103 /* Allow reading WordPerfect? */
104 #define WITH_LIBWPG 1
105
106+ /* Default to libwpg 0.1.x */
107+ #define WITH_LIBWPG01 1
108+
109 /* Do we support SVG Fonts? */
110 #define ENABLE_SVG_FONTS 1
111
112@@ -660,6 +663,7 @@
113 <copy todir="${dist}" file="${devlibs}/bin/libsigc-2.0-0.dll"/>
114 <copy todir="${dist}" file="${devlibs}/bin/freetype6.dll"/>
115 <copy todir="${dist}" file="${devlibs}/bin/libatk-1.0-0.dll"/>
116+ <copy todir="${dist}" file="${devlibs}/bin/libgcc_s_sjlj-1.dll"/>
117 <copy todir="${dist}" file="${devlibs}/bin/libgdk-win32-2.0-0.dll"/>
118 <copy todir="${dist}" file="${devlibs}/bin/libgdk_pixbuf-2.0-0.dll"/>
119 <copy todir="${dist}" file="${devlibs}/bin/libglib-2.0-0.dll"/>
120@@ -704,7 +708,7 @@
121 <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
122 <!-- MINGW support DLLs needed for openmp support -->
123 <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
124- <copy todir="${dist}" file="${mingw}/lib/gcc/mingw32/bin/libgomp-1.dll"/>
125+ <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/>
126
127 <!-- MSGFMT files -->
128 <copy todir="${dist}">
129
130=== modified file 'config.guess'
131--- config.guess 2011-02-20 12:07:30 +0000
132+++ config.guess 2011-07-10 11:35:55 +0000
133@@ -1,10 +1,10 @@
134 #! /bin/sh
135 # Attempt to guess a canonical system name.
136 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
137-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
138-# Free Software Foundation, Inc.
139+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
140+# 2011 Free Software Foundation, Inc.
141
142-timestamp='2009-12-30'
143+timestamp='2011-05-11'
144
145 # This file is free software; you can redistribute it and/or modify it
146 # under the terms of the GNU General Public License as published by
147@@ -57,7 +57,7 @@
148
149 Originally written by Per Bothner.
150 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
151-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
152+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
153 Software Foundation, Inc.
154
155 This is free software; see the source for copying conditions. There is NO
156@@ -181,7 +181,7 @@
157 fi
158 ;;
159 *)
160- os=netbsd
161+ os=netbsd
162 ;;
163 esac
164 # The OS release
165@@ -224,7 +224,7 @@
166 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
167 ;;
168 *5.*)
169- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
170+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
171 ;;
172 esac
173 # According to Compaq, /usr/sbin/psrinfo has been available on
174@@ -270,7 +270,10 @@
175 # A Xn.n version is an unreleased experimental baselevel.
176 # 1.2 uses "1.2" for uname -r.
177 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
178- exit ;;
179+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
180+ exitcode=$?
181+ trap '' 0
182+ exit $exitcode ;;
183 Alpha\ *:Windows_NT*:*)
184 # How do we know it's Interix rather than the generic POSIX subsystem?
185 # Should we change UNAME_MACHINE based on the output of uname instead
186@@ -296,7 +299,7 @@
187 echo s390-ibm-zvmoe
188 exit ;;
189 *:OS400:*:*)
190- echo powerpc-ibm-os400
191+ echo powerpc-ibm-os400
192 exit ;;
193 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
194 echo arm-acorn-riscix${UNAME_RELEASE}
195@@ -395,23 +398,23 @@
196 # MiNT. But MiNT is downward compatible to TOS, so this should
197 # be no problem.
198 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
199- echo m68k-atari-mint${UNAME_RELEASE}
200+ echo m68k-atari-mint${UNAME_RELEASE}
201 exit ;;
202 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
203 echo m68k-atari-mint${UNAME_RELEASE}
204- exit ;;
205+ exit ;;
206 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
207- echo m68k-atari-mint${UNAME_RELEASE}
208+ echo m68k-atari-mint${UNAME_RELEASE}
209 exit ;;
210 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
211- echo m68k-milan-mint${UNAME_RELEASE}
212- exit ;;
213+ echo m68k-milan-mint${UNAME_RELEASE}
214+ exit ;;
215 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
216- echo m68k-hades-mint${UNAME_RELEASE}
217- exit ;;
218+ echo m68k-hades-mint${UNAME_RELEASE}
219+ exit ;;
220 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
221- echo m68k-unknown-mint${UNAME_RELEASE}
222- exit ;;
223+ echo m68k-unknown-mint${UNAME_RELEASE}
224+ exit ;;
225 m68k:machten:*:*)
226 echo m68k-apple-machten${UNAME_RELEASE}
227 exit ;;
228@@ -481,8 +484,8 @@
229 echo m88k-motorola-sysv3
230 exit ;;
231 AViiON:dgux:*:*)
232- # DG/UX returns AViiON for all architectures
233- UNAME_PROCESSOR=`/usr/bin/uname -p`
234+ # DG/UX returns AViiON for all architectures
235+ UNAME_PROCESSOR=`/usr/bin/uname -p`
236 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
237 then
238 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
239@@ -495,7 +498,7 @@
240 else
241 echo i586-dg-dgux${UNAME_RELEASE}
242 fi
243- exit ;;
244+ exit ;;
245 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
246 echo m88k-dolphin-sysv3
247 exit ;;
248@@ -552,7 +555,7 @@
249 echo rs6000-ibm-aix3.2
250 fi
251 exit ;;
252- *:AIX:*:[456])
253+ *:AIX:*:[4567])
254 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
255 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
256 IBM_ARCH=rs6000
257@@ -595,52 +598,52 @@
258 9000/[678][0-9][0-9])
259 if [ -x /usr/bin/getconf ]; then
260 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
261- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
262- case "${sc_cpu_version}" in
263- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
264- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
265- 532) # CPU_PA_RISC2_0
266- case "${sc_kernel_bits}" in
267- 32) HP_ARCH="hppa2.0n" ;;
268- 64) HP_ARCH="hppa2.0w" ;;
269+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
270+ case "${sc_cpu_version}" in
271+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
272+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
273+ 532) # CPU_PA_RISC2_0
274+ case "${sc_kernel_bits}" in
275+ 32) HP_ARCH="hppa2.0n" ;;
276+ 64) HP_ARCH="hppa2.0w" ;;
277 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
278- esac ;;
279- esac
280+ esac ;;
281+ esac
282 fi
283 if [ "${HP_ARCH}" = "" ]; then
284 eval $set_cc_for_build
285- sed 's/^ //' << EOF >$dummy.c
286-
287- #define _HPUX_SOURCE
288- #include <stdlib.h>
289- #include <unistd.h>
290-
291- int main ()
292- {
293- #if defined(_SC_KERNEL_BITS)
294- long bits = sysconf(_SC_KERNEL_BITS);
295- #endif
296- long cpu = sysconf (_SC_CPU_VERSION);
297-
298- switch (cpu)
299- {
300- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
301- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
302- case CPU_PA_RISC2_0:
303- #if defined(_SC_KERNEL_BITS)
304- switch (bits)
305- {
306- case 64: puts ("hppa2.0w"); break;
307- case 32: puts ("hppa2.0n"); break;
308- default: puts ("hppa2.0"); break;
309- } break;
310- #else /* !defined(_SC_KERNEL_BITS) */
311- puts ("hppa2.0"); break;
312- #endif
313- default: puts ("hppa1.0"); break;
314- }
315- exit (0);
316- }
317+ sed 's/^ //' << EOF >$dummy.c
318+
319+ #define _HPUX_SOURCE
320+ #include <stdlib.h>
321+ #include <unistd.h>
322+
323+ int main ()
324+ {
325+ #if defined(_SC_KERNEL_BITS)
326+ long bits = sysconf(_SC_KERNEL_BITS);
327+ #endif
328+ long cpu = sysconf (_SC_CPU_VERSION);
329+
330+ switch (cpu)
331+ {
332+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
333+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
334+ case CPU_PA_RISC2_0:
335+ #if defined(_SC_KERNEL_BITS)
336+ switch (bits)
337+ {
338+ case 64: puts ("hppa2.0w"); break;
339+ case 32: puts ("hppa2.0n"); break;
340+ default: puts ("hppa2.0"); break;
341+ } break;
342+ #else /* !defined(_SC_KERNEL_BITS) */
343+ puts ("hppa2.0"); break;
344+ #endif
345+ default: puts ("hppa1.0"); break;
346+ }
347+ exit (0);
348+ }
349 EOF
350 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
351 test -z "$HP_ARCH" && HP_ARCH=hppa
352@@ -731,22 +734,22 @@
353 exit ;;
354 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
355 echo c1-convex-bsd
356- exit ;;
357+ exit ;;
358 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
359 if getsysinfo -f scalar_acc
360 then echo c32-convex-bsd
361 else echo c2-convex-bsd
362 fi
363- exit ;;
364+ exit ;;
365 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
366 echo c34-convex-bsd
367- exit ;;
368+ exit ;;
369 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
370 echo c38-convex-bsd
371- exit ;;
372+ exit ;;
373 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
374 echo c4-convex-bsd
375- exit ;;
376+ exit ;;
377 CRAY*Y-MP:*:*:*)
378 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
379 exit ;;
380@@ -770,14 +773,14 @@
381 exit ;;
382 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
383 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
384- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
385- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
386- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
387- exit ;;
388+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
389+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
390+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
391+ exit ;;
392 5000:UNIX_System_V:4.*:*)
393- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
394- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
395- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
396+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
397+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
398+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
399 exit ;;
400 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
401 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
402@@ -805,14 +808,14 @@
403 echo ${UNAME_MACHINE}-pc-mingw32
404 exit ;;
405 i*:windows32*:*)
406- # uname -m includes "-pc" on this system.
407- echo ${UNAME_MACHINE}-mingw32
408+ # uname -m includes "-pc" on this system.
409+ echo ${UNAME_MACHINE}-mingw32
410 exit ;;
411 i*:PW*:*)
412 echo ${UNAME_MACHINE}-pc-pw32
413 exit ;;
414 *:Interix*:*)
415- case ${UNAME_MACHINE} in
416+ case ${UNAME_MACHINE} in
417 x86)
418 echo i586-pc-interix${UNAME_RELEASE}
419 exit ;;
420@@ -867,7 +870,7 @@
421 EV6) UNAME_MACHINE=alphaev6 ;;
422 EV67) UNAME_MACHINE=alphaev67 ;;
423 EV68*) UNAME_MACHINE=alphaev68 ;;
424- esac
425+ esac
426 objdump --private-headers /bin/sh | grep -q ld.so.1
427 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
428 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
429@@ -879,7 +882,13 @@
430 then
431 echo ${UNAME_MACHINE}-unknown-linux-gnu
432 else
433- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
434+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
435+ | grep -q __ARM_PCS_VFP
436+ then
437+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
438+ else
439+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
440+ fi
441 fi
442 exit ;;
443 avr32*:Linux:*:*)
444@@ -892,7 +901,7 @@
445 echo crisv32-axis-linux-gnu
446 exit ;;
447 frv:Linux:*:*)
448- echo frv-unknown-linux-gnu
449+ echo frv-unknown-linux-gnu
450 exit ;;
451 i*86:Linux:*:*)
452 LIBC=gnu
453@@ -960,7 +969,7 @@
454 echo ${UNAME_MACHINE}-ibm-linux
455 exit ;;
456 sh64*:Linux:*:*)
457- echo ${UNAME_MACHINE}-unknown-linux-gnu
458+ echo ${UNAME_MACHINE}-unknown-linux-gnu
459 exit ;;
460 sh*:Linux:*:*)
461 echo ${UNAME_MACHINE}-unknown-linux-gnu
462@@ -968,6 +977,9 @@
463 sparc:Linux:*:* | sparc64:Linux:*:*)
464 echo ${UNAME_MACHINE}-unknown-linux-gnu
465 exit ;;
466+ tile*:Linux:*:*)
467+ echo ${UNAME_MACHINE}-tilera-linux-gnu
468+ exit ;;
469 vax:Linux:*:*)
470 echo ${UNAME_MACHINE}-dec-linux-gnu
471 exit ;;
472@@ -975,7 +987,7 @@
473 echo x86_64-unknown-linux-gnu
474 exit ;;
475 xtensa*:Linux:*:*)
476- echo ${UNAME_MACHINE}-unknown-linux-gnu
477+ echo ${UNAME_MACHINE}-unknown-linux-gnu
478 exit ;;
479 i*86:DYNIX/ptx:4*:*)
480 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
481@@ -984,11 +996,11 @@
482 echo i386-sequent-sysv4
483 exit ;;
484 i*86:UNIX_SV:4.2MP:2.*)
485- # Unixware is an offshoot of SVR4, but it has its own version
486- # number series starting with 2...
487- # I am not positive that other SVR4 systems won't match this,
488+ # Unixware is an offshoot of SVR4, but it has its own version
489+ # number series starting with 2...
490+ # I am not positive that other SVR4 systems won't match this,
491 # I just have to hope. -- rms.
492- # Use sysv4.2uw... so that sysv4* matches it.
493+ # Use sysv4.2uw... so that sysv4* matches it.
494 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
495 exit ;;
496 i*86:OS/2:*:*)
497@@ -1020,7 +1032,7 @@
498 fi
499 exit ;;
500 i*86:*:5:[678]*)
501- # UnixWare 7.x, OpenUNIX and OpenServer 6.
502+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
503 case `/bin/uname -X | grep "^Machine"` in
504 *486*) UNAME_MACHINE=i486 ;;
505 *Pentium) UNAME_MACHINE=i586 ;;
506@@ -1048,13 +1060,13 @@
507 exit ;;
508 pc:*:*:*)
509 # Left here for compatibility:
510- # uname -m prints for DJGPP always 'pc', but it prints nothing about
511- # the processor, so we play safe by assuming i586.
512+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
513+ # the processor, so we play safe by assuming i586.
514 # Note: whatever this is, it MUST be the same as what config.sub
515 # prints for the "djgpp" host, or else GDB configury will decide that
516 # this is a cross-build.
517 echo i586-pc-msdosdjgpp
518- exit ;;
519+ exit ;;
520 Intel:Mach:3*:*)
521 echo i386-pc-mach3
522 exit ;;
523@@ -1089,8 +1101,8 @@
524 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
525 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
526 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
527- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
528- && { echo i486-ncr-sysv4; exit; } ;;
529+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
530+ && { echo i486-ncr-sysv4; exit; } ;;
531 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
532 OS_REL='.3'
533 test -r /etc/.relid \
534@@ -1133,10 +1145,10 @@
535 echo ns32k-sni-sysv
536 fi
537 exit ;;
538- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
539- # says <Richard.M.Bartel@ccMail.Census.GOV>
540- echo i586-unisys-sysv4
541- exit ;;
542+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
543+ # says <Richard.M.Bartel@ccMail.Census.GOV>
544+ echo i586-unisys-sysv4
545+ exit ;;
546 *:UNIX_System_V:4*:FTX*)
547 # From Gerald Hewes <hewes@openmarket.com>.
548 # How about differentiating between stratus architectures? -djm
549@@ -1162,11 +1174,11 @@
550 exit ;;
551 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
552 if [ -d /usr/nec ]; then
553- echo mips-nec-sysv${UNAME_RELEASE}
554+ echo mips-nec-sysv${UNAME_RELEASE}
555 else
556- echo mips-unknown-sysv${UNAME_RELEASE}
557+ echo mips-unknown-sysv${UNAME_RELEASE}
558 fi
559- exit ;;
560+ exit ;;
561 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
562 echo powerpc-be-beos
563 exit ;;
564@@ -1231,6 +1243,9 @@
565 *:QNX:*:4*)
566 echo i386-pc-qnx
567 exit ;;
568+ NEO-?:NONSTOP_KERNEL:*:*)
569+ echo neo-tandem-nsk${UNAME_RELEASE}
570+ exit ;;
571 NSE-?:NONSTOP_KERNEL:*:*)
572 echo nse-tandem-nsk${UNAME_RELEASE}
573 exit ;;
574@@ -1276,13 +1291,13 @@
575 echo pdp10-unknown-its
576 exit ;;
577 SEI:*:*:SEIUX)
578- echo mips-sei-seiux${UNAME_RELEASE}
579+ echo mips-sei-seiux${UNAME_RELEASE}
580 exit ;;
581 *:DragonFly:*:*)
582 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
583 exit ;;
584 *:*VMS:*:*)
585- UNAME_MACHINE=`(uname -p) 2>/dev/null`
586+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
587 case "${UNAME_MACHINE}" in
588 A*) echo alpha-dec-vms ; exit ;;
589 I*) echo ia64-dec-vms ; exit ;;
590@@ -1322,11 +1337,11 @@
591 #include <sys/param.h>
592 printf ("m68k-sony-newsos%s\n",
593 #ifdef NEWSOS4
594- "4"
595+ "4"
596 #else
597- ""
598+ ""
599 #endif
600- ); exit (0);
601+ ); exit (0);
602 #endif
603 #endif
604
605
606=== modified file 'config.h.in'
607--- config.h.in 2011-02-20 12:07:30 +0000
608+++ config.h.in 2011-07-10 11:35:55 +0000
609@@ -285,6 +285,12 @@
610 /* Build in libwpg */
611 #undef WITH_LIBWPG
612
613+/* Build in libwpg 0.1.x */
614+#undef WITH_LIBWPG01
615+
616+/* Build in libwpg 0.2.x */
617+#undef WITH_LIBWPG02
618+
619 /* use Perl for embedded scripting */
620 #undef WITH_PERL
621
622
623=== modified file 'config.sub'
624--- config.sub 2011-02-20 12:07:30 +0000
625+++ config.sub 2011-07-10 11:35:55 +0000
626@@ -1,10 +1,10 @@
627 #! /bin/sh
628 # Configuration validation subroutine script.
629 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
630-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
631-# Free Software Foundation, Inc.
632+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
633+# 2011 Free Software Foundation, Inc.
634
635-timestamp='2010-01-22'
636+timestamp='2011-03-23'
637
638 # This file is (in principle) common to ALL GNU software.
639 # The presence of a machine in this file suggests that SOME GNU software
640@@ -76,7 +76,7 @@
641 GNU config.sub ($timestamp)
642
643 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
644-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
645+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
646 Software Foundation, Inc.
647
648 This is free software; see the source for copying conditions. There is NO
649@@ -124,8 +124,9 @@
650 # Here we must recognize all the valid KERNEL-OS combinations.
651 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
652 case $maybe_os in
653- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
654- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
655+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
656+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
657+ knetbsd*-gnu* | netbsd*-gnu* | \
658 kopensolaris*-gnu* | \
659 storm-chaos* | os2-emx* | rtmk-nova*)
660 os=-$maybe_os
661@@ -157,8 +158,8 @@
662 os=
663 basic_machine=$1
664 ;;
665- -bluegene*)
666- os=-cnk
667+ -bluegene*)
668+ os=-cnk
669 ;;
670 -sim | -cisco | -oki | -wec | -winbond)
671 os=
672@@ -174,10 +175,10 @@
673 os=-chorusos
674 basic_machine=$1
675 ;;
676- -chorusrdb)
677- os=-chorusrdb
678+ -chorusrdb)
679+ os=-chorusrdb
680 basic_machine=$1
681- ;;
682+ ;;
683 -hiux*)
684 os=-hiuxwe2
685 ;;
686@@ -282,11 +283,13 @@
687 | moxie \
688 | mt \
689 | msp430 \
690+ | nds32 | nds32le | nds32be \
691 | nios | nios2 \
692 | ns16k | ns32k \
693+ | open8 \
694 | or32 \
695 | pdp10 | pdp11 | pj | pjl \
696- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
697+ | powerpc | powerpc64 | powerpc64le | powerpcle \
698 | pyramid \
699 | rx \
700 | score \
701@@ -294,15 +297,24 @@
702 | sh64 | sh64le \
703 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
704 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
705- | spu | strongarm \
706- | tahoe | thumb | tic4x | tic80 | tron \
707+ | spu \
708+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
709 | ubicom32 \
710 | v850 | v850e \
711 | we32k \
712- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
713+ | x86 | xc16x | xstormy16 | xtensa \
714 | z8k | z80)
715 basic_machine=$basic_machine-unknown
716 ;;
717+ c54x)
718+ basic_machine=tic54x-unknown
719+ ;;
720+ c55x)
721+ basic_machine=tic55x-unknown
722+ ;;
723+ c6x)
724+ basic_machine=tic6x-unknown
725+ ;;
726 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
727 # Motorola 68HC11/12.
728 basic_machine=$basic_machine-unknown
729@@ -314,6 +326,18 @@
730 basic_machine=mt-unknown
731 ;;
732
733+ strongarm | thumb | xscale)
734+ basic_machine=arm-unknown
735+ ;;
736+
737+ xscaleeb)
738+ basic_machine=armeb-unknown
739+ ;;
740+
741+ xscaleel)
742+ basic_machine=armel-unknown
743+ ;;
744+
745 # We use `pc' rather than `unknown'
746 # because (1) that's what they normally are, and
747 # (2) the word "unknown" tends to confuse beginning users.
748@@ -334,7 +358,7 @@
749 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
750 | avr-* | avr32-* \
751 | bfin-* | bs2000-* \
752- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
753+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
754 | clipper-* | craynv-* | cydra-* \
755 | d10v-* | d30v-* | dlx-* \
756 | elxsi-* \
757@@ -368,26 +392,28 @@
758 | mmix-* \
759 | mt-* \
760 | msp430-* \
761+ | nds32-* | nds32le-* | nds32be-* \
762 | nios-* | nios2-* \
763 | none-* | np1-* | ns16k-* | ns32k-* \
764+ | open8-* \
765 | orion-* \
766 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
767- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
768+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
769 | pyramid-* \
770 | romp-* | rs6000-* | rx-* \
771 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
772 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
773 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
774 | sparclite-* \
775- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
776- | tahoe-* | thumb-* \
777+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
778+ | tahoe-* \
779 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
780 | tile-* | tilegx-* \
781 | tron-* \
782 | ubicom32-* \
783 | v850-* | v850e-* | vax-* \
784 | we32k-* \
785- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
786+ | x86-* | x86_64-* | xc16x-* | xps100-* \
787 | xstormy16-* | xtensa*-* \
788 | ymp-* \
789 | z8k-* | z80-*)
790@@ -412,7 +438,7 @@
791 basic_machine=a29k-amd
792 os=-udi
793 ;;
794- abacus)
795+ abacus)
796 basic_machine=abacus-unknown
797 ;;
798 adobe68k)
799@@ -482,11 +508,20 @@
800 basic_machine=powerpc-ibm
801 os=-cnk
802 ;;
803+ c54x-*)
804+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
805+ ;;
806+ c55x-*)
807+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
808+ ;;
809+ c6x-*)
810+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
811+ ;;
812 c90)
813 basic_machine=c90-cray
814 os=-unicos
815 ;;
816- cegcc)
817+ cegcc)
818 basic_machine=arm-unknown
819 os=-cegcc
820 ;;
821@@ -518,7 +553,7 @@
822 basic_machine=craynv-cray
823 os=-unicosmp
824 ;;
825- cr16)
826+ cr16 | cr16-*)
827 basic_machine=cr16-unknown
828 os=-elf
829 ;;
830@@ -734,7 +769,7 @@
831 basic_machine=ns32k-utek
832 os=-sysv
833 ;;
834- microblaze)
835+ microblaze)
836 basic_machine=microblaze-xilinx
837 ;;
838 mingw32)
839@@ -841,6 +876,12 @@
840 np1)
841 basic_machine=np1-gould
842 ;;
843+ neo-tandem)
844+ basic_machine=neo-tandem
845+ ;;
846+ nse-tandem)
847+ basic_machine=nse-tandem
848+ ;;
849 nsr-tandem)
850 basic_machine=nsr-tandem
851 ;;
852@@ -923,9 +964,10 @@
853 ;;
854 power) basic_machine=power-ibm
855 ;;
856- ppc) basic_machine=powerpc-unknown
857+ ppc | ppcbe) basic_machine=powerpc-unknown
858 ;;
859- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
860+ ppc-* | ppcbe-*)
861+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
862 ;;
863 ppcle | powerpclittle | ppc-le | powerpc-little)
864 basic_machine=powerpcle-unknown
865@@ -1019,6 +1061,9 @@
866 basic_machine=i860-stratus
867 os=-sysv4
868 ;;
869+ strongarm-* | thumb-*)
870+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
871+ ;;
872 sun2)
873 basic_machine=m68000-sun
874 ;;
875@@ -1075,20 +1120,8 @@
876 basic_machine=t90-cray
877 os=-unicos
878 ;;
879- tic54x | c54x*)
880- basic_machine=tic54x-unknown
881- os=-coff
882- ;;
883- tic55x | c55x*)
884- basic_machine=tic55x-unknown
885- os=-coff
886- ;;
887- tic6x | c6x*)
888- basic_machine=tic6x-unknown
889- os=-coff
890- ;;
891- # This must be matched before tile*.
892- tilegx*)
893+ # This must be matched before tile*.
894+ tilegx*)
895 basic_machine=tilegx-unknown
896 os=-linux-gnu
897 ;;
898@@ -1163,6 +1196,9 @@
899 xps | xps100)
900 basic_machine=xps100-honeywell
901 ;;
902+ xscale-* | xscalee[bl]-*)
903+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
904+ ;;
905 ymp)
906 basic_machine=ymp-cray
907 os=-unicos
908@@ -1260,11 +1296,11 @@
909 if [ x"$os" != x"" ]
910 then
911 case $os in
912- # First match some system type aliases
913- # that might get confused with valid system types.
914+ # First match some system type aliases
915+ # that might get confused with valid system types.
916 # -solaris* is a basic system type, with this one exception.
917- -auroraux)
918- os=-auroraux
919+ -auroraux)
920+ os=-auroraux
921 ;;
922 -solaris1 | -solaris1.*)
923 os=`echo $os | sed -e 's|solaris1|sunos4|'`
924@@ -1301,7 +1337,8 @@
925 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
926 | -chorusos* | -chorusrdb* | -cegcc* \
927 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
928- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
929+ | -mingw32* | -linux-gnu* | -linux-android* \
930+ | -linux-newlib* | -linux-uclibc* \
931 | -uxpv* | -beos* | -mpeix* | -udk* \
932 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
933 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
934@@ -1348,7 +1385,7 @@
935 -opened*)
936 os=-openedition
937 ;;
938- -os400*)
939+ -os400*)
940 os=-os400
941 ;;
942 -wince*)
943@@ -1397,7 +1434,7 @@
944 -sinix*)
945 os=-sysv4
946 ;;
947- -tpf*)
948+ -tpf*)
949 os=-tpf
950 ;;
951 -triton*)
952@@ -1442,8 +1479,8 @@
953 -dicos*)
954 os=-dicos
955 ;;
956- -nacl*)
957- ;;
958+ -nacl*)
959+ ;;
960 -none)
961 ;;
962 *)
963@@ -1466,10 +1503,10 @@
964 # system, and we'll never get to this point.
965
966 case $basic_machine in
967- score-*)
968+ score-*)
969 os=-elf
970 ;;
971- spu-*)
972+ spu-*)
973 os=-elf
974 ;;
975 *-acorn)
976@@ -1481,8 +1518,17 @@
977 arm*-semi)
978 os=-aout
979 ;;
980- c4x-* | tic4x-*)
981- os=-coff
982+ c4x-* | tic4x-*)
983+ os=-coff
984+ ;;
985+ tic54x-*)
986+ os=-coff
987+ ;;
988+ tic55x-*)
989+ os=-coff
990+ ;;
991+ tic6x-*)
992+ os=-coff
993 ;;
994 # This must come before the *-dec entry.
995 pdp10-*)
996@@ -1509,7 +1555,7 @@
997 m68*-cisco)
998 os=-aout
999 ;;
1000- mep-*)
1001+ mep-*)
1002 os=-elf
1003 ;;
1004 mips*-cisco)
1005@@ -1536,7 +1582,7 @@
1006 *-ibm)
1007 os=-aix
1008 ;;
1009- *-knuth)
1010+ *-knuth)
1011 os=-mmixware
1012 ;;
1013 *-wec)
1014
1015=== modified file 'configure'
1016--- configure 2011-02-20 12:07:30 +0000
1017+++ configure 2011-07-10 11:35:55 +0000
1018@@ -1,6 +1,6 @@
1019 #! /bin/sh
1020 # Guess values for system-dependent variables and create Makefiles.
1021-# Generated by GNU Autoconf 2.67 for inkscape 0.48.1.
1022+# Generated by GNU Autoconf 2.68 for inkscape 0.48.2.
1023 #
1024 #
1025 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1026@@ -89,6 +89,7 @@
1027 IFS=" "" $as_nl"
1028
1029 # Find who we are. Look in the path if we contain no directory separator.
1030+as_myself=
1031 case $0 in #((
1032 *[\\/]* ) as_myself=$0 ;;
1033 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1034@@ -214,11 +215,18 @@
1035 # We cannot yet assume a decent shell, so we have to provide a
1036 # neutralization value for shells without unset; and this also
1037 # works around shells that cannot unset nonexistent variables.
1038+ # Preserve -v and -x to the replacement shell.
1039 BASH_ENV=/dev/null
1040 ENV=/dev/null
1041 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1042 export CONFIG_SHELL
1043- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1044+ case $- in # ((((
1045+ *v*x* | *x*v* ) as_opts=-vx ;;
1046+ *v* ) as_opts=-v ;;
1047+ *x* ) as_opts=-x ;;
1048+ * ) as_opts= ;;
1049+ esac
1050+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
1051 fi
1052
1053 if test x$as_have_required = xno; then :
1054@@ -549,8 +557,8 @@
1055 # Identity of this package.
1056 PACKAGE_NAME='inkscape'
1057 PACKAGE_TARNAME='inkscape'
1058-PACKAGE_VERSION='0.48.1'
1059-PACKAGE_STRING='inkscape 0.48.1'
1060+PACKAGE_VERSION='0.48.2'
1061+PACKAGE_STRING='inkscape 0.48.2'
1062 PACKAGE_BUGREPORT=''
1063 PACKAGE_URL=''
1064
1065@@ -613,8 +621,16 @@
1066 IMAGEMAGICK_CFLAGS
1067 WITH_LIBWPG_FALSE
1068 WITH_LIBWPG_TRUE
1069+WITH_LIBWPG02_FALSE
1070+WITH_LIBWPG02_TRUE
1071+LIBWPG02_LIBS
1072+LIBWPG02_CFLAGS
1073+WITH_LIBWPG01_FALSE
1074+WITH_LIBWPG01_TRUE
1075+LIBWPG_CFLAGS
1076 LIBWPG_LIBS
1077-LIBWPG_CFLAGS
1078+LIBWPG01_LIBS
1079+LIBWPG01_CFLAGS
1080 INKBOARD_CFLAGS
1081 INKBOARD_LIBS
1082 POPPLER_GFXFONT_LIBS
1083@@ -653,6 +669,8 @@
1084 PKG_CONFIG_PATH
1085 PLATFORM_SOLARIS_FALSE
1086 PLATFORM_SOLARIS_TRUE
1087+PLATFORM_OSX_FALSE
1088+PLATFORM_OSX_TRUE
1089 WIN32_CFLAGS
1090 PLATFORM_WIN32_FALSE
1091 PLATFORM_WIN32_TRUE
1092@@ -858,8 +876,10 @@
1093 POPPLER_CAIRO_LIBS
1094 POPPLER_GFXFONT_CFLAGS
1095 POPPLER_GFXFONT_LIBS
1096-LIBWPG_CFLAGS
1097-LIBWPG_LIBS
1098+LIBWPG01_CFLAGS
1099+LIBWPG01_LIBS
1100+LIBWPG02_CFLAGS
1101+LIBWPG02_LIBS
1102 IMAGEMAGICK_CFLAGS
1103 IMAGEMAGICK_LIBS
1104 CAIRO_USER_FONTS_CFLAGS
1105@@ -1272,7 +1292,7 @@
1106 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1107 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1108 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1109- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1110+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1111 ;;
1112
1113 esac
1114@@ -1410,7 +1430,7 @@
1115 # Omit some internal or obsolete options to make the list less imposing.
1116 # This message is too long to be a string in the A/UX 3.1 sh.
1117 cat <<_ACEOF
1118-\`configure' configures inkscape 0.48.1 to adapt to many kinds of systems.
1119+\`configure' configures inkscape 0.48.2 to adapt to many kinds of systems.
1120
1121 Usage: $0 [OPTION]... [VAR=VALUE]...
1122
1123@@ -1480,7 +1500,7 @@
1124
1125 if test -n "$ac_init_help"; then
1126 case $ac_init_help in
1127- short | recursive ) echo "Configuration of inkscape 0.48.1:";;
1128+ short | recursive ) echo "Configuration of inkscape 0.48.2:";;
1129 esac
1130 cat <<\_ACEOF
1131
1132@@ -1558,9 +1578,14 @@
1133 C compiler flags for POPPLER_GFXFONT, overriding pkg-config
1134 POPPLER_GFXFONT_LIBS
1135 linker flags for POPPLER_GFXFONT, overriding pkg-config
1136- LIBWPG_CFLAGS
1137- C compiler flags for LIBWPG, overriding pkg-config
1138- LIBWPG_LIBS linker flags for LIBWPG, overriding pkg-config
1139+ LIBWPG01_CFLAGS
1140+ C compiler flags for LIBWPG01, overriding pkg-config
1141+ LIBWPG01_LIBS
1142+ linker flags for LIBWPG01, overriding pkg-config
1143+ LIBWPG02_CFLAGS
1144+ C compiler flags for LIBWPG02, overriding pkg-config
1145+ LIBWPG02_LIBS
1146+ linker flags for LIBWPG02, overriding pkg-config
1147 IMAGEMAGICK_CFLAGS
1148 C compiler flags for IMAGEMAGICK, overriding pkg-config
1149 IMAGEMAGICK_LIBS
1150@@ -1644,8 +1669,8 @@
1151 test -n "$ac_init_help" && exit $ac_status
1152 if $ac_init_version; then
1153 cat <<\_ACEOF
1154-inkscape configure 0.48.1
1155-generated by GNU Autoconf 2.67
1156+inkscape configure 0.48.2
1157+generated by GNU Autoconf 2.68
1158
1159 Copyright (C) 2010 Free Software Foundation, Inc.
1160 This configure script is free software; the Free Software Foundation
1161@@ -1691,7 +1716,7 @@
1162
1163 ac_retval=1
1164 fi
1165- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1166+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1167 as_fn_set_status $ac_retval
1168
1169 } # ac_fn_cxx_try_compile
1170@@ -1737,7 +1762,7 @@
1171 # interfere with the next link command; also delete a directory that is
1172 # left behind by Apple's compiler. We do this before executing the actions.
1173 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1174- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1175+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1176 as_fn_set_status $ac_retval
1177
1178 } # ac_fn_cxx_try_link
1179@@ -1775,7 +1800,7 @@
1180
1181 ac_retval=1
1182 fi
1183- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1184+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1185 as_fn_set_status $ac_retval
1186
1187 } # ac_fn_c_try_compile
1188@@ -1788,7 +1813,7 @@
1189 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1190 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1191 $as_echo_n "checking for $2... " >&6; }
1192-if eval "test \"\${$3+set}\"" = set; then :
1193+if eval \${$3+:} false; then :
1194 $as_echo_n "(cached) " >&6
1195 else
1196 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1197@@ -1843,7 +1868,7 @@
1198 eval ac_res=\$$3
1199 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1200 $as_echo "$ac_res" >&6; }
1201- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1202+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1203
1204 } # ac_fn_cxx_check_func
1205
1206@@ -1879,7 +1904,7 @@
1207
1208 ac_retval=1
1209 fi
1210- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1211+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1212 as_fn_set_status $ac_retval
1213
1214 } # ac_fn_cxx_try_cpp
1215@@ -1921,7 +1946,7 @@
1216 ac_retval=$ac_status
1217 fi
1218 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1219- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1220+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1221 as_fn_set_status $ac_retval
1222
1223 } # ac_fn_cxx_try_run
1224@@ -1967,7 +1992,7 @@
1225 # interfere with the next link command; also delete a directory that is
1226 # left behind by Apple's compiler. We do this before executing the actions.
1227 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1228- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1229+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1230 as_fn_set_status $ac_retval
1231
1232 } # ac_fn_c_try_link
1233@@ -1980,10 +2005,10 @@
1234 ac_fn_cxx_check_header_mongrel ()
1235 {
1236 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1237- if eval "test \"\${$3+set}\"" = set; then :
1238+ if eval \${$3+:} false; then :
1239 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1240 $as_echo_n "checking for $2... " >&6; }
1241-if eval "test \"\${$3+set}\"" = set; then :
1242+if eval \${$3+:} false; then :
1243 $as_echo_n "(cached) " >&6
1244 fi
1245 eval ac_res=\$$3
1246@@ -2046,7 +2071,7 @@
1247 esac
1248 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1249 $as_echo_n "checking for $2... " >&6; }
1250-if eval "test \"\${$3+set}\"" = set; then :
1251+if eval \${$3+:} false; then :
1252 $as_echo_n "(cached) " >&6
1253 else
1254 eval "$3=\$ac_header_compiler"
1255@@ -2055,7 +2080,7 @@
1256 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1257 $as_echo "$ac_res" >&6; }
1258 fi
1259- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1260+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1261
1262 } # ac_fn_cxx_check_header_mongrel
1263
1264@@ -2068,7 +2093,7 @@
1265 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1266 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1267 $as_echo_n "checking for $2... " >&6; }
1268-if eval "test \"\${$3+set}\"" = set; then :
1269+if eval \${$3+:} false; then :
1270 $as_echo_n "(cached) " >&6
1271 else
1272 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1273@@ -2086,7 +2111,7 @@
1274 eval ac_res=\$$3
1275 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1276 $as_echo "$ac_res" >&6; }
1277- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1278+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1279
1280 } # ac_fn_cxx_check_header_compile
1281
1282@@ -2099,7 +2124,7 @@
1283 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1284 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
1285 $as_echo_n "checking for $2.$3... " >&6; }
1286-if eval "test \"\${$4+set}\"" = set; then :
1287+if eval \${$4+:} false; then :
1288 $as_echo_n "(cached) " >&6
1289 else
1290 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1291@@ -2143,7 +2168,7 @@
1292 eval ac_res=\$$4
1293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1294 $as_echo "$ac_res" >&6; }
1295- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1296+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1297
1298 } # ac_fn_cxx_check_member
1299
1300@@ -2156,7 +2181,7 @@
1301 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1302 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1303 $as_echo_n "checking for $2... " >&6; }
1304-if eval "test \"\${$3+set}\"" = set; then :
1305+if eval \${$3+:} false; then :
1306 $as_echo_n "(cached) " >&6
1307 else
1308 eval "$3=no"
1309@@ -2197,15 +2222,15 @@
1310 eval ac_res=\$$3
1311 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1312 $as_echo "$ac_res" >&6; }
1313- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1314+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1315
1316 } # ac_fn_cxx_check_type
1317 cat >config.log <<_ACEOF
1318 This file contains any messages produced by compilers while
1319 running configure, to aid debugging if configure makes a mistake.
1320
1321-It was created by inkscape $as_me 0.48.1, which was
1322-generated by GNU Autoconf 2.67. Invocation command line was
1323+It was created by inkscape $as_me 0.48.2, which was
1324+generated by GNU Autoconf 2.68. Invocation command line was
1325
1326 $ $0 $@
1327
1328@@ -2463,7 +2488,7 @@
1329 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1330 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1331 as_fn_error $? "failed to load site script $ac_site_file
1332-See \`config.log' for more details" "$LINENO" 5 ; }
1333+See \`config.log' for more details" "$LINENO" 5; }
1334 fi
1335 done
1336
1337@@ -2588,7 +2613,7 @@
1338
1339 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
1340 $as_echo_n "checking build system type... " >&6; }
1341-if test "${ac_cv_build+set}" = set; then :
1342+if ${ac_cv_build+:} false; then :
1343 $as_echo_n "(cached) " >&6
1344 else
1345 ac_build_alias=$build_alias
1346@@ -2604,7 +2629,7 @@
1347 $as_echo "$ac_cv_build" >&6; }
1348 case $ac_cv_build in
1349 *-*-*) ;;
1350-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
1351+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
1352 esac
1353 build=$ac_cv_build
1354 ac_save_IFS=$IFS; IFS='-'
1355@@ -2622,7 +2647,7 @@
1356
1357 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
1358 $as_echo_n "checking host system type... " >&6; }
1359-if test "${ac_cv_host+set}" = set; then :
1360+if ${ac_cv_host+:} false; then :
1361 $as_echo_n "(cached) " >&6
1362 else
1363 if test "x$host_alias" = x; then
1364@@ -2637,7 +2662,7 @@
1365 $as_echo "$ac_cv_host" >&6; }
1366 case $ac_cv_host in
1367 *-*-*) ;;
1368-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
1369+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
1370 esac
1371 host=$ac_cv_host
1372 ac_save_IFS=$IFS; IFS='-'
1373@@ -2673,7 +2698,7 @@
1374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
1375 $as_echo_n "checking for a BSD-compatible install... " >&6; }
1376 if test -z "$INSTALL"; then
1377-if test "${ac_cv_path_install+set}" = set; then :
1378+if ${ac_cv_path_install+:} false; then :
1379 $as_echo_n "(cached) " >&6
1380 else
1381 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1382@@ -2760,11 +2785,11 @@
1383 '
1384 case `pwd` in
1385 *[\\\"\#\$\&\'\`$am_lf]*)
1386- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
1387+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
1388 esac
1389 case $srcdir in
1390 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
1391- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
1392+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
1393 esac
1394
1395 # Do `set' in a subshell so we don't clobber the current shell's
1396@@ -2850,7 +2875,7 @@
1397 set dummy ${ac_tool_prefix}strip; ac_word=$2
1398 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1399 $as_echo_n "checking for $ac_word... " >&6; }
1400-if test "${ac_cv_prog_STRIP+set}" = set; then :
1401+if ${ac_cv_prog_STRIP+:} false; then :
1402 $as_echo_n "(cached) " >&6
1403 else
1404 if test -n "$STRIP"; then
1405@@ -2890,7 +2915,7 @@
1406 set dummy strip; ac_word=$2
1407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1408 $as_echo_n "checking for $ac_word... " >&6; }
1409-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1410+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1411 $as_echo_n "(cached) " >&6
1412 else
1413 if test -n "$ac_ct_STRIP"; then
1414@@ -2943,7 +2968,7 @@
1415 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
1416 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
1417 if test -z "$MKDIR_P"; then
1418- if test "${ac_cv_path_mkdir+set}" = set; then :
1419+ if ${ac_cv_path_mkdir+:} false; then :
1420 $as_echo_n "(cached) " >&6
1421 else
1422 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1423@@ -2994,7 +3019,7 @@
1424 set dummy $ac_prog; ac_word=$2
1425 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1426 $as_echo_n "checking for $ac_word... " >&6; }
1427-if test "${ac_cv_prog_AWK+set}" = set; then :
1428+if ${ac_cv_prog_AWK+:} false; then :
1429 $as_echo_n "(cached) " >&6
1430 else
1431 if test -n "$AWK"; then
1432@@ -3034,7 +3059,7 @@
1433 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
1434 set x ${MAKE-make}
1435 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1436-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
1437+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
1438 $as_echo_n "(cached) " >&6
1439 else
1440 cat >conftest.make <<\_ACEOF
1441@@ -3092,7 +3117,7 @@
1442
1443 # Define the identity of the package.
1444 PACKAGE='inkscape'
1445- VERSION='0.48.1'
1446+ VERSION='0.48.2'
1447
1448
1449 cat >>confdefs.h <<_ACEOF
1450@@ -3200,7 +3225,7 @@
1451 done
1452 rm -rf conftest.dir
1453
1454-if test "${am_cv_prog_tar_pax+set}" = set; then :
1455+if ${am_cv_prog_tar_pax+:} false; then :
1456 $as_echo_n "(cached) " >&6
1457 else
1458 am_cv_prog_tar_pax=$_am_tool
1459@@ -3313,7 +3338,7 @@
1460 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1461 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1462 $as_echo_n "checking for $ac_word... " >&6; }
1463-if test "${ac_cv_prog_CXX+set}" = set; then :
1464+if ${ac_cv_prog_CXX+:} false; then :
1465 $as_echo_n "(cached) " >&6
1466 else
1467 if test -n "$CXX"; then
1468@@ -3357,7 +3382,7 @@
1469 set dummy $ac_prog; ac_word=$2
1470 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1471 $as_echo_n "checking for $ac_word... " >&6; }
1472-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
1473+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
1474 $as_echo_n "(cached) " >&6
1475 else
1476 if test -n "$ac_ct_CXX"; then
1477@@ -3521,7 +3546,7 @@
1478 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1479 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1480 as_fn_error 77 "C++ compiler cannot create executables
1481-See \`config.log' for more details" "$LINENO" 5 ; }
1482+See \`config.log' for more details" "$LINENO" 5; }
1483 else
1484 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1485 $as_echo "yes" >&6; }
1486@@ -3564,7 +3589,7 @@
1487 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1488 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1489 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
1490-See \`config.log' for more details" "$LINENO" 5 ; }
1491+See \`config.log' for more details" "$LINENO" 5; }
1492 fi
1493 rm -f conftest conftest$ac_cv_exeext
1494 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
1495@@ -3623,7 +3648,7 @@
1496 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1497 as_fn_error $? "cannot run C++ compiled programs.
1498 If you meant to cross compile, use \`--host'.
1499-See \`config.log' for more details" "$LINENO" 5 ; }
1500+See \`config.log' for more details" "$LINENO" 5; }
1501 fi
1502 fi
1503 fi
1504@@ -3634,7 +3659,7 @@
1505 ac_clean_files=$ac_clean_files_save
1506 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
1507 $as_echo_n "checking for suffix of object files... " >&6; }
1508-if test "${ac_cv_objext+set}" = set; then :
1509+if ${ac_cv_objext+:} false; then :
1510 $as_echo_n "(cached) " >&6
1511 else
1512 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1513@@ -3675,7 +3700,7 @@
1514 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1515 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1516 as_fn_error $? "cannot compute suffix of object files: cannot compile
1517-See \`config.log' for more details" "$LINENO" 5 ; }
1518+See \`config.log' for more details" "$LINENO" 5; }
1519 fi
1520 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1521 fi
1522@@ -3685,7 +3710,7 @@
1523 ac_objext=$OBJEXT
1524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
1525 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
1526-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
1527+if ${ac_cv_cxx_compiler_gnu+:} false; then :
1528 $as_echo_n "(cached) " >&6
1529 else
1530 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1531@@ -3722,7 +3747,7 @@
1532 ac_save_CXXFLAGS=$CXXFLAGS
1533 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
1534 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
1535-if test "${ac_cv_prog_cxx_g+set}" = set; then :
1536+if ${ac_cv_prog_cxx_g+:} false; then :
1537 $as_echo_n "(cached) " >&6
1538 else
1539 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
1540@@ -3808,7 +3833,7 @@
1541
1542 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1543 $as_echo_n "checking dependency style of $depcc... " >&6; }
1544-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
1545+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
1546 $as_echo_n "(cached) " >&6
1547 else
1548 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1549@@ -3934,7 +3959,7 @@
1550
1551 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
1552 $as_echo_n "checking for library containing strerror... " >&6; }
1553-if test "${ac_cv_search_strerror+set}" = set; then :
1554+if ${ac_cv_search_strerror+:} false; then :
1555 $as_echo_n "(cached) " >&6
1556 else
1557 ac_func_search_save_LIBS=$LIBS
1558@@ -3968,11 +3993,11 @@
1559 fi
1560 rm -f core conftest.err conftest.$ac_objext \
1561 conftest$ac_exeext
1562- if test "${ac_cv_search_strerror+set}" = set; then :
1563+ if ${ac_cv_search_strerror+:} false; then :
1564 break
1565 fi
1566 done
1567-if test "${ac_cv_search_strerror+set}" = set; then :
1568+if ${ac_cv_search_strerror+:} false; then :
1569
1570 else
1571 ac_cv_search_strerror=no
1572@@ -4004,7 +4029,7 @@
1573 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1574 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1575 $as_echo_n "checking for $ac_word... " >&6; }
1576-if test "${ac_cv_prog_CXX+set}" = set; then :
1577+if ${ac_cv_prog_CXX+:} false; then :
1578 $as_echo_n "(cached) " >&6
1579 else
1580 if test -n "$CXX"; then
1581@@ -4048,7 +4073,7 @@
1582 set dummy $ac_prog; ac_word=$2
1583 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1584 $as_echo_n "checking for $ac_word... " >&6; }
1585-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
1586+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
1587 $as_echo_n "(cached) " >&6
1588 else
1589 if test -n "$ac_ct_CXX"; then
1590@@ -4126,7 +4151,7 @@
1591
1592 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
1593 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
1594-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
1595+if ${ac_cv_cxx_compiler_gnu+:} false; then :
1596 $as_echo_n "(cached) " >&6
1597 else
1598 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1599@@ -4163,7 +4188,7 @@
1600 ac_save_CXXFLAGS=$CXXFLAGS
1601 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
1602 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
1603-if test "${ac_cv_prog_cxx_g+set}" = set; then :
1604+if ${ac_cv_prog_cxx_g+:} false; then :
1605 $as_echo_n "(cached) " >&6
1606 else
1607 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
1608@@ -4249,7 +4274,7 @@
1609
1610 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1611 $as_echo_n "checking dependency style of $depcc... " >&6; }
1612-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
1613+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
1614 $as_echo_n "(cached) " >&6
1615 else
1616 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1617@@ -4382,7 +4407,7 @@
1618 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1619 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1620 $as_echo_n "checking for $ac_word... " >&6; }
1621-if test "${ac_cv_prog_CC+set}" = set; then :
1622+if ${ac_cv_prog_CC+:} false; then :
1623 $as_echo_n "(cached) " >&6
1624 else
1625 if test -n "$CC"; then
1626@@ -4422,7 +4447,7 @@
1627 set dummy gcc; ac_word=$2
1628 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1629 $as_echo_n "checking for $ac_word... " >&6; }
1630-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1631+if ${ac_cv_prog_ac_ct_CC+:} false; then :
1632 $as_echo_n "(cached) " >&6
1633 else
1634 if test -n "$ac_ct_CC"; then
1635@@ -4475,7 +4500,7 @@
1636 set dummy ${ac_tool_prefix}cc; ac_word=$2
1637 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1638 $as_echo_n "checking for $ac_word... " >&6; }
1639-if test "${ac_cv_prog_CC+set}" = set; then :
1640+if ${ac_cv_prog_CC+:} false; then :
1641 $as_echo_n "(cached) " >&6
1642 else
1643 if test -n "$CC"; then
1644@@ -4515,7 +4540,7 @@
1645 set dummy cc; ac_word=$2
1646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1647 $as_echo_n "checking for $ac_word... " >&6; }
1648-if test "${ac_cv_prog_CC+set}" = set; then :
1649+if ${ac_cv_prog_CC+:} false; then :
1650 $as_echo_n "(cached) " >&6
1651 else
1652 if test -n "$CC"; then
1653@@ -4574,7 +4599,7 @@
1654 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1656 $as_echo_n "checking for $ac_word... " >&6; }
1657-if test "${ac_cv_prog_CC+set}" = set; then :
1658+if ${ac_cv_prog_CC+:} false; then :
1659 $as_echo_n "(cached) " >&6
1660 else
1661 if test -n "$CC"; then
1662@@ -4618,7 +4643,7 @@
1663 set dummy $ac_prog; ac_word=$2
1664 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1665 $as_echo_n "checking for $ac_word... " >&6; }
1666-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1667+if ${ac_cv_prog_ac_ct_CC+:} false; then :
1668 $as_echo_n "(cached) " >&6
1669 else
1670 if test -n "$ac_ct_CC"; then
1671@@ -4673,7 +4698,7 @@
1672 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1673 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1674 as_fn_error $? "no acceptable C compiler found in \$PATH
1675-See \`config.log' for more details" "$LINENO" 5 ; }
1676+See \`config.log' for more details" "$LINENO" 5; }
1677
1678 # Provide some information about the compiler.
1679 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
1680@@ -4702,7 +4727,7 @@
1681
1682 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
1683 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1684-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
1685+if ${ac_cv_c_compiler_gnu+:} false; then :
1686 $as_echo_n "(cached) " >&6
1687 else
1688 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1689@@ -4739,7 +4764,7 @@
1690 ac_save_CFLAGS=$CFLAGS
1691 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
1692 $as_echo_n "checking whether $CC accepts -g... " >&6; }
1693-if test "${ac_cv_prog_cc_g+set}" = set; then :
1694+if ${ac_cv_prog_cc_g+:} false; then :
1695 $as_echo_n "(cached) " >&6
1696 else
1697 ac_save_c_werror_flag=$ac_c_werror_flag
1698@@ -4817,7 +4842,7 @@
1699 fi
1700 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
1701 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1702-if test "${ac_cv_prog_cc_c89+set}" = set; then :
1703+if ${ac_cv_prog_cc_c89+:} false; then :
1704 $as_echo_n "(cached) " >&6
1705 else
1706 ac_cv_prog_cc_c89=no
1707@@ -4916,7 +4941,7 @@
1708
1709 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1710 $as_echo_n "checking dependency style of $depcc... " >&6; }
1711-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
1712+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
1713 $as_echo_n "(cached) " >&6
1714 else
1715 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1716@@ -5053,7 +5078,7 @@
1717
1718 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1719 $as_echo_n "checking dependency style of $depcc... " >&6; }
1720-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
1721+if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
1722 $as_echo_n "(cached) " >&6
1723 else
1724 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1725@@ -5179,7 +5204,7 @@
1726 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
1727 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1728 $as_echo_n "checking for $ac_word... " >&6; }
1729-if test "${ac_cv_prog_RANLIB+set}" = set; then :
1730+if ${ac_cv_prog_RANLIB+:} false; then :
1731 $as_echo_n "(cached) " >&6
1732 else
1733 if test -n "$RANLIB"; then
1734@@ -5219,7 +5244,7 @@
1735 set dummy ranlib; ac_word=$2
1736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1737 $as_echo_n "checking for $ac_word... " >&6; }
1738-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
1739+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
1740 $as_echo_n "(cached) " >&6
1741 else
1742 if test -n "$ac_ct_RANLIB"; then
1743@@ -5308,7 +5333,7 @@
1744 set dummy intltool-update; ac_word=$2
1745 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1746 $as_echo_n "checking for $ac_word... " >&6; }
1747-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
1748+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
1749 $as_echo_n "(cached) " >&6
1750 else
1751 case $INTLTOOL_UPDATE in
1752@@ -5348,7 +5373,7 @@
1753 set dummy intltool-merge; ac_word=$2
1754 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1755 $as_echo_n "checking for $ac_word... " >&6; }
1756-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
1757+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
1758 $as_echo_n "(cached) " >&6
1759 else
1760 case $INTLTOOL_MERGE in
1761@@ -5388,7 +5413,7 @@
1762 set dummy intltool-extract; ac_word=$2
1763 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1764 $as_echo_n "checking for $ac_word... " >&6; }
1765-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
1766+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
1767 $as_echo_n "(cached) " >&6
1768 else
1769 case $INTLTOOL_EXTRACT in
1770@@ -5549,7 +5574,7 @@
1771 set dummy xgettext; ac_word=$2
1772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1773 $as_echo_n "checking for $ac_word... " >&6; }
1774-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
1775+if ${ac_cv_path_XGETTEXT+:} false; then :
1776 $as_echo_n "(cached) " >&6
1777 else
1778 case $XGETTEXT in
1779@@ -5589,7 +5614,7 @@
1780 set dummy msgmerge; ac_word=$2
1781 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1782 $as_echo_n "checking for $ac_word... " >&6; }
1783-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
1784+if ${ac_cv_path_MSGMERGE+:} false; then :
1785 $as_echo_n "(cached) " >&6
1786 else
1787 case $MSGMERGE in
1788@@ -5629,7 +5654,7 @@
1789 set dummy msgfmt; ac_word=$2
1790 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1791 $as_echo_n "checking for $ac_word... " >&6; }
1792-if test "${ac_cv_path_MSGFMT+set}" = set; then :
1793+if ${ac_cv_path_MSGFMT+:} false; then :
1794 $as_echo_n "(cached) " >&6
1795 else
1796 case $MSGFMT in
1797@@ -5669,7 +5694,7 @@
1798 set dummy gmsgfmt; ac_word=$2
1799 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1800 $as_echo_n "checking for $ac_word... " >&6; }
1801-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
1802+if ${ac_cv_path_GMSGFMT+:} false; then :
1803 $as_echo_n "(cached) " >&6
1804 else
1805 case $GMSGFMT in
1806@@ -5720,7 +5745,7 @@
1807 set dummy perl; ac_word=$2
1808 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1809 $as_echo_n "checking for $ac_word... " >&6; }
1810-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
1811+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
1812 $as_echo_n "(cached) " >&6
1813 else
1814 case $INTLTOOL_PERL in
1815@@ -5804,7 +5829,7 @@
1816 case $host in
1817 *-*-solaris*)
1818 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
1819-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
1820+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
1821 DATADIRNAME=share
1822 else
1823 DATADIRNAME=lib
1824@@ -5832,7 +5857,7 @@
1825 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
1826 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
1827 if test -z "$CXXCPP"; then
1828- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
1829+ if ${ac_cv_prog_CXXCPP+:} false; then :
1830 $as_echo_n "(cached) " >&6
1831 else
1832 # Double quotes because CXXCPP needs to be expanded
1833@@ -5948,7 +5973,7 @@
1834 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1835 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1836 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
1837-See \`config.log' for more details" "$LINENO" 5 ; }
1838+See \`config.log' for more details" "$LINENO" 5; }
1839 fi
1840
1841 ac_ext=cpp
1842@@ -5960,7 +5985,7 @@
1843
1844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1845 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1846-if test "${ac_cv_path_GREP+set}" = set; then :
1847+if ${ac_cv_path_GREP+:} false; then :
1848 $as_echo_n "(cached) " >&6
1849 else
1850 if test -z "$GREP"; then
1851@@ -6023,7 +6048,7 @@
1852
1853 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1854 $as_echo_n "checking for egrep... " >&6; }
1855-if test "${ac_cv_path_EGREP+set}" = set; then :
1856+if ${ac_cv_path_EGREP+:} false; then :
1857 $as_echo_n "(cached) " >&6
1858 else
1859 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1860@@ -6090,7 +6115,7 @@
1861
1862 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1863 $as_echo_n "checking for ANSI C header files... " >&6; }
1864-if test "${ac_cv_header_stdc+set}" = set; then :
1865+if ${ac_cv_header_stdc+:} false; then :
1866 $as_echo_n "(cached) " >&6
1867 else
1868 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1869@@ -6203,7 +6228,7 @@
1870
1871 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZR snapshot build" >&5
1872 $as_echo_n "checking for BZR snapshot build... " >&6; }
1873-if test "${ink_cv_bzr_snapshot_build+set}" = set; then :
1874+if ${ink_cv_bzr_snapshot_build+:} false; then :
1875 $as_echo_n "(cached) " >&6
1876 else
1877 ink_cv_bzr_snapshot_build=no
1878@@ -6247,7 +6272,7 @@
1879 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1880 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1881 $as_echo_n "checking for $ac_word... " >&6; }
1882-if test "${ac_cv_prog_CC+set}" = set; then :
1883+if ${ac_cv_prog_CC+:} false; then :
1884 $as_echo_n "(cached) " >&6
1885 else
1886 if test -n "$CC"; then
1887@@ -6287,7 +6312,7 @@
1888 set dummy gcc; ac_word=$2
1889 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1890 $as_echo_n "checking for $ac_word... " >&6; }
1891-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1892+if ${ac_cv_prog_ac_ct_CC+:} false; then :
1893 $as_echo_n "(cached) " >&6
1894 else
1895 if test -n "$ac_ct_CC"; then
1896@@ -6340,7 +6365,7 @@
1897 set dummy ${ac_tool_prefix}cc; ac_word=$2
1898 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1899 $as_echo_n "checking for $ac_word... " >&6; }
1900-if test "${ac_cv_prog_CC+set}" = set; then :
1901+if ${ac_cv_prog_CC+:} false; then :
1902 $as_echo_n "(cached) " >&6
1903 else
1904 if test -n "$CC"; then
1905@@ -6380,7 +6405,7 @@
1906 set dummy cc; ac_word=$2
1907 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1908 $as_echo_n "checking for $ac_word... " >&6; }
1909-if test "${ac_cv_prog_CC+set}" = set; then :
1910+if ${ac_cv_prog_CC+:} false; then :
1911 $as_echo_n "(cached) " >&6
1912 else
1913 if test -n "$CC"; then
1914@@ -6439,7 +6464,7 @@
1915 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1916 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1917 $as_echo_n "checking for $ac_word... " >&6; }
1918-if test "${ac_cv_prog_CC+set}" = set; then :
1919+if ${ac_cv_prog_CC+:} false; then :
1920 $as_echo_n "(cached) " >&6
1921 else
1922 if test -n "$CC"; then
1923@@ -6483,7 +6508,7 @@
1924 set dummy $ac_prog; ac_word=$2
1925 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1926 $as_echo_n "checking for $ac_word... " >&6; }
1927-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1928+if ${ac_cv_prog_ac_ct_CC+:} false; then :
1929 $as_echo_n "(cached) " >&6
1930 else
1931 if test -n "$ac_ct_CC"; then
1932@@ -6538,7 +6563,7 @@
1933 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1934 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1935 as_fn_error $? "no acceptable C compiler found in \$PATH
1936-See \`config.log' for more details" "$LINENO" 5 ; }
1937+See \`config.log' for more details" "$LINENO" 5; }
1938
1939 # Provide some information about the compiler.
1940 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
1941@@ -6567,7 +6592,7 @@
1942
1943 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
1944 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1945-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
1946+if ${ac_cv_c_compiler_gnu+:} false; then :
1947 $as_echo_n "(cached) " >&6
1948 else
1949 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1950@@ -6604,7 +6629,7 @@
1951 ac_save_CFLAGS=$CFLAGS
1952 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
1953 $as_echo_n "checking whether $CC accepts -g... " >&6; }
1954-if test "${ac_cv_prog_cc_g+set}" = set; then :
1955+if ${ac_cv_prog_cc_g+:} false; then :
1956 $as_echo_n "(cached) " >&6
1957 else
1958 ac_save_c_werror_flag=$ac_c_werror_flag
1959@@ -6682,7 +6707,7 @@
1960 fi
1961 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
1962 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1963-if test "${ac_cv_prog_cc_c89+set}" = set; then :
1964+if ${ac_cv_prog_cc_c89+:} false; then :
1965 $as_echo_n "(cached) " >&6
1966 else
1967 ac_cv_prog_cc_c89=no
1968@@ -6781,7 +6806,7 @@
1969
1970 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1971 $as_echo_n "checking dependency style of $depcc... " >&6; }
1972-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
1973+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
1974 $as_echo_n "(cached) " >&6
1975 else
1976 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1977@@ -6913,7 +6938,7 @@
1978 fi
1979 set dummy $CC; ac_cc=`$as_echo "$2" |
1980 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
1981-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
1982+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
1983 $as_echo_n "(cached) " >&6
1984 else
1985 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1986@@ -7230,7 +7255,7 @@
1987
1988
1989 ac_fn_cxx_check_header_mongrel "$LINENO" "boost/unordered_set.hpp" "ac_cv_header_boost_unordered_set_hpp" "$ac_includes_default"
1990-if test "x$ac_cv_header_boost_unordered_set_hpp" = x""yes; then :
1991+if test "x$ac_cv_header_boost_unordered_set_hpp" = xyes; then :
1992
1993 $as_echo "#define HAVE_BOOST_UNORDERED_SET 1" >>confdefs.h
1994
1995@@ -7238,7 +7263,7 @@
1996
1997
1998 ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_set" "ac_cv_header_ext_hash_set" "$ac_includes_default"
1999-if test "x$ac_cv_header_ext_hash_set" = x""yes; then :
2000+if test "x$ac_cv_header_ext_hash_set" = xyes; then :
2001
2002 $as_echo "#define HAVE_EXT_HASH_SET 1" >>confdefs.h
2003
2004@@ -7289,7 +7314,7 @@
2005 for ac_header in locale.h
2006 do :
2007 ac_fn_cxx_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
2008-if test "x$ac_cv_header_locale_h" = x""yes; then :
2009+if test "x$ac_cv_header_locale_h" = xyes; then :
2010 cat >>confdefs.h <<_ACEOF
2011 #define HAVE_LOCALE_H 1
2012 _ACEOF
2013@@ -7301,7 +7326,7 @@
2014 if test $ac_cv_header_locale_h = yes; then
2015 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
2016 $as_echo_n "checking for LC_MESSAGES... " >&6; }
2017-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
2018+if ${am_cv_val_LC_MESSAGES+:} false; then :
2019 $as_echo_n "(cached) " >&6
2020 else
2021 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2022@@ -7341,7 +7366,7 @@
2023 INTLLIBS=
2024
2025 ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
2026-if test "x$ac_cv_header_libintl_h" = x""yes; then :
2027+if test "x$ac_cv_header_libintl_h" = xyes; then :
2028 gt_cv_func_dgettext_libintl="no"
2029 libintl_extra_libs=""
2030
2031@@ -7350,7 +7375,7 @@
2032 #
2033 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
2034 $as_echo_n "checking for ngettext in libc... " >&6; }
2035-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
2036+if ${gt_cv_func_ngettext_libc+:} false; then :
2037 $as_echo_n "(cached) " >&6
2038 else
2039 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2040@@ -7381,7 +7406,7 @@
2041 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
2042 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
2043 $as_echo_n "checking for dgettext in libc... " >&6; }
2044-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
2045+if ${gt_cv_func_dgettext_libc+:} false; then :
2046 $as_echo_n "(cached) " >&6
2047 else
2048 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2049@@ -7414,7 +7439,7 @@
2050 for ac_func in bind_textdomain_codeset
2051 do :
2052 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
2053-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
2054+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
2055 cat >>confdefs.h <<_ACEOF
2056 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
2057 _ACEOF
2058@@ -7433,7 +7458,7 @@
2059
2060 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
2061 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
2062-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
2063+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
2064 $as_echo_n "(cached) " >&6
2065 else
2066 ac_check_lib_save_LIBS=$LIBS
2067@@ -7467,10 +7492,10 @@
2068 fi
2069 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
2070 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
2071-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
2072+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
2073 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
2074 $as_echo_n "checking for ngettext in -lintl... " >&6; }
2075-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
2076+if ${ac_cv_lib_intl_ngettext+:} false; then :
2077 $as_echo_n "(cached) " >&6
2078 else
2079 ac_check_lib_save_LIBS=$LIBS
2080@@ -7504,10 +7529,10 @@
2081 fi
2082 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
2083 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
2084-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
2085+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
2086 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
2087 $as_echo_n "checking for dgettext in -lintl... " >&6; }
2088-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
2089+if ${ac_cv_lib_intl_dgettext+:} false; then :
2090 $as_echo_n "(cached) " >&6
2091 else
2092 ac_check_lib_save_LIBS=$LIBS
2093@@ -7541,7 +7566,7 @@
2094 fi
2095 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
2096 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
2097-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
2098+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
2099 gt_cv_func_dgettext_libintl=yes
2100 fi
2101
2102@@ -7557,7 +7582,7 @@
2103 $as_echo "" >&6; }
2104 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
2105 $as_echo_n "checking for ngettext in -lintl... " >&6; }
2106-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
2107+if ${ac_cv_lib_intl_ngettext+:} false; then :
2108 $as_echo_n "(cached) " >&6
2109 else
2110 ac_check_lib_save_LIBS=$LIBS
2111@@ -7591,10 +7616,10 @@
2112 fi
2113 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
2114 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
2115-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
2116+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
2117 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
2118 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
2119-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
2120+if ${ac_cv_lib_intl_dcgettext+:} false; then :
2121 $as_echo_n "(cached) " >&6
2122 else
2123 ac_check_lib_save_LIBS=$LIBS
2124@@ -7628,7 +7653,7 @@
2125 fi
2126 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
2127 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
2128-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
2129+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
2130 gt_cv_func_dgettext_libintl=yes
2131 libintl_extra_libs=-liconv
2132 else
2133@@ -7653,7 +7678,7 @@
2134 for ac_func in bind_textdomain_codeset
2135 do :
2136 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
2137-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
2138+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
2139 cat >>confdefs.h <<_ACEOF
2140 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
2141 _ACEOF
2142@@ -7691,7 +7716,7 @@
2143 set dummy msgfmt; ac_word=$2
2144 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2145 $as_echo_n "checking for $ac_word... " >&6; }
2146-if test "${ac_cv_path_MSGFMT+set}" = set; then :
2147+if ${ac_cv_path_MSGFMT+:} false; then :
2148 $as_echo_n "(cached) " >&6
2149 else
2150 case "$MSGFMT" in
2151@@ -7728,7 +7753,7 @@
2152 for ac_func in dcgettext
2153 do :
2154 ac_fn_cxx_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
2155-if test "x$ac_cv_func_dcgettext" = x""yes; then :
2156+if test "x$ac_cv_func_dcgettext" = xyes; then :
2157 cat >>confdefs.h <<_ACEOF
2158 #define HAVE_DCGETTEXT 1
2159 _ACEOF
2160@@ -7769,7 +7794,7 @@
2161 set dummy gmsgfmt; ac_word=$2
2162 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2163 $as_echo_n "checking for $ac_word... " >&6; }
2164-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
2165+if ${ac_cv_path_GMSGFMT+:} false; then :
2166 $as_echo_n "(cached) " >&6
2167 else
2168 case $GMSGFMT in
2169@@ -7810,7 +7835,7 @@
2170 set dummy xgettext; ac_word=$2
2171 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2172 $as_echo_n "checking for $ac_word... " >&6; }
2173-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
2174+if ${ac_cv_path_XGETTEXT+:} false; then :
2175 $as_echo_n "(cached) " >&6
2176 else
2177 case "$XGETTEXT" in
2178@@ -7861,7 +7886,7 @@
2179 case $host in
2180 *-*-solaris*)
2181 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
2182-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
2183+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
2184 CATOBJEXT=.gmo
2185 DATADIRNAME=share
2186 else
2187@@ -7994,7 +8019,7 @@
2188 set dummy pkg-config; ac_word=$2
2189 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2190 $as_echo_n "checking for $ac_word... " >&6; }
2191-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
2192+if ${ac_cv_path_PKG_CONFIG+:} false; then :
2193 $as_echo_n "(cached) " >&6
2194 else
2195 case $PKG_CONFIG in
2196@@ -8039,7 +8064,7 @@
2197 set dummy msgfmt; ac_word=$2
2198 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2199 $as_echo_n "checking for $ac_word... " >&6; }
2200-if test "${ac_cv_path_MSGFMT+set}" = set; then :
2201+if ${ac_cv_path_MSGFMT+:} false; then :
2202 $as_echo_n "(cached) " >&6
2203 else
2204 case $MSGFMT in
2205@@ -8080,7 +8105,7 @@
2206 set dummy gmsgfmt; ac_word=$2
2207 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2208 $as_echo_n "checking for $ac_word... " >&6; }
2209-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
2210+if ${ac_cv_path_GMSGFMT+:} false; then :
2211 $as_echo_n "(cached) " >&6
2212 else
2213 case $GMSGFMT in
2214@@ -8122,7 +8147,7 @@
2215
2216 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C++ compiler" >&5
2217 $as_echo_n "checking for OpenMP flag of C++ compiler... " >&6; }
2218-if test "${ax_cv_cxx_openmp+set}" = set; then :
2219+if ${ax_cv_cxx_openmp+:} false; then :
2220 $as_echo_n "(cached) " >&6
2221 else
2222 saveCXXFLAGS=$CXXFLAGS
2223@@ -8179,7 +8204,7 @@
2224 if test "x$openmp_ok" = "xyes"; then
2225 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
2226 ac_fn_cxx_check_header_mongrel "$LINENO" "omp.h" "ac_cv_header_omp_h" "$ac_includes_default"
2227-if test "x$ac_cv_header_omp_h" = x""yes; then :
2228+if test "x$ac_cv_header_omp_h" = xyes; then :
2229
2230 fi
2231
2232@@ -8191,7 +8216,7 @@
2233
2234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
2235 $as_echo_n "checking for png_read_info in -lpng... " >&6; }
2236-if test "${ac_cv_lib_png_png_read_info+set}" = set; then :
2237+if ${ac_cv_lib_png_png_read_info+:} false; then :
2238 $as_echo_n "(cached) " >&6
2239 else
2240 ac_check_lib_save_LIBS=$LIBS
2241@@ -8225,9 +8250,9 @@
2242 fi
2243 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&5
2244 $as_echo "$ac_cv_lib_png_png_read_info" >&6; }
2245-if test "x$ac_cv_lib_png_png_read_info" = x""yes; then :
2246+if test "x$ac_cv_lib_png_png_read_info" = xyes; then :
2247 ac_fn_cxx_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
2248-if test "x$ac_cv_header_png_h" = x""yes; then :
2249+if test "x$ac_cv_header_png_h" = xyes; then :
2250 png_ok=yes
2251 else
2252 png_ok=yes
2253@@ -8244,7 +8269,7 @@
2254
2255 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
2256 $as_echo_n "checking for shl_load in -ldld... " >&6; }
2257-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
2258+if ${ac_cv_lib_dld_shl_load+:} false; then :
2259 $as_echo_n "(cached) " >&6
2260 else
2261 ac_check_lib_save_LIBS=$LIBS
2262@@ -8278,16 +8303,16 @@
2263 fi
2264 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
2265 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
2266-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
2267+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
2268 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
2269 else
2270 ac_fn_cxx_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
2271-if test "x$ac_cv_func_dlopen" = x""yes; then :
2272+if test "x$ac_cv_func_dlopen" = xyes; then :
2273 lt_cv_dlopen="dlopen"
2274 else
2275 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
2276 $as_echo_n "checking for dlopen in -ldl... " >&6; }
2277-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
2278+if ${ac_cv_lib_dl_dlopen+:} false; then :
2279 $as_echo_n "(cached) " >&6
2280 else
2281 ac_check_lib_save_LIBS=$LIBS
2282@@ -8321,12 +8346,12 @@
2283 fi
2284 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
2285 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
2286-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
2287+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
2288 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
2289 else
2290 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
2291 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
2292-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
2293+if ${ac_cv_lib_svld_dlopen+:} false; then :
2294 $as_echo_n "(cached) " >&6
2295 else
2296 ac_check_lib_save_LIBS=$LIBS
2297@@ -8360,12 +8385,12 @@
2298 fi
2299 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
2300 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
2301-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
2302+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
2303 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
2304 else
2305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
2306 $as_echo_n "checking for dld_link in -ldld... " >&6; }
2307-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
2308+if ${ac_cv_lib_dld_dld_link+:} false; then :
2309 $as_echo_n "(cached) " >&6
2310 else
2311 ac_check_lib_save_LIBS=$LIBS
2312@@ -8399,7 +8424,7 @@
2313 fi
2314 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
2315 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
2316-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
2317+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
2318 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
2319 fi
2320
2321@@ -8433,7 +8458,7 @@
2322 gc_libs=""
2323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_init in -lgc" >&5
2324 $as_echo_n "checking for GC_init in -lgc... " >&6; }
2325-if test "${ac_cv_lib_gc_GC_init+set}" = set; then :
2326+if ${ac_cv_lib_gc_GC_init+:} false; then :
2327 $as_echo_n "(cached) " >&6
2328 else
2329 ac_check_lib_save_LIBS=$LIBS
2330@@ -8467,7 +8492,7 @@
2331 fi
2332 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5
2333 $as_echo "$ac_cv_lib_gc_GC_init" >&6; }
2334-if test "x$ac_cv_lib_gc_GC_init" = x""yes; then :
2335+if test "x$ac_cv_lib_gc_GC_init" = xyes; then :
2336 gc_ok=yes;
2337 LIBS="-lgc $gc_libs $LIBS";
2338 break
2339@@ -8478,7 +8503,7 @@
2340 gc_libs="-lpthread"
2341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
2342 $as_echo_n "checking for GC_malloc in -lgc... " >&6; }
2343-if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then :
2344+if ${ac_cv_lib_gc_GC_malloc+:} false; then :
2345 $as_echo_n "(cached) " >&6
2346 else
2347 ac_check_lib_save_LIBS=$LIBS
2348@@ -8512,7 +8537,7 @@
2349 fi
2350 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
2351 $as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
2352-if test "x$ac_cv_lib_gc_GC_malloc" = x""yes; then :
2353+if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
2354 gc_ok=yes;
2355 LIBS="-lgc $gc_libs $LIBS";
2356 break
2357@@ -8523,7 +8548,7 @@
2358 gc_libs="$lt_cv_dlopen_libs"
2359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_realloc in -lgc" >&5
2360 $as_echo_n "checking for GC_realloc in -lgc... " >&6; }
2361-if test "${ac_cv_lib_gc_GC_realloc+set}" = set; then :
2362+if ${ac_cv_lib_gc_GC_realloc+:} false; then :
2363 $as_echo_n "(cached) " >&6
2364 else
2365 ac_check_lib_save_LIBS=$LIBS
2366@@ -8557,7 +8582,7 @@
2367 fi
2368 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_realloc" >&5
2369 $as_echo "$ac_cv_lib_gc_GC_realloc" >&6; }
2370-if test "x$ac_cv_lib_gc_GC_realloc" = x""yes; then :
2371+if test "x$ac_cv_lib_gc_GC_realloc" = xyes; then :
2372 gc_ok=yes;
2373 LIBS="-lgc $gc_libs $LIBS";
2374 break
2375@@ -8568,7 +8593,7 @@
2376 gc_libs="-lpthread $lt_cv_dlopen_libs"
2377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_free in -lgc" >&5
2378 $as_echo_n "checking for GC_free in -lgc... " >&6; }
2379-if test "${ac_cv_lib_gc_GC_free+set}" = set; then :
2380+if ${ac_cv_lib_gc_GC_free+:} false; then :
2381 $as_echo_n "(cached) " >&6
2382 else
2383 ac_check_lib_save_LIBS=$LIBS
2384@@ -8602,7 +8627,7 @@
2385 fi
2386 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_free" >&5
2387 $as_echo "$ac_cv_lib_gc_GC_free" >&6; }
2388-if test "x$ac_cv_lib_gc_GC_free" = x""yes; then :
2389+if test "x$ac_cv_lib_gc_GC_free" = xyes; then :
2390 gc_ok=yes;
2391 LIBS="-lgc $gc_libs $LIBS";
2392 break
2393@@ -8624,7 +8649,7 @@
2394 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2395 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2396 as_fn_error $? "cannot run test program while cross compiling
2397-See \`config.log' for more details" "$LINENO" 5 ; }
2398+See \`config.log' for more details" "$LINENO" 5; }
2399 else
2400 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2401 /* end confdefs.h. */
2402@@ -8663,7 +8688,7 @@
2403 for ac_header in sys/filio.h
2404 do :
2405 ac_fn_cxx_check_header_mongrel "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
2406-if test "x$ac_cv_header_sys_filio_h" = x""yes; then :
2407+if test "x$ac_cv_header_sys_filio_h" = xyes; then :
2408 cat >>confdefs.h <<_ACEOF
2409 #define HAVE_SYS_FILIO_H 1
2410 _ACEOF
2411@@ -8677,7 +8702,7 @@
2412 for ac_header in malloc.h
2413 do :
2414 ac_fn_cxx_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
2415-if test "x$ac_cv_header_malloc_h" = x""yes; then :
2416+if test "x$ac_cv_header_malloc_h" = xyes; then :
2417 cat >>confdefs.h <<_ACEOF
2418 #define HAVE_MALLOC_H 1
2419 _ACEOF
2420@@ -8689,14 +8714,14 @@
2421 for ac_func in mallinfo
2422 do :
2423 ac_fn_cxx_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"
2424-if test "x$ac_cv_func_mallinfo" = x""yes; then :
2425+if test "x$ac_cv_func_mallinfo" = xyes; then :
2426 cat >>confdefs.h <<_ACEOF
2427 #define HAVE_MALLINFO 1
2428 _ACEOF
2429
2430 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "usmblks" "ac_cv_member_struct_mallinfo_usmblks" "#include <malloc.h>
2431 "
2432-if test "x$ac_cv_member_struct_mallinfo_usmblks" = x""yes; then :
2433+if test "x$ac_cv_member_struct_mallinfo_usmblks" = xyes; then :
2434
2435 cat >>confdefs.h <<_ACEOF
2436 #define HAVE_STRUCT_MALLINFO_USMBLKS 1
2437@@ -8706,7 +8731,7 @@
2438 fi
2439 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fsmblks" "ac_cv_member_struct_mallinfo_fsmblks" "#include <malloc.h>
2440 "
2441-if test "x$ac_cv_member_struct_mallinfo_fsmblks" = x""yes; then :
2442+if test "x$ac_cv_member_struct_mallinfo_fsmblks" = xyes; then :
2443
2444 cat >>confdefs.h <<_ACEOF
2445 #define HAVE_STRUCT_MALLINFO_FSMBLKS 1
2446@@ -8716,7 +8741,7 @@
2447 fi
2448 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "uordblks" "ac_cv_member_struct_mallinfo_uordblks" "#include <malloc.h>
2449 "
2450-if test "x$ac_cv_member_struct_mallinfo_uordblks" = x""yes; then :
2451+if test "x$ac_cv_member_struct_mallinfo_uordblks" = xyes; then :
2452
2453 cat >>confdefs.h <<_ACEOF
2454 #define HAVE_STRUCT_MALLINFO_UORDBLKS 1
2455@@ -8726,7 +8751,7 @@
2456 fi
2457 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fordblks" "ac_cv_member_struct_mallinfo_fordblks" "#include <malloc.h>
2458 "
2459-if test "x$ac_cv_member_struct_mallinfo_fordblks" = x""yes; then :
2460+if test "x$ac_cv_member_struct_mallinfo_fordblks" = xyes; then :
2461
2462 cat >>confdefs.h <<_ACEOF
2463 #define HAVE_STRUCT_MALLINFO_FORDBLKS 1
2464@@ -8736,7 +8761,7 @@
2465 fi
2466 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "hblkhd" "ac_cv_member_struct_mallinfo_hblkhd" "#include <malloc.h>
2467 "
2468-if test "x$ac_cv_member_struct_mallinfo_hblkhd" = x""yes; then :
2469+if test "x$ac_cv_member_struct_mallinfo_hblkhd" = xyes; then :
2470
2471 cat >>confdefs.h <<_ACEOF
2472 #define HAVE_STRUCT_MALLINFO_HBLKHD 1
2473@@ -8754,7 +8779,7 @@
2474 set dummy freetype-config; ac_word=$2
2475 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2476 $as_echo_n "checking for $ac_word... " >&6; }
2477-if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then :
2478+if ${ac_cv_path_FREETYPE_CONFIG+:} false; then :
2479 $as_echo_n "(cached) " >&6
2480 else
2481 case $FREETYPE_CONFIG in
2482@@ -8822,6 +8847,24 @@
2483
2484
2485
2486+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSX platform" >&5
2487+$as_echo_n "checking for OSX platform... " >&6; }
2488+if test "x$build_vendor" = "xapple" ; then
2489+ platform_osx=yes
2490+else
2491+ platform_osx=no
2492+fi
2493+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_osx" >&5
2494+$as_echo "$platform_osx" >&6; }
2495+ if test "$platform_osx" = "yes"; then
2496+ PLATFORM_OSX_TRUE=
2497+ PLATFORM_OSX_FALSE='#'
2498+else
2499+ PLATFORM_OSX_TRUE='#'
2500+ PLATFORM_OSX_FALSE=
2501+fi
2502+
2503+
2504 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris platform" >&5
2505 $as_echo_n "checking for Solaris platform... " >&6; }
2506 case "$host" in
2507@@ -8863,13 +8906,14 @@
2508
2509
2510
2511+
2512 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
2513 if test -n "$ac_tool_prefix"; then
2514 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
2515 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
2516 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2517 $as_echo_n "checking for $ac_word... " >&6; }
2518-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
2519+if ${ac_cv_path_PKG_CONFIG+:} false; then :
2520 $as_echo_n "(cached) " >&6
2521 else
2522 case $PKG_CONFIG in
2523@@ -8912,7 +8956,7 @@
2524 set dummy pkg-config; ac_word=$2
2525 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2526 $as_echo_n "checking for $ac_word... " >&6; }
2527-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
2528+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
2529 $as_echo_n "(cached) " >&6
2530 else
2531 case $ac_pt_PKG_CONFIG in
2532@@ -8991,6 +9035,7 @@
2533 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2534 test $ac_status = 0; }; then
2535 pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`
2536+ test "x$?" != "x0" && pkg_failed=yes
2537 else
2538 pkg_failed=yes
2539 fi
2540@@ -9007,6 +9052,7 @@
2541 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2542 test $ac_status = 0; }; then
2543 pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null`
2544+ test "x$?" != "x0" && pkg_failed=yes
2545 else
2546 pkg_failed=yes
2547 fi
2548@@ -9026,9 +9072,9 @@
2549 _pkg_short_errors_supported=no
2550 fi
2551 if test $_pkg_short_errors_supported = yes; then
2552- XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig" 2>&1`
2553+ XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig" 2>&1`
2554 else
2555- XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig" 2>&1`
2556+ XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig" 2>&1`
2557 fi
2558 # Put the nasty error message in config.log where it belongs
2559 echo "$XFT_PKG_ERRORS" >&5
2560@@ -9061,6 +9107,7 @@
2561 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2562 test $ac_status = 0; }; then
2563 pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft" 2>/dev/null`
2564+ test "x$?" != "x0" && pkg_failed=yes
2565 else
2566 pkg_failed=yes
2567 fi
2568@@ -9077,6 +9124,7 @@
2569 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2570 test $ac_status = 0; }; then
2571 pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft" 2>/dev/null`
2572+ test "x$?" != "x0" && pkg_failed=yes
2573 else
2574 pkg_failed=yes
2575 fi
2576@@ -9096,9 +9144,9 @@
2577 _pkg_short_errors_supported=no
2578 fi
2579 if test $_pkg_short_errors_supported = yes; then
2580- XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xft" 2>&1`
2581+ XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xft" 2>&1`
2582 else
2583- XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xft" 2>&1`
2584+ XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xft" 2>&1`
2585 fi
2586 # Put the nasty error message in config.log where it belongs
2587 echo "$XFT_PKG_ERRORS" >&5
2588@@ -9117,7 +9165,7 @@
2589 fi
2590 if test "x$xft_ok" != "xyes"; then
2591 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
2592-if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then :
2593+if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
2594 xft_ok=yes
2595 else
2596 xft_ok=no
2597@@ -9171,6 +9219,7 @@
2598 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2599 test $ac_status = 0; }; then
2600 pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`
2601+ test "x$?" != "x0" && pkg_failed=yes
2602 else
2603 pkg_failed=yes
2604 fi
2605@@ -9187,6 +9236,7 @@
2606 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2607 test $ac_status = 0; }; then
2608 pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null`
2609+ test "x$?" != "x0" && pkg_failed=yes
2610 else
2611 pkg_failed=yes
2612 fi
2613@@ -9206,9 +9256,9 @@
2614 _pkg_short_errors_supported=no
2615 fi
2616 if test $_pkg_short_errors_supported = yes; then
2617- PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangoft2" 2>&1`
2618+ PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pangoft2" 2>&1`
2619 else
2620- PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2" 2>&1`
2621+ PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pangoft2" 2>&1`
2622 fi
2623 # Put the nasty error message in config.log where it belongs
2624 echo "$PANGOFT2_PKG_ERRORS" >&5
2625@@ -9259,6 +9309,7 @@
2626 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2627 test $ac_status = 0; }; then
2628 pkg_cv_GNOME_VFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
2629+ test "x$?" != "x0" && pkg_failed=yes
2630 else
2631 pkg_failed=yes
2632 fi
2633@@ -9275,6 +9326,7 @@
2634 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2635 test $ac_status = 0; }; then
2636 pkg_cv_GNOME_VFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
2637+ test "x$?" != "x0" && pkg_failed=yes
2638 else
2639 pkg_failed=yes
2640 fi
2641@@ -9294,9 +9346,9 @@
2642 _pkg_short_errors_supported=no
2643 fi
2644 if test $_pkg_short_errors_supported = yes; then
2645- GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-vfs-2.0 >= 2.0" 2>&1`
2646+ GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-vfs-2.0 >= 2.0" 2>&1`
2647 else
2648- GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-vfs-2.0 >= 2.0" 2>&1`
2649+ GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-vfs-2.0 >= 2.0" 2>&1`
2650 fi
2651 # Put the nasty error message in config.log where it belongs
2652 echo "$GNOME_VFS_PKG_ERRORS" >&5
2653@@ -9357,7 +9409,7 @@
2654
2655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
2656 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
2657-if test "${ac_cv_c_bigendian+set}" = set; then :
2658+if ${ac_cv_c_bigendian+:} false; then :
2659 $as_echo_n "(cached) " >&6
2660 else
2661 ac_cv_c_bigendian=unknown
2662@@ -9576,13 +9628,13 @@
2663 ;; #(
2664 *)
2665 as_fn_error $? "unknown endianness
2666- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
2667+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
2668 esac
2669
2670 for ac_header in zlib.h
2671 do :
2672 ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
2673-if test "x$ac_cv_header_zlib_h" = x""yes; then :
2674+if test "x$ac_cv_header_zlib_h" = xyes; then :
2675 cat >>confdefs.h <<_ACEOF
2676 #define HAVE_ZLIB_H 1
2677 _ACEOF
2678@@ -9646,7 +9698,7 @@
2679 CFLAGS="$CFLAGS $checkPERL_CFLAGS"
2680 LIBS="$LIBS $checkPERL_LIBS"
2681 ac_fn_cxx_check_func "$LINENO" "perl_parse" "ac_cv_func_perl_parse"
2682-if test "x$ac_cv_func_perl_parse" = x""yes; then :
2683+if test "x$ac_cv_func_perl_parse" = xyes; then :
2684
2685 PERL_CFLAGS="$checkPERL_CFLAGS"
2686 PERL_LIBS="$checkPERL_LIBS"
2687@@ -9708,7 +9760,7 @@
2688 CFLAGS="$CFLAGS $checkPYTHON_CFLAGS"
2689 LIBS="$LIBS $checkPYTHON_LIBS"
2690 ac_fn_cxx_check_func "$LINENO" "Py_Initialize" "ac_cv_func_Py_Initialize"
2691-if test "x$ac_cv_func_Py_Initialize" = x""yes; then :
2692+if test "x$ac_cv_func_Py_Initialize" = xyes; then :
2693
2694 PYTHON_CFLAGS="$checkPYTHON_CFLAGS"
2695 PYTHON_LIBS="$checkPYTHON_LIBS"
2696@@ -9763,6 +9815,7 @@
2697 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2698 test $ac_status = 0; }; then
2699 pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= 1.13" 2>/dev/null`
2700+ test "x$?" != "x0" && pkg_failed=yes
2701 else
2702 pkg_failed=yes
2703 fi
2704@@ -9779,6 +9832,7 @@
2705 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2706 test $ac_status = 0; }; then
2707 pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms >= 1.13" 2>/dev/null`
2708+ test "x$?" != "x0" && pkg_failed=yes
2709 else
2710 pkg_failed=yes
2711 fi
2712@@ -9798,9 +9852,9 @@
2713 _pkg_short_errors_supported=no
2714 fi
2715 if test $_pkg_short_errors_supported = yes; then
2716- LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lcms >= 1.13" 2>&1`
2717+ LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms >= 1.13" 2>&1`
2718 else
2719- LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "lcms >= 1.13" 2>&1`
2720+ LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms >= 1.13" 2>&1`
2721 fi
2722 # Put the nasty error message in config.log where it belongs
2723 echo "$LCMS_PKG_ERRORS" >&5
2724@@ -9861,6 +9915,7 @@
2725 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2726 test $ac_status = 0; }; then
2727 pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.5.9" 2>/dev/null`
2728+ test "x$?" != "x0" && pkg_failed=yes
2729 else
2730 pkg_failed=yes
2731 fi
2732@@ -9877,6 +9932,7 @@
2733 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2734 test $ac_status = 0; }; then
2735 pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.5.9" 2>/dev/null`
2736+ test "x$?" != "x0" && pkg_failed=yes
2737 else
2738 pkg_failed=yes
2739 fi
2740@@ -9896,9 +9952,9 @@
2741 _pkg_short_errors_supported=no
2742 fi
2743 if test $_pkg_short_errors_supported = yes; then
2744- POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler >= 0.5.9" 2>&1`
2745+ POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.5.9" 2>&1`
2746 else
2747- POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler >= 0.5.9" 2>&1`
2748+ POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.5.9" 2>&1`
2749 fi
2750 # Put the nasty error message in config.log where it belongs
2751 echo "$POPPLER_PKG_ERRORS" >&5
2752@@ -9932,6 +9988,7 @@
2753 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2754 test $ac_status = 0; }; then
2755 pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "poppler-glib >= 0.5.9" 2>/dev/null`
2756+ test "x$?" != "x0" && pkg_failed=yes
2757 else
2758 pkg_failed=yes
2759 fi
2760@@ -9948,6 +10005,7 @@
2761 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2762 test $ac_status = 0; }; then
2763 pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "poppler-glib >= 0.5.9" 2>/dev/null`
2764+ test "x$?" != "x0" && pkg_failed=yes
2765 else
2766 pkg_failed=yes
2767 fi
2768@@ -9967,9 +10025,9 @@
2769 _pkg_short_errors_supported=no
2770 fi
2771 if test $_pkg_short_errors_supported = yes; then
2772- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler-glib >= 0.5.9" 2>&1`
2773+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-glib >= 0.5.9" 2>&1`
2774 else
2775- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler-glib >= 0.5.9" 2>&1`
2776+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-glib >= 0.5.9" 2>&1`
2777 fi
2778 # Put the nasty error message in config.log where it belongs
2779 echo "$POPPLER_GLIB_PKG_ERRORS" >&5
2780@@ -10002,6 +10060,7 @@
2781 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2782 test $ac_status = 0; }; then
2783 pkg_cv_CAIRO_SVG_CFLAGS=`$PKG_CONFIG --cflags "cairo-svg" 2>/dev/null`
2784+ test "x$?" != "x0" && pkg_failed=yes
2785 else
2786 pkg_failed=yes
2787 fi
2788@@ -10018,6 +10077,7 @@
2789 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2790 test $ac_status = 0; }; then
2791 pkg_cv_CAIRO_SVG_LIBS=`$PKG_CONFIG --libs "cairo-svg" 2>/dev/null`
2792+ test "x$?" != "x0" && pkg_failed=yes
2793 else
2794 pkg_failed=yes
2795 fi
2796@@ -10037,9 +10097,9 @@
2797 _pkg_short_errors_supported=no
2798 fi
2799 if test $_pkg_short_errors_supported = yes; then
2800- CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-svg" 2>&1`
2801+ CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo-svg" 2>&1`
2802 else
2803- CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-svg" 2>&1`
2804+ CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo-svg" 2>&1`
2805 fi
2806 # Put the nasty error message in config.log where it belongs
2807 echo "$CAIRO_SVG_PKG_ERRORS" >&5
2808@@ -10076,6 +10136,7 @@
2809 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2810 test $ac_status = 0; }; then
2811 pkg_cv_POPPLER_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "poppler-cairo >= 0.5.9" 2>/dev/null`
2812+ test "x$?" != "x0" && pkg_failed=yes
2813 else
2814 pkg_failed=yes
2815 fi
2816@@ -10092,6 +10153,7 @@
2817 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2818 test $ac_status = 0; }; then
2819 pkg_cv_POPPLER_CAIRO_LIBS=`$PKG_CONFIG --libs "poppler-cairo >= 0.5.9" 2>/dev/null`
2820+ test "x$?" != "x0" && pkg_failed=yes
2821 else
2822 pkg_failed=yes
2823 fi
2824@@ -10111,9 +10173,9 @@
2825 _pkg_short_errors_supported=no
2826 fi
2827 if test $_pkg_short_errors_supported = yes; then
2828- POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler-cairo >= 0.5.9" 2>&1`
2829+ POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-cairo >= 0.5.9" 2>&1`
2830 else
2831- POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler-cairo >= 0.5.9" 2>&1`
2832+ POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-cairo >= 0.5.9" 2>&1`
2833 fi
2834 # Put the nasty error message in config.log where it belongs
2835 echo "$POPPLER_CAIRO_PKG_ERRORS" >&5
2836@@ -10172,6 +10234,7 @@
2837 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2838 test $ac_status = 0; }; then
2839 pkg_cv_POPPLER_GFXFONT_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.3" 2>/dev/null`
2840+ test "x$?" != "x0" && pkg_failed=yes
2841 else
2842 pkg_failed=yes
2843 fi
2844@@ -10188,6 +10251,7 @@
2845 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2846 test $ac_status = 0; }; then
2847 pkg_cv_POPPLER_GFXFONT_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.3" 2>/dev/null`
2848+ test "x$?" != "x0" && pkg_failed=yes
2849 else
2850 pkg_failed=yes
2851 fi
2852@@ -10207,9 +10271,9 @@
2853 _pkg_short_errors_supported=no
2854 fi
2855 if test $_pkg_short_errors_supported = yes; then
2856- POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler >= 0.8.3" 2>&1`
2857+ POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.8.3" 2>&1`
2858 else
2859- POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler >= 0.8.3" 2>&1`
2860+ POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.8.3" 2>&1`
2861 fi
2862 # Put the nasty error message in config.log where it belongs
2863 echo "$POPPLER_GFXFONT_PKG_ERRORS" >&5
2864@@ -10316,75 +10380,188 @@
2865
2866
2867
2868-
2869-pkg_failed=no
2870-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG" >&5
2871-$as_echo_n "checking for LIBWPG... " >&6; }
2872-
2873-if test -n "$LIBWPG_CFLAGS"; then
2874- pkg_cv_LIBWPG_CFLAGS="$LIBWPG_CFLAGS"
2875- elif test -n "$PKG_CONFIG"; then
2876- if test -n "$PKG_CONFIG" && \
2877- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
2878- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
2879- ac_status=$?
2880- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2881- test $ac_status = 0; }; then
2882- pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
2883-else
2884- pkg_failed=yes
2885-fi
2886- else
2887- pkg_failed=untried
2888-fi
2889-if test -n "$LIBWPG_LIBS"; then
2890- pkg_cv_LIBWPG_LIBS="$LIBWPG_LIBS"
2891- elif test -n "$PKG_CONFIG"; then
2892- if test -n "$PKG_CONFIG" && \
2893- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
2894- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
2895- ac_status=$?
2896- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2897- test $ac_status = 0; }; then
2898- pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
2899-else
2900- pkg_failed=yes
2901-fi
2902- else
2903- pkg_failed=untried
2904-fi
2905-
2906-
2907-
2908-if test $pkg_failed = yes; then
2909- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2910-$as_echo "no" >&6; }
2911-
2912-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2913- _pkg_short_errors_supported=yes
2914-else
2915- _pkg_short_errors_supported=no
2916-fi
2917- if test $_pkg_short_errors_supported = yes; then
2918- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
2919- else
2920- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
2921- fi
2922- # Put the nasty error message in config.log where it belongs
2923- echo "$LIBWPG_PKG_ERRORS" >&5
2924-
2925- with_libwpg=no
2926-elif test $pkg_failed = untried; then
2927- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2928-$as_echo "no" >&6; }
2929- with_libwpg=no
2930-else
2931- LIBWPG_CFLAGS=$pkg_cv_LIBWPG_CFLAGS
2932- LIBWPG_LIBS=$pkg_cv_LIBWPG_LIBS
2933- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2934-$as_echo "yes" >&6; }
2935- with_libwpg=yes
2936-fi
2937+with_libwpg=no
2938+
2939+
2940+pkg_failed=no
2941+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG01" >&5
2942+$as_echo_n "checking for LIBWPG01... " >&6; }
2943+
2944+if test -n "$LIBWPG01_CFLAGS"; then
2945+ pkg_cv_LIBWPG01_CFLAGS="$LIBWPG01_CFLAGS"
2946+ elif test -n "$PKG_CONFIG"; then
2947+ if test -n "$PKG_CONFIG" && \
2948+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
2949+ ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
2950+ ac_status=$?
2951+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2952+ test $ac_status = 0; }; then
2953+ pkg_cv_LIBWPG01_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
2954+ test "x$?" != "x0" && pkg_failed=yes
2955+else
2956+ pkg_failed=yes
2957+fi
2958+ else
2959+ pkg_failed=untried
2960+fi
2961+if test -n "$LIBWPG01_LIBS"; then
2962+ pkg_cv_LIBWPG01_LIBS="$LIBWPG01_LIBS"
2963+ elif test -n "$PKG_CONFIG"; then
2964+ if test -n "$PKG_CONFIG" && \
2965+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
2966+ ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
2967+ ac_status=$?
2968+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2969+ test $ac_status = 0; }; then
2970+ pkg_cv_LIBWPG01_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
2971+ test "x$?" != "x0" && pkg_failed=yes
2972+else
2973+ pkg_failed=yes
2974+fi
2975+ else
2976+ pkg_failed=untried
2977+fi
2978+
2979+
2980+
2981+if test $pkg_failed = yes; then
2982+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2983+$as_echo "no" >&6; }
2984+
2985+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2986+ _pkg_short_errors_supported=yes
2987+else
2988+ _pkg_short_errors_supported=no
2989+fi
2990+ if test $_pkg_short_errors_supported = yes; then
2991+ LIBWPG01_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwpg-0.1 libwpg-stream-0.1" 2>&1`
2992+ else
2993+ LIBWPG01_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwpg-0.1 libwpg-stream-0.1" 2>&1`
2994+ fi
2995+ # Put the nasty error message in config.log where it belongs
2996+ echo "$LIBWPG01_PKG_ERRORS" >&5
2997+
2998+ with_libwpg01=no
2999+elif test $pkg_failed = untried; then
3000+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3001+$as_echo "no" >&6; }
3002+ with_libwpg01=no
3003+else
3004+ LIBWPG01_CFLAGS=$pkg_cv_LIBWPG01_CFLAGS
3005+ LIBWPG01_LIBS=$pkg_cv_LIBWPG01_LIBS
3006+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3007+$as_echo "yes" >&6; }
3008+ with_libwpg01=yes
3009+fi
3010+if test "x$with_libwpg01" = "xyes"; then
3011+
3012+$as_echo "#define WITH_LIBWPG01 1" >>confdefs.h
3013+
3014+ with_libwpg=yes
3015+ LIBWPG_LIBS=$LIBWPG01_LIBS
3016+
3017+ LIBWPG_CFLAGS=$LIBWPG01_CFLAGS
3018+
3019+fi
3020+ if test "x$with_libwpg01" = "xyes"; then
3021+ WITH_LIBWPG01_TRUE=
3022+ WITH_LIBWPG01_FALSE='#'
3023+else
3024+ WITH_LIBWPG01_TRUE='#'
3025+ WITH_LIBWPG01_FALSE=
3026+fi
3027+
3028+
3029+
3030+pkg_failed=no
3031+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG02" >&5
3032+$as_echo_n "checking for LIBWPG02... " >&6; }
3033+
3034+if test -n "$LIBWPG02_CFLAGS"; then
3035+ pkg_cv_LIBWPG02_CFLAGS="$LIBWPG02_CFLAGS"
3036+ elif test -n "$PKG_CONFIG"; then
3037+ if test -n "$PKG_CONFIG" && \
3038+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
3039+ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
3040+ ac_status=$?
3041+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3042+ test $ac_status = 0; }; then
3043+ pkg_cv_LIBWPG02_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
3044+ test "x$?" != "x0" && pkg_failed=yes
3045+else
3046+ pkg_failed=yes
3047+fi
3048+ else
3049+ pkg_failed=untried
3050+fi
3051+if test -n "$LIBWPG02_LIBS"; then
3052+ pkg_cv_LIBWPG02_LIBS="$LIBWPG02_LIBS"
3053+ elif test -n "$PKG_CONFIG"; then
3054+ if test -n "$PKG_CONFIG" && \
3055+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
3056+ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
3057+ ac_status=$?
3058+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3059+ test $ac_status = 0; }; then
3060+ pkg_cv_LIBWPG02_LIBS=`$PKG_CONFIG --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
3061+ test "x$?" != "x0" && pkg_failed=yes
3062+else
3063+ pkg_failed=yes
3064+fi
3065+ else
3066+ pkg_failed=untried
3067+fi
3068+
3069+
3070+
3071+if test $pkg_failed = yes; then
3072+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3073+$as_echo "no" >&6; }
3074+
3075+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3076+ _pkg_short_errors_supported=yes
3077+else
3078+ _pkg_short_errors_supported=no
3079+fi
3080+ if test $_pkg_short_errors_supported = yes; then
3081+ LIBWPG02_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
3082+ else
3083+ LIBWPG02_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
3084+ fi
3085+ # Put the nasty error message in config.log where it belongs
3086+ echo "$LIBWPG02_PKG_ERRORS" >&5
3087+
3088+ with_libwpg02=no
3089+elif test $pkg_failed = untried; then
3090+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3091+$as_echo "no" >&6; }
3092+ with_libwpg02=no
3093+else
3094+ LIBWPG02_CFLAGS=$pkg_cv_LIBWPG02_CFLAGS
3095+ LIBWPG02_LIBS=$pkg_cv_LIBWPG02_LIBS
3096+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3097+$as_echo "yes" >&6; }
3098+ with_libwpg02=yes
3099+fi
3100+if test "x$with_libwpg02" = "xyes"; then
3101+
3102+$as_echo "#define WITH_LIBWPG02 1" >>confdefs.h
3103+
3104+ with_libwpg=yes
3105+ LIBWPG_LIBS=$LIBWPG02_LIBS
3106+
3107+ LIBWPG_CFLAGS=$LIBWPG02_CFLAGS
3108+
3109+fi
3110+ if test "x$with_libwpg02" = "xyes"; then
3111+ WITH_LIBWPG02_TRUE=
3112+ WITH_LIBWPG02_FALSE='#'
3113+else
3114+ WITH_LIBWPG02_TRUE='#'
3115+ WITH_LIBWPG02_FALSE=
3116+fi
3117+
3118+
3119 if test "x$with_libwpg" = "xyes"; then
3120
3121 $as_echo "#define WITH_LIBWPG 1" >>confdefs.h
3122@@ -10401,9 +10578,6 @@
3123
3124
3125
3126-
3127-
3128-
3129 pkg_failed=no
3130 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAGEMAGICK" >&5
3131 $as_echo_n "checking for IMAGEMAGICK... " >&6; }
3132@@ -10418,6 +10592,7 @@
3133 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3134 test $ac_status = 0; }; then
3135 pkg_cv_IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick++" 2>/dev/null`
3136+ test "x$?" != "x0" && pkg_failed=yes
3137 else
3138 pkg_failed=yes
3139 fi
3140@@ -10434,6 +10609,7 @@
3141 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3142 test $ac_status = 0; }; then
3143 pkg_cv_IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "ImageMagick++" 2>/dev/null`
3144+ test "x$?" != "x0" && pkg_failed=yes
3145 else
3146 pkg_failed=yes
3147 fi
3148@@ -10453,9 +10629,9 @@
3149 _pkg_short_errors_supported=no
3150 fi
3151 if test $_pkg_short_errors_supported = yes; then
3152- IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ImageMagick++" 2>&1`
3153+ IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ImageMagick++" 2>&1`
3154 else
3155- IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors "ImageMagick++" 2>&1`
3156+ IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ImageMagick++" 2>&1`
3157 fi
3158 # Put the nasty error message in config.log where it belongs
3159 echo "$IMAGEMAGICK_PKG_ERRORS" >&5
3160@@ -10505,6 +10681,7 @@
3161 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3162 test $ac_status = 0; }; then
3163 pkg_cv_CAIRO_USER_FONTS_CFLAGS=`$PKG_CONFIG --cflags "cairo > 1.7.6" 2>/dev/null`
3164+ test "x$?" != "x0" && pkg_failed=yes
3165 else
3166 pkg_failed=yes
3167 fi
3168@@ -10521,6 +10698,7 @@
3169 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3170 test $ac_status = 0; }; then
3171 pkg_cv_CAIRO_USER_FONTS_LIBS=`$PKG_CONFIG --libs "cairo > 1.7.6" 2>/dev/null`
3172+ test "x$?" != "x0" && pkg_failed=yes
3173 else
3174 pkg_failed=yes
3175 fi
3176@@ -10540,9 +10718,9 @@
3177 _pkg_short_errors_supported=no
3178 fi
3179 if test $_pkg_short_errors_supported = yes; then
3180- CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo > 1.7.6" 2>&1`
3181+ CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo > 1.7.6" 2>&1`
3182 else
3183- CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo > 1.7.6" 2>&1`
3184+ CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo > 1.7.6" 2>&1`
3185 fi
3186 # Put the nasty error message in config.log where it belongs
3187 echo "$CAIRO_USER_FONTS_PKG_ERRORS" >&5
3188@@ -10586,6 +10764,7 @@
3189 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3190 test $ac_status = 0; }; then
3191 pkg_cv_INKSCAPE_CFLAGS=`$PKG_CONFIG --cflags "gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>/dev/null`
3192+ test "x$?" != "x0" && pkg_failed=yes
3193 else
3194 pkg_failed=yes
3195 fi
3196@@ -10602,6 +10781,7 @@
3197 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3198 test $ac_status = 0; }; then
3199 pkg_cv_INKSCAPE_LIBS=`$PKG_CONFIG --libs "gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>/dev/null`
3200+ test "x$?" != "x0" && pkg_failed=yes
3201 else
3202 pkg_failed=yes
3203 fi
3204@@ -10621,9 +10801,9 @@
3205 _pkg_short_errors_supported=no
3206 fi
3207 if test $_pkg_short_errors_supported = yes; then
3208- INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
3209+ INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
3210 else
3211- INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
3212+ INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
3213 fi
3214 # Put the nasty error message in config.log where it belongs
3215 echo "$INKSCAPE_PKG_ERRORS" >&5
3216@@ -10652,7 +10832,7 @@
3217 See the pkg-config man page for more details.
3218
3219 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3220-See \`config.log' for more details" "$LINENO" 5 ; }
3221+See \`config.log' for more details" "$LINENO" 5; }
3222 else
3223 INKSCAPE_CFLAGS=$pkg_cv_INKSCAPE_CFLAGS
3224 INKSCAPE_LIBS=$pkg_cv_INKSCAPE_LIBS
3225@@ -10698,7 +10878,7 @@
3226 for ac_header in boost/concept_check.hpp
3227 do :
3228 ac_fn_cxx_check_header_mongrel "$LINENO" "boost/concept_check.hpp" "ac_cv_header_boost_concept_check_hpp" "$ac_includes_default"
3229-if test "x$ac_cv_header_boost_concept_check_hpp" = x""yes; then :
3230+if test "x$ac_cv_header_boost_concept_check_hpp" = xyes; then :
3231 cat >>confdefs.h <<_ACEOF
3232 #define HAVE_BOOST_CONCEPT_CHECK_HPP 1
3233 _ACEOF
3234@@ -10725,6 +10905,7 @@
3235 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3236 test $ac_status = 0; }; then
3237 pkg_cv_CAIRO_PDF_CFLAGS=`$PKG_CONFIG --cflags "cairo-pdf" 2>/dev/null`
3238+ test "x$?" != "x0" && pkg_failed=yes
3239 else
3240 pkg_failed=yes
3241 fi
3242@@ -10741,6 +10922,7 @@
3243 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3244 test $ac_status = 0; }; then
3245 pkg_cv_CAIRO_PDF_LIBS=`$PKG_CONFIG --libs "cairo-pdf" 2>/dev/null`
3246+ test "x$?" != "x0" && pkg_failed=yes
3247 else
3248 pkg_failed=yes
3249 fi
3250@@ -10760,9 +10942,9 @@
3251 _pkg_short_errors_supported=no
3252 fi
3253 if test $_pkg_short_errors_supported = yes; then
3254- CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-pdf" 2>&1`
3255+ CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo-pdf" 2>&1`
3256 else
3257- CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-pdf" 2>&1`
3258+ CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo-pdf" 2>&1`
3259 fi
3260 # Put the nasty error message in config.log where it belongs
3261 echo "$CAIRO_PDF_PKG_ERRORS" >&5
3262@@ -10791,7 +10973,7 @@
3263 fi
3264
3265 ac_fn_cxx_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
3266-if test "x$ac_cv_header_popt_h" = x""yes; then :
3267+if test "x$ac_cv_header_popt_h" = xyes; then :
3268 INKSCAPE_LIBS="$INKSCAPE_LIBS -lpopt"
3269 else
3270 as_fn_error $? "libpopt is required" "$LINENO" 5
3271@@ -10801,7 +10983,7 @@
3272
3273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
3274 $as_echo_n "checking for new_aspell_config in -laspell... " >&6; }
3275-if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then :
3276+if ${ac_cv_lib_aspell_new_aspell_config+:} false; then :
3277 $as_echo_n "(cached) " >&6
3278 else
3279 ac_check_lib_save_LIBS=$LIBS
3280@@ -10835,9 +11017,9 @@
3281 fi
3282 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
3283 $as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }
3284-if test "x$ac_cv_lib_aspell_new_aspell_config" = x""yes; then :
3285+if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes; then :
3286 ac_fn_cxx_check_header_mongrel "$LINENO" "aspell.h" "ac_cv_header_aspell_h" "$ac_includes_default"
3287-if test "x$ac_cv_header_aspell_h" = x""yes; then :
3288+if test "x$ac_cv_header_aspell_h" = xyes; then :
3289 aspell_ok=yes
3290 else
3291 aspell_ok=no
3292@@ -10863,7 +11045,7 @@
3293 for ac_func in bind_textdomain_codeset
3294 do :
3295 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
3296-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
3297+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
3298 cat >>confdefs.h <<_ACEOF
3299 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
3300 _ACEOF
3301@@ -10874,7 +11056,7 @@
3302 for ac_func in gtk_window_set_default_icon_from_file
3303 do :
3304 ac_fn_cxx_check_func "$LINENO" "gtk_window_set_default_icon_from_file" "ac_cv_func_gtk_window_set_default_icon_from_file"
3305-if test "x$ac_cv_func_gtk_window_set_default_icon_from_file" = x""yes; then :
3306+if test "x$ac_cv_func_gtk_window_set_default_icon_from_file" = xyes; then :
3307 cat >>confdefs.h <<_ACEOF
3308 #define HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE 1
3309 _ACEOF
3310@@ -10885,7 +11067,7 @@
3311 for ac_func in gtk_window_fullscreen
3312 do :
3313 ac_fn_cxx_check_func "$LINENO" "gtk_window_fullscreen" "ac_cv_func_gtk_window_fullscreen"
3314-if test "x$ac_cv_func_gtk_window_fullscreen" = x""yes; then :
3315+if test "x$ac_cv_func_gtk_window_fullscreen" = xyes; then :
3316 cat >>confdefs.h <<_ACEOF
3317 #define HAVE_GTK_WINDOW_FULLSCREEN 1
3318 _ACEOF
3319@@ -10987,7 +11169,7 @@
3320 for ac_func in pow
3321 do :
3322 ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"
3323-if test "x$ac_cv_func_pow" = x""yes; then :
3324+if test "x$ac_cv_func_pow" = xyes; then :
3325 cat >>confdefs.h <<_ACEOF
3326 #define HAVE_POW 1
3327 _ACEOF
3328@@ -10999,7 +11181,7 @@
3329 if test x"$ac_cv_func_pow" = x"no" ; then
3330 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
3331 $as_echo_n "checking for pow in -lm... " >&6; }
3332-if test "${ac_cv_lib_m_pow+set}" = set; then :
3333+if ${ac_cv_lib_m_pow+:} false; then :
3334 $as_echo_n "(cached) " >&6
3335 else
3336 ac_check_lib_save_LIBS=$LIBS
3337@@ -11033,7 +11215,7 @@
3338 fi
3339 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
3340 $as_echo "$ac_cv_lib_m_pow" >&6; }
3341-if test "x$ac_cv_lib_m_pow" = x""yes; then :
3342+if test "x$ac_cv_lib_m_pow" = xyes; then :
3343 cat >>confdefs.h <<_ACEOF
3344 #define HAVE_LIBM 1
3345 _ACEOF
3346@@ -11046,7 +11228,7 @@
3347 for ac_func in sqrt
3348 do :
3349 ac_fn_cxx_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt"
3350-if test "x$ac_cv_func_sqrt" = x""yes; then :
3351+if test "x$ac_cv_func_sqrt" = xyes; then :
3352 cat >>confdefs.h <<_ACEOF
3353 #define HAVE_SQRT 1
3354 _ACEOF
3355@@ -11057,7 +11239,7 @@
3356 for ac_func in floor
3357 do :
3358 ac_fn_cxx_check_func "$LINENO" "floor" "ac_cv_func_floor"
3359-if test "x$ac_cv_func_floor" = x""yes; then :
3360+if test "x$ac_cv_func_floor" = xyes; then :
3361 cat >>confdefs.h <<_ACEOF
3362 #define HAVE_FLOOR 1
3363 _ACEOF
3364@@ -11068,7 +11250,7 @@
3365 for ac_func in gettimeofday
3366 do :
3367 ac_fn_cxx_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
3368-if test "x$ac_cv_func_gettimeofday" = x""yes; then :
3369+if test "x$ac_cv_func_gettimeofday" = xyes; then :
3370 cat >>confdefs.h <<_ACEOF
3371 #define HAVE_GETTIMEOFDAY 1
3372 _ACEOF
3373@@ -11079,7 +11261,7 @@
3374 for ac_func in memmove
3375 do :
3376 ac_fn_cxx_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
3377-if test "x$ac_cv_func_memmove" = x""yes; then :
3378+if test "x$ac_cv_func_memmove" = xyes; then :
3379 cat >>confdefs.h <<_ACEOF
3380 #define HAVE_MEMMOVE 1
3381 _ACEOF
3382@@ -11090,7 +11272,7 @@
3383 for ac_func in memset
3384 do :
3385 ac_fn_cxx_check_func "$LINENO" "memset" "ac_cv_func_memset"
3386-if test "x$ac_cv_func_memset" = x""yes; then :
3387+if test "x$ac_cv_func_memset" = xyes; then :
3388 cat >>confdefs.h <<_ACEOF
3389 #define HAVE_MEMSET 1
3390 _ACEOF
3391@@ -11101,7 +11283,7 @@
3392 for ac_func in mkdir
3393 do :
3394 ac_fn_cxx_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
3395-if test "x$ac_cv_func_mkdir" = x""yes; then :
3396+if test "x$ac_cv_func_mkdir" = xyes; then :
3397 cat >>confdefs.h <<_ACEOF
3398 #define HAVE_MKDIR 1
3399 _ACEOF
3400@@ -11112,7 +11294,7 @@
3401 for ac_func in strncasecmp
3402 do :
3403 ac_fn_cxx_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
3404-if test "x$ac_cv_func_strncasecmp" = x""yes; then :
3405+if test "x$ac_cv_func_strncasecmp" = xyes; then :
3406 cat >>confdefs.h <<_ACEOF
3407 #define HAVE_STRNCASECMP 1
3408 _ACEOF
3409@@ -11123,7 +11305,7 @@
3410 for ac_func in strpbrk
3411 do :
3412 ac_fn_cxx_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
3413-if test "x$ac_cv_func_strpbrk" = x""yes; then :
3414+if test "x$ac_cv_func_strpbrk" = xyes; then :
3415 cat >>confdefs.h <<_ACEOF
3416 #define HAVE_STRPBRK 1
3417 _ACEOF
3418@@ -11134,7 +11316,7 @@
3419 for ac_func in strrchr
3420 do :
3421 ac_fn_cxx_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr"
3422-if test "x$ac_cv_func_strrchr" = x""yes; then :
3423+if test "x$ac_cv_func_strrchr" = xyes; then :
3424 cat >>confdefs.h <<_ACEOF
3425 #define HAVE_STRRCHR 1
3426 _ACEOF
3427@@ -11145,7 +11327,7 @@
3428 for ac_func in strspn
3429 do :
3430 ac_fn_cxx_check_func "$LINENO" "strspn" "ac_cv_func_strspn"
3431-if test "x$ac_cv_func_strspn" = x""yes; then :
3432+if test "x$ac_cv_func_strspn" = xyes; then :
3433 cat >>confdefs.h <<_ACEOF
3434 #define HAVE_STRSPN 1
3435 _ACEOF
3436@@ -11156,7 +11338,7 @@
3437 for ac_func in strstr
3438 do :
3439 ac_fn_cxx_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
3440-if test "x$ac_cv_func_strstr" = x""yes; then :
3441+if test "x$ac_cv_func_strstr" = xyes; then :
3442 cat >>confdefs.h <<_ACEOF
3443 #define HAVE_STRSTR 1
3444 _ACEOF
3445@@ -11167,7 +11349,7 @@
3446 for ac_func in strtoul
3447 do :
3448 ac_fn_cxx_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
3449-if test "x$ac_cv_func_strtoul" = x""yes; then :
3450+if test "x$ac_cv_func_strtoul" = xyes; then :
3451 cat >>confdefs.h <<_ACEOF
3452 #define HAVE_STRTOUL 1
3453 _ACEOF
3454@@ -11178,7 +11360,7 @@
3455 for ac_func in fpsetmask
3456 do :
3457 ac_fn_cxx_check_func "$LINENO" "fpsetmask" "ac_cv_func_fpsetmask"
3458-if test "x$ac_cv_func_fpsetmask" = x""yes; then :
3459+if test "x$ac_cv_func_fpsetmask" = xyes; then :
3460 cat >>confdefs.h <<_ACEOF
3461 #define HAVE_FPSETMASK 1
3462 _ACEOF
3463@@ -11189,7 +11371,7 @@
3464 for ac_func in ecvt
3465 do :
3466 ac_fn_cxx_check_func "$LINENO" "ecvt" "ac_cv_func_ecvt"
3467-if test "x$ac_cv_func_ecvt" = x""yes; then :
3468+if test "x$ac_cv_func_ecvt" = xyes; then :
3469 cat >>confdefs.h <<_ACEOF
3470 #define HAVE_ECVT 1
3471 _ACEOF
3472@@ -11200,7 +11382,7 @@
3473 for ac_header in ieeefp.h
3474 do :
3475 ac_fn_cxx_check_header_mongrel "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "$ac_includes_default"
3476-if test "x$ac_cv_header_ieeefp_h" = x""yes; then :
3477+if test "x$ac_cv_header_ieeefp_h" = xyes; then :
3478 cat >>confdefs.h <<_ACEOF
3479 #define HAVE_IEEEFP_H 1
3480 _ACEOF
3481@@ -11212,7 +11394,7 @@
3482 for ac_header in fcntl.h
3483 do :
3484 ac_fn_cxx_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
3485-if test "x$ac_cv_header_fcntl_h" = x""yes; then :
3486+if test "x$ac_cv_header_fcntl_h" = xyes; then :
3487 cat >>confdefs.h <<_ACEOF
3488 #define HAVE_FCNTL_H 1
3489 _ACEOF
3490@@ -11224,7 +11406,7 @@
3491 for ac_header in libintl.h
3492 do :
3493 ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
3494-if test "x$ac_cv_header_libintl_h" = x""yes; then :
3495+if test "x$ac_cv_header_libintl_h" = xyes; then :
3496 cat >>confdefs.h <<_ACEOF
3497 #define HAVE_LIBINTL_H 1
3498 _ACEOF
3499@@ -11236,7 +11418,7 @@
3500 for ac_header in stddef.h
3501 do :
3502 ac_fn_cxx_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
3503-if test "x$ac_cv_header_stddef_h" = x""yes; then :
3504+if test "x$ac_cv_header_stddef_h" = xyes; then :
3505 cat >>confdefs.h <<_ACEOF
3506 #define HAVE_STDDEF_H 1
3507 _ACEOF
3508@@ -11248,7 +11430,7 @@
3509 for ac_header in sys/time.h
3510 do :
3511 ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
3512-if test "x$ac_cv_header_sys_time_h" = x""yes; then :
3513+if test "x$ac_cv_header_sys_time_h" = xyes; then :
3514 cat >>confdefs.h <<_ACEOF
3515 #define HAVE_SYS_TIME_H 1
3516 _ACEOF
3517@@ -11259,7 +11441,7 @@
3518
3519 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
3520 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
3521-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
3522+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
3523 $as_echo_n "(cached) " >&6
3524 else
3525 rm -f conftest.sym conftest.file
3526@@ -11321,7 +11503,7 @@
3527
3528 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
3529 $as_echo_n "checking whether stat accepts an empty string... " >&6; }
3530-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
3531+if ${ac_cv_func_stat_empty_string_bug+:} false; then :
3532 $as_echo_n "(cached) " >&6
3533 else
3534 if test "$cross_compiling" = yes; then :
3535@@ -11368,7 +11550,7 @@
3536 for ac_func in strftime
3537 do :
3538 ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
3539-if test "x$ac_cv_func_strftime" = x""yes; then :
3540+if test "x$ac_cv_func_strftime" = xyes; then :
3541 cat >>confdefs.h <<_ACEOF
3542 #define HAVE_STRFTIME 1
3543 _ACEOF
3544@@ -11377,7 +11559,7 @@
3545 # strftime is in -lintl on SCO UNIX.
3546 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
3547 $as_echo_n "checking for strftime in -lintl... " >&6; }
3548-if test "${ac_cv_lib_intl_strftime+set}" = set; then :
3549+if ${ac_cv_lib_intl_strftime+:} false; then :
3550 $as_echo_n "(cached) " >&6
3551 else
3552 ac_check_lib_save_LIBS=$LIBS
3553@@ -11411,7 +11593,7 @@
3554 fi
3555 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
3556 $as_echo "$ac_cv_lib_intl_strftime" >&6; }
3557-if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
3558+if test "x$ac_cv_lib_intl_strftime" = xyes; then :
3559 $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
3560
3561 LIBS="-lintl $LIBS"
3562@@ -11422,7 +11604,7 @@
3563
3564 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
3565 $as_echo_n "checking for working strtod... " >&6; }
3566-if test "${ac_cv_func_strtod+set}" = set; then :
3567+if ${ac_cv_func_strtod+:} false; then :
3568 $as_echo_n "(cached) " >&6
3569 else
3570 if test "$cross_compiling" = yes; then :
3571@@ -11481,14 +11663,14 @@
3572 esac
3573
3574 ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"
3575-if test "x$ac_cv_func_pow" = x""yes; then :
3576+if test "x$ac_cv_func_pow" = xyes; then :
3577
3578 fi
3579
3580 if test $ac_cv_func_pow = no; then
3581 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
3582 $as_echo_n "checking for pow in -lm... " >&6; }
3583-if test "${ac_cv_lib_m_pow+set}" = set; then :
3584+if ${ac_cv_lib_m_pow+:} false; then :
3585 $as_echo_n "(cached) " >&6
3586 else
3587 ac_check_lib_save_LIBS=$LIBS
3588@@ -11522,7 +11704,7 @@
3589 fi
3590 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
3591 $as_echo "$ac_cv_lib_m_pow" >&6; }
3592-if test "x$ac_cv_lib_m_pow" = x""yes; then :
3593+if test "x$ac_cv_lib_m_pow" = xyes; then :
3594 POW_LIB=-lm
3595 else
3596 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
3597@@ -11535,7 +11717,7 @@
3598
3599 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
3600 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
3601-if test "${ac_cv_header_stat_broken+set}" = set; then :
3602+if ${ac_cv_header_stat_broken+:} false; then :
3603 $as_echo_n "(cached) " >&6
3604 else
3605 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3606@@ -11577,7 +11759,7 @@
3607
3608 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
3609 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
3610-if test "${ac_cv_header_time+set}" = set; then :
3611+if ${ac_cv_header_time+:} false; then :
3612 $as_echo_n "(cached) " >&6
3613 else
3614 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3615@@ -11612,7 +11794,7 @@
3616
3617 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
3618 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
3619-if test "${ac_cv_struct_tm+set}" = set; then :
3620+if ${ac_cv_struct_tm+:} false; then :
3621 $as_echo_n "(cached) " >&6
3622 else
3623 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3624@@ -11646,7 +11828,7 @@
3625 fi
3626
3627 ac_fn_cxx_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
3628-if test "x$ac_cv_type_mode_t" = x""yes; then :
3629+if test "x$ac_cv_type_mode_t" = xyes; then :
3630
3631 else
3632
3633@@ -11658,7 +11840,7 @@
3634
3635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
3636 $as_echo_n "checking return type of signal handlers... " >&6; }
3637-if test "${ac_cv_type_signal+set}" = set; then :
3638+if ${ac_cv_type_signal+:} false; then :
3639 $as_echo_n "(cached) " >&6
3640 else
3641 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3642@@ -11840,10 +12022,21 @@
3643 :end' >>confcache
3644 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
3645 if test -w "$cache_file"; then
3646- test "x$cache_file" != "x/dev/null" &&
3647+ if test "x$cache_file" != "x/dev/null"; then
3648 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
3649 $as_echo "$as_me: updating cache $cache_file" >&6;}
3650- cat confcache >$cache_file
3651+ if test ! -f "$cache_file" || test -h "$cache_file"; then
3652+ cat confcache >"$cache_file"
3653+ else
3654+ case $cache_file in #(
3655+ */* | ?:*)
3656+ mv -f confcache "$cache_file"$$ &&
3657+ mv -f "$cache_file"$$ "$cache_file" ;; #(
3658+ *)
3659+ mv -f confcache "$cache_file" ;;
3660+ esac
3661+ fi
3662+ fi
3663 else
3664 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
3665 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3666@@ -11918,6 +12111,10 @@
3667 as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
3668 Usually this means the macro was only invoked conditionally." "$LINENO" 5
3669 fi
3670+if test -z "${PLATFORM_OSX_TRUE}" && test -z "${PLATFORM_OSX_FALSE}"; then
3671+ as_fn_error $? "conditional \"PLATFORM_OSX\" was never defined.
3672+Usually this means the macro was only invoked conditionally." "$LINENO" 5
3673+fi
3674 if test -z "${PLATFORM_SOLARIS_TRUE}" && test -z "${PLATFORM_SOLARIS_FALSE}"; then
3675 as_fn_error $? "conditional \"PLATFORM_SOLARIS\" was never defined.
3676 Usually this means the macro was only invoked conditionally." "$LINENO" 5
3677@@ -11943,6 +12140,14 @@
3678 as_fn_error $? "conditional \"WITH_PYTHON\" was never defined.
3679 Usually this means the macro was only invoked conditionally." "$LINENO" 5
3680 fi
3681+if test -z "${WITH_LIBWPG01_TRUE}" && test -z "${WITH_LIBWPG01_FALSE}"; then
3682+ as_fn_error $? "conditional \"WITH_LIBWPG01\" was never defined.
3683+Usually this means the macro was only invoked conditionally." "$LINENO" 5
3684+fi
3685+if test -z "${WITH_LIBWPG02_TRUE}" && test -z "${WITH_LIBWPG02_FALSE}"; then
3686+ as_fn_error $? "conditional \"WITH_LIBWPG02\" was never defined.
3687+Usually this means the macro was only invoked conditionally." "$LINENO" 5
3688+fi
3689 if test -z "${WITH_LIBWPG_TRUE}" && test -z "${WITH_LIBWPG_FALSE}"; then
3690 as_fn_error $? "conditional \"WITH_LIBWPG\" was never defined.
3691 Usually this means the macro was only invoked conditionally." "$LINENO" 5
3692@@ -11956,7 +12161,7 @@
3693 Usually this means the macro was only invoked conditionally." "$LINENO" 5
3694 fi
3695
3696-: ${CONFIG_STATUS=./config.status}
3697+: "${CONFIG_STATUS=./config.status}"
3698 ac_write_fail=0
3699 ac_clean_files_save=$ac_clean_files
3700 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
3701@@ -12057,6 +12262,7 @@
3702 IFS=" "" $as_nl"
3703
3704 # Find who we are. Look in the path if we contain no directory separator.
3705+as_myself=
3706 case $0 in #((
3707 *[\\/]* ) as_myself=$0 ;;
3708 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3709@@ -12363,8 +12569,8 @@
3710 # report actual input values of CONFIG_FILES etc. instead of their
3711 # values after options handling.
3712 ac_log="
3713-This file was extended by inkscape $as_me 0.48.1, which was
3714-generated by GNU Autoconf 2.67. Invocation command line was
3715+This file was extended by inkscape $as_me 0.48.2, which was
3716+generated by GNU Autoconf 2.68. Invocation command line was
3717
3718 CONFIG_FILES = $CONFIG_FILES
3719 CONFIG_HEADERS = $CONFIG_HEADERS
3720@@ -12429,8 +12635,8 @@
3721 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3722 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
3723 ac_cs_version="\\
3724-inkscape config.status 0.48.1
3725-configured by $0, generated by GNU Autoconf 2.67,
3726+inkscape config.status 0.48.2
3727+configured by $0, generated by GNU Autoconf 2.68,
3728 with options \\"\$ac_cs_config\\"
3729
3730 Copyright (C) 2010 Free Software Foundation, Inc.
3731@@ -12635,7 +12841,7 @@
3732 "inkview.1") CONFIG_FILES="$CONFIG_FILES inkview.1" ;;
3733 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
3734
3735- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
3736+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
3737 esac
3738 done
3739
3740@@ -12658,9 +12864,10 @@
3741 # after its creation but before its name has been assigned to `$tmp'.
3742 $debug ||
3743 {
3744- tmp=
3745+ tmp= ac_tmp=
3746 trap 'exit_status=$?
3747- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
3748+ : "${ac_tmp:=$tmp}"
3749+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
3750 ' 0
3751 trap 'as_fn_exit 1' 1 2 13 15
3752 }
3753@@ -12668,12 +12875,13 @@
3754
3755 {
3756 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
3757- test -n "$tmp" && test -d "$tmp"
3758+ test -d "$tmp"
3759 } ||
3760 {
3761 tmp=./conf$$-$RANDOM
3762 (umask 077 && mkdir "$tmp")
3763 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
3764+ac_tmp=$tmp
3765
3766 # Set up the scripts for CONFIG_FILES section.
3767 # No need to generate them if there are no CONFIG_FILES.
3768@@ -12695,7 +12903,7 @@
3769 ac_cs_awk_cr=$ac_cr
3770 fi
3771
3772-echo 'BEGIN {' >"$tmp/subs1.awk" &&
3773+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
3774 _ACEOF
3775
3776
3777@@ -12723,7 +12931,7 @@
3778 rm -f conf$$subs.sh
3779
3780 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3781-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
3782+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
3783 _ACEOF
3784 sed -n '
3785 h
3786@@ -12771,7 +12979,7 @@
3787 rm -f conf$$subs.awk
3788 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3789 _ACAWK
3790-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
3791+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
3792 for (key in S) S_is_set[key] = 1
3793 FS = ""
3794
3795@@ -12803,7 +13011,7 @@
3796 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
3797 else
3798 cat
3799-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
3800+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
3801 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
3802 _ACEOF
3803
3804@@ -12837,7 +13045,7 @@
3805 # No need to generate them if there are no CONFIG_HEADERS.
3806 # This happens for instance with `./config.status Makefile'.
3807 if test -n "$CONFIG_HEADERS"; then
3808-cat >"$tmp/defines.awk" <<\_ACAWK ||
3809+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
3810 BEGIN {
3811 _ACEOF
3812
3813@@ -12849,8 +13057,8 @@
3814 # handling of long lines.
3815 ac_delim='%!_!# '
3816 for ac_last_try in false false :; do
3817- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
3818- if test -z "$ac_t"; then
3819+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
3820+ if test -z "$ac_tt"; then
3821 break
3822 elif $ac_last_try; then
3823 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
3824@@ -12951,7 +13159,7 @@
3825 esac
3826 case $ac_mode$ac_tag in
3827 :[FHL]*:*);;
3828- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
3829+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
3830 :[FH]-) ac_tag=-:-;;
3831 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
3832 esac
3833@@ -12970,7 +13178,7 @@
3834 for ac_f
3835 do
3836 case $ac_f in
3837- -) ac_f="$tmp/stdin";;
3838+ -) ac_f="$ac_tmp/stdin";;
3839 *) # Look for the file first in the build tree, then in the source tree
3840 # (if the path is not absolute). The absolute path cannot be DOS-style,
3841 # because $ac_f cannot contain `:'.
3842@@ -12979,7 +13187,7 @@
3843 [\\/$]*) false;;
3844 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
3845 esac ||
3846- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
3847+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
3848 esac
3849 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
3850 as_fn_append ac_file_inputs " '$ac_f'"
3851@@ -13005,8 +13213,8 @@
3852 esac
3853
3854 case $ac_tag in
3855- *:-:* | *:-) cat >"$tmp/stdin" \
3856- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
3857+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
3858+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
3859 esac
3860 ;;
3861 esac
3862@@ -13142,21 +13350,22 @@
3863 s&@MKDIR_P@&$ac_MKDIR_P&;t t
3864 $ac_datarootdir_hack
3865 "
3866-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
3867- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3868+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
3869+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3870
3871 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
3872- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
3873- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
3874+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
3875+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
3876+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
3877 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3878 which seems to be undefined. Please make sure it is defined" >&5
3879 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3880 which seems to be undefined. Please make sure it is defined" >&2;}
3881
3882- rm -f "$tmp/stdin"
3883+ rm -f "$ac_tmp/stdin"
3884 case $ac_file in
3885- -) cat "$tmp/out" && rm -f "$tmp/out";;
3886- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
3887+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
3888+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
3889 esac \
3890 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3891 ;;
3892@@ -13167,20 +13376,20 @@
3893 if test x"$ac_file" != x-; then
3894 {
3895 $as_echo "/* $configure_input */" \
3896- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
3897- } >"$tmp/config.h" \
3898+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
3899+ } >"$ac_tmp/config.h" \
3900 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3901- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
3902+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
3903 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
3904 $as_echo "$as_me: $ac_file is unchanged" >&6;}
3905 else
3906 rm -f "$ac_file"
3907- mv "$tmp/config.h" "$ac_file" \
3908+ mv "$ac_tmp/config.h" "$ac_file" \
3909 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3910 fi
3911 else
3912 $as_echo "/* $configure_input */" \
3913- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
3914+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
3915 || as_fn_error $? "could not create -" "$LINENO" 5
3916 fi
3917 # Compute "$ac_file"'s index in $config_headers.
3918
3919=== modified file 'configure.ac'
3920--- configure.ac 2011-02-20 12:07:30 +0000
3921+++ configure.ac 2011-07-10 11:35:55 +0000
3922@@ -7,7 +7,7 @@
3923 # `dpkg --compare-versions'. (ii) We don't always know what the next
3924 # version is going to be called until about the time we release it
3925 # (whereas we always know what the previous version was called).
3926-AC_INIT(inkscape, 0.48.1)
3927+AC_INIT(inkscape, 0.48.2)
3928
3929 AC_CANONICAL_HOST
3930 AC_CONFIG_SRCDIR([src/main.cpp])
3931@@ -313,6 +313,18 @@
3932 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
3933 AC_SUBST(WIN32_CFLAGS)
3934
3935+dnl ******************************
3936+dnl MacOS X
3937+dnl ******************************
3938+AC_MSG_CHECKING([for OSX platform])
3939+if test "x$build_vendor" = "xapple" ; then
3940+ platform_osx=yes
3941+else
3942+ platform_osx=no
3943+fi
3944+AC_MSG_RESULT([$platform_osx])
3945+AM_CONDITIONAL(PLATFORM_OSX, test "$platform_osx" = "yes")
3946+
3947 AC_MSG_CHECKING([for Solaris platform])
3948 case "$host" in
3949 *-solaris2.*)
3950@@ -699,15 +711,31 @@
3951 dnl Check for libwpg for extension
3952 dnl ******************************
3953
3954-PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
3955+with_libwpg=no
3956+
3957+PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
3958+if test "x$with_libwpg01" = "xyes"; then
3959+ AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
3960+ with_libwpg=yes
3961+ AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
3962+ AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
3963+fi
3964+AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
3965+
3966+PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
3967+if test "x$with_libwpg02" = "xyes"; then
3968+ AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x])
3969+ with_libwpg=yes
3970+ AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS)
3971+ AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS)
3972+fi
3973+AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes")
3974+
3975 if test "x$with_libwpg" = "xyes"; then
3976 AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
3977 fi
3978 AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
3979
3980-AC_SUBST(LIBWPG_LIBS)
3981-AC_SUBST(LIBWPG_CFLAGS)
3982-
3983 dnl ******************************
3984 dnl Check for ImageMagick Magick++
3985 dnl ******************************
3986
3987=== modified file 'debian/changelog'
3988--- debian/changelog 2011-06-06 16:50:22 +0000
3989+++ debian/changelog 2011-07-10 11:35:55 +0000
3990@@ -1,3 +1,25 @@
3991+inkscape (0.48.2-0ubuntu1) oneiric; urgency=low
3992+
3993+ * New upstream release (LP: #807912). Fixes several Ubuntu bugs:
3994+ - [SVG Font Editor] Crash when kerning an empty pair (LP: #706506)
3995+ - Connector tool crash Inkscake (orthogonal mode) (LP: #771738)
3996+ - Errors printed to console if openclipart search fails (LP: #638844)
3997+ - pdf export with cairo 1.10 defaults to version PDF-1.5 (LP: #664335)
3998+ - Cairo rendering broken for "use" elements when scaling or a viewBox
3999+ (LP: #705345)
4000+ - gimp_xcf.py crashed with TypeError in effect() (LP: #565296)
4001+ - Enable build against libwpg-0.2 (LP: #778951)
4002+ - Please add supported filetypes into MimeType line of inkscape.desktop
4003+ (LP: #278307)
4004+ - Inkscape fails to build with gcc 4.6 (LP: #707205)
4005+ * Drop 01-libwpg0.2.dpatch - Applied upstream
4006+ * Drop 03-add-missing-mimetypes.dpatch - Applied upstream
4007+ * Drop 04-fix-build-with-gcc4.6.dpatch - Applied upstream
4008+ * Drop 05-add-missing-includes.dpatch - Applied upstream
4009+ * Drop fix-fontforge-glyph-template.dpatch - Applied upstream
4010+
4011+ -- Alex Valavanis <valavanisalex@gmail.com> Sun, 10 Jul 2011 11:35:30 +0100
4012+
4013 inkscape (0.48.1-2.1ubuntu1) oneiric; urgency=low
4014
4015 * Merge from Debian Unstable (LP: #791728). Remaining changes:
4016
4017=== modified file 'debian/patches/00list'
4018--- debian/patches/00list 2011-06-02 17:17:33 +0000
4019+++ debian/patches/00list 2011-07-10 11:35:55 +0000
4020@@ -1,8 +1,3 @@
4021-01-libwpg0.2.dpatch
4022 02-add-shebangs-and-fix-permissions
4023-03-add-missing-mimetypes
4024 01_add_unity_quicklist_support.patch
4025-04-fix-build-with-gcc4.6.dpatch
4026-05-add-missing-includes.dpatch
4027-fix-fontforge-glyph-template.dpatch
4028 fix-datamatrix-ui.dpatch
4029
4030=== removed file 'debian/patches/01-libwpg0.2.dpatch'
4031--- debian/patches/01-libwpg0.2.dpatch 2011-06-01 18:05:51 +0000
4032+++ debian/patches/01-libwpg0.2.dpatch 1970-01-01 00:00:00 +0000
4033@@ -1,99 +0,0 @@
4034-#! /bin/sh /usr/share/dpatch/dpatch-run
4035-## 02_libwpd0_9.dpatch by <rene@debian.org>
4036-##
4037-## All lines beginning with `## DP:' are a description of the patch.
4038-## DP: No description.
4039-
4040-@DPATCH@
4041-
4042---- a/configure
4043-+++ b/configure
4044-@@ -10325,12 +10325,13 @@ if test -n "$LIBWPG_CFLAGS"; then
4045- pkg_cv_LIBWPG_CFLAGS="$LIBWPG_CFLAGS"
4046- elif test -n "$PKG_CONFIG"; then
4047- if test -n "$PKG_CONFIG" && \
4048-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
4049-- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
4050-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
4051-+ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
4052-+
4053- ac_status=$?
4054- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4055- test $ac_status = 0; }; then
4056-- pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
4057-+ pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
4058- else
4059- pkg_failed=yes
4060- fi
4061-@@ -10341,12 +10342,13 @@ if test -n "$LIBWPG_LIBS"; then
4062- pkg_cv_LIBWPG_LIBS="$LIBWPG_LIBS"
4063- elif test -n "$PKG_CONFIG"; then
4064- if test -n "$PKG_CONFIG" && \
4065-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
4066-- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
4067-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
4068-+ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
4069-+
4070- ac_status=$?
4071- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4072- test $ac_status = 0; }; then
4073-- pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
4074-+ pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
4075- else
4076- pkg_failed=yes
4077- fi
4078-@@ -10366,9 +10368,9 @@ else
4079- _pkg_short_errors_supported=no
4080- fi
4081- if test $_pkg_short_errors_supported = yes; then
4082-- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
4083-+ LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
4084- else
4085-- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
4086-+ LIBWPG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
4087- fi
4088- # Put the nasty error message in config.log where it belongs
4089- echo "$LIBWPG_PKG_ERRORS" >&5
4090---- a/configure.ac
4091-+++ b/configure.ac
4092-@@ -699,7 +699,7 @@ dnl ******************************
4093- dnl Check for libwpg for extension
4094- dnl ******************************
4095-
4096--PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
4097-+PKG_CHECK_MODULES(LIBWPG, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg=yes, with_libwpg=no)
4098- if test "x$with_libwpg" = "xyes"; then
4099- AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
4100- fi
4101---- inkscape-0.48.0~/src/extension/internal/wpg-input.cpp 2010-07-13 05:48:40.000000000 +0200
4102-+++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp 2010-11-24 15:57:38.000000000 +0100
4103-@@ -49,7 +49,7 @@
4104- #include "document.h"
4105-
4106- #include "libwpg/libwpg.h"
4107--#include "libwpg/WPGStreamImplementation.h"
4108-+#include "libwpd-stream/libwpd-stream.h"
4109-
4110-
4111- using namespace libwpg;
4112-@@ -61,9 +61,9 @@
4113-
4114- SPDocument *
4115- WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
4116-- WPXInputStream* input = new libwpg::WPGFileStream(uri);
4117-+ WPXInputStream* input = new WPXFileStream(uri);
4118- if (input->isOLEStream()) {
4119-- WPXInputStream* olestream = input->getDocumentOLEStream();
4120-+ WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN");
4121- if (olestream) {
4122- delete input;
4123- input = olestream;
4124-@@ -78,7 +78,7 @@
4125- return NULL;
4126- }
4127-
4128-- libwpg::WPGString output;
4129-+ WPXString output;
4130- if (!libwpg::WPGraphics::generateSVG(input, output)) {
4131- delete input;
4132- return NULL;
4133
4134=== removed file 'debian/patches/03-add-missing-mimetypes.dpatch'
4135--- debian/patches/03-add-missing-mimetypes.dpatch 2011-06-01 18:05:51 +0000
4136+++ debian/patches/03-add-missing-mimetypes.dpatch 1970-01-01 00:00:00 +0000
4137@@ -1,20 +0,0 @@
4138-#! /bin/sh /usr/share/dpatch/dpatch-run
4139-## 03-add-missing-mimetypes.dpatch by <wolfi@sigxcpu.org>
4140-##
4141-## All lines beginning with `## DP:' are a description of the patch.
4142-## DP: Patch to Add supported Mime types to inkscape.desktop.in
4143-## DP: Taken from upstream's Bug tracker at
4144-## DP: https://bugs.launchpad.net/ubuntu/+source/inkscape/+bug/278307
4145-## DP: original patch by Mantas Kriaučiūnas
4146-
4147-@DPATCH@
4148-
4149---- a/inkscape.desktop.in 2008-03-11 04:21:19.000000000 +0000
4150-+++ b/inkscape.desktop.in 2008-10-04 20:36:49.311456804 +0000
4151-@@ -7,5 +7,5 @@
4152- Type=Application
4153- Categories=Graphics;VectorGraphics;GTK;
4154--MimeType=image/svg+xml;image/svg+xml-compressed;
4155-+MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
4156- Exec=inkscape %F
4157- TryExec=inkscape
4158
4159=== removed file 'debian/patches/04-fix-build-with-gcc4.6.dpatch'
4160--- debian/patches/04-fix-build-with-gcc4.6.dpatch 2011-05-30 17:07:11 +0000
4161+++ debian/patches/04-fix-build-with-gcc4.6.dpatch 1970-01-01 00:00:00 +0000
4162@@ -1,18 +0,0 @@
4163-#! /bin/sh /usr/share/dpatch/dpatch-run
4164-## 04-fix-build-with-gcc4.6.dpatch by Mehdi Dogguy <mehdi@debian.org>
4165-##
4166-## DP: #624770
4167-
4168-@DPATCH@
4169-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/Makefile.am inkscape-0.48.1/src/Makefile.am
4170---- inkscape-0.48.1~/src/Makefile.am 2010-07-13 05:48:40.000000000 +0200
4171-+++ inkscape-0.48.1/src/Makefile.am 2011-05-30 16:36:29.000000000 +0200
4172-@@ -205,7 +205,7 @@
4173-
4174- inkscape_SOURCES += main.cpp $(win32_sources)
4175- inkscape_LDADD = $(all_libs)
4176--inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
4177-+inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
4178-
4179- inkview_SOURCES += inkview.cpp $(win32_sources)
4180- inkview_LDADD = $(all_libs)
4181
4182=== removed file 'debian/patches/05-add-missing-includes.dpatch'
4183--- debian/patches/05-add-missing-includes.dpatch 2011-05-30 17:07:11 +0000
4184+++ debian/patches/05-add-missing-includes.dpatch 1970-01-01 00:00:00 +0000
4185@@ -1,799 +0,0 @@
4186-#! /bin/sh /usr/share/dpatch/dpatch-run
4187-## 05-add-missing-includes.dpatch by Mehdi Dogguy <mehdi@debian.org>
4188-##
4189-## DP: #628226.
4190-
4191-@DPATCH@
4192-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/2geom/utils.h inkscape-0.48.1/src/2geom/utils.h
4193---- inkscape-0.48.1~/src/2geom/utils.h 2010-07-13 05:48:40.000000000 +0200
4194-+++ inkscape-0.48.1/src/2geom/utils.h 2011-05-30 17:48:28.000000000 +0200
4195-@@ -35,6 +35,7 @@
4196-
4197- #include <cmath>
4198- #include <vector>
4199-+#include <stddef.h>
4200-
4201- namespace Geom {
4202-
4203-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/arc-context.h inkscape-0.48.1/src/arc-context.h
4204---- inkscape-0.48.1~/src/arc-context.h 2010-07-13 05:48:40.000000000 +0200
4205-+++ inkscape-0.48.1/src/arc-context.h 2011-05-30 17:47:12.000000000 +0200
4206-@@ -15,6 +15,7 @@
4207- * Released under GNU GPL, read the file 'COPYING' for more information
4208- */
4209-
4210-+#include <stddef.h>
4211- #include <sigc++/connection.h>
4212-
4213- #include <2geom/point.h>
4214-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/box3d-context.h inkscape-0.48.1/src/box3d-context.h
4215---- inkscape-0.48.1~/src/box3d-context.h 2010-07-13 05:48:40.000000000 +0200
4216-+++ inkscape-0.48.1/src/box3d-context.h 2011-05-30 17:47:12.000000000 +0200
4217-@@ -15,6 +15,7 @@
4218- * Released under GNU GPL
4219- */
4220-
4221-+#include <stddef.h>
4222- #include <sigc++/sigc++.h>
4223- #include "event-context.h"
4224- #include "proj_pt.h"
4225-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/conn-avoid-ref.h inkscape-0.48.1/src/conn-avoid-ref.h
4226---- inkscape-0.48.1~/src/conn-avoid-ref.h 2010-07-13 05:48:40.000000000 +0200
4227-+++ inkscape-0.48.1/src/conn-avoid-ref.h 2011-05-30 17:47:12.000000000 +0200
4228-@@ -14,6 +14,7 @@
4229- */
4230-
4231- #include <glib/gslist.h>
4232-+#include <stddef.h>
4233- #include <sigc++/connection.h>
4234-
4235- struct SPDesktop;
4236-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/connection-pool.h inkscape-0.48.1/src/connection-pool.h
4237---- inkscape-0.48.1~/src/connection-pool.h 2010-07-13 05:48:40.000000000 +0200
4238-+++ inkscape-0.48.1/src/connection-pool.h 2011-05-30 17:47:12.000000000 +0200
4239-@@ -3,6 +3,7 @@
4240-
4241- #include <glib-object.h>
4242- #include <gtkmm.h>
4243-+#include <stddef.h>
4244- #include <sigc++/sigc++.h>
4245-
4246- namespace Inkscape
4247-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/connector-context.h inkscape-0.48.1/src/connector-context.h
4248---- inkscape-0.48.1~/src/connector-context.h 2010-07-13 05:48:40.000000000 +0200
4249-+++ inkscape-0.48.1/src/connector-context.h 2011-05-30 17:47:12.000000000 +0200
4250-@@ -12,6 +12,7 @@
4251- * Released under GNU GPL, read the file 'COPYING' for more information
4252- */
4253-
4254-+#include <stddef.h>
4255- #include <sigc++/sigc++.h>
4256- #include <sigc++/connection.h>
4257- #include "event-context.h"
4258-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/desktop.h inkscape-0.48.1/src/desktop.h
4259---- inkscape-0.48.1~/src/desktop.h 2010-07-13 05:48:40.000000000 +0200
4260-+++ inkscape-0.48.1/src/desktop.h 2011-05-30 17:47:12.000000000 +0200
4261-@@ -27,6 +27,7 @@
4262-
4263- #include <gdk/gdkevents.h>
4264- #include <gtk/gtktypeutils.h>
4265-+#include <stddef.h>
4266- #include <sigc++/sigc++.h>
4267-
4268- #include <2geom/matrix.h>
4269-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/display/canvas-temporary-item.h inkscape-0.48.1/src/display/canvas-temporary-item.h
4270---- inkscape-0.48.1~/src/display/canvas-temporary-item.h 2010-07-13 05:48:40.000000000 +0200
4271-+++ inkscape-0.48.1/src/display/canvas-temporary-item.h 2011-05-30 17:47:12.000000000 +0200
4272-@@ -12,6 +12,7 @@
4273- * Released under GNU GPL, read the file 'COPYING' for more information
4274- */
4275-
4276-+#include <stddef.h>
4277- #include "display/display-forward.h"
4278-
4279- #include <sigc++/sigc++.h>
4280-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document-private.h inkscape-0.48.1/src/document-private.h
4281---- inkscape-0.48.1~/src/document-private.h 2010-07-13 05:48:40.000000000 +0200
4282-+++ inkscape-0.48.1/src/document-private.h 2011-05-30 17:47:12.000000000 +0200
4283-@@ -14,6 +14,7 @@
4284- */
4285-
4286- #include <map>
4287-+#include <stddef.h>
4288- #include <sigc++/sigc++.h>
4289- #include "xml/event-fns.h"
4290- #include "sp-defs.h"
4291-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document-subset.h inkscape-0.48.1/src/document-subset.h
4292---- inkscape-0.48.1~/src/document-subset.h 2010-07-13 05:48:40.000000000 +0200
4293-+++ inkscape-0.48.1/src/document-subset.h 2011-05-30 17:47:12.000000000 +0200
4294-@@ -10,6 +10,7 @@
4295- #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H
4296- #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H
4297-
4298-+#include <stddef.h>
4299- #include <sigc++/connection.h>
4300- #include <sigc++/functors/slot.h>
4301-
4302-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document.h inkscape-0.48.1/src/document.h
4303---- inkscape-0.48.1~/src/document.h 2010-08-04 18:45:00.000000000 +0200
4304-+++ inkscape-0.48.1/src/document.h 2011-05-30 17:47:12.000000000 +0200
4305-@@ -17,6 +17,7 @@
4306-
4307- #include <glib-object.h>
4308- #include <gtk/gtksignal.h>
4309-+#include <stddef.h>
4310- #include <sigc++/sigc++.h>
4311- #include <sigc++/class_slot.h>
4312-
4313-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/draw-context.h inkscape-0.48.1/src/draw-context.h
4314---- inkscape-0.48.1~/src/draw-context.h 2010-07-13 05:48:40.000000000 +0200
4315-+++ inkscape-0.48.1/src/draw-context.h 2011-05-30 17:47:12.000000000 +0200
4316-@@ -14,6 +14,7 @@
4317- * Released under GNU GPL
4318- */
4319-
4320-+#include <stddef.h>
4321- #include <sigc++/sigc++.h>
4322- #include "event-context.h"
4323- #include <forward.h>
4324-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/extension/timer.h inkscape-0.48.1/src/extension/timer.h
4325---- inkscape-0.48.1~/src/extension/timer.h 2010-07-13 05:48:40.000000000 +0200
4326-+++ inkscape-0.48.1/src/extension/timer.h 2011-05-30 17:47:12.000000000 +0200
4327-@@ -13,6 +13,7 @@
4328- #ifndef INKSCAPE_EXTENSION_TIMER_H__
4329- #define INKSCAPE_EXTENSION_TIMER_H__
4330-
4331-+#include <stddef.h>
4332- #include <sigc++/sigc++.h>
4333- #include <glibmm/timeval.h>
4334- #include "extension-forward.h"
4335-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/flood-context.h inkscape-0.48.1/src/flood-context.h
4336---- inkscape-0.48.1~/src/flood-context.h 2010-07-13 05:48:40.000000000 +0200
4337-+++ inkscape-0.48.1/src/flood-context.h 2011-05-30 17:47:12.000000000 +0200
4338-@@ -11,6 +11,7 @@
4339- * Released under GNU GPL
4340- */
4341-
4342-+#include <stddef.h>
4343- #include <sigc++/sigc++.h>
4344- #include <gtk/gtk.h>
4345- #include "event-context.h"
4346-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gc-alloc.h inkscape-0.48.1/src/gc-alloc.h
4347---- inkscape-0.48.1~/src/gc-alloc.h 2010-07-13 05:48:40.000000000 +0200
4348-+++ inkscape-0.48.1/src/gc-alloc.h 2011-05-30 17:47:12.000000000 +0200
4349-@@ -16,6 +16,7 @@
4350- #define SEEN_INKSCAPE_GC_ALLOC_H
4351-
4352- #include <limits>
4353-+#include <stddef.h>
4354- #include "gc-core.h"
4355-
4356- namespace Inkscape {
4357-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gc.cpp inkscape-0.48.1/src/gc.cpp
4358---- inkscape-0.48.1~/src/gc.cpp 2010-07-13 05:48:40.000000000 +0200
4359-+++ inkscape-0.48.1/src/gc.cpp 2011-05-30 17:47:12.000000000 +0200
4360-@@ -16,6 +16,7 @@
4361- #include <glib/gmessages.h>
4362- #include <sigc++/functors/ptr_fun.h>
4363- #include <glibmm/main.h>
4364-+#include <stddef.h>
4365-
4366- namespace Inkscape {
4367- namespace GC {
4368-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gradient-context.h inkscape-0.48.1/src/gradient-context.h
4369---- inkscape-0.48.1~/src/gradient-context.h 2010-07-13 05:48:40.000000000 +0200
4370-+++ inkscape-0.48.1/src/gradient-context.h 2011-05-30 17:47:12.000000000 +0200
4371-@@ -15,6 +15,7 @@
4372- * Released under GNU GPL
4373- */
4374-
4375-+#include <stddef.h>
4376- #include <sigc++/sigc++.h>
4377- #include "event-context.h"
4378-
4379-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gradient-drag.h inkscape-0.48.1/src/gradient-drag.h
4380---- inkscape-0.48.1~/src/gradient-drag.h 2010-08-04 18:45:00.000000000 +0200
4381-+++ inkscape-0.48.1/src/gradient-drag.h 2011-05-30 17:47:12.000000000 +0200
4382-@@ -15,6 +15,7 @@
4383- */
4384-
4385- #include <glib/gslist.h>
4386-+#include <stddef.h>
4387- #include <sigc++/sigc++.h>
4388- #include <vector>
4389-
4390-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/knot.h inkscape-0.48.1/src/knot.h
4391---- inkscape-0.48.1~/src/knot.h 2010-07-13 05:48:40.000000000 +0200
4392-+++ inkscape-0.48.1/src/knot.h 2011-05-30 17:47:12.000000000 +0200
4393-@@ -20,6 +20,7 @@
4394- #include "forward.h"
4395- #include <2geom/point.h>
4396- #include "knot-enums.h"
4397-+#include <stddef.h>
4398- #include <sigc++/sigc++.h>
4399-
4400- class SPKnot;
4401-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/libavoid/geomtypes.h inkscape-0.48.1/src/libavoid/geomtypes.h
4402---- inkscape-0.48.1~/src/libavoid/geomtypes.h 2010-07-13 05:48:40.000000000 +0200
4403-+++ inkscape-0.48.1/src/libavoid/geomtypes.h 2011-05-30 17:47:12.000000000 +0200
4404-@@ -29,6 +29,7 @@
4405- #ifndef AVOID_GEOMTYPES_H
4406- #define AVOID_GEOMTYPES_H
4407-
4408-+#include <stddef.h>
4409- #include <vector>
4410- #include <utility>
4411-
4412-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/lpeobject-reference.h inkscape-0.48.1/src/live_effects/lpeobject-reference.h
4413---- inkscape-0.48.1~/src/live_effects/lpeobject-reference.h 2010-07-13 05:48:40.000000000 +0200
4414-+++ inkscape-0.48.1/src/live_effects/lpeobject-reference.h 2011-05-30 17:47:12.000000000 +0200
4415-@@ -11,6 +11,7 @@
4416-
4417- #include <forward.h>
4418- #include <uri-references.h>
4419-+#include <stddef.h>
4420- #include <sigc++/sigc++.h>
4421-
4422- namespace Inkscape {
4423-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/parameter/path-reference.h inkscape-0.48.1/src/live_effects/parameter/path-reference.h
4424---- inkscape-0.48.1~/src/live_effects/parameter/path-reference.h 2010-07-13 05:48:40.000000000 +0200
4425-+++ inkscape-0.48.1/src/live_effects/parameter/path-reference.h 2011-05-30 17:47:12.000000000 +0200
4426-@@ -11,6 +11,7 @@
4427-
4428- #include <forward.h>
4429- #include <uri-references.h>
4430-+#include <stddef.h>
4431- #include <sigc++/sigc++.h>
4432-
4433- class Path;
4434-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/parameter/path.h inkscape-0.48.1/src/live_effects/parameter/path.h
4435---- inkscape-0.48.1~/src/live_effects/parameter/path.h 2010-07-13 05:48:40.000000000 +0200
4436-+++ inkscape-0.48.1/src/live_effects/parameter/path.h 2011-05-30 17:47:12.000000000 +0200
4437-@@ -16,6 +16,7 @@
4438-
4439- #include "live_effects/parameter/parameter.h"
4440- #include "live_effects/parameter/path-reference.h"
4441-+#include <stddef.h>
4442- #include <sigc++/sigc++.h>
4443-
4444- namespace Inkscape {
4445-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/message-stack.h inkscape-0.48.1/src/message-stack.h
4446---- inkscape-0.48.1~/src/message-stack.h 2010-07-13 05:48:40.000000000 +0200
4447-+++ inkscape-0.48.1/src/message-stack.h 2011-05-30 17:47:12.000000000 +0200
4448-@@ -14,6 +14,7 @@
4449- #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H
4450- #define SEEN_INKSCAPE_MESSAGE_STACK_H
4451-
4452-+#include <stddef.h>
4453- #include <sigc++/sigc++.h>
4454- #include <glib.h>
4455- #include <stdarg.h>
4456-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/object-hierarchy.h inkscape-0.48.1/src/object-hierarchy.h
4457---- inkscape-0.48.1~/src/object-hierarchy.h 2010-07-13 05:48:40.000000000 +0200
4458-+++ inkscape-0.48.1/src/object-hierarchy.h 2011-05-30 17:47:12.000000000 +0200
4459-@@ -14,6 +14,7 @@
4460-
4461- #include <exception>
4462- #include <list>
4463-+#include <stddef.h>
4464- #include <sigc++/connection.h>
4465- #include <sigc++/signal.h>
4466- #include <glib/gmessages.h>
4467-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/persp3d-reference.h inkscape-0.48.1/src/persp3d-reference.h
4468---- inkscape-0.48.1~/src/persp3d-reference.h 2010-07-13 05:48:40.000000000 +0200
4469-+++ inkscape-0.48.1/src/persp3d-reference.h 2011-05-30 17:47:12.000000000 +0200
4470-@@ -11,6 +11,7 @@
4471- */
4472-
4473- #include "uri-references.h"
4474-+#include <stddef.h>
4475- #include <sigc++/sigc++.h>
4476- #include "persp3d.h"
4477-
4478-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/rect-context.h inkscape-0.48.1/src/rect-context.h
4479---- inkscape-0.48.1~/src/rect-context.h 2010-07-13 05:48:40.000000000 +0200
4480-+++ inkscape-0.48.1/src/rect-context.h 2011-05-30 17:47:12.000000000 +0200
4481-@@ -14,6 +14,7 @@
4482- * Released under GNU GPL
4483- */
4484-
4485-+#include <stddef.h>
4486- #include <sigc++/sigc++.h>
4487- #include "event-context.h"
4488- #include "libnr/nr-point.h"
4489-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selcue.h inkscape-0.48.1/src/selcue.h
4490---- inkscape-0.48.1~/src/selcue.h 2010-07-13 05:48:40.000000000 +0200
4491-+++ inkscape-0.48.1/src/selcue.h 2011-05-30 17:47:12.000000000 +0200
4492-@@ -14,6 +14,7 @@
4493- */
4494-
4495- #include <list>
4496-+#include <stddef.h>
4497- #include <sigc++/sigc++.h>
4498-
4499- class SPDesktop;
4500-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selection-describer.h inkscape-0.48.1/src/selection-describer.h
4501---- inkscape-0.48.1~/src/selection-describer.h 2010-07-13 05:48:40.000000000 +0200
4502-+++ inkscape-0.48.1/src/selection-describer.h 2011-05-30 17:47:12.000000000 +0200
4503-@@ -12,6 +12,7 @@
4504- #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
4505- #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
4506-
4507-+#include <stddef.h>
4508- #include <sigc++/sigc++.h>
4509- #include "message-context.h"
4510-
4511-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selection.h inkscape-0.48.1/src/selection.h
4512---- inkscape-0.48.1~/src/selection.h 2010-07-13 05:48:40.000000000 +0200
4513-+++ inkscape-0.48.1/src/selection.h 2011-05-30 17:47:12.000000000 +0200
4514-@@ -19,6 +19,7 @@
4515- #include <vector>
4516- #include <map>
4517- #include <list>
4518-+#include <stddef.h>
4519- #include <sigc++/sigc++.h>
4520-
4521- //#include "libnr/nr-rect.h"
4522-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/seltrans.h inkscape-0.48.1/src/seltrans.h
4523---- inkscape-0.48.1~/src/seltrans.h 2010-07-13 05:48:40.000000000 +0200
4524-+++ inkscape-0.48.1/src/seltrans.h 2011-05-30 17:47:12.000000000 +0200
4525-@@ -15,6 +15,7 @@
4526- * Released under GNU GPL, read the file 'COPYING' for more information
4527- */
4528-
4529-+#include <stddef.h>
4530- #include <sigc++/sigc++.h>
4531- #include <2geom/point.h>
4532- #include <2geom/matrix.h>
4533-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-conn-end-pair.h inkscape-0.48.1/src/sp-conn-end-pair.h
4534---- inkscape-0.48.1~/src/sp-conn-end-pair.h 2010-07-13 05:48:40.000000000 +0200
4535-+++ inkscape-0.48.1/src/sp-conn-end-pair.h 2011-05-30 17:47:12.000000000 +0200
4536-@@ -15,6 +15,7 @@
4537-
4538- #include "forward.h"
4539- #include "libnr/nr-point.h"
4540-+#include <stddef.h>
4541- #include <sigc++/connection.h>
4542- #include <sigc++/functors/slot.h>
4543- #include <sigc++/signal.h>
4544-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-conn-end.h inkscape-0.48.1/src/sp-conn-end.h
4545---- inkscape-0.48.1~/src/sp-conn-end.h 2010-07-13 05:48:40.000000000 +0200
4546-+++ inkscape-0.48.1/src/sp-conn-end.h 2011-05-30 17:47:12.000000000 +0200
4547-@@ -2,6 +2,7 @@
4548- #define SEEN_SP_CONN_END
4549-
4550- #include <glib/gtypes.h>
4551-+#include <stddef.h>
4552- #include <sigc++/connection.h>
4553-
4554- #include "sp-use-reference.h"
4555-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-gradient.h inkscape-0.48.1/src/sp-gradient.h
4556---- inkscape-0.48.1~/src/sp-gradient.h 2010-08-04 18:45:00.000000000 +0200
4557-+++ inkscape-0.48.1/src/sp-gradient.h 2011-05-30 17:47:12.000000000 +0200
4558-@@ -25,6 +25,7 @@
4559- #include "sp-gradient-units.h"
4560- #include "sp-gradient-vector.h"
4561-
4562-+#include <stddef.h>
4563- #include <sigc++/connection.h>
4564-
4565- struct SPGradientReference;
4566-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-object.h inkscape-0.48.1/src/sp-object.h
4567---- inkscape-0.48.1~/src/sp-object.h 2010-07-13 05:48:40.000000000 +0200
4568-+++ inkscape-0.48.1/src/sp-object.h 2011-05-30 17:47:12.000000000 +0200
4569-@@ -56,6 +56,7 @@
4570-
4571-
4572- #include <glib-object.h>
4573-+#include <stddef.h>
4574- #include <sigc++/connection.h>
4575- #include <sigc++/functors/slot.h>
4576- #include <sigc++/signal.h>
4577-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-offset.h inkscape-0.48.1/src/sp-offset.h
4578---- inkscape-0.48.1~/src/sp-offset.h 2010-07-13 05:48:40.000000000 +0200
4579-+++ inkscape-0.48.1/src/sp-offset.h 2011-05-30 17:47:12.000000000 +0200
4580-@@ -16,6 +16,7 @@
4581-
4582- #include "sp-shape.h"
4583-
4584-+#include <stddef.h>
4585- #include <sigc++/sigc++.h>
4586-
4587- #define SP_TYPE_OFFSET (sp_offset_get_type ())
4588-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-pattern.h inkscape-0.48.1/src/sp-pattern.h
4589---- inkscape-0.48.1~/src/sp-pattern.h 2010-07-13 05:48:40.000000000 +0200
4590-+++ inkscape-0.48.1/src/sp-pattern.h 2011-05-30 17:47:12.000000000 +0200
4591-@@ -32,6 +32,7 @@
4592- #include "sp-paint-server.h"
4593- #include "uri-references.h"
4594-
4595-+#include <stddef.h>
4596- #include <sigc++/connection.h>
4597-
4598- class SPPatternReference : public Inkscape::URIReference {
4599-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-shape.h inkscape-0.48.1/src/sp-shape.h
4600---- inkscape-0.48.1~/src/sp-shape.h 2010-07-13 05:48:40.000000000 +0200
4601-+++ inkscape-0.48.1/src/sp-shape.h 2011-05-30 17:47:12.000000000 +0200
4602-@@ -19,6 +19,7 @@
4603- #include "sp-marker-loc.h"
4604- #include <2geom/forward.h>
4605-
4606-+#include <stddef.h>
4607- #include <sigc++/connection.h>
4608-
4609- #define SP_TYPE_SHAPE (sp_shape_get_type ())
4610-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-switch.h inkscape-0.48.1/src/sp-switch.h
4611---- inkscape-0.48.1~/src/sp-switch.h 2010-07-13 05:48:40.000000000 +0200
4612-+++ inkscape-0.48.1/src/sp-switch.h 2011-05-30 17:47:12.000000000 +0200
4613-@@ -14,6 +14,7 @@
4614-
4615- #include "sp-item-group.h"
4616-
4617-+#include <stddef.h>
4618- #include <sigc++/connection.h>
4619-
4620- #define SP_TYPE_SWITCH (CSwitch::getType())
4621-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-text.h inkscape-0.48.1/src/sp-text.h
4622---- inkscape-0.48.1~/src/sp-text.h 2010-07-13 05:48:40.000000000 +0200
4623-+++ inkscape-0.48.1/src/sp-text.h 2011-05-30 17:47:12.000000000 +0200
4624-@@ -14,6 +14,7 @@
4625- */
4626-
4627- #include <glib/gtypes.h>
4628-+#include <stddef.h>
4629- #include <sigc++/sigc++.h>
4630- #include "sp-item.h"
4631- #include "sp-string.h"
4632-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-tref-reference.h inkscape-0.48.1/src/sp-tref-reference.h
4633---- inkscape-0.48.1~/src/sp-tref-reference.h 2010-07-13 05:48:40.000000000 +0200
4634-+++ inkscape-0.48.1/src/sp-tref-reference.h 2011-05-30 17:47:12.000000000 +0200
4635-@@ -13,6 +13,7 @@
4636-
4637- #include <forward.h>
4638- #include <uri-references.h>
4639-+#include <stddef.h>
4640- #include <sigc++/sigc++.h>
4641-
4642- #include "util/share.h"
4643-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-use.h inkscape-0.48.1/src/sp-use.h
4644---- inkscape-0.48.1~/src/sp-use.h 2010-07-13 05:48:40.000000000 +0200
4645-+++ inkscape-0.48.1/src/sp-use.h 2011-05-30 17:47:12.000000000 +0200
4646-@@ -13,6 +13,7 @@
4647- * Released under GNU GPL, read the file 'COPYING' for more information
4648- */
4649-
4650-+#include <stddef.h>
4651- #include <sigc++/sigc++.h>
4652- #include "svg/svg-length.h"
4653- #include "sp-item.h"
4654-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/spiral-context.h inkscape-0.48.1/src/spiral-context.h
4655---- inkscape-0.48.1~/src/spiral-context.h 2010-07-13 05:48:40.000000000 +0200
4656-+++ inkscape-0.48.1/src/spiral-context.h 2011-05-30 17:47:12.000000000 +0200
4657-@@ -16,6 +16,7 @@
4658- */
4659-
4660- #include <gtk/gtktypeutils.h>
4661-+#include <stddef.h>
4662- #include <sigc++/sigc++.h>
4663- #include "event-context.h"
4664- #include "libnr/nr-point.h"
4665-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/star-context.h inkscape-0.48.1/src/star-context.h
4666---- inkscape-0.48.1~/src/star-context.h 2010-07-13 05:48:40.000000000 +0200
4667-+++ inkscape-0.48.1/src/star-context.h 2011-05-30 17:47:12.000000000 +0200
4668-@@ -14,6 +14,7 @@
4669- * Released under GNU GPL, read the file 'COPYING' for more information
4670- */
4671-
4672-+#include <stddef.h>
4673- #include <sigc++/sigc++.h>
4674- #include "event-context.h"
4675- #include "libnr/nr-point.h"
4676-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/strneq.h inkscape-0.48.1/src/strneq.h
4677---- inkscape-0.48.1~/src/strneq.h 2010-07-13 05:48:40.000000000 +0200
4678-+++ inkscape-0.48.1/src/strneq.h 2011-05-30 17:48:50.000000000 +0200
4679-@@ -2,6 +2,7 @@
4680- #define INKSCAPE_STRNEQ_H
4681-
4682- #include <cstring>
4683-+#include <stddef.h>
4684-
4685- /** Convenience/readability wrapper for strncmp(a,b,n)==0. */
4686- inline bool
4687-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/style.h inkscape-0.48.1/src/style.h
4688---- inkscape-0.48.1~/src/style.h 2010-08-04 18:45:00.000000000 +0200
4689-+++ inkscape-0.48.1/src/style.h 2011-05-30 17:47:12.000000000 +0200
4690-@@ -24,6 +24,7 @@
4691- #include "uri.h"
4692- #include "sp-paint-server.h"
4693-
4694-+#include <stddef.h>
4695- #include <sigc++/connection.h>
4696-
4697- namespace Inkscape {
4698-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/text-context.h inkscape-0.48.1/src/text-context.h
4699---- inkscape-0.48.1~/src/text-context.h 2010-07-13 05:48:40.000000000 +0200
4700-+++ inkscape-0.48.1/src/text-context.h 2011-05-30 17:47:12.000000000 +0200
4701-@@ -15,6 +15,7 @@
4702- */
4703-
4704- /* #include <gdk/gdkic.h> */
4705-+#include <stddef.h>
4706- #include <sigc++/sigc++.h>
4707- #include <gtk/gtkimcontext.h>
4708-
4709-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/desktop-tracker.h inkscape-0.48.1/src/ui/dialog/desktop-tracker.h
4710---- inkscape-0.48.1~/src/ui/dialog/desktop-tracker.h 2010-07-13 05:48:40.000000000 +0200
4711-+++ inkscape-0.48.1/src/ui/dialog/desktop-tracker.h 2011-05-30 17:47:12.000000000 +0200
4712-@@ -11,6 +11,7 @@
4713- #ifndef SEEN_DIALOG_DESKTOP_TRACKER
4714- #define SEEN_DIALOG_DESKTOP_TRACKER
4715-
4716-+#include <stddef.h>
4717- #include <sigc++/connection.h>
4718- #include <glib/gtypes.h>
4719-
4720-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/document-metadata.h inkscape-0.48.1/src/ui/dialog/document-metadata.h
4721---- inkscape-0.48.1~/src/ui/dialog/document-metadata.h 2010-07-13 05:48:40.000000000 +0200
4722-+++ inkscape-0.48.1/src/ui/dialog/document-metadata.h 2011-05-30 17:47:12.000000000 +0200
4723-@@ -14,6 +14,7 @@
4724- #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H
4725-
4726- #include <list>
4727-+#include <stddef.h>
4728- #include <sigc++/sigc++.h>
4729- #include <gtkmm/notebook.h>
4730- #include <glibmm/i18n.h>
4731-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/document-properties.h inkscape-0.48.1/src/ui/dialog/document-properties.h
4732---- inkscape-0.48.1~/src/ui/dialog/document-properties.h 2010-07-13 05:48:40.000000000 +0200
4733-+++ inkscape-0.48.1/src/ui/dialog/document-properties.h 2011-05-30 17:47:12.000000000 +0200
4734-@@ -15,6 +15,7 @@
4735- #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
4736-
4737- #include <list>
4738-+#include <stddef.h>
4739- #include <sigc++/sigc++.h>//
4740- #include <gtkmm/notebook.h>
4741- #include <glibmm/i18n.h>
4742-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/inkscape-preferences.h inkscape-0.48.1/src/ui/dialog/inkscape-preferences.h
4743---- inkscape-0.48.1~/src/ui/dialog/inkscape-preferences.h 2010-11-06 19:47:19.000000000 +0100
4744-+++ inkscape-0.48.1/src/ui/dialog/inkscape-preferences.h 2011-05-30 17:47:12.000000000 +0200
4745-@@ -28,6 +28,7 @@
4746- #include <gtkmm/frame.h>
4747- #include <gtkmm/notebook.h>
4748- #include "ui/widget/preferences-widget.h"
4749-+#include <stddef.h>
4750- #include <sigc++/sigc++.h>
4751- #include <glibmm/i18n.h>
4752- #include <gtkmm/textview.h>
4753-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/control-point-selection.h inkscape-0.48.1/src/ui/tool/control-point-selection.h
4754---- inkscape-0.48.1~/src/ui/tool/control-point-selection.h 2010-08-04 18:45:00.000000000 +0200
4755-+++ inkscape-0.48.1/src/ui/tool/control-point-selection.h 2011-05-30 17:47:12.000000000 +0200
4756-@@ -14,6 +14,7 @@
4757-
4758- #include <memory>
4759- #include <boost/optional.hpp>
4760-+#include <stddef.h>
4761- #include <sigc++/sigc++.h>
4762- #include <2geom/forward.h>
4763- #include <2geom/point.h>
4764-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/control-point.h inkscape-0.48.1/src/ui/tool/control-point.h
4765---- inkscape-0.48.1~/src/ui/tool/control-point.h 2010-07-13 05:48:40.000000000 +0200
4766-+++ inkscape-0.48.1/src/ui/tool/control-point.h 2011-05-30 17:47:12.000000000 +0200
4767-@@ -12,6 +12,7 @@
4768- #define SEEN_UI_TOOL_CONTROL_POINT_H
4769-
4770- #include <boost/utility.hpp>
4771-+#include <stddef.h>
4772- #include <sigc++/sigc++.h>
4773- #include <gdkmm.h>
4774- #include <gtkmm.h>
4775-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/manipulator.h inkscape-0.48.1/src/ui/tool/manipulator.h
4776---- inkscape-0.48.1~/src/ui/tool/manipulator.h 2010-07-13 05:48:40.000000000 +0200
4777-+++ inkscape-0.48.1/src/ui/tool/manipulator.h 2011-05-30 17:47:12.000000000 +0200
4778-@@ -13,6 +13,7 @@
4779-
4780- #include <set>
4781- #include <map>
4782-+#include <stddef.h>
4783- #include <sigc++/sigc++.h>
4784- #include <glib.h>
4785- #include <gdk/gdk.h>
4786-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/multi-path-manipulator.h inkscape-0.48.1/src/ui/tool/multi-path-manipulator.h
4787---- inkscape-0.48.1~/src/ui/tool/multi-path-manipulator.h 2010-11-06 19:47:19.000000000 +0100
4788-+++ inkscape-0.48.1/src/ui/tool/multi-path-manipulator.h 2011-05-30 17:47:12.000000000 +0200
4789-@@ -11,6 +11,7 @@
4790- #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
4791- #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
4792-
4793-+#include <stddef.h>
4794- #include <sigc++/connection.h>
4795- #include "display/display-forward.h"
4796- #include "forward.h"
4797-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/node-tool.h inkscape-0.48.1/src/ui/tool/node-tool.h
4798---- inkscape-0.48.1~/src/ui/tool/node-tool.h 2010-11-06 19:47:19.000000000 +0100
4799-+++ inkscape-0.48.1/src/ui/tool/node-tool.h 2011-05-30 17:47:12.000000000 +0200
4800-@@ -14,6 +14,7 @@
4801- #include <memory>
4802- #include <boost/ptr_container/ptr_map.hpp>
4803- #include <glib.h>
4804-+#include <stddef.h>
4805- #include <sigc++/sigc++.h>
4806- #include "event-context.h"
4807- #include "forward.h"
4808-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/node.h inkscape-0.48.1/src/ui/tool/node.h
4809---- inkscape-0.48.1~/src/ui/tool/node.h 2011-01-02 05:34:09.000000000 +0100
4810-+++ inkscape-0.48.1/src/ui/tool/node.h 2011-05-30 17:47:12.000000000 +0200
4811-@@ -15,6 +15,7 @@
4812- #include <iterator>
4813- #include <iosfwd>
4814- #include <stdexcept>
4815-+#include <stddef.h>
4816- #include <tr1/functional>
4817- #include <boost/utility.hpp>
4818- #include <boost/shared_ptr.hpp>
4819-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/view/view.h inkscape-0.48.1/src/ui/view/view.h
4820---- inkscape-0.48.1~/src/ui/view/view.h 2010-07-13 05:48:40.000000000 +0200
4821-+++ inkscape-0.48.1/src/ui/view/view.h 2011-05-30 17:47:12.000000000 +0200
4822-@@ -15,6 +15,7 @@
4823- */
4824-
4825- #include <gdk/gdktypes.h>
4826-+#include <stddef.h>
4827- #include <sigc++/connection.h>
4828- #include "message.h"
4829- #include "gc-managed.h"
4830-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/color-picker.h inkscape-0.48.1/src/ui/widget/color-picker.h
4831---- inkscape-0.48.1~/src/ui/widget/color-picker.h 2010-07-13 05:48:40.000000000 +0200
4832-+++ inkscape-0.48.1/src/ui/widget/color-picker.h 2011-05-30 17:47:12.000000000 +0200
4833-@@ -13,6 +13,7 @@
4834- #ifndef __COLOR_PICKER_H__
4835- #define __COLOR_PICKER_H__
4836-
4837-+#include <stddef.h>
4838- #include <sigc++/sigc++.h>
4839- #include <gtkmm/button.h>
4840- #include <gtkmm/dialog.h>
4841-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/page-sizer.h inkscape-0.48.1/src/ui/widget/page-sizer.h
4842---- inkscape-0.48.1~/src/ui/widget/page-sizer.h 2010-07-13 05:48:40.000000000 +0200
4843-+++ inkscape-0.48.1/src/ui/widget/page-sizer.h 2011-05-30 17:47:12.000000000 +0200
4844-@@ -13,6 +13,7 @@
4845- #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H
4846-
4847- #include <gtkmm.h>
4848-+#include <stddef.h>
4849- #include <sigc++/sigc++.h>
4850-
4851- #include "helper/units.h"
4852-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/preferences-widget.h inkscape-0.48.1/src/ui/widget/preferences-widget.h
4853---- inkscape-0.48.1~/src/ui/widget/preferences-widget.h 2010-07-13 05:48:40.000000000 +0200
4854-+++ inkscape-0.48.1/src/ui/widget/preferences-widget.h 2011-05-30 17:47:12.000000000 +0200
4855-@@ -26,6 +26,7 @@
4856- #include <gtkmm/drawingarea.h>
4857- #include <gtkmm/frame.h>
4858- #include <gtkmm/filechooserbutton.h>
4859-+#include <stddef.h>
4860- #include <sigc++/sigc++.h>
4861- #include <glibmm/i18n.h>
4862-
4863-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/selected-style.h inkscape-0.48.1/src/ui/widget/selected-style.h
4864---- inkscape-0.48.1~/src/ui/widget/selected-style.h 2010-07-13 05:48:40.000000000 +0200
4865-+++ inkscape-0.48.1/src/ui/widget/selected-style.h 2011-05-30 17:47:12.000000000 +0200
4866-@@ -23,6 +23,7 @@
4867- #include <gtkmm/adjustment.h>
4868- #include <gtkmm/spinbutton.h>
4869-
4870-+#include <stddef.h>
4871- #include <sigc++/sigc++.h>
4872-
4873- #include <glibmm/i18n.h>
4874-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/style-subject.h inkscape-0.48.1/src/ui/widget/style-subject.h
4875---- inkscape-0.48.1~/src/ui/widget/style-subject.h 2010-07-13 05:48:40.000000000 +0200
4876-+++ inkscape-0.48.1/src/ui/widget/style-subject.h 2011-05-30 17:47:12.000000000 +0200
4877-@@ -14,6 +14,7 @@
4878- #include "libnr/nr-rect.h"
4879- #include <2geom/rect.h>
4880- #include "sp-item.h"
4881-+#include <stddef.h>
4882- #include <sigc++/sigc++.h>
4883-
4884- class SPDesktop;
4885-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/uri-references.h inkscape-0.48.1/src/uri-references.h
4886---- inkscape-0.48.1~/src/uri-references.h 2010-07-13 05:48:40.000000000 +0200
4887-+++ inkscape-0.48.1/src/uri-references.h 2011-05-30 17:47:12.000000000 +0200
4888-@@ -13,6 +13,7 @@
4889- * Released under GNU GPL, read the file 'COPYING' for more information
4890- */
4891-
4892-+#include <stddef.h>
4893- #include <sigc++/connection.h>
4894- #include <sigc++/trackable.h>
4895-
4896-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/forward-pointer-iterator.h inkscape-0.48.1/src/util/forward-pointer-iterator.h
4897---- inkscape-0.48.1~/src/util/forward-pointer-iterator.h 2010-07-13 05:48:40.000000000 +0200
4898-+++ inkscape-0.48.1/src/util/forward-pointer-iterator.h 2011-05-30 17:47:12.000000000 +0200
4899-@@ -15,6 +15,7 @@
4900- #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H
4901-
4902- #include <iterator>
4903-+#include <stddef.h>
4904- #include "util/reference.h"
4905-
4906- namespace Inkscape {
4907-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/share.h inkscape-0.48.1/src/util/share.h
4908---- inkscape-0.48.1~/src/util/share.h 2010-07-13 05:48:40.000000000 +0200
4909-+++ inkscape-0.48.1/src/util/share.h 2011-05-30 17:47:12.000000000 +0200
4910-@@ -14,6 +14,7 @@
4911-
4912- #include "gc-core.h"
4913- #include <cstring>
4914-+#include <stddef.h>
4915-
4916- namespace Inkscape {
4917- namespace Util {
4918-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/unordered-containers.h inkscape-0.48.1/src/util/unordered-containers.h
4919---- inkscape-0.48.1~/src/util/unordered-containers.h 2010-07-13 05:48:40.000000000 +0200
4920-+++ inkscape-0.48.1/src/util/unordered-containers.h 2011-05-30 17:47:12.000000000 +0200
4921-@@ -41,6 +41,8 @@
4922- # define INK_UNORDERED_MAP __gnu_cxx::hash_map
4923- # define INK_HASH __gnu_cxx::hash
4924-
4925-+#include <stddef.h>
4926-+
4927- namespace __gnu_cxx {
4928- // hash function for pointers
4929- // TR1 and Boost have this defined by default, __gnu_cxx doesn't
4930-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/desktop-widget.h inkscape-0.48.1/src/widgets/desktop-widget.h
4931---- inkscape-0.48.1~/src/widgets/desktop-widget.h 2010-07-13 05:48:40.000000000 +0200
4932-+++ inkscape-0.48.1/src/widgets/desktop-widget.h 2011-05-30 17:47:12.000000000 +0200
4933-@@ -21,6 +21,7 @@
4934- #include "ui/view/view-widget.h"
4935- #include "ui/view/edit-widget-interface.h"
4936-
4937-+#include <stddef.h>
4938- #include <sigc++/connection.h>
4939-
4940- // forward declaration
4941-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/gradient-image.h inkscape-0.48.1/src/widgets/gradient-image.h
4942---- inkscape-0.48.1~/src/widgets/gradient-image.h 2010-07-13 05:48:40.000000000 +0200
4943-+++ inkscape-0.48.1/src/widgets/gradient-image.h 2011-05-30 17:47:12.000000000 +0200
4944-@@ -19,6 +19,7 @@
4945-
4946- #include <glib.h>
4947-
4948-+#include <stddef.h>
4949- #include <sigc++/connection.h>
4950-
4951- #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
4952-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/gradient-vector.h inkscape-0.48.1/src/widgets/gradient-vector.h
4953---- inkscape-0.48.1~/src/widgets/gradient-vector.h 2010-07-13 05:48:40.000000000 +0200
4954-+++ inkscape-0.48.1/src/widgets/gradient-vector.h 2011-05-30 17:47:12.000000000 +0200
4955-@@ -17,6 +17,7 @@
4956-
4957- #include <glib.h>
4958-
4959-+#include <stddef.h>
4960- #include <sigc++/connection.h>
4961-
4962- #include <gtk/gtkvbox.h>
4963-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/sp-attribute-widget.h inkscape-0.48.1/src/widgets/sp-attribute-widget.h
4964---- inkscape-0.48.1~/src/widgets/sp-attribute-widget.h 2010-07-13 05:48:40.000000000 +0200
4965-+++ inkscape-0.48.1/src/widgets/sp-attribute-widget.h 2011-05-30 17:47:12.000000000 +0200
4966-@@ -14,6 +14,7 @@
4967- #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
4968-
4969- #include <glib.h>
4970-+#include <stddef.h>
4971- #include <sigc++/connection.h>
4972-
4973- #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ())
4974-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/xml/helper-observer.h inkscape-0.48.1/src/xml/helper-observer.h
4975---- inkscape-0.48.1~/src/xml/helper-observer.h 2010-07-13 05:48:40.000000000 +0200
4976-+++ inkscape-0.48.1/src/xml/helper-observer.h 2011-05-30 17:47:12.000000000 +0200
4977-@@ -5,6 +5,7 @@
4978- #include "node.h"
4979- #include "../sp-object.h"
4980- //#include "../sp-object-repr.h"
4981-+#include <stddef.h>
4982- #include <sigc++/sigc++.h>
4983-
4984- namespace Inkscape {
4985
4986=== removed file 'debian/patches/fix-fontforge-glyph-template.dpatch'
4987--- debian/patches/fix-fontforge-glyph-template.dpatch 2011-06-01 18:05:51 +0000
4988+++ debian/patches/fix-fontforge-glyph-template.dpatch 1970-01-01 00:00:00 +0000
4989@@ -1,82 +0,0 @@
4990-#! /bin/sh /usr/share/dpatch/dpatch-run
4991-# From: JazzyNico <nicoduf@yahoo.fr>
4992-# Description: Fix layer structure in fontforge glyph template
4993-# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/9693
4994-# Bug: https://launchpad.net/bugs/565296
4995-# Bug-Ubuntu: https://launchpad.net/bugs/565296
4996-# Last-Update: 2011-05-30
4997-
4998-@DPATCH@
4999-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg inkscape_0.48.1-2ubuntu5/share/templates/fontforge_glyph.svg
5000---- inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg 2011-05-30 17:38:10.000000000 +0100
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches