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
=== modified file 'Info.plist'
--- Info.plist 2011-02-20 12:07:30 +0000
+++ Info.plist 2011-07-10 11:35:55 +0000
@@ -7,7 +7,7 @@
7 <key>CFBundleExecutable</key>7 <key>CFBundleExecutable</key>
8 <string>Inkscape</string>8 <string>Inkscape</string>
9 <key>CFBundleGetInfoString</key>9 <key>CFBundleGetInfoString</key>
10 <string>0.48.1, Copyright 2003-2009 Inkscape Developers</string>10 <string>0.48.2, Copyright 2003-2009 Inkscape Developers</string>
11 <key>CFBundleIconFile</key>11 <key>CFBundleIconFile</key>
12 <string>Inkscape.icns</string>12 <string>Inkscape.icns</string>
13 <key>CFBundleIdentifier</key>13 <key>CFBundleIdentifier</key>
@@ -323,11 +323,11 @@
323 <key>CFBundlePackageType</key>323 <key>CFBundlePackageType</key>
324 <string>APPL</string>324 <string>APPL</string>
325 <key>CFBundleShortVersionString</key>325 <key>CFBundleShortVersionString</key>
326 <string>0.48.1</string>326 <string>0.48.2</string>
327 <key>CFBundleSignature</key>327 <key>CFBundleSignature</key>
328 <string>Inks</string>328 <string>Inks</string>
329 <key>CFBundleVersion</key>329 <key>CFBundleVersion</key>
330 <string>0.48.1</string>330 <string>0.48.2</string>
331 <key>NSHumanReadableCopyright</key>331 <key>NSHumanReadableCopyright</key>
332 <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string>332 <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string>
333 <key>LSMinimumSystemVersion</key>333 <key>LSMinimumSystemVersion</key>
334334
=== modified file 'Makefile.in'
--- Makefile.in 2011-02-20 12:07:30 +0000
+++ Makefile.in 2011-07-10 11:35:55 +0000
@@ -259,6 +259,10 @@
259LDFLAGS = @LDFLAGS@259LDFLAGS = @LDFLAGS@
260LIBOBJS = @LIBOBJS@260LIBOBJS = @LIBOBJS@
261LIBS = @LIBS@261LIBS = @LIBS@
262LIBWPG01_CFLAGS = @LIBWPG01_CFLAGS@
263LIBWPG01_LIBS = @LIBWPG01_LIBS@
264LIBWPG02_CFLAGS = @LIBWPG02_CFLAGS@
265LIBWPG02_LIBS = @LIBWPG02_LIBS@
262LIBWPG_CFLAGS = @LIBWPG_CFLAGS@266LIBWPG_CFLAGS = @LIBWPG_CFLAGS@
263LIBWPG_LIBS = @LIBWPG_LIBS@267LIBWPG_LIBS = @LIBWPG_LIBS@
264LTLIBOBJS = @LTLIBOBJS@268LTLIBOBJS = @LTLIBOBJS@
265269
=== modified file 'aclocal.m4'
--- aclocal.m4 2011-02-20 12:07:30 +0000
+++ aclocal.m4 2011-07-10 11:35:55 +0000
@@ -13,8 +13,8 @@
1313
14m4_ifndef([AC_AUTOCONF_VERSION],14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
17[m4_warning([this file was generated for autoconf 2.67.17[m4_warning([this file was generated for autoconf 2.68.
18You have another version of autoconf. It may work, but is not guaranteed to.18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely.19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])])20To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -707,7 +707,8 @@
707# ----------------------------------707# ----------------------------------
708AC_DEFUN([PKG_PROG_PKG_CONFIG],708AC_DEFUN([PKG_PROG_PKG_CONFIG],
709[m4_pattern_forbid([^_?PKG_[A-Z_]+$])709[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
710m4_pattern_allow([^PKG_CONFIG(_PATH)?$])710m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
711m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
711AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])712AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
712AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])713AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
713AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])714AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -753,7 +754,8 @@
753 pkg_cv_[]$1="$$1"754 pkg_cv_[]$1="$$1"
754 elif test -n "$PKG_CONFIG"; then755 elif test -n "$PKG_CONFIG"; then
755 PKG_CHECK_EXISTS([$3],756 PKG_CHECK_EXISTS([$3],
756 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],757 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
758 test "x$?" != "x0" && pkg_failed=yes ],
757 [pkg_failed=yes])759 [pkg_failed=yes])
758 else760 else
759 pkg_failed=untried761 pkg_failed=untried
@@ -801,9 +803,9 @@
801 AC_MSG_RESULT([no])803 AC_MSG_RESULT([no])
802 _PKG_SHORT_ERRORS_SUPPORTED804 _PKG_SHORT_ERRORS_SUPPORTED
803 if test $_pkg_short_errors_supported = yes; then805 if test $_pkg_short_errors_supported = yes; then
804 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`806 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
805 else 807 else
806 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`808 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
807 fi809 fi
808 # Put the nasty error message in config.log where it belongs810 # Put the nasty error message in config.log where it belongs
809 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD811 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
810812
=== modified file 'build.xml'
--- build.xml 2011-02-01 12:53:34 +0000
+++ build.xml 2011-07-10 11:35:55 +0000
@@ -42,7 +42,7 @@
42 </description>42 </description>
4343
44 <!-- set global properties for this build -->44 <!-- set global properties for this build -->
45 <property name="version" value="0.48.1"/>45 <property name="version" value="0.48.2"/>
46 <property name="src" location="src"/>46 <property name="src" location="src"/>
47 <property name="lib" location="lib"/>47 <property name="lib" location="lib"/>
48 <property name="build" location="build"/>48 <property name="build" location="build"/>
@@ -186,6 +186,9 @@
186 /* Allow reading WordPerfect? */186 /* Allow reading WordPerfect? */
187 #define WITH_LIBWPG 1187 #define WITH_LIBWPG 1
188188
189 /* Default to libwpg 0.1.x */
190 #define WITH_LIBWPG01 1
191
189 /* Do we support SVG Fonts? */192 /* Do we support SVG Fonts? */
190 #define ENABLE_SVG_FONTS 1193 #define ENABLE_SVG_FONTS 1
191194
@@ -660,6 +663,7 @@
660 <copy todir="${dist}" file="${devlibs}/bin/libsigc-2.0-0.dll"/>663 <copy todir="${dist}" file="${devlibs}/bin/libsigc-2.0-0.dll"/>
661 <copy todir="${dist}" file="${devlibs}/bin/freetype6.dll"/>664 <copy todir="${dist}" file="${devlibs}/bin/freetype6.dll"/>
662 <copy todir="${dist}" file="${devlibs}/bin/libatk-1.0-0.dll"/>665 <copy todir="${dist}" file="${devlibs}/bin/libatk-1.0-0.dll"/>
666 <copy todir="${dist}" file="${devlibs}/bin/libgcc_s_sjlj-1.dll"/>
663 <copy todir="${dist}" file="${devlibs}/bin/libgdk-win32-2.0-0.dll"/>667 <copy todir="${dist}" file="${devlibs}/bin/libgdk-win32-2.0-0.dll"/>
664 <copy todir="${dist}" file="${devlibs}/bin/libgdk_pixbuf-2.0-0.dll"/>668 <copy todir="${dist}" file="${devlibs}/bin/libgdk_pixbuf-2.0-0.dll"/>
665 <copy todir="${dist}" file="${devlibs}/bin/libglib-2.0-0.dll"/>669 <copy todir="${dist}" file="${devlibs}/bin/libglib-2.0-0.dll"/>
@@ -704,7 +708,7 @@
704 <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>708 <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
705 <!-- MINGW support DLLs needed for openmp support -->709 <!-- MINGW support DLLs needed for openmp support -->
706 <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>710 <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
707 <copy todir="${dist}" file="${mingw}/lib/gcc/mingw32/bin/libgomp-1.dll"/>711 <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/>
708712
709 <!-- MSGFMT files -->713 <!-- MSGFMT files -->
710 <copy todir="${dist}">714 <copy todir="${dist}">
711715
=== modified file 'config.guess'
--- config.guess 2011-02-20 12:07:30 +0000
+++ config.guess 2011-07-10 11:35:55 +0000
@@ -1,10 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Attempt to guess a canonical system name.2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 20104# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5# Free Software Foundation, Inc.5# 2011 Free Software Foundation, Inc.
66
7timestamp='2009-12-30'7timestamp='2011-05-11'
88
9# This file is free software; you can redistribute it and/or modify it9# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by10# under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
5757
58Originally written by Per Bothner.58Originally written by Per Bothner.
59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
602001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free602001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
61Software Foundation, Inc.61Software Foundation, Inc.
6262
63This is free software; see the source for copying conditions. There is NO63This is free software; see the source for copying conditions. There is NO
@@ -181,7 +181,7 @@
181 fi181 fi
182 ;;182 ;;
183 *)183 *)
184 os=netbsd184 os=netbsd
185 ;;185 ;;
186 esac186 esac
187 # The OS release187 # The OS release
@@ -224,7 +224,7 @@
224 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`224 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
225 ;;225 ;;
226 *5.*)226 *5.*)
227 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`227 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
228 ;;228 ;;
229 esac229 esac
230 # According to Compaq, /usr/sbin/psrinfo has been available on230 # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@
270 # A Xn.n version is an unreleased experimental baselevel.270 # A Xn.n version is an unreleased experimental baselevel.
271 # 1.2 uses "1.2" for uname -r.271 # 1.2 uses "1.2" for uname -r.
272 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`272 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
273 exit ;;273 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
274 exitcode=$?
275 trap '' 0
276 exit $exitcode ;;
274 Alpha\ *:Windows_NT*:*)277 Alpha\ *:Windows_NT*:*)
275 # How do we know it's Interix rather than the generic POSIX subsystem?278 # How do we know it's Interix rather than the generic POSIX subsystem?
276 # Should we change UNAME_MACHINE based on the output of uname instead279 # Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@
296 echo s390-ibm-zvmoe299 echo s390-ibm-zvmoe
297 exit ;;300 exit ;;
298 *:OS400:*:*)301 *:OS400:*:*)
299 echo powerpc-ibm-os400302 echo powerpc-ibm-os400
300 exit ;;303 exit ;;
301 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)304 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
302 echo arm-acorn-riscix${UNAME_RELEASE}305 echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@
395 # MiNT. But MiNT is downward compatible to TOS, so this should398 # MiNT. But MiNT is downward compatible to TOS, so this should
396 # be no problem.399 # be no problem.
397 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)400 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
398 echo m68k-atari-mint${UNAME_RELEASE}401 echo m68k-atari-mint${UNAME_RELEASE}
399 exit ;;402 exit ;;
400 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)403 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
401 echo m68k-atari-mint${UNAME_RELEASE}404 echo m68k-atari-mint${UNAME_RELEASE}
402 exit ;;405 exit ;;
403 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)406 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
404 echo m68k-atari-mint${UNAME_RELEASE}407 echo m68k-atari-mint${UNAME_RELEASE}
405 exit ;;408 exit ;;
406 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)409 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
407 echo m68k-milan-mint${UNAME_RELEASE}410 echo m68k-milan-mint${UNAME_RELEASE}
408 exit ;;411 exit ;;
409 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)412 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
410 echo m68k-hades-mint${UNAME_RELEASE}413 echo m68k-hades-mint${UNAME_RELEASE}
411 exit ;;414 exit ;;
412 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)415 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
413 echo m68k-unknown-mint${UNAME_RELEASE}416 echo m68k-unknown-mint${UNAME_RELEASE}
414 exit ;;417 exit ;;
415 m68k:machten:*:*)418 m68k:machten:*:*)
416 echo m68k-apple-machten${UNAME_RELEASE}419 echo m68k-apple-machten${UNAME_RELEASE}
417 exit ;;420 exit ;;
@@ -481,8 +484,8 @@
481 echo m88k-motorola-sysv3484 echo m88k-motorola-sysv3
482 exit ;;485 exit ;;
483 AViiON:dgux:*:*)486 AViiON:dgux:*:*)
484 # DG/UX returns AViiON for all architectures487 # DG/UX returns AViiON for all architectures
485 UNAME_PROCESSOR=`/usr/bin/uname -p`488 UNAME_PROCESSOR=`/usr/bin/uname -p`
486 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]489 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
487 then490 then
488 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \491 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@
495 else498 else
496 echo i586-dg-dgux${UNAME_RELEASE}499 echo i586-dg-dgux${UNAME_RELEASE}
497 fi500 fi
498 exit ;;501 exit ;;
499 M88*:DolphinOS:*:*) # DolphinOS (SVR3)502 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
500 echo m88k-dolphin-sysv3503 echo m88k-dolphin-sysv3
501 exit ;;504 exit ;;
@@ -552,7 +555,7 @@
552 echo rs6000-ibm-aix3.2555 echo rs6000-ibm-aix3.2
553 fi556 fi
554 exit ;;557 exit ;;
555 *:AIX:*:[456])558 *:AIX:*:[4567])
556 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`559 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
557 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then560 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
558 IBM_ARCH=rs6000561 IBM_ARCH=rs6000
@@ -595,52 +598,52 @@
595 9000/[678][0-9][0-9])598 9000/[678][0-9][0-9])
596 if [ -x /usr/bin/getconf ]; then599 if [ -x /usr/bin/getconf ]; then
597 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`600 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
598 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`601 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
599 case "${sc_cpu_version}" in602 case "${sc_cpu_version}" in
600 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0603 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
601 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1604 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
602 532) # CPU_PA_RISC2_0605 532) # CPU_PA_RISC2_0
603 case "${sc_kernel_bits}" in606 case "${sc_kernel_bits}" in
604 32) HP_ARCH="hppa2.0n" ;;607 32) HP_ARCH="hppa2.0n" ;;
605 64) HP_ARCH="hppa2.0w" ;;608 64) HP_ARCH="hppa2.0w" ;;
606 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20609 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
607 esac ;;610 esac ;;
608 esac611 esac
609 fi612 fi
610 if [ "${HP_ARCH}" = "" ]; then613 if [ "${HP_ARCH}" = "" ]; then
611 eval $set_cc_for_build614 eval $set_cc_for_build
612 sed 's/^ //' << EOF >$dummy.c615 sed 's/^ //' << EOF >$dummy.c
613616
614 #define _HPUX_SOURCE617 #define _HPUX_SOURCE
615 #include <stdlib.h>618 #include <stdlib.h>
616 #include <unistd.h>619 #include <unistd.h>
617620
618 int main ()621 int main ()
619 {622 {
620 #if defined(_SC_KERNEL_BITS)623 #if defined(_SC_KERNEL_BITS)
621 long bits = sysconf(_SC_KERNEL_BITS);624 long bits = sysconf(_SC_KERNEL_BITS);
622 #endif625 #endif
623 long cpu = sysconf (_SC_CPU_VERSION);626 long cpu = sysconf (_SC_CPU_VERSION);
624627
625 switch (cpu)628 switch (cpu)
626 {629 {
627 case CPU_PA_RISC1_0: puts ("hppa1.0"); break;630 case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
628 case CPU_PA_RISC1_1: puts ("hppa1.1"); break;631 case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
629 case CPU_PA_RISC2_0:632 case CPU_PA_RISC2_0:
630 #if defined(_SC_KERNEL_BITS)633 #if defined(_SC_KERNEL_BITS)
631 switch (bits)634 switch (bits)
632 {635 {
633 case 64: puts ("hppa2.0w"); break;636 case 64: puts ("hppa2.0w"); break;
634 case 32: puts ("hppa2.0n"); break;637 case 32: puts ("hppa2.0n"); break;
635 default: puts ("hppa2.0"); break;638 default: puts ("hppa2.0"); break;
636 } break;639 } break;
637 #else /* !defined(_SC_KERNEL_BITS) */640 #else /* !defined(_SC_KERNEL_BITS) */
638 puts ("hppa2.0"); break;641 puts ("hppa2.0"); break;
639 #endif642 #endif
640 default: puts ("hppa1.0"); break;643 default: puts ("hppa1.0"); break;
641 }644 }
642 exit (0);645 exit (0);
643 }646 }
644EOF647EOF
645 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`648 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
646 test -z "$HP_ARCH" && HP_ARCH=hppa649 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@
731 exit ;;734 exit ;;
732 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)735 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
733 echo c1-convex-bsd736 echo c1-convex-bsd
734 exit ;;737 exit ;;
735 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)738 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
736 if getsysinfo -f scalar_acc739 if getsysinfo -f scalar_acc
737 then echo c32-convex-bsd740 then echo c32-convex-bsd
738 else echo c2-convex-bsd741 else echo c2-convex-bsd
739 fi742 fi
740 exit ;;743 exit ;;
741 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)744 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
742 echo c34-convex-bsd745 echo c34-convex-bsd
743 exit ;;746 exit ;;
744 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)747 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
745 echo c38-convex-bsd748 echo c38-convex-bsd
746 exit ;;749 exit ;;
747 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)750 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
748 echo c4-convex-bsd751 echo c4-convex-bsd
749 exit ;;752 exit ;;
750 CRAY*Y-MP:*:*:*)753 CRAY*Y-MP:*:*:*)
751 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'754 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
752 exit ;;755 exit ;;
@@ -770,14 +773,14 @@
770 exit ;;773 exit ;;
771 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)774 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
772 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`775 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
773 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`776 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
774 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`777 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
775 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"778 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
776 exit ;;779 exit ;;
777 5000:UNIX_System_V:4.*:*)780 5000:UNIX_System_V:4.*:*)
778 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`781 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
779 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`782 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
780 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"783 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
781 exit ;;784 exit ;;
782 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)785 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
783 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}786 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@
805 echo ${UNAME_MACHINE}-pc-mingw32808 echo ${UNAME_MACHINE}-pc-mingw32
806 exit ;;809 exit ;;
807 i*:windows32*:*)810 i*:windows32*:*)
808 # uname -m includes "-pc" on this system.811 # uname -m includes "-pc" on this system.
809 echo ${UNAME_MACHINE}-mingw32812 echo ${UNAME_MACHINE}-mingw32
810 exit ;;813 exit ;;
811 i*:PW*:*)814 i*:PW*:*)
812 echo ${UNAME_MACHINE}-pc-pw32815 echo ${UNAME_MACHINE}-pc-pw32
813 exit ;;816 exit ;;
814 *:Interix*:*)817 *:Interix*:*)
815 case ${UNAME_MACHINE} in818 case ${UNAME_MACHINE} in
816 x86)819 x86)
817 echo i586-pc-interix${UNAME_RELEASE}820 echo i586-pc-interix${UNAME_RELEASE}
818 exit ;;821 exit ;;
@@ -867,7 +870,7 @@
867 EV6) UNAME_MACHINE=alphaev6 ;;870 EV6) UNAME_MACHINE=alphaev6 ;;
868 EV67) UNAME_MACHINE=alphaev67 ;;871 EV67) UNAME_MACHINE=alphaev67 ;;
869 EV68*) UNAME_MACHINE=alphaev68 ;;872 EV68*) UNAME_MACHINE=alphaev68 ;;
870 esac873 esac
871 objdump --private-headers /bin/sh | grep -q ld.so.1874 objdump --private-headers /bin/sh | grep -q ld.so.1
872 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi875 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
873 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}876 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@
879 then882 then
880 echo ${UNAME_MACHINE}-unknown-linux-gnu883 echo ${UNAME_MACHINE}-unknown-linux-gnu
881 else884 else
882 echo ${UNAME_MACHINE}-unknown-linux-gnueabi885 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
886 | grep -q __ARM_PCS_VFP
887 then
888 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
889 else
890 echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
891 fi
883 fi892 fi
884 exit ;;893 exit ;;
885 avr32*:Linux:*:*)894 avr32*:Linux:*:*)
@@ -892,7 +901,7 @@
892 echo crisv32-axis-linux-gnu901 echo crisv32-axis-linux-gnu
893 exit ;;902 exit ;;
894 frv:Linux:*:*)903 frv:Linux:*:*)
895 echo frv-unknown-linux-gnu904 echo frv-unknown-linux-gnu
896 exit ;;905 exit ;;
897 i*86:Linux:*:*)906 i*86:Linux:*:*)
898 LIBC=gnu907 LIBC=gnu
@@ -960,7 +969,7 @@
960 echo ${UNAME_MACHINE}-ibm-linux969 echo ${UNAME_MACHINE}-ibm-linux
961 exit ;;970 exit ;;
962 sh64*:Linux:*:*)971 sh64*:Linux:*:*)
963 echo ${UNAME_MACHINE}-unknown-linux-gnu972 echo ${UNAME_MACHINE}-unknown-linux-gnu
964 exit ;;973 exit ;;
965 sh*:Linux:*:*)974 sh*:Linux:*:*)
966 echo ${UNAME_MACHINE}-unknown-linux-gnu975 echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +977,9 @@
968 sparc:Linux:*:* | sparc64:Linux:*:*)977 sparc:Linux:*:* | sparc64:Linux:*:*)
969 echo ${UNAME_MACHINE}-unknown-linux-gnu978 echo ${UNAME_MACHINE}-unknown-linux-gnu
970 exit ;;979 exit ;;
980 tile*:Linux:*:*)
981 echo ${UNAME_MACHINE}-tilera-linux-gnu
982 exit ;;
971 vax:Linux:*:*)983 vax:Linux:*:*)
972 echo ${UNAME_MACHINE}-dec-linux-gnu984 echo ${UNAME_MACHINE}-dec-linux-gnu
973 exit ;;985 exit ;;
@@ -975,7 +987,7 @@
975 echo x86_64-unknown-linux-gnu987 echo x86_64-unknown-linux-gnu
976 exit ;;988 exit ;;
977 xtensa*:Linux:*:*)989 xtensa*:Linux:*:*)
978 echo ${UNAME_MACHINE}-unknown-linux-gnu990 echo ${UNAME_MACHINE}-unknown-linux-gnu
979 exit ;;991 exit ;;
980 i*86:DYNIX/ptx:4*:*)992 i*86:DYNIX/ptx:4*:*)
981 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.993 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +996,11 @@
984 echo i386-sequent-sysv4996 echo i386-sequent-sysv4
985 exit ;;997 exit ;;
986 i*86:UNIX_SV:4.2MP:2.*)998 i*86:UNIX_SV:4.2MP:2.*)
987 # Unixware is an offshoot of SVR4, but it has its own version999 # Unixware is an offshoot of SVR4, but it has its own version
988 # number series starting with 2...1000 # number series starting with 2...
989 # I am not positive that other SVR4 systems won't match this,1001 # I am not positive that other SVR4 systems won't match this,
990 # I just have to hope. -- rms.1002 # I just have to hope. -- rms.
991 # Use sysv4.2uw... so that sysv4* matches it.1003 # Use sysv4.2uw... so that sysv4* matches it.
992 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}1004 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
993 exit ;;1005 exit ;;
994 i*86:OS/2:*:*)1006 i*86:OS/2:*:*)
@@ -1020,7 +1032,7 @@
1020 fi1032 fi
1021 exit ;;1033 exit ;;
1022 i*86:*:5:[678]*)1034 i*86:*:5:[678]*)
1023 # UnixWare 7.x, OpenUNIX and OpenServer 6.1035 # UnixWare 7.x, OpenUNIX and OpenServer 6.
1024 case `/bin/uname -X | grep "^Machine"` in1036 case `/bin/uname -X | grep "^Machine"` in
1025 *486*) UNAME_MACHINE=i486 ;;1037 *486*) UNAME_MACHINE=i486 ;;
1026 *Pentium) UNAME_MACHINE=i586 ;;1038 *Pentium) UNAME_MACHINE=i586 ;;
@@ -1048,13 +1060,13 @@
1048 exit ;;1060 exit ;;
1049 pc:*:*:*)1061 pc:*:*:*)
1050 # Left here for compatibility:1062 # Left here for compatibility:
1051 # uname -m prints for DJGPP always 'pc', but it prints nothing about1063 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1052 # the processor, so we play safe by assuming i586.1064 # the processor, so we play safe by assuming i586.
1053 # Note: whatever this is, it MUST be the same as what config.sub1065 # Note: whatever this is, it MUST be the same as what config.sub
1054 # prints for the "djgpp" host, or else GDB configury will decide that1066 # prints for the "djgpp" host, or else GDB configury will decide that
1055 # this is a cross-build.1067 # this is a cross-build.
1056 echo i586-pc-msdosdjgpp1068 echo i586-pc-msdosdjgpp
1057 exit ;;1069 exit ;;
1058 Intel:Mach:3*:*)1070 Intel:Mach:3*:*)
1059 echo i386-pc-mach31071 echo i386-pc-mach3
1060 exit ;;1072 exit ;;
@@ -1089,8 +1101,8 @@
1089 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \1101 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1090 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;1102 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1091 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)1103 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1092 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \1104 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1093 && { echo i486-ncr-sysv4; exit; } ;;1105 && { echo i486-ncr-sysv4; exit; } ;;
1094 NCR*:*:4.2:* | MPRAS*:*:4.2:*)1106 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1095 OS_REL='.3'1107 OS_REL='.3'
1096 test -r /etc/.relid \1108 test -r /etc/.relid \
@@ -1133,10 +1145,10 @@
1133 echo ns32k-sni-sysv1145 echo ns32k-sni-sysv
1134 fi1146 fi
1135 exit ;;1147 exit ;;
1136 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort1148 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1137 # says <Richard.M.Bartel@ccMail.Census.GOV>1149 # says <Richard.M.Bartel@ccMail.Census.GOV>
1138 echo i586-unisys-sysv41150 echo i586-unisys-sysv4
1139 exit ;;1151 exit ;;
1140 *:UNIX_System_V:4*:FTX*)1152 *:UNIX_System_V:4*:FTX*)
1141 # From Gerald Hewes <hewes@openmarket.com>.1153 # From Gerald Hewes <hewes@openmarket.com>.
1142 # How about differentiating between stratus architectures? -djm1154 # How about differentiating between stratus architectures? -djm
@@ -1162,11 +1174,11 @@
1162 exit ;;1174 exit ;;
1163 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)1175 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1164 if [ -d /usr/nec ]; then1176 if [ -d /usr/nec ]; then
1165 echo mips-nec-sysv${UNAME_RELEASE}1177 echo mips-nec-sysv${UNAME_RELEASE}
1166 else1178 else
1167 echo mips-unknown-sysv${UNAME_RELEASE}1179 echo mips-unknown-sysv${UNAME_RELEASE}
1168 fi1180 fi
1169 exit ;;1181 exit ;;
1170 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.1182 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1171 echo powerpc-be-beos1183 echo powerpc-be-beos
1172 exit ;;1184 exit ;;
@@ -1231,6 +1243,9 @@
1231 *:QNX:*:4*)1243 *:QNX:*:4*)
1232 echo i386-pc-qnx1244 echo i386-pc-qnx
1233 exit ;;1245 exit ;;
1246 NEO-?:NONSTOP_KERNEL:*:*)
1247 echo neo-tandem-nsk${UNAME_RELEASE}
1248 exit ;;
1234 NSE-?:NONSTOP_KERNEL:*:*)1249 NSE-?:NONSTOP_KERNEL:*:*)
1235 echo nse-tandem-nsk${UNAME_RELEASE}1250 echo nse-tandem-nsk${UNAME_RELEASE}
1236 exit ;;1251 exit ;;
@@ -1276,13 +1291,13 @@
1276 echo pdp10-unknown-its1291 echo pdp10-unknown-its
1277 exit ;;1292 exit ;;
1278 SEI:*:*:SEIUX)1293 SEI:*:*:SEIUX)
1279 echo mips-sei-seiux${UNAME_RELEASE}1294 echo mips-sei-seiux${UNAME_RELEASE}
1280 exit ;;1295 exit ;;
1281 *:DragonFly:*:*)1296 *:DragonFly:*:*)
1282 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`1297 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1283 exit ;;1298 exit ;;
1284 *:*VMS:*:*)1299 *:*VMS:*:*)
1285 UNAME_MACHINE=`(uname -p) 2>/dev/null`1300 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1286 case "${UNAME_MACHINE}" in1301 case "${UNAME_MACHINE}" in
1287 A*) echo alpha-dec-vms ; exit ;;1302 A*) echo alpha-dec-vms ; exit ;;
1288 I*) echo ia64-dec-vms ; exit ;;1303 I*) echo ia64-dec-vms ; exit ;;
@@ -1322,11 +1337,11 @@
1322#include <sys/param.h>1337#include <sys/param.h>
1323 printf ("m68k-sony-newsos%s\n",1338 printf ("m68k-sony-newsos%s\n",
1324#ifdef NEWSOS41339#ifdef NEWSOS4
1325 "4"1340 "4"
1326#else1341#else
1327 ""1342 ""
1328#endif1343#endif
1329 ); exit (0);1344 ); exit (0);
1330#endif1345#endif
1331#endif1346#endif
13321347
13331348
=== modified file 'config.h.in'
--- config.h.in 2011-02-20 12:07:30 +0000
+++ config.h.in 2011-07-10 11:35:55 +0000
@@ -285,6 +285,12 @@
285/* Build in libwpg */285/* Build in libwpg */
286#undef WITH_LIBWPG286#undef WITH_LIBWPG
287287
288/* Build in libwpg 0.1.x */
289#undef WITH_LIBWPG01
290
291/* Build in libwpg 0.2.x */
292#undef WITH_LIBWPG02
293
288/* use Perl for embedded scripting */294/* use Perl for embedded scripting */
289#undef WITH_PERL295#undef WITH_PERL
290296
291297
=== modified file 'config.sub'
--- config.sub 2011-02-20 12:07:30 +0000
+++ config.sub 2011-07-10 11:35:55 +0000
@@ -1,10 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Configuration validation subroutine script.2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 20104# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5# Free Software Foundation, Inc.5# 2011 Free Software Foundation, Inc.
66
7timestamp='2010-01-22'7timestamp='2011-03-23'
88
9# This file is (in principle) common to ALL GNU software.9# This file is (in principle) common to ALL GNU software.
10# The presence of a machine in this file suggests that SOME GNU software10# The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@
76GNU config.sub ($timestamp)76GNU config.sub ($timestamp)
7777
78Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,78Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
792001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free792001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
80Software Foundation, Inc.80Software Foundation, Inc.
8181
82This is free software; see the source for copying conditions. There is NO82This is free software; see the source for copying conditions. There is NO
@@ -124,8 +124,9 @@
124# Here we must recognize all the valid KERNEL-OS combinations.124# Here we must recognize all the valid KERNEL-OS combinations.
125maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`125maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
126case $maybe_os in126case $maybe_os in
127 nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \127 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
128 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \128 linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
129 knetbsd*-gnu* | netbsd*-gnu* | \
129 kopensolaris*-gnu* | \130 kopensolaris*-gnu* | \
130 storm-chaos* | os2-emx* | rtmk-nova*)131 storm-chaos* | os2-emx* | rtmk-nova*)
131 os=-$maybe_os132 os=-$maybe_os
@@ -157,8 +158,8 @@
157 os=158 os=
158 basic_machine=$1159 basic_machine=$1
159 ;;160 ;;
160 -bluegene*)161 -bluegene*)
161 os=-cnk162 os=-cnk
162 ;;163 ;;
163 -sim | -cisco | -oki | -wec | -winbond)164 -sim | -cisco | -oki | -wec | -winbond)
164 os=165 os=
@@ -174,10 +175,10 @@
174 os=-chorusos175 os=-chorusos
175 basic_machine=$1176 basic_machine=$1
176 ;;177 ;;
177 -chorusrdb)178 -chorusrdb)
178 os=-chorusrdb179 os=-chorusrdb
179 basic_machine=$1180 basic_machine=$1
180 ;;181 ;;
181 -hiux*)182 -hiux*)
182 os=-hiuxwe2183 os=-hiuxwe2
183 ;;184 ;;
@@ -282,11 +283,13 @@
282 | moxie \283 | moxie \
283 | mt \284 | mt \
284 | msp430 \285 | msp430 \
286 | nds32 | nds32le | nds32be \
285 | nios | nios2 \287 | nios | nios2 \
286 | ns16k | ns32k \288 | ns16k | ns32k \
289 | open8 \
287 | or32 \290 | or32 \
288 | pdp10 | pdp11 | pj | pjl \291 | pdp10 | pdp11 | pj | pjl \
289 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \292 | powerpc | powerpc64 | powerpc64le | powerpcle \
290 | pyramid \293 | pyramid \
291 | rx \294 | rx \
292 | score \295 | score \
@@ -294,15 +297,24 @@
294 | sh64 | sh64le \297 | sh64 | sh64le \
295 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \298 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
296 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \299 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
297 | spu | strongarm \300 | spu \
298 | tahoe | thumb | tic4x | tic80 | tron \301 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
299 | ubicom32 \302 | ubicom32 \
300 | v850 | v850e \303 | v850 | v850e \
301 | we32k \304 | we32k \
302 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \305 | x86 | xc16x | xstormy16 | xtensa \
303 | z8k | z80)306 | z8k | z80)
304 basic_machine=$basic_machine-unknown307 basic_machine=$basic_machine-unknown
305 ;;308 ;;
309 c54x)
310 basic_machine=tic54x-unknown
311 ;;
312 c55x)
313 basic_machine=tic55x-unknown
314 ;;
315 c6x)
316 basic_machine=tic6x-unknown
317 ;;
306 m6811 | m68hc11 | m6812 | m68hc12 | picochip)318 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
307 # Motorola 68HC11/12.319 # Motorola 68HC11/12.
308 basic_machine=$basic_machine-unknown320 basic_machine=$basic_machine-unknown
@@ -314,6 +326,18 @@
314 basic_machine=mt-unknown326 basic_machine=mt-unknown
315 ;;327 ;;
316328
329 strongarm | thumb | xscale)
330 basic_machine=arm-unknown
331 ;;
332
333 xscaleeb)
334 basic_machine=armeb-unknown
335 ;;
336
337 xscaleel)
338 basic_machine=armel-unknown
339 ;;
340
317 # We use `pc' rather than `unknown'341 # We use `pc' rather than `unknown'
318 # because (1) that's what they normally are, and342 # because (1) that's what they normally are, and
319 # (2) the word "unknown" tends to confuse beginning users.343 # (2) the word "unknown" tends to confuse beginning users.
@@ -334,7 +358,7 @@
334 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \358 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
335 | avr-* | avr32-* \359 | avr-* | avr32-* \
336 | bfin-* | bs2000-* \360 | bfin-* | bs2000-* \
337 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \361 | c[123]* | c30-* | [cjt]90-* | c4x-* \
338 | clipper-* | craynv-* | cydra-* \362 | clipper-* | craynv-* | cydra-* \
339 | d10v-* | d30v-* | dlx-* \363 | d10v-* | d30v-* | dlx-* \
340 | elxsi-* \364 | elxsi-* \
@@ -368,26 +392,28 @@
368 | mmix-* \392 | mmix-* \
369 | mt-* \393 | mt-* \
370 | msp430-* \394 | msp430-* \
395 | nds32-* | nds32le-* | nds32be-* \
371 | nios-* | nios2-* \396 | nios-* | nios2-* \
372 | none-* | np1-* | ns16k-* | ns32k-* \397 | none-* | np1-* | ns16k-* | ns32k-* \
398 | open8-* \
373 | orion-* \399 | orion-* \
374 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \400 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
375 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \401 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
376 | pyramid-* \402 | pyramid-* \
377 | romp-* | rs6000-* | rx-* \403 | romp-* | rs6000-* | rx-* \
378 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \404 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
379 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \405 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
380 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \406 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
381 | sparclite-* \407 | sparclite-* \
382 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \408 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
383 | tahoe-* | thumb-* \409 | tahoe-* \
384 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \410 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
385 | tile-* | tilegx-* \411 | tile-* | tilegx-* \
386 | tron-* \412 | tron-* \
387 | ubicom32-* \413 | ubicom32-* \
388 | v850-* | v850e-* | vax-* \414 | v850-* | v850e-* | vax-* \
389 | we32k-* \415 | we32k-* \
390 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \416 | x86-* | x86_64-* | xc16x-* | xps100-* \
391 | xstormy16-* | xtensa*-* \417 | xstormy16-* | xtensa*-* \
392 | ymp-* \418 | ymp-* \
393 | z8k-* | z80-*)419 | z8k-* | z80-*)
@@ -412,7 +438,7 @@
412 basic_machine=a29k-amd438 basic_machine=a29k-amd
413 os=-udi439 os=-udi
414 ;;440 ;;
415 abacus)441 abacus)
416 basic_machine=abacus-unknown442 basic_machine=abacus-unknown
417 ;;443 ;;
418 adobe68k)444 adobe68k)
@@ -482,11 +508,20 @@
482 basic_machine=powerpc-ibm508 basic_machine=powerpc-ibm
483 os=-cnk509 os=-cnk
484 ;;510 ;;
511 c54x-*)
512 basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
513 ;;
514 c55x-*)
515 basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
516 ;;
517 c6x-*)
518 basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
519 ;;
485 c90)520 c90)
486 basic_machine=c90-cray521 basic_machine=c90-cray
487 os=-unicos522 os=-unicos
488 ;;523 ;;
489 cegcc)524 cegcc)
490 basic_machine=arm-unknown525 basic_machine=arm-unknown
491 os=-cegcc526 os=-cegcc
492 ;;527 ;;
@@ -518,7 +553,7 @@
518 basic_machine=craynv-cray553 basic_machine=craynv-cray
519 os=-unicosmp554 os=-unicosmp
520 ;;555 ;;
521 cr16)556 cr16 | cr16-*)
522 basic_machine=cr16-unknown557 basic_machine=cr16-unknown
523 os=-elf558 os=-elf
524 ;;559 ;;
@@ -734,7 +769,7 @@
734 basic_machine=ns32k-utek769 basic_machine=ns32k-utek
735 os=-sysv770 os=-sysv
736 ;;771 ;;
737 microblaze)772 microblaze)
738 basic_machine=microblaze-xilinx773 basic_machine=microblaze-xilinx
739 ;;774 ;;
740 mingw32)775 mingw32)
@@ -841,6 +876,12 @@
841 np1)876 np1)
842 basic_machine=np1-gould877 basic_machine=np1-gould
843 ;;878 ;;
879 neo-tandem)
880 basic_machine=neo-tandem
881 ;;
882 nse-tandem)
883 basic_machine=nse-tandem
884 ;;
844 nsr-tandem)885 nsr-tandem)
845 basic_machine=nsr-tandem886 basic_machine=nsr-tandem
846 ;;887 ;;
@@ -923,9 +964,10 @@
923 ;;964 ;;
924 power) basic_machine=power-ibm965 power) basic_machine=power-ibm
925 ;;966 ;;
926 ppc) basic_machine=powerpc-unknown967 ppc | ppcbe) basic_machine=powerpc-unknown
927 ;;968 ;;
928 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`969 ppc-* | ppcbe-*)
970 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
929 ;;971 ;;
930 ppcle | powerpclittle | ppc-le | powerpc-little)972 ppcle | powerpclittle | ppc-le | powerpc-little)
931 basic_machine=powerpcle-unknown973 basic_machine=powerpcle-unknown
@@ -1019,6 +1061,9 @@
1019 basic_machine=i860-stratus1061 basic_machine=i860-stratus
1020 os=-sysv41062 os=-sysv4
1021 ;;1063 ;;
1064 strongarm-* | thumb-*)
1065 basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1066 ;;
1022 sun2)1067 sun2)
1023 basic_machine=m68000-sun1068 basic_machine=m68000-sun
1024 ;;1069 ;;
@@ -1075,20 +1120,8 @@
1075 basic_machine=t90-cray1120 basic_machine=t90-cray
1076 os=-unicos1121 os=-unicos
1077 ;;1122 ;;
1078 tic54x | c54x*)1123 # This must be matched before tile*.
1079 basic_machine=tic54x-unknown1124 tilegx*)
1080 os=-coff
1081 ;;
1082 tic55x | c55x*)
1083 basic_machine=tic55x-unknown
1084 os=-coff
1085 ;;
1086 tic6x | c6x*)
1087 basic_machine=tic6x-unknown
1088 os=-coff
1089 ;;
1090 # This must be matched before tile*.
1091 tilegx*)
1092 basic_machine=tilegx-unknown1125 basic_machine=tilegx-unknown
1093 os=-linux-gnu1126 os=-linux-gnu
1094 ;;1127 ;;
@@ -1163,6 +1196,9 @@
1163 xps | xps100)1196 xps | xps100)
1164 basic_machine=xps100-honeywell1197 basic_machine=xps100-honeywell
1165 ;;1198 ;;
1199 xscale-* | xscalee[bl]-*)
1200 basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1201 ;;
1166 ymp)1202 ymp)
1167 basic_machine=ymp-cray1203 basic_machine=ymp-cray
1168 os=-unicos1204 os=-unicos
@@ -1260,11 +1296,11 @@
1260if [ x"$os" != x"" ]1296if [ x"$os" != x"" ]
1261then1297then
1262case $os in1298case $os in
1263 # First match some system type aliases1299 # First match some system type aliases
1264 # that might get confused with valid system types.1300 # that might get confused with valid system types.
1265 # -solaris* is a basic system type, with this one exception.1301 # -solaris* is a basic system type, with this one exception.
1266 -auroraux)1302 -auroraux)
1267 os=-auroraux1303 os=-auroraux
1268 ;;1304 ;;
1269 -solaris1 | -solaris1.*)1305 -solaris1 | -solaris1.*)
1270 os=`echo $os | sed -e 's|solaris1|sunos4|'`1306 os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1301,7 +1337,8 @@
1301 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \1337 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1302 | -chorusos* | -chorusrdb* | -cegcc* \1338 | -chorusos* | -chorusrdb* | -cegcc* \
1303 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \1339 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1304 | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \1340 | -mingw32* | -linux-gnu* | -linux-android* \
1341 | -linux-newlib* | -linux-uclibc* \
1305 | -uxpv* | -beos* | -mpeix* | -udk* \1342 | -uxpv* | -beos* | -mpeix* | -udk* \
1306 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \1343 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1307 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \1344 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1348,7 +1385,7 @@
1348 -opened*)1385 -opened*)
1349 os=-openedition1386 os=-openedition
1350 ;;1387 ;;
1351 -os400*)1388 -os400*)
1352 os=-os4001389 os=-os400
1353 ;;1390 ;;
1354 -wince*)1391 -wince*)
@@ -1397,7 +1434,7 @@
1397 -sinix*)1434 -sinix*)
1398 os=-sysv41435 os=-sysv4
1399 ;;1436 ;;
1400 -tpf*)1437 -tpf*)
1401 os=-tpf1438 os=-tpf
1402 ;;1439 ;;
1403 -triton*)1440 -triton*)
@@ -1442,8 +1479,8 @@
1442 -dicos*)1479 -dicos*)
1443 os=-dicos1480 os=-dicos
1444 ;;1481 ;;
1445 -nacl*)1482 -nacl*)
1446 ;;1483 ;;
1447 -none)1484 -none)
1448 ;;1485 ;;
1449 *)1486 *)
@@ -1466,10 +1503,10 @@
1466# system, and we'll never get to this point.1503# system, and we'll never get to this point.
14671504
1468case $basic_machine in1505case $basic_machine in
1469 score-*)1506 score-*)
1470 os=-elf1507 os=-elf
1471 ;;1508 ;;
1472 spu-*)1509 spu-*)
1473 os=-elf1510 os=-elf
1474 ;;1511 ;;
1475 *-acorn)1512 *-acorn)
@@ -1481,8 +1518,17 @@
1481 arm*-semi)1518 arm*-semi)
1482 os=-aout1519 os=-aout
1483 ;;1520 ;;
1484 c4x-* | tic4x-*)1521 c4x-* | tic4x-*)
1485 os=-coff1522 os=-coff
1523 ;;
1524 tic54x-*)
1525 os=-coff
1526 ;;
1527 tic55x-*)
1528 os=-coff
1529 ;;
1530 tic6x-*)
1531 os=-coff
1486 ;;1532 ;;
1487 # This must come before the *-dec entry.1533 # This must come before the *-dec entry.
1488 pdp10-*)1534 pdp10-*)
@@ -1509,7 +1555,7 @@
1509 m68*-cisco)1555 m68*-cisco)
1510 os=-aout1556 os=-aout
1511 ;;1557 ;;
1512 mep-*)1558 mep-*)
1513 os=-elf1559 os=-elf
1514 ;;1560 ;;
1515 mips*-cisco)1561 mips*-cisco)
@@ -1536,7 +1582,7 @@
1536 *-ibm)1582 *-ibm)
1537 os=-aix1583 os=-aix
1538 ;;1584 ;;
1539 *-knuth)1585 *-knuth)
1540 os=-mmixware1586 os=-mmixware
1541 ;;1587 ;;
1542 *-wec)1588 *-wec)
15431589
=== modified file 'configure'
--- configure 2011-02-20 12:07:30 +0000
+++ configure 2011-07-10 11:35:55 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for inkscape 0.48.1.3# Generated by GNU Autoconf 2.68 for inkscape 0.48.2.
4#4#
5#5#
6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -89,6 +89,7 @@
89IFS=" "" $as_nl"89IFS=" "" $as_nl"
9090
91# Find who we are. Look in the path if we contain no directory separator.91# Find who we are. Look in the path if we contain no directory separator.
92as_myself=
92case $0 in #((93case $0 in #((
93 *[\\/]* ) as_myself=$0 ;;94 *[\\/]* ) as_myself=$0 ;;
94 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR95 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -214,11 +215,18 @@
214 # We cannot yet assume a decent shell, so we have to provide a215 # We cannot yet assume a decent shell, so we have to provide a
215 # neutralization value for shells without unset; and this also216 # neutralization value for shells without unset; and this also
216 # works around shells that cannot unset nonexistent variables.217 # works around shells that cannot unset nonexistent variables.
218 # Preserve -v and -x to the replacement shell.
217 BASH_ENV=/dev/null219 BASH_ENV=/dev/null
218 ENV=/dev/null220 ENV=/dev/null
219 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV221 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
220 export CONFIG_SHELL222 export CONFIG_SHELL
221 exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}223 case $- in # ((((
224 *v*x* | *x*v* ) as_opts=-vx ;;
225 *v* ) as_opts=-v ;;
226 *x* ) as_opts=-x ;;
227 * ) as_opts= ;;
228 esac
229 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
222fi230fi
223231
224 if test x$as_have_required = xno; then :232 if test x$as_have_required = xno; then :
@@ -549,8 +557,8 @@
549# Identity of this package.557# Identity of this package.
550PACKAGE_NAME='inkscape'558PACKAGE_NAME='inkscape'
551PACKAGE_TARNAME='inkscape'559PACKAGE_TARNAME='inkscape'
552PACKAGE_VERSION='0.48.1'560PACKAGE_VERSION='0.48.2'
553PACKAGE_STRING='inkscape 0.48.1'561PACKAGE_STRING='inkscape 0.48.2'
554PACKAGE_BUGREPORT=''562PACKAGE_BUGREPORT=''
555PACKAGE_URL=''563PACKAGE_URL=''
556564
@@ -613,8 +621,16 @@
613IMAGEMAGICK_CFLAGS621IMAGEMAGICK_CFLAGS
614WITH_LIBWPG_FALSE622WITH_LIBWPG_FALSE
615WITH_LIBWPG_TRUE623WITH_LIBWPG_TRUE
624WITH_LIBWPG02_FALSE
625WITH_LIBWPG02_TRUE
626LIBWPG02_LIBS
627LIBWPG02_CFLAGS
628WITH_LIBWPG01_FALSE
629WITH_LIBWPG01_TRUE
630LIBWPG_CFLAGS
616LIBWPG_LIBS631LIBWPG_LIBS
617LIBWPG_CFLAGS632LIBWPG01_LIBS
633LIBWPG01_CFLAGS
618INKBOARD_CFLAGS634INKBOARD_CFLAGS
619INKBOARD_LIBS635INKBOARD_LIBS
620POPPLER_GFXFONT_LIBS636POPPLER_GFXFONT_LIBS
@@ -653,6 +669,8 @@
653PKG_CONFIG_PATH669PKG_CONFIG_PATH
654PLATFORM_SOLARIS_FALSE670PLATFORM_SOLARIS_FALSE
655PLATFORM_SOLARIS_TRUE671PLATFORM_SOLARIS_TRUE
672PLATFORM_OSX_FALSE
673PLATFORM_OSX_TRUE
656WIN32_CFLAGS674WIN32_CFLAGS
657PLATFORM_WIN32_FALSE675PLATFORM_WIN32_FALSE
658PLATFORM_WIN32_TRUE676PLATFORM_WIN32_TRUE
@@ -858,8 +876,10 @@
858POPPLER_CAIRO_LIBS876POPPLER_CAIRO_LIBS
859POPPLER_GFXFONT_CFLAGS877POPPLER_GFXFONT_CFLAGS
860POPPLER_GFXFONT_LIBS878POPPLER_GFXFONT_LIBS
861LIBWPG_CFLAGS879LIBWPG01_CFLAGS
862LIBWPG_LIBS880LIBWPG01_LIBS
881LIBWPG02_CFLAGS
882LIBWPG02_LIBS
863IMAGEMAGICK_CFLAGS883IMAGEMAGICK_CFLAGS
864IMAGEMAGICK_LIBS884IMAGEMAGICK_LIBS
865CAIRO_USER_FONTS_CFLAGS885CAIRO_USER_FONTS_CFLAGS
@@ -1272,7 +1292,7 @@
1272 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&21292 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1273 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&1293 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1274 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&21294 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1275 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}1295 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1276 ;;1296 ;;
12771297
1278 esac1298 esac
@@ -1410,7 +1430,7 @@
1410 # Omit some internal or obsolete options to make the list less imposing.1430 # Omit some internal or obsolete options to make the list less imposing.
1411 # This message is too long to be a string in the A/UX 3.1 sh.1431 # This message is too long to be a string in the A/UX 3.1 sh.
1412 cat <<_ACEOF1432 cat <<_ACEOF
1413\`configure' configures inkscape 0.48.1 to adapt to many kinds of systems.1433\`configure' configures inkscape 0.48.2 to adapt to many kinds of systems.
14141434
1415Usage: $0 [OPTION]... [VAR=VALUE]...1435Usage: $0 [OPTION]... [VAR=VALUE]...
14161436
@@ -1480,7 +1500,7 @@
14801500
1481if test -n "$ac_init_help"; then1501if test -n "$ac_init_help"; then
1482 case $ac_init_help in1502 case $ac_init_help in
1483 short | recursive ) echo "Configuration of inkscape 0.48.1:";;1503 short | recursive ) echo "Configuration of inkscape 0.48.2:";;
1484 esac1504 esac
1485 cat <<\_ACEOF1505 cat <<\_ACEOF
14861506
@@ -1558,9 +1578,14 @@
1558 C compiler flags for POPPLER_GFXFONT, overriding pkg-config1578 C compiler flags for POPPLER_GFXFONT, overriding pkg-config
1559 POPPLER_GFXFONT_LIBS1579 POPPLER_GFXFONT_LIBS
1560 linker flags for POPPLER_GFXFONT, overriding pkg-config1580 linker flags for POPPLER_GFXFONT, overriding pkg-config
1561 LIBWPG_CFLAGS1581 LIBWPG01_CFLAGS
1562 C compiler flags for LIBWPG, overriding pkg-config1582 C compiler flags for LIBWPG01, overriding pkg-config
1563 LIBWPG_LIBS linker flags for LIBWPG, overriding pkg-config1583 LIBWPG01_LIBS
1584 linker flags for LIBWPG01, overriding pkg-config
1585 LIBWPG02_CFLAGS
1586 C compiler flags for LIBWPG02, overriding pkg-config
1587 LIBWPG02_LIBS
1588 linker flags for LIBWPG02, overriding pkg-config
1564 IMAGEMAGICK_CFLAGS1589 IMAGEMAGICK_CFLAGS
1565 C compiler flags for IMAGEMAGICK, overriding pkg-config1590 C compiler flags for IMAGEMAGICK, overriding pkg-config
1566 IMAGEMAGICK_LIBS1591 IMAGEMAGICK_LIBS
@@ -1644,8 +1669,8 @@
1644test -n "$ac_init_help" && exit $ac_status1669test -n "$ac_init_help" && exit $ac_status
1645if $ac_init_version; then1670if $ac_init_version; then
1646 cat <<\_ACEOF1671 cat <<\_ACEOF
1647inkscape configure 0.48.11672inkscape configure 0.48.2
1648generated by GNU Autoconf 2.671673generated by GNU Autoconf 2.68
16491674
1650Copyright (C) 2010 Free Software Foundation, Inc.1675Copyright (C) 2010 Free Software Foundation, Inc.
1651This configure script is free software; the Free Software Foundation1676This configure script is free software; the Free Software Foundation
@@ -1691,7 +1716,7 @@
16911716
1692 ac_retval=11717 ac_retval=1
1693fi1718fi
1694 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1719 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1695 as_fn_set_status $ac_retval1720 as_fn_set_status $ac_retval
16961721
1697} # ac_fn_cxx_try_compile1722} # ac_fn_cxx_try_compile
@@ -1737,7 +1762,7 @@
1737 # interfere with the next link command; also delete a directory that is1762 # interfere with the next link command; also delete a directory that is
1738 # left behind by Apple's compiler. We do this before executing the actions.1763 # left behind by Apple's compiler. We do this before executing the actions.
1739 rm -rf conftest.dSYM conftest_ipa8_conftest.oo1764 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1740 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1765 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1741 as_fn_set_status $ac_retval1766 as_fn_set_status $ac_retval
17421767
1743} # ac_fn_cxx_try_link1768} # ac_fn_cxx_try_link
@@ -1775,7 +1800,7 @@
17751800
1776 ac_retval=11801 ac_retval=1
1777fi1802fi
1778 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1803 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1779 as_fn_set_status $ac_retval1804 as_fn_set_status $ac_retval
17801805
1781} # ac_fn_c_try_compile1806} # ac_fn_c_try_compile
@@ -1788,7 +1813,7 @@
1788 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1813 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1789 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51814 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1790$as_echo_n "checking for $2... " >&6; }1815$as_echo_n "checking for $2... " >&6; }
1791if eval "test \"\${$3+set}\"" = set; then :1816if eval \${$3+:} false; then :
1792 $as_echo_n "(cached) " >&61817 $as_echo_n "(cached) " >&6
1793else1818else
1794 cat confdefs.h - <<_ACEOF >conftest.$ac_ext1819 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1843,7 +1868,7 @@
1843eval ac_res=\$$31868eval ac_res=\$$3
1844 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&51869 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1845$as_echo "$ac_res" >&6; }1870$as_echo "$ac_res" >&6; }
1846 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1871 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
18471872
1848} # ac_fn_cxx_check_func1873} # ac_fn_cxx_check_func
18491874
@@ -1879,7 +1904,7 @@
18791904
1880 ac_retval=11905 ac_retval=1
1881fi1906fi
1882 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1907 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1883 as_fn_set_status $ac_retval1908 as_fn_set_status $ac_retval
18841909
1885} # ac_fn_cxx_try_cpp1910} # ac_fn_cxx_try_cpp
@@ -1921,7 +1946,7 @@
1921 ac_retval=$ac_status1946 ac_retval=$ac_status
1922fi1947fi
1923 rm -rf conftest.dSYM conftest_ipa8_conftest.oo1948 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1924 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1949 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1925 as_fn_set_status $ac_retval1950 as_fn_set_status $ac_retval
19261951
1927} # ac_fn_cxx_try_run1952} # ac_fn_cxx_try_run
@@ -1967,7 +1992,7 @@
1967 # interfere with the next link command; also delete a directory that is1992 # interfere with the next link command; also delete a directory that is
1968 # left behind by Apple's compiler. We do this before executing the actions.1993 # left behind by Apple's compiler. We do this before executing the actions.
1969 rm -rf conftest.dSYM conftest_ipa8_conftest.oo1994 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1970 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}1995 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1971 as_fn_set_status $ac_retval1996 as_fn_set_status $ac_retval
19721997
1973} # ac_fn_c_try_link1998} # ac_fn_c_try_link
@@ -1980,10 +2005,10 @@
1980ac_fn_cxx_check_header_mongrel ()2005ac_fn_cxx_check_header_mongrel ()
1981{2006{
1982 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack2007 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1983 if eval "test \"\${$3+set}\"" = set; then :2008 if eval \${$3+:} false; then :
1984 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&52009 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1985$as_echo_n "checking for $2... " >&6; }2010$as_echo_n "checking for $2... " >&6; }
1986if eval "test \"\${$3+set}\"" = set; then :2011if eval \${$3+:} false; then :
1987 $as_echo_n "(cached) " >&62012 $as_echo_n "(cached) " >&6
1988fi2013fi
1989eval ac_res=\$$32014eval ac_res=\$$3
@@ -2046,7 +2071,7 @@
2046esac2071esac
2047 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&52072 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2048$as_echo_n "checking for $2... " >&6; }2073$as_echo_n "checking for $2... " >&6; }
2049if eval "test \"\${$3+set}\"" = set; then :2074if eval \${$3+:} false; then :
2050 $as_echo_n "(cached) " >&62075 $as_echo_n "(cached) " >&6
2051else2076else
2052 eval "$3=\$ac_header_compiler"2077 eval "$3=\$ac_header_compiler"
@@ -2055,7 +2080,7 @@
2055 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&52080 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2056$as_echo "$ac_res" >&6; }2081$as_echo "$ac_res" >&6; }
2057fi2082fi
2058 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}2083 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
20592084
2060} # ac_fn_cxx_check_header_mongrel2085} # ac_fn_cxx_check_header_mongrel
20612086
@@ -2068,7 +2093,7 @@
2068 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack2093 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2069 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&52094 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2070$as_echo_n "checking for $2... " >&6; }2095$as_echo_n "checking for $2... " >&6; }
2071if eval "test \"\${$3+set}\"" = set; then :2096if eval \${$3+:} false; then :
2072 $as_echo_n "(cached) " >&62097 $as_echo_n "(cached) " >&6
2073else2098else
2074 cat confdefs.h - <<_ACEOF >conftest.$ac_ext2099 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2086,7 +2111,7 @@
2086eval ac_res=\$$32111eval ac_res=\$$3
2087 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&52112 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2088$as_echo "$ac_res" >&6; }2113$as_echo "$ac_res" >&6; }
2089 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}2114 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
20902115
2091} # ac_fn_cxx_check_header_compile2116} # ac_fn_cxx_check_header_compile
20922117
@@ -2099,7 +2124,7 @@
2099 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack2124 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2100 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&52125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
2101$as_echo_n "checking for $2.$3... " >&6; }2126$as_echo_n "checking for $2.$3... " >&6; }
2102if eval "test \"\${$4+set}\"" = set; then :2127if eval \${$4+:} false; then :
2103 $as_echo_n "(cached) " >&62128 $as_echo_n "(cached) " >&6
2104else2129else
2105 cat confdefs.h - <<_ACEOF >conftest.$ac_ext2130 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2143,7 +2168,7 @@
2143eval ac_res=\$$42168eval ac_res=\$$4
2144 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&52169 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2145$as_echo "$ac_res" >&6; }2170$as_echo "$ac_res" >&6; }
2146 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}2171 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
21472172
2148} # ac_fn_cxx_check_member2173} # ac_fn_cxx_check_member
21492174
@@ -2156,7 +2181,7 @@
2156 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack2181 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2157 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&52182 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2158$as_echo_n "checking for $2... " >&6; }2183$as_echo_n "checking for $2... " >&6; }
2159if eval "test \"\${$3+set}\"" = set; then :2184if eval \${$3+:} false; then :
2160 $as_echo_n "(cached) " >&62185 $as_echo_n "(cached) " >&6
2161else2186else
2162 eval "$3=no"2187 eval "$3=no"
@@ -2197,15 +2222,15 @@
2197eval ac_res=\$$32222eval ac_res=\$$3
2198 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&52223 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2199$as_echo "$ac_res" >&6; }2224$as_echo "$ac_res" >&6; }
2200 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}2225 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
22012226
2202} # ac_fn_cxx_check_type2227} # ac_fn_cxx_check_type
2203cat >config.log <<_ACEOF2228cat >config.log <<_ACEOF
2204This file contains any messages produced by compilers while2229This file contains any messages produced by compilers while
2205running configure, to aid debugging if configure makes a mistake.2230running configure, to aid debugging if configure makes a mistake.
22062231
2207It was created by inkscape $as_me 0.48.1, which was2232It was created by inkscape $as_me 0.48.2, which was
2208generated by GNU Autoconf 2.67. Invocation command line was2233generated by GNU Autoconf 2.68. Invocation command line was
22092234
2210 $ $0 $@2235 $ $0 $@
22112236
@@ -2463,7 +2488,7 @@
2463 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&52488 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2464$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}2489$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2465as_fn_error $? "failed to load site script $ac_site_file2490as_fn_error $? "failed to load site script $ac_site_file
2466See \`config.log' for more details" "$LINENO" 5 ; }2491See \`config.log' for more details" "$LINENO" 5; }
2467 fi2492 fi
2468done2493done
24692494
@@ -2588,7 +2613,7 @@
25882613
2589{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&52614{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
2590$as_echo_n "checking build system type... " >&6; }2615$as_echo_n "checking build system type... " >&6; }
2591if test "${ac_cv_build+set}" = set; then :2616if ${ac_cv_build+:} false; then :
2592 $as_echo_n "(cached) " >&62617 $as_echo_n "(cached) " >&6
2593else2618else
2594 ac_build_alias=$build_alias2619 ac_build_alias=$build_alias
@@ -2604,7 +2629,7 @@
2604$as_echo "$ac_cv_build" >&6; }2629$as_echo "$ac_cv_build" >&6; }
2605case $ac_cv_build in2630case $ac_cv_build in
2606*-*-*) ;;2631*-*-*) ;;
2607*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;2632*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
2608esac2633esac
2609build=$ac_cv_build2634build=$ac_cv_build
2610ac_save_IFS=$IFS; IFS='-'2635ac_save_IFS=$IFS; IFS='-'
@@ -2622,7 +2647,7 @@
26222647
2623{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&52648{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
2624$as_echo_n "checking host system type... " >&6; }2649$as_echo_n "checking host system type... " >&6; }
2625if test "${ac_cv_host+set}" = set; then :2650if ${ac_cv_host+:} false; then :
2626 $as_echo_n "(cached) " >&62651 $as_echo_n "(cached) " >&6
2627else2652else
2628 if test "x$host_alias" = x; then2653 if test "x$host_alias" = x; then
@@ -2637,7 +2662,7 @@
2637$as_echo "$ac_cv_host" >&6; }2662$as_echo "$ac_cv_host" >&6; }
2638case $ac_cv_host in2663case $ac_cv_host in
2639*-*-*) ;;2664*-*-*) ;;
2640*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;2665*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
2641esac2666esac
2642host=$ac_cv_host2667host=$ac_cv_host
2643ac_save_IFS=$IFS; IFS='-'2668ac_save_IFS=$IFS; IFS='-'
@@ -2673,7 +2698,7 @@
2673{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&52698{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2674$as_echo_n "checking for a BSD-compatible install... " >&6; }2699$as_echo_n "checking for a BSD-compatible install... " >&6; }
2675if test -z "$INSTALL"; then2700if test -z "$INSTALL"; then
2676if test "${ac_cv_path_install+set}" = set; then :2701if ${ac_cv_path_install+:} false; then :
2677 $as_echo_n "(cached) " >&62702 $as_echo_n "(cached) " >&6
2678else2703else
2679 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR2704 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2760,11 +2785,11 @@
2760'2785'
2761case `pwd` in2786case `pwd` in
2762 *[\\\"\#\$\&\'\`$am_lf]*)2787 *[\\\"\#\$\&\'\`$am_lf]*)
2763 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;2788 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
2764esac2789esac
2765case $srcdir in2790case $srcdir in
2766 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)2791 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2767 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;2792 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2768esac2793esac
27692794
2770# Do `set' in a subshell so we don't clobber the current shell's2795# Do `set' in a subshell so we don't clobber the current shell's
@@ -2850,7 +2875,7 @@
2850set dummy ${ac_tool_prefix}strip; ac_word=$22875set dummy ${ac_tool_prefix}strip; ac_word=$2
2851{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52876{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2852$as_echo_n "checking for $ac_word... " >&6; }2877$as_echo_n "checking for $ac_word... " >&6; }
2853if test "${ac_cv_prog_STRIP+set}" = set; then :2878if ${ac_cv_prog_STRIP+:} false; then :
2854 $as_echo_n "(cached) " >&62879 $as_echo_n "(cached) " >&6
2855else2880else
2856 if test -n "$STRIP"; then2881 if test -n "$STRIP"; then
@@ -2890,7 +2915,7 @@
2890set dummy strip; ac_word=$22915set dummy strip; ac_word=$2
2891{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&52916{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2892$as_echo_n "checking for $ac_word... " >&6; }2917$as_echo_n "checking for $ac_word... " >&6; }
2893if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :2918if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
2894 $as_echo_n "(cached) " >&62919 $as_echo_n "(cached) " >&6
2895else2920else
2896 if test -n "$ac_ct_STRIP"; then2921 if test -n "$ac_ct_STRIP"; then
@@ -2943,7 +2968,7 @@
2943{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&52968{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
2944$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }2969$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
2945if test -z "$MKDIR_P"; then2970if test -z "$MKDIR_P"; then
2946 if test "${ac_cv_path_mkdir+set}" = set; then :2971 if ${ac_cv_path_mkdir+:} false; then :
2947 $as_echo_n "(cached) " >&62972 $as_echo_n "(cached) " >&6
2948else2973else
2949 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR2974 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2994,7 +3019,7 @@
2994set dummy $ac_prog; ac_word=$23019set dummy $ac_prog; ac_word=$2
2995{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53020{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2996$as_echo_n "checking for $ac_word... " >&6; }3021$as_echo_n "checking for $ac_word... " >&6; }
2997if test "${ac_cv_prog_AWK+set}" = set; then :3022if ${ac_cv_prog_AWK+:} false; then :
2998 $as_echo_n "(cached) " >&63023 $as_echo_n "(cached) " >&6
2999else3024else
3000 if test -n "$AWK"; then3025 if test -n "$AWK"; then
@@ -3034,7 +3059,7 @@
3034$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }3059$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
3035set x ${MAKE-make}3060set x ${MAKE-make}
3036ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`3061ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3037if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :3062if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
3038 $as_echo_n "(cached) " >&63063 $as_echo_n "(cached) " >&6
3039else3064else
3040 cat >conftest.make <<\_ACEOF3065 cat >conftest.make <<\_ACEOF
@@ -3092,7 +3117,7 @@
30923117
3093# Define the identity of the package.3118# Define the identity of the package.
3094 PACKAGE='inkscape'3119 PACKAGE='inkscape'
3095 VERSION='0.48.1'3120 VERSION='0.48.2'
30963121
30973122
3098cat >>confdefs.h <<_ACEOF3123cat >>confdefs.h <<_ACEOF
@@ -3200,7 +3225,7 @@
3200done3225done
3201rm -rf conftest.dir3226rm -rf conftest.dir
32023227
3203if test "${am_cv_prog_tar_pax+set}" = set; then :3228if ${am_cv_prog_tar_pax+:} false; then :
3204 $as_echo_n "(cached) " >&63229 $as_echo_n "(cached) " >&6
3205else3230else
3206 am_cv_prog_tar_pax=$_am_tool3231 am_cv_prog_tar_pax=$_am_tool
@@ -3313,7 +3338,7 @@
3313set dummy $ac_tool_prefix$ac_prog; ac_word=$23338set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3314{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53339{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3315$as_echo_n "checking for $ac_word... " >&6; }3340$as_echo_n "checking for $ac_word... " >&6; }
3316if test "${ac_cv_prog_CXX+set}" = set; then :3341if ${ac_cv_prog_CXX+:} false; then :
3317 $as_echo_n "(cached) " >&63342 $as_echo_n "(cached) " >&6
3318else3343else
3319 if test -n "$CXX"; then3344 if test -n "$CXX"; then
@@ -3357,7 +3382,7 @@
3357set dummy $ac_prog; ac_word=$23382set dummy $ac_prog; ac_word=$2
3358{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53383{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3359$as_echo_n "checking for $ac_word... " >&6; }3384$as_echo_n "checking for $ac_word... " >&6; }
3360if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :3385if ${ac_cv_prog_ac_ct_CXX+:} false; then :
3361 $as_echo_n "(cached) " >&63386 $as_echo_n "(cached) " >&6
3362else3387else
3363 if test -n "$ac_ct_CXX"; then3388 if test -n "$ac_ct_CXX"; then
@@ -3521,7 +3546,7 @@
3521{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53546{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3522$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3547$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3523as_fn_error 77 "C++ compiler cannot create executables3548as_fn_error 77 "C++ compiler cannot create executables
3524See \`config.log' for more details" "$LINENO" 5 ; }3549See \`config.log' for more details" "$LINENO" 5; }
3525else3550else
3526 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&53551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3527$as_echo "yes" >&6; }3552$as_echo "yes" >&6; }
@@ -3564,7 +3589,7 @@
3564 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53589 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3565$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3590$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3566as_fn_error $? "cannot compute suffix of executables: cannot compile and link3591as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3567See \`config.log' for more details" "$LINENO" 5 ; }3592See \`config.log' for more details" "$LINENO" 5; }
3568fi3593fi
3569rm -f conftest conftest$ac_cv_exeext3594rm -f conftest conftest$ac_cv_exeext
3570{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&53595{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3623,7 +3648,7 @@
3623$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3648$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3624as_fn_error $? "cannot run C++ compiled programs.3649as_fn_error $? "cannot run C++ compiled programs.
3625If you meant to cross compile, use \`--host'.3650If you meant to cross compile, use \`--host'.
3626See \`config.log' for more details" "$LINENO" 5 ; }3651See \`config.log' for more details" "$LINENO" 5; }
3627 fi3652 fi
3628 fi3653 fi
3629fi3654fi
@@ -3634,7 +3659,7 @@
3634ac_clean_files=$ac_clean_files_save3659ac_clean_files=$ac_clean_files_save
3635{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&53660{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
3636$as_echo_n "checking for suffix of object files... " >&6; }3661$as_echo_n "checking for suffix of object files... " >&6; }
3637if test "${ac_cv_objext+set}" = set; then :3662if ${ac_cv_objext+:} false; then :
3638 $as_echo_n "(cached) " >&63663 $as_echo_n "(cached) " >&6
3639else3664else
3640 cat confdefs.h - <<_ACEOF >conftest.$ac_ext3665 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3675,7 +3700,7 @@
3675{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53700{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3676$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3701$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3677as_fn_error $? "cannot compute suffix of object files: cannot compile3702as_fn_error $? "cannot compute suffix of object files: cannot compile
3678See \`config.log' for more details" "$LINENO" 5 ; }3703See \`config.log' for more details" "$LINENO" 5; }
3679fi3704fi
3680rm -f conftest.$ac_cv_objext conftest.$ac_ext3705rm -f conftest.$ac_cv_objext conftest.$ac_ext
3681fi3706fi
@@ -3685,7 +3710,7 @@
3685ac_objext=$OBJEXT3710ac_objext=$OBJEXT
3686{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&53711{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
3687$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }3712$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
3688if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :3713if ${ac_cv_cxx_compiler_gnu+:} false; then :
3689 $as_echo_n "(cached) " >&63714 $as_echo_n "(cached) " >&6
3690else3715else
3691 cat confdefs.h - <<_ACEOF >conftest.$ac_ext3716 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3722,7 +3747,7 @@
3722ac_save_CXXFLAGS=$CXXFLAGS3747ac_save_CXXFLAGS=$CXXFLAGS
3723{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&53748{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
3724$as_echo_n "checking whether $CXX accepts -g... " >&6; }3749$as_echo_n "checking whether $CXX accepts -g... " >&6; }
3725if test "${ac_cv_prog_cxx_g+set}" = set; then :3750if ${ac_cv_prog_cxx_g+:} false; then :
3726 $as_echo_n "(cached) " >&63751 $as_echo_n "(cached) " >&6
3727else3752else
3728 ac_save_cxx_werror_flag=$ac_cxx_werror_flag3753 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3808,7 +3833,7 @@
38083833
3809{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&53834{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
3810$as_echo_n "checking dependency style of $depcc... " >&6; }3835$as_echo_n "checking dependency style of $depcc... " >&6; }
3811if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :3836if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
3812 $as_echo_n "(cached) " >&63837 $as_echo_n "(cached) " >&6
3813else3838else
3814 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then3839 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3934,7 +3959,7 @@
39343959
3935{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&53960{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
3936$as_echo_n "checking for library containing strerror... " >&6; }3961$as_echo_n "checking for library containing strerror... " >&6; }
3937if test "${ac_cv_search_strerror+set}" = set; then :3962if ${ac_cv_search_strerror+:} false; then :
3938 $as_echo_n "(cached) " >&63963 $as_echo_n "(cached) " >&6
3939else3964else
3940 ac_func_search_save_LIBS=$LIBS3965 ac_func_search_save_LIBS=$LIBS
@@ -3968,11 +3993,11 @@
3968fi3993fi
3969rm -f core conftest.err conftest.$ac_objext \3994rm -f core conftest.err conftest.$ac_objext \
3970 conftest$ac_exeext3995 conftest$ac_exeext
3971 if test "${ac_cv_search_strerror+set}" = set; then :3996 if ${ac_cv_search_strerror+:} false; then :
3972 break3997 break
3973fi3998fi
3974done3999done
3975if test "${ac_cv_search_strerror+set}" = set; then :4000if ${ac_cv_search_strerror+:} false; then :
39764001
3977else4002else
3978 ac_cv_search_strerror=no4003 ac_cv_search_strerror=no
@@ -4004,7 +4029,7 @@
4004set dummy $ac_tool_prefix$ac_prog; ac_word=$24029set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4005{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54030{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4006$as_echo_n "checking for $ac_word... " >&6; }4031$as_echo_n "checking for $ac_word... " >&6; }
4007if test "${ac_cv_prog_CXX+set}" = set; then :4032if ${ac_cv_prog_CXX+:} false; then :
4008 $as_echo_n "(cached) " >&64033 $as_echo_n "(cached) " >&6
4009else4034else
4010 if test -n "$CXX"; then4035 if test -n "$CXX"; then
@@ -4048,7 +4073,7 @@
4048set dummy $ac_prog; ac_word=$24073set dummy $ac_prog; ac_word=$2
4049{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54074{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4050$as_echo_n "checking for $ac_word... " >&6; }4075$as_echo_n "checking for $ac_word... " >&6; }
4051if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :4076if ${ac_cv_prog_ac_ct_CXX+:} false; then :
4052 $as_echo_n "(cached) " >&64077 $as_echo_n "(cached) " >&6
4053else4078else
4054 if test -n "$ac_ct_CXX"; then4079 if test -n "$ac_ct_CXX"; then
@@ -4126,7 +4151,7 @@
41264151
4127{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&54152{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
4128$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }4153$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
4129if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :4154if ${ac_cv_cxx_compiler_gnu+:} false; then :
4130 $as_echo_n "(cached) " >&64155 $as_echo_n "(cached) " >&6
4131else4156else
4132 cat confdefs.h - <<_ACEOF >conftest.$ac_ext4157 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4163,7 +4188,7 @@
4163ac_save_CXXFLAGS=$CXXFLAGS4188ac_save_CXXFLAGS=$CXXFLAGS
4164{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&54189{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
4165$as_echo_n "checking whether $CXX accepts -g... " >&6; }4190$as_echo_n "checking whether $CXX accepts -g... " >&6; }
4166if test "${ac_cv_prog_cxx_g+set}" = set; then :4191if ${ac_cv_prog_cxx_g+:} false; then :
4167 $as_echo_n "(cached) " >&64192 $as_echo_n "(cached) " >&6
4168else4193else
4169 ac_save_cxx_werror_flag=$ac_cxx_werror_flag4194 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -4249,7 +4274,7 @@
42494274
4250{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&54275{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4251$as_echo_n "checking dependency style of $depcc... " >&6; }4276$as_echo_n "checking dependency style of $depcc... " >&6; }
4252if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :4277if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
4253 $as_echo_n "(cached) " >&64278 $as_echo_n "(cached) " >&6
4254else4279else
4255 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then4280 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4382,7 +4407,7 @@
4382set dummy ${ac_tool_prefix}gcc; ac_word=$24407set dummy ${ac_tool_prefix}gcc; ac_word=$2
4383{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54408{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4384$as_echo_n "checking for $ac_word... " >&6; }4409$as_echo_n "checking for $ac_word... " >&6; }
4385if test "${ac_cv_prog_CC+set}" = set; then :4410if ${ac_cv_prog_CC+:} false; then :
4386 $as_echo_n "(cached) " >&64411 $as_echo_n "(cached) " >&6
4387else4412else
4388 if test -n "$CC"; then4413 if test -n "$CC"; then
@@ -4422,7 +4447,7 @@
4422set dummy gcc; ac_word=$24447set dummy gcc; ac_word=$2
4423{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54448{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4424$as_echo_n "checking for $ac_word... " >&6; }4449$as_echo_n "checking for $ac_word... " >&6; }
4425if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :4450if ${ac_cv_prog_ac_ct_CC+:} false; then :
4426 $as_echo_n "(cached) " >&64451 $as_echo_n "(cached) " >&6
4427else4452else
4428 if test -n "$ac_ct_CC"; then4453 if test -n "$ac_ct_CC"; then
@@ -4475,7 +4500,7 @@
4475set dummy ${ac_tool_prefix}cc; ac_word=$24500set dummy ${ac_tool_prefix}cc; ac_word=$2
4476{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54501{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4477$as_echo_n "checking for $ac_word... " >&6; }4502$as_echo_n "checking for $ac_word... " >&6; }
4478if test "${ac_cv_prog_CC+set}" = set; then :4503if ${ac_cv_prog_CC+:} false; then :
4479 $as_echo_n "(cached) " >&64504 $as_echo_n "(cached) " >&6
4480else4505else
4481 if test -n "$CC"; then4506 if test -n "$CC"; then
@@ -4515,7 +4540,7 @@
4515set dummy cc; ac_word=$24540set dummy cc; ac_word=$2
4516{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54541{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4517$as_echo_n "checking for $ac_word... " >&6; }4542$as_echo_n "checking for $ac_word... " >&6; }
4518if test "${ac_cv_prog_CC+set}" = set; then :4543if ${ac_cv_prog_CC+:} false; then :
4519 $as_echo_n "(cached) " >&64544 $as_echo_n "(cached) " >&6
4520else4545else
4521 if test -n "$CC"; then4546 if test -n "$CC"; then
@@ -4574,7 +4599,7 @@
4574set dummy $ac_tool_prefix$ac_prog; ac_word=$24599set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4575{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54600{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4576$as_echo_n "checking for $ac_word... " >&6; }4601$as_echo_n "checking for $ac_word... " >&6; }
4577if test "${ac_cv_prog_CC+set}" = set; then :4602if ${ac_cv_prog_CC+:} false; then :
4578 $as_echo_n "(cached) " >&64603 $as_echo_n "(cached) " >&6
4579else4604else
4580 if test -n "$CC"; then4605 if test -n "$CC"; then
@@ -4618,7 +4643,7 @@
4618set dummy $ac_prog; ac_word=$24643set dummy $ac_prog; ac_word=$2
4619{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54644{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4620$as_echo_n "checking for $ac_word... " >&6; }4645$as_echo_n "checking for $ac_word... " >&6; }
4621if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :4646if ${ac_cv_prog_ac_ct_CC+:} false; then :
4622 $as_echo_n "(cached) " >&64647 $as_echo_n "(cached) " >&6
4623else4648else
4624 if test -n "$ac_ct_CC"; then4649 if test -n "$ac_ct_CC"; then
@@ -4673,7 +4698,7 @@
4673test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&54698test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4674$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}4699$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4675as_fn_error $? "no acceptable C compiler found in \$PATH4700as_fn_error $? "no acceptable C compiler found in \$PATH
4676See \`config.log' for more details" "$LINENO" 5 ; }4701See \`config.log' for more details" "$LINENO" 5; }
46774702
4678# Provide some information about the compiler.4703# Provide some information about the compiler.
4679$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&54704$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4702,7 +4727,7 @@
47024727
4703{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&54728{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
4704$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }4729$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
4705if test "${ac_cv_c_compiler_gnu+set}" = set; then :4730if ${ac_cv_c_compiler_gnu+:} false; then :
4706 $as_echo_n "(cached) " >&64731 $as_echo_n "(cached) " >&6
4707else4732else
4708 cat confdefs.h - <<_ACEOF >conftest.$ac_ext4733 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4739,7 +4764,7 @@
4739ac_save_CFLAGS=$CFLAGS4764ac_save_CFLAGS=$CFLAGS
4740{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&54765{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
4741$as_echo_n "checking whether $CC accepts -g... " >&6; }4766$as_echo_n "checking whether $CC accepts -g... " >&6; }
4742if test "${ac_cv_prog_cc_g+set}" = set; then :4767if ${ac_cv_prog_cc_g+:} false; then :
4743 $as_echo_n "(cached) " >&64768 $as_echo_n "(cached) " >&6
4744else4769else
4745 ac_save_c_werror_flag=$ac_c_werror_flag4770 ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4817,7 +4842,7 @@
4817fi4842fi
4818{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&54843{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
4819$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }4844$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
4820if test "${ac_cv_prog_cc_c89+set}" = set; then :4845if ${ac_cv_prog_cc_c89+:} false; then :
4821 $as_echo_n "(cached) " >&64846 $as_echo_n "(cached) " >&6
4822else4847else
4823 ac_cv_prog_cc_c89=no4848 ac_cv_prog_cc_c89=no
@@ -4916,7 +4941,7 @@
49164941
4917{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&54942{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4918$as_echo_n "checking dependency style of $depcc... " >&6; }4943$as_echo_n "checking dependency style of $depcc... " >&6; }
4919if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :4944if ${am_cv_CC_dependencies_compiler_type+:} false; then :
4920 $as_echo_n "(cached) " >&64945 $as_echo_n "(cached) " >&6
4921else4946else
4922 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then4947 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5053,7 +5078,7 @@
50535078
5054{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&55079{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
5055$as_echo_n "checking dependency style of $depcc... " >&6; }5080$as_echo_n "checking dependency style of $depcc... " >&6; }
5056if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :5081if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
5057 $as_echo_n "(cached) " >&65082 $as_echo_n "(cached) " >&6
5058else5083else
5059 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then5084 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5179,7 +5204,7 @@
5179set dummy ${ac_tool_prefix}ranlib; ac_word=$25204set dummy ${ac_tool_prefix}ranlib; ac_word=$2
5180{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55205{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5181$as_echo_n "checking for $ac_word... " >&6; }5206$as_echo_n "checking for $ac_word... " >&6; }
5182if test "${ac_cv_prog_RANLIB+set}" = set; then :5207if ${ac_cv_prog_RANLIB+:} false; then :
5183 $as_echo_n "(cached) " >&65208 $as_echo_n "(cached) " >&6
5184else5209else
5185 if test -n "$RANLIB"; then5210 if test -n "$RANLIB"; then
@@ -5219,7 +5244,7 @@
5219set dummy ranlib; ac_word=$25244set dummy ranlib; ac_word=$2
5220{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55245{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5221$as_echo_n "checking for $ac_word... " >&6; }5246$as_echo_n "checking for $ac_word... " >&6; }
5222if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :5247if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
5223 $as_echo_n "(cached) " >&65248 $as_echo_n "(cached) " >&6
5224else5249else
5225 if test -n "$ac_ct_RANLIB"; then5250 if test -n "$ac_ct_RANLIB"; then
@@ -5308,7 +5333,7 @@
5308set dummy intltool-update; ac_word=$25333set dummy intltool-update; ac_word=$2
5309{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55334{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5310$as_echo_n "checking for $ac_word... " >&6; }5335$as_echo_n "checking for $ac_word... " >&6; }
5311if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :5336if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
5312 $as_echo_n "(cached) " >&65337 $as_echo_n "(cached) " >&6
5313else5338else
5314 case $INTLTOOL_UPDATE in5339 case $INTLTOOL_UPDATE in
@@ -5348,7 +5373,7 @@
5348set dummy intltool-merge; ac_word=$25373set dummy intltool-merge; ac_word=$2
5349{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55374{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5350$as_echo_n "checking for $ac_word... " >&6; }5375$as_echo_n "checking for $ac_word... " >&6; }
5351if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :5376if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
5352 $as_echo_n "(cached) " >&65377 $as_echo_n "(cached) " >&6
5353else5378else
5354 case $INTLTOOL_MERGE in5379 case $INTLTOOL_MERGE in
@@ -5388,7 +5413,7 @@
5388set dummy intltool-extract; ac_word=$25413set dummy intltool-extract; ac_word=$2
5389{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55414{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5390$as_echo_n "checking for $ac_word... " >&6; }5415$as_echo_n "checking for $ac_word... " >&6; }
5391if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :5416if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
5392 $as_echo_n "(cached) " >&65417 $as_echo_n "(cached) " >&6
5393else5418else
5394 case $INTLTOOL_EXTRACT in5419 case $INTLTOOL_EXTRACT in
@@ -5549,7 +5574,7 @@
5549set dummy xgettext; ac_word=$25574set dummy xgettext; ac_word=$2
5550{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55575{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5551$as_echo_n "checking for $ac_word... " >&6; }5576$as_echo_n "checking for $ac_word... " >&6; }
5552if test "${ac_cv_path_XGETTEXT+set}" = set; then :5577if ${ac_cv_path_XGETTEXT+:} false; then :
5553 $as_echo_n "(cached) " >&65578 $as_echo_n "(cached) " >&6
5554else5579else
5555 case $XGETTEXT in5580 case $XGETTEXT in
@@ -5589,7 +5614,7 @@
5589set dummy msgmerge; ac_word=$25614set dummy msgmerge; ac_word=$2
5590{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55615{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5591$as_echo_n "checking for $ac_word... " >&6; }5616$as_echo_n "checking for $ac_word... " >&6; }
5592if test "${ac_cv_path_MSGMERGE+set}" = set; then :5617if ${ac_cv_path_MSGMERGE+:} false; then :
5593 $as_echo_n "(cached) " >&65618 $as_echo_n "(cached) " >&6
5594else5619else
5595 case $MSGMERGE in5620 case $MSGMERGE in
@@ -5629,7 +5654,7 @@
5629set dummy msgfmt; ac_word=$25654set dummy msgfmt; ac_word=$2
5630{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55655{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5631$as_echo_n "checking for $ac_word... " >&6; }5656$as_echo_n "checking for $ac_word... " >&6; }
5632if test "${ac_cv_path_MSGFMT+set}" = set; then :5657if ${ac_cv_path_MSGFMT+:} false; then :
5633 $as_echo_n "(cached) " >&65658 $as_echo_n "(cached) " >&6
5634else5659else
5635 case $MSGFMT in5660 case $MSGFMT in
@@ -5669,7 +5694,7 @@
5669set dummy gmsgfmt; ac_word=$25694set dummy gmsgfmt; ac_word=$2
5670{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55695{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5671$as_echo_n "checking for $ac_word... " >&6; }5696$as_echo_n "checking for $ac_word... " >&6; }
5672if test "${ac_cv_path_GMSGFMT+set}" = set; then :5697if ${ac_cv_path_GMSGFMT+:} false; then :
5673 $as_echo_n "(cached) " >&65698 $as_echo_n "(cached) " >&6
5674else5699else
5675 case $GMSGFMT in5700 case $GMSGFMT in
@@ -5720,7 +5745,7 @@
5720set dummy perl; ac_word=$25745set dummy perl; ac_word=$2
5721{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&55746{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5722$as_echo_n "checking for $ac_word... " >&6; }5747$as_echo_n "checking for $ac_word... " >&6; }
5723if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :5748if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
5724 $as_echo_n "(cached) " >&65749 $as_echo_n "(cached) " >&6
5725else5750else
5726 case $INTLTOOL_PERL in5751 case $INTLTOOL_PERL in
@@ -5804,7 +5829,7 @@
5804 case $host in5829 case $host in
5805 *-*-solaris*)5830 *-*-solaris*)
5806 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"5831 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
5807if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :5832if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
5808 DATADIRNAME=share5833 DATADIRNAME=share
5809else5834else
5810 DATADIRNAME=lib5835 DATADIRNAME=lib
@@ -5832,7 +5857,7 @@
5832{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&55857{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
5833$as_echo_n "checking how to run the C++ preprocessor... " >&6; }5858$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
5834if test -z "$CXXCPP"; then5859if test -z "$CXXCPP"; then
5835 if test "${ac_cv_prog_CXXCPP+set}" = set; then :5860 if ${ac_cv_prog_CXXCPP+:} false; then :
5836 $as_echo_n "(cached) " >&65861 $as_echo_n "(cached) " >&6
5837else5862else
5838 # Double quotes because CXXCPP needs to be expanded5863 # Double quotes because CXXCPP needs to be expanded
@@ -5948,7 +5973,7 @@
5948 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&55973 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5949$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}5974$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5950as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check5975as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
5951See \`config.log' for more details" "$LINENO" 5 ; }5976See \`config.log' for more details" "$LINENO" 5; }
5952fi5977fi
59535978
5954ac_ext=cpp5979ac_ext=cpp
@@ -5960,7 +5985,7 @@
59605985
5961{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&55986{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
5962$as_echo_n "checking for grep that handles long lines and -e... " >&6; }5987$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
5963if test "${ac_cv_path_GREP+set}" = set; then :5988if ${ac_cv_path_GREP+:} false; then :
5964 $as_echo_n "(cached) " >&65989 $as_echo_n "(cached) " >&6
5965else5990else
5966 if test -z "$GREP"; then5991 if test -z "$GREP"; then
@@ -6023,7 +6048,7 @@
60236048
6024{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&56049{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
6025$as_echo_n "checking for egrep... " >&6; }6050$as_echo_n "checking for egrep... " >&6; }
6026if test "${ac_cv_path_EGREP+set}" = set; then :6051if ${ac_cv_path_EGREP+:} false; then :
6027 $as_echo_n "(cached) " >&66052 $as_echo_n "(cached) " >&6
6028else6053else
6029 if echo a | $GREP -E '(a|b)' >/dev/null 2>&16054 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -6090,7 +6115,7 @@
60906115
6091{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&56116{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
6092$as_echo_n "checking for ANSI C header files... " >&6; }6117$as_echo_n "checking for ANSI C header files... " >&6; }
6093if test "${ac_cv_header_stdc+set}" = set; then :6118if ${ac_cv_header_stdc+:} false; then :
6094 $as_echo_n "(cached) " >&66119 $as_echo_n "(cached) " >&6
6095else6120else
6096 cat confdefs.h - <<_ACEOF >conftest.$ac_ext6121 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6203,7 +6228,7 @@
62036228
6204 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZR snapshot build" >&56229 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZR snapshot build" >&5
6205$as_echo_n "checking for BZR snapshot build... " >&6; }6230$as_echo_n "checking for BZR snapshot build... " >&6; }
6206if test "${ink_cv_bzr_snapshot_build+set}" = set; then :6231if ${ink_cv_bzr_snapshot_build+:} false; then :
6207 $as_echo_n "(cached) " >&66232 $as_echo_n "(cached) " >&6
6208else6233else
6209 ink_cv_bzr_snapshot_build=no6234 ink_cv_bzr_snapshot_build=no
@@ -6247,7 +6272,7 @@
6247set dummy ${ac_tool_prefix}gcc; ac_word=$26272set dummy ${ac_tool_prefix}gcc; ac_word=$2
6248{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&56273{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6249$as_echo_n "checking for $ac_word... " >&6; }6274$as_echo_n "checking for $ac_word... " >&6; }
6250if test "${ac_cv_prog_CC+set}" = set; then :6275if ${ac_cv_prog_CC+:} false; then :
6251 $as_echo_n "(cached) " >&66276 $as_echo_n "(cached) " >&6
6252else6277else
6253 if test -n "$CC"; then6278 if test -n "$CC"; then
@@ -6287,7 +6312,7 @@
6287set dummy gcc; ac_word=$26312set dummy gcc; ac_word=$2
6288{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&56313{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6289$as_echo_n "checking for $ac_word... " >&6; }6314$as_echo_n "checking for $ac_word... " >&6; }
6290if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :6315if ${ac_cv_prog_ac_ct_CC+:} false; then :
6291 $as_echo_n "(cached) " >&66316 $as_echo_n "(cached) " >&6
6292else6317else
6293 if test -n "$ac_ct_CC"; then6318 if test -n "$ac_ct_CC"; then
@@ -6340,7 +6365,7 @@
6340set dummy ${ac_tool_prefix}cc; ac_word=$26365set dummy ${ac_tool_prefix}cc; ac_word=$2
6341{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&56366{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6342$as_echo_n "checking for $ac_word... " >&6; }6367$as_echo_n "checking for $ac_word... " >&6; }
6343if test "${ac_cv_prog_CC+set}" = set; then :6368if ${ac_cv_prog_CC+:} false; then :
6344 $as_echo_n "(cached) " >&66369 $as_echo_n "(cached) " >&6
6345else6370else
6346 if test -n "$CC"; then6371 if test -n "$CC"; then
@@ -6380,7 +6405,7 @@
6380set dummy cc; ac_word=$26405set dummy cc; ac_word=$2
6381{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&56406{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6382$as_echo_n "checking for $ac_word... " >&6; }6407$as_echo_n "checking for $ac_word... " >&6; }
6383if test "${ac_cv_prog_CC+set}" = set; then :6408if ${ac_cv_prog_CC+:} false; then :
6384 $as_echo_n "(cached) " >&66409 $as_echo_n "(cached) " >&6
6385else6410else
6386 if test -n "$CC"; then6411 if test -n "$CC"; then
@@ -6439,7 +6464,7 @@
6439set dummy $ac_tool_prefix$ac_prog; ac_word=$26464set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6440{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&56465{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6441$as_echo_n "checking for $ac_word... " >&6; }6466$as_echo_n "checking for $ac_word... " >&6; }
6442if test "${ac_cv_prog_CC+set}" = set; then :6467if ${ac_cv_prog_CC+:} false; then :
6443 $as_echo_n "(cached) " >&66468 $as_echo_n "(cached) " >&6
6444else6469else
6445 if test -n "$CC"; then6470 if test -n "$CC"; then
@@ -6483,7 +6508,7 @@
6483set dummy $ac_prog; ac_word=$26508set dummy $ac_prog; ac_word=$2
6484{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&56509{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6485$as_echo_n "checking for $ac_word... " >&6; }6510$as_echo_n "checking for $ac_word... " >&6; }
6486if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :6511if ${ac_cv_prog_ac_ct_CC+:} false; then :
6487 $as_echo_n "(cached) " >&66512 $as_echo_n "(cached) " >&6
6488else6513else
6489 if test -n "$ac_ct_CC"; then6514 if test -n "$ac_ct_CC"; then
@@ -6538,7 +6563,7 @@
6538test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56563test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6539$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6564$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6540as_fn_error $? "no acceptable C compiler found in \$PATH6565as_fn_error $? "no acceptable C compiler found in \$PATH
6541See \`config.log' for more details" "$LINENO" 5 ; }6566See \`config.log' for more details" "$LINENO" 5; }
65426567
6543# Provide some information about the compiler.6568# Provide some information about the compiler.
6544$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&56569$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -6567,7 +6592,7 @@
65676592
6568{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&56593{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
6569$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }6594$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
6570if test "${ac_cv_c_compiler_gnu+set}" = set; then :6595if ${ac_cv_c_compiler_gnu+:} false; then :
6571 $as_echo_n "(cached) " >&66596 $as_echo_n "(cached) " >&6
6572else6597else
6573 cat confdefs.h - <<_ACEOF >conftest.$ac_ext6598 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6604,7 +6629,7 @@
6604ac_save_CFLAGS=$CFLAGS6629ac_save_CFLAGS=$CFLAGS
6605{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&56630{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
6606$as_echo_n "checking whether $CC accepts -g... " >&6; }6631$as_echo_n "checking whether $CC accepts -g... " >&6; }
6607if test "${ac_cv_prog_cc_g+set}" = set; then :6632if ${ac_cv_prog_cc_g+:} false; then :
6608 $as_echo_n "(cached) " >&66633 $as_echo_n "(cached) " >&6
6609else6634else
6610 ac_save_c_werror_flag=$ac_c_werror_flag6635 ac_save_c_werror_flag=$ac_c_werror_flag
@@ -6682,7 +6707,7 @@
6682fi6707fi
6683{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&56708{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
6684$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }6709$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
6685if test "${ac_cv_prog_cc_c89+set}" = set; then :6710if ${ac_cv_prog_cc_c89+:} false; then :
6686 $as_echo_n "(cached) " >&66711 $as_echo_n "(cached) " >&6
6687else6712else
6688 ac_cv_prog_cc_c89=no6713 ac_cv_prog_cc_c89=no
@@ -6781,7 +6806,7 @@
67816806
6782{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&56807{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
6783$as_echo_n "checking dependency style of $depcc... " >&6; }6808$as_echo_n "checking dependency style of $depcc... " >&6; }
6784if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :6809if ${am_cv_CC_dependencies_compiler_type+:} false; then :
6785 $as_echo_n "(cached) " >&66810 $as_echo_n "(cached) " >&6
6786else6811else
6787 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then6812 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -6913,7 +6938,7 @@
6913fi6938fi
6914set dummy $CC; ac_cc=`$as_echo "$2" |6939set dummy $CC; ac_cc=`$as_echo "$2" |
6915 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`6940 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
6916if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :6941if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
6917 $as_echo_n "(cached) " >&66942 $as_echo_n "(cached) " >&6
6918else6943else
6919 cat confdefs.h - <<_ACEOF >conftest.$ac_ext6944 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7230,7 +7255,7 @@
72307255
72317256
7232ac_fn_cxx_check_header_mongrel "$LINENO" "boost/unordered_set.hpp" "ac_cv_header_boost_unordered_set_hpp" "$ac_includes_default"7257ac_fn_cxx_check_header_mongrel "$LINENO" "boost/unordered_set.hpp" "ac_cv_header_boost_unordered_set_hpp" "$ac_includes_default"
7233if test "x$ac_cv_header_boost_unordered_set_hpp" = x""yes; then :7258if test "x$ac_cv_header_boost_unordered_set_hpp" = xyes; then :
72347259
7235$as_echo "#define HAVE_BOOST_UNORDERED_SET 1" >>confdefs.h7260$as_echo "#define HAVE_BOOST_UNORDERED_SET 1" >>confdefs.h
72367261
@@ -7238,7 +7263,7 @@
72387263
72397264
7240ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_set" "ac_cv_header_ext_hash_set" "$ac_includes_default"7265ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_set" "ac_cv_header_ext_hash_set" "$ac_includes_default"
7241if test "x$ac_cv_header_ext_hash_set" = x""yes; then :7266if test "x$ac_cv_header_ext_hash_set" = xyes; then :
72427267
7243$as_echo "#define HAVE_EXT_HASH_SET 1" >>confdefs.h7268$as_echo "#define HAVE_EXT_HASH_SET 1" >>confdefs.h
72447269
@@ -7289,7 +7314,7 @@
7289 for ac_header in locale.h7314 for ac_header in locale.h
7290do :7315do :
7291 ac_fn_cxx_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"7316 ac_fn_cxx_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
7292if test "x$ac_cv_header_locale_h" = x""yes; then :7317if test "x$ac_cv_header_locale_h" = xyes; then :
7293 cat >>confdefs.h <<_ACEOF7318 cat >>confdefs.h <<_ACEOF
7294#define HAVE_LOCALE_H 17319#define HAVE_LOCALE_H 1
7295_ACEOF7320_ACEOF
@@ -7301,7 +7326,7 @@
7301 if test $ac_cv_header_locale_h = yes; then7326 if test $ac_cv_header_locale_h = yes; then
7302 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&57327 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
7303$as_echo_n "checking for LC_MESSAGES... " >&6; }7328$as_echo_n "checking for LC_MESSAGES... " >&6; }
7304if test "${am_cv_val_LC_MESSAGES+set}" = set; then :7329if ${am_cv_val_LC_MESSAGES+:} false; then :
7305 $as_echo_n "(cached) " >&67330 $as_echo_n "(cached) " >&6
7306else7331else
7307 cat confdefs.h - <<_ACEOF >conftest.$ac_ext7332 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7341,7 +7366,7 @@
7341 INTLLIBS=7366 INTLLIBS=
73427367
7343 ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"7368 ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
7344if test "x$ac_cv_header_libintl_h" = x""yes; then :7369if test "x$ac_cv_header_libintl_h" = xyes; then :
7345 gt_cv_func_dgettext_libintl="no"7370 gt_cv_func_dgettext_libintl="no"
7346 libintl_extra_libs=""7371 libintl_extra_libs=""
73477372
@@ -7350,7 +7375,7 @@
7350 #7375 #
7351 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&57376 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
7352$as_echo_n "checking for ngettext in libc... " >&6; }7377$as_echo_n "checking for ngettext in libc... " >&6; }
7353if test "${gt_cv_func_ngettext_libc+set}" = set; then :7378if ${gt_cv_func_ngettext_libc+:} false; then :
7354 $as_echo_n "(cached) " >&67379 $as_echo_n "(cached) " >&6
7355else7380else
7356 cat confdefs.h - <<_ACEOF >conftest.$ac_ext7381 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7381,7 +7406,7 @@
7381 if test "$gt_cv_func_ngettext_libc" = "yes" ; then7406 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
7382 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&57407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
7383$as_echo_n "checking for dgettext in libc... " >&6; }7408$as_echo_n "checking for dgettext in libc... " >&6; }
7384if test "${gt_cv_func_dgettext_libc+set}" = set; then :7409if ${gt_cv_func_dgettext_libc+:} false; then :
7385 $as_echo_n "(cached) " >&67410 $as_echo_n "(cached) " >&6
7386else7411else
7387 cat confdefs.h - <<_ACEOF >conftest.$ac_ext7412 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7414,7 +7439,7 @@
7414 for ac_func in bind_textdomain_codeset7439 for ac_func in bind_textdomain_codeset
7415do :7440do :
7416 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"7441 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
7417if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :7442if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
7418 cat >>confdefs.h <<_ACEOF7443 cat >>confdefs.h <<_ACEOF
7419#define HAVE_BIND_TEXTDOMAIN_CODESET 17444#define HAVE_BIND_TEXTDOMAIN_CODESET 1
7420_ACEOF7445_ACEOF
@@ -7433,7 +7458,7 @@
74337458
7434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&57459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
7435$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }7460$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
7436if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :7461if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
7437 $as_echo_n "(cached) " >&67462 $as_echo_n "(cached) " >&6
7438else7463else
7439 ac_check_lib_save_LIBS=$LIBS7464 ac_check_lib_save_LIBS=$LIBS
@@ -7467,10 +7492,10 @@
7467fi7492fi
7468{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&57493{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
7469$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }7494$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
7470if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :7495if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
7471 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&57496 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
7472$as_echo_n "checking for ngettext in -lintl... " >&6; }7497$as_echo_n "checking for ngettext in -lintl... " >&6; }
7473if test "${ac_cv_lib_intl_ngettext+set}" = set; then :7498if ${ac_cv_lib_intl_ngettext+:} false; then :
7474 $as_echo_n "(cached) " >&67499 $as_echo_n "(cached) " >&6
7475else7500else
7476 ac_check_lib_save_LIBS=$LIBS7501 ac_check_lib_save_LIBS=$LIBS
@@ -7504,10 +7529,10 @@
7504fi7529fi
7505{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&57530{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
7506$as_echo "$ac_cv_lib_intl_ngettext" >&6; }7531$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
7507if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :7532if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
7508 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&57533 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
7509$as_echo_n "checking for dgettext in -lintl... " >&6; }7534$as_echo_n "checking for dgettext in -lintl... " >&6; }
7510if test "${ac_cv_lib_intl_dgettext+set}" = set; then :7535if ${ac_cv_lib_intl_dgettext+:} false; then :
7511 $as_echo_n "(cached) " >&67536 $as_echo_n "(cached) " >&6
7512else7537else
7513 ac_check_lib_save_LIBS=$LIBS7538 ac_check_lib_save_LIBS=$LIBS
@@ -7541,7 +7566,7 @@
7541fi7566fi
7542{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&57567{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
7543$as_echo "$ac_cv_lib_intl_dgettext" >&6; }7568$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
7544if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :7569if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
7545 gt_cv_func_dgettext_libintl=yes7570 gt_cv_func_dgettext_libintl=yes
7546fi7571fi
75477572
@@ -7557,7 +7582,7 @@
7557$as_echo "" >&6; }7582$as_echo "" >&6; }
7558 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&57583 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
7559$as_echo_n "checking for ngettext in -lintl... " >&6; }7584$as_echo_n "checking for ngettext in -lintl... " >&6; }
7560if test "${ac_cv_lib_intl_ngettext+set}" = set; then :7585if ${ac_cv_lib_intl_ngettext+:} false; then :
7561 $as_echo_n "(cached) " >&67586 $as_echo_n "(cached) " >&6
7562else7587else
7563 ac_check_lib_save_LIBS=$LIBS7588 ac_check_lib_save_LIBS=$LIBS
@@ -7591,10 +7616,10 @@
7591fi7616fi
7592{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&57617{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
7593$as_echo "$ac_cv_lib_intl_ngettext" >&6; }7618$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
7594if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :7619if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
7595 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&57620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
7596$as_echo_n "checking for dcgettext in -lintl... " >&6; }7621$as_echo_n "checking for dcgettext in -lintl... " >&6; }
7597if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :7622if ${ac_cv_lib_intl_dcgettext+:} false; then :
7598 $as_echo_n "(cached) " >&67623 $as_echo_n "(cached) " >&6
7599else7624else
7600 ac_check_lib_save_LIBS=$LIBS7625 ac_check_lib_save_LIBS=$LIBS
@@ -7628,7 +7653,7 @@
7628fi7653fi
7629{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&57654{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
7630$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }7655$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
7631if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :7656if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
7632 gt_cv_func_dgettext_libintl=yes7657 gt_cv_func_dgettext_libintl=yes
7633 libintl_extra_libs=-liconv7658 libintl_extra_libs=-liconv
7634else7659else
@@ -7653,7 +7678,7 @@
7653 for ac_func in bind_textdomain_codeset7678 for ac_func in bind_textdomain_codeset
7654do :7679do :
7655 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"7680 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
7656if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :7681if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
7657 cat >>confdefs.h <<_ACEOF7682 cat >>confdefs.h <<_ACEOF
7658#define HAVE_BIND_TEXTDOMAIN_CODESET 17683#define HAVE_BIND_TEXTDOMAIN_CODESET 1
7659_ACEOF7684_ACEOF
@@ -7691,7 +7716,7 @@
7691set dummy msgfmt; ac_word=$27716set dummy msgfmt; ac_word=$2
7692{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&57717{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7693$as_echo_n "checking for $ac_word... " >&6; }7718$as_echo_n "checking for $ac_word... " >&6; }
7694if test "${ac_cv_path_MSGFMT+set}" = set; then :7719if ${ac_cv_path_MSGFMT+:} false; then :
7695 $as_echo_n "(cached) " >&67720 $as_echo_n "(cached) " >&6
7696else7721else
7697 case "$MSGFMT" in7722 case "$MSGFMT" in
@@ -7728,7 +7753,7 @@
7728 for ac_func in dcgettext7753 for ac_func in dcgettext
7729do :7754do :
7730 ac_fn_cxx_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"7755 ac_fn_cxx_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
7731if test "x$ac_cv_func_dcgettext" = x""yes; then :7756if test "x$ac_cv_func_dcgettext" = xyes; then :
7732 cat >>confdefs.h <<_ACEOF7757 cat >>confdefs.h <<_ACEOF
7733#define HAVE_DCGETTEXT 17758#define HAVE_DCGETTEXT 1
7734_ACEOF7759_ACEOF
@@ -7769,7 +7794,7 @@
7769set dummy gmsgfmt; ac_word=$27794set dummy gmsgfmt; ac_word=$2
7770{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&57795{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7771$as_echo_n "checking for $ac_word... " >&6; }7796$as_echo_n "checking for $ac_word... " >&6; }
7772if test "${ac_cv_path_GMSGFMT+set}" = set; then :7797if ${ac_cv_path_GMSGFMT+:} false; then :
7773 $as_echo_n "(cached) " >&67798 $as_echo_n "(cached) " >&6
7774else7799else
7775 case $GMSGFMT in7800 case $GMSGFMT in
@@ -7810,7 +7835,7 @@
7810set dummy xgettext; ac_word=$27835set dummy xgettext; ac_word=$2
7811{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&57836{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7812$as_echo_n "checking for $ac_word... " >&6; }7837$as_echo_n "checking for $ac_word... " >&6; }
7813if test "${ac_cv_path_XGETTEXT+set}" = set; then :7838if ${ac_cv_path_XGETTEXT+:} false; then :
7814 $as_echo_n "(cached) " >&67839 $as_echo_n "(cached) " >&6
7815else7840else
7816 case "$XGETTEXT" in7841 case "$XGETTEXT" in
@@ -7861,7 +7886,7 @@
7861 case $host in7886 case $host in
7862 *-*-solaris*)7887 *-*-solaris*)
7863 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"7888 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
7864if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :7889if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
7865 CATOBJEXT=.gmo7890 CATOBJEXT=.gmo
7866 DATADIRNAME=share7891 DATADIRNAME=share
7867else7892else
@@ -7994,7 +8019,7 @@
7994set dummy pkg-config; ac_word=$28019set dummy pkg-config; ac_word=$2
7995{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&58020{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7996$as_echo_n "checking for $ac_word... " >&6; }8021$as_echo_n "checking for $ac_word... " >&6; }
7997if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :8022if ${ac_cv_path_PKG_CONFIG+:} false; then :
7998 $as_echo_n "(cached) " >&68023 $as_echo_n "(cached) " >&6
7999else8024else
8000 case $PKG_CONFIG in8025 case $PKG_CONFIG in
@@ -8039,7 +8064,7 @@
8039set dummy msgfmt; ac_word=$28064set dummy msgfmt; ac_word=$2
8040{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&58065{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8041$as_echo_n "checking for $ac_word... " >&6; }8066$as_echo_n "checking for $ac_word... " >&6; }
8042if test "${ac_cv_path_MSGFMT+set}" = set; then :8067if ${ac_cv_path_MSGFMT+:} false; then :
8043 $as_echo_n "(cached) " >&68068 $as_echo_n "(cached) " >&6
8044else8069else
8045 case $MSGFMT in8070 case $MSGFMT in
@@ -8080,7 +8105,7 @@
8080set dummy gmsgfmt; ac_word=$28105set dummy gmsgfmt; ac_word=$2
8081{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&58106{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8082$as_echo_n "checking for $ac_word... " >&6; }8107$as_echo_n "checking for $ac_word... " >&6; }
8083if test "${ac_cv_path_GMSGFMT+set}" = set; then :8108if ${ac_cv_path_GMSGFMT+:} false; then :
8084 $as_echo_n "(cached) " >&68109 $as_echo_n "(cached) " >&6
8085else8110else
8086 case $GMSGFMT in8111 case $GMSGFMT in
@@ -8122,7 +8147,7 @@
81228147
8123{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C++ compiler" >&58148{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C++ compiler" >&5
8124$as_echo_n "checking for OpenMP flag of C++ compiler... " >&6; }8149$as_echo_n "checking for OpenMP flag of C++ compiler... " >&6; }
8125if test "${ax_cv_cxx_openmp+set}" = set; then :8150if ${ax_cv_cxx_openmp+:} false; then :
8126 $as_echo_n "(cached) " >&68151 $as_echo_n "(cached) " >&6
8127else8152else
8128 saveCXXFLAGS=$CXXFLAGS8153 saveCXXFLAGS=$CXXFLAGS
@@ -8179,7 +8204,7 @@
8179if test "x$openmp_ok" = "xyes"; then8204if test "x$openmp_ok" = "xyes"; then
8180 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"8205 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
8181 ac_fn_cxx_check_header_mongrel "$LINENO" "omp.h" "ac_cv_header_omp_h" "$ac_includes_default"8206 ac_fn_cxx_check_header_mongrel "$LINENO" "omp.h" "ac_cv_header_omp_h" "$ac_includes_default"
8182if test "x$ac_cv_header_omp_h" = x""yes; then :8207if test "x$ac_cv_header_omp_h" = xyes; then :
81838208
8184fi8209fi
81858210
@@ -8191,7 +8216,7 @@
81918216
8192{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&58217{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
8193$as_echo_n "checking for png_read_info in -lpng... " >&6; }8218$as_echo_n "checking for png_read_info in -lpng... " >&6; }
8194if test "${ac_cv_lib_png_png_read_info+set}" = set; then :8219if ${ac_cv_lib_png_png_read_info+:} false; then :
8195 $as_echo_n "(cached) " >&68220 $as_echo_n "(cached) " >&6
8196else8221else
8197 ac_check_lib_save_LIBS=$LIBS8222 ac_check_lib_save_LIBS=$LIBS
@@ -8225,9 +8250,9 @@
8225fi8250fi
8226{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&58251{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&5
8227$as_echo "$ac_cv_lib_png_png_read_info" >&6; }8252$as_echo "$ac_cv_lib_png_png_read_info" >&6; }
8228if test "x$ac_cv_lib_png_png_read_info" = x""yes; then :8253if test "x$ac_cv_lib_png_png_read_info" = xyes; then :
8229 ac_fn_cxx_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"8254 ac_fn_cxx_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
8230if test "x$ac_cv_header_png_h" = x""yes; then :8255if test "x$ac_cv_header_png_h" = xyes; then :
8231 png_ok=yes8256 png_ok=yes
8232else8257else
8233 png_ok=yes8258 png_ok=yes
@@ -8244,7 +8269,7 @@
82448269
8245{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&58270{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
8246$as_echo_n "checking for shl_load in -ldld... " >&6; }8271$as_echo_n "checking for shl_load in -ldld... " >&6; }
8247if test "${ac_cv_lib_dld_shl_load+set}" = set; then :8272if ${ac_cv_lib_dld_shl_load+:} false; then :
8248 $as_echo_n "(cached) " >&68273 $as_echo_n "(cached) " >&6
8249else8274else
8250 ac_check_lib_save_LIBS=$LIBS8275 ac_check_lib_save_LIBS=$LIBS
@@ -8278,16 +8303,16 @@
8278fi8303fi
8279{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&58304{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
8280$as_echo "$ac_cv_lib_dld_shl_load" >&6; }8305$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
8281if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :8306if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
8282 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"8307 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
8283else8308else
8284 ac_fn_cxx_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"8309 ac_fn_cxx_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
8285if test "x$ac_cv_func_dlopen" = x""yes; then :8310if test "x$ac_cv_func_dlopen" = xyes; then :
8286 lt_cv_dlopen="dlopen"8311 lt_cv_dlopen="dlopen"
8287else8312else
8288 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&58313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
8289$as_echo_n "checking for dlopen in -ldl... " >&6; }8314$as_echo_n "checking for dlopen in -ldl... " >&6; }
8290if test "${ac_cv_lib_dl_dlopen+set}" = set; then :8315if ${ac_cv_lib_dl_dlopen+:} false; then :
8291 $as_echo_n "(cached) " >&68316 $as_echo_n "(cached) " >&6
8292else8317else
8293 ac_check_lib_save_LIBS=$LIBS8318 ac_check_lib_save_LIBS=$LIBS
@@ -8321,12 +8346,12 @@
8321fi8346fi
8322{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&58347{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
8323$as_echo "$ac_cv_lib_dl_dlopen" >&6; }8348$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
8324if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :8349if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
8325 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"8350 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
8326else8351else
8327 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&58352 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
8328$as_echo_n "checking for dlopen in -lsvld... " >&6; }8353$as_echo_n "checking for dlopen in -lsvld... " >&6; }
8329if test "${ac_cv_lib_svld_dlopen+set}" = set; then :8354if ${ac_cv_lib_svld_dlopen+:} false; then :
8330 $as_echo_n "(cached) " >&68355 $as_echo_n "(cached) " >&6
8331else8356else
8332 ac_check_lib_save_LIBS=$LIBS8357 ac_check_lib_save_LIBS=$LIBS
@@ -8360,12 +8385,12 @@
8360fi8385fi
8361{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&58386{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
8362$as_echo "$ac_cv_lib_svld_dlopen" >&6; }8387$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
8363if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :8388if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
8364 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"8389 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
8365else8390else
8366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&58391 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
8367$as_echo_n "checking for dld_link in -ldld... " >&6; }8392$as_echo_n "checking for dld_link in -ldld... " >&6; }
8368if test "${ac_cv_lib_dld_dld_link+set}" = set; then :8393if ${ac_cv_lib_dld_dld_link+:} false; then :
8369 $as_echo_n "(cached) " >&68394 $as_echo_n "(cached) " >&6
8370else8395else
8371 ac_check_lib_save_LIBS=$LIBS8396 ac_check_lib_save_LIBS=$LIBS
@@ -8399,7 +8424,7 @@
8399fi8424fi
8400{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&58425{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
8401$as_echo "$ac_cv_lib_dld_dld_link" >&6; }8426$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
8402if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :8427if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
8403 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"8428 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
8404fi8429fi
84058430
@@ -8433,7 +8458,7 @@
8433 gc_libs=""8458 gc_libs=""
8434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_init in -lgc" >&58459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_init in -lgc" >&5
8435$as_echo_n "checking for GC_init in -lgc... " >&6; }8460$as_echo_n "checking for GC_init in -lgc... " >&6; }
8436if test "${ac_cv_lib_gc_GC_init+set}" = set; then :8461if ${ac_cv_lib_gc_GC_init+:} false; then :
8437 $as_echo_n "(cached) " >&68462 $as_echo_n "(cached) " >&6
8438else8463else
8439 ac_check_lib_save_LIBS=$LIBS8464 ac_check_lib_save_LIBS=$LIBS
@@ -8467,7 +8492,7 @@
8467fi8492fi
8468{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&58493{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5
8469$as_echo "$ac_cv_lib_gc_GC_init" >&6; }8494$as_echo "$ac_cv_lib_gc_GC_init" >&6; }
8470if test "x$ac_cv_lib_gc_GC_init" = x""yes; then :8495if test "x$ac_cv_lib_gc_GC_init" = xyes; then :
8471 gc_ok=yes;8496 gc_ok=yes;
8472 LIBS="-lgc $gc_libs $LIBS";8497 LIBS="-lgc $gc_libs $LIBS";
8473 break8498 break
@@ -8478,7 +8503,7 @@
8478 gc_libs="-lpthread"8503 gc_libs="-lpthread"
8479 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&58504 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
8480$as_echo_n "checking for GC_malloc in -lgc... " >&6; }8505$as_echo_n "checking for GC_malloc in -lgc... " >&6; }
8481if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then :8506if ${ac_cv_lib_gc_GC_malloc+:} false; then :
8482 $as_echo_n "(cached) " >&68507 $as_echo_n "(cached) " >&6
8483else8508else
8484 ac_check_lib_save_LIBS=$LIBS8509 ac_check_lib_save_LIBS=$LIBS
@@ -8512,7 +8537,7 @@
8512fi8537fi
8513{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&58538{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
8514$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }8539$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
8515if test "x$ac_cv_lib_gc_GC_malloc" = x""yes; then :8540if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
8516 gc_ok=yes;8541 gc_ok=yes;
8517 LIBS="-lgc $gc_libs $LIBS";8542 LIBS="-lgc $gc_libs $LIBS";
8518 break8543 break
@@ -8523,7 +8548,7 @@
8523 gc_libs="$lt_cv_dlopen_libs"8548 gc_libs="$lt_cv_dlopen_libs"
8524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_realloc in -lgc" >&58549 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_realloc in -lgc" >&5
8525$as_echo_n "checking for GC_realloc in -lgc... " >&6; }8550$as_echo_n "checking for GC_realloc in -lgc... " >&6; }
8526if test "${ac_cv_lib_gc_GC_realloc+set}" = set; then :8551if ${ac_cv_lib_gc_GC_realloc+:} false; then :
8527 $as_echo_n "(cached) " >&68552 $as_echo_n "(cached) " >&6
8528else8553else
8529 ac_check_lib_save_LIBS=$LIBS8554 ac_check_lib_save_LIBS=$LIBS
@@ -8557,7 +8582,7 @@
8557fi8582fi
8558{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_realloc" >&58583{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_realloc" >&5
8559$as_echo "$ac_cv_lib_gc_GC_realloc" >&6; }8584$as_echo "$ac_cv_lib_gc_GC_realloc" >&6; }
8560if test "x$ac_cv_lib_gc_GC_realloc" = x""yes; then :8585if test "x$ac_cv_lib_gc_GC_realloc" = xyes; then :
8561 gc_ok=yes;8586 gc_ok=yes;
8562 LIBS="-lgc $gc_libs $LIBS";8587 LIBS="-lgc $gc_libs $LIBS";
8563 break8588 break
@@ -8568,7 +8593,7 @@
8568 gc_libs="-lpthread $lt_cv_dlopen_libs"8593 gc_libs="-lpthread $lt_cv_dlopen_libs"
8569 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_free in -lgc" >&58594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_free in -lgc" >&5
8570$as_echo_n "checking for GC_free in -lgc... " >&6; }8595$as_echo_n "checking for GC_free in -lgc... " >&6; }
8571if test "${ac_cv_lib_gc_GC_free+set}" = set; then :8596if ${ac_cv_lib_gc_GC_free+:} false; then :
8572 $as_echo_n "(cached) " >&68597 $as_echo_n "(cached) " >&6
8573else8598else
8574 ac_check_lib_save_LIBS=$LIBS8599 ac_check_lib_save_LIBS=$LIBS
@@ -8602,7 +8627,7 @@
8602fi8627fi
8603{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_free" >&58628{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_free" >&5
8604$as_echo "$ac_cv_lib_gc_GC_free" >&6; }8629$as_echo "$ac_cv_lib_gc_GC_free" >&6; }
8605if test "x$ac_cv_lib_gc_GC_free" = x""yes; then :8630if test "x$ac_cv_lib_gc_GC_free" = xyes; then :
8606 gc_ok=yes;8631 gc_ok=yes;
8607 LIBS="-lgc $gc_libs $LIBS";8632 LIBS="-lgc $gc_libs $LIBS";
8608 break8633 break
@@ -8624,7 +8649,7 @@
8624 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&58649 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8625$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}8650$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8626as_fn_error $? "cannot run test program while cross compiling8651as_fn_error $? "cannot run test program while cross compiling
8627See \`config.log' for more details" "$LINENO" 5 ; }8652See \`config.log' for more details" "$LINENO" 5; }
8628else8653else
8629 cat confdefs.h - <<_ACEOF >conftest.$ac_ext8654 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8630/* end confdefs.h. */8655/* end confdefs.h. */
@@ -8663,7 +8688,7 @@
8663for ac_header in sys/filio.h8688for ac_header in sys/filio.h
8664do :8689do :
8665 ac_fn_cxx_check_header_mongrel "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"8690 ac_fn_cxx_check_header_mongrel "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
8666if test "x$ac_cv_header_sys_filio_h" = x""yes; then :8691if test "x$ac_cv_header_sys_filio_h" = xyes; then :
8667 cat >>confdefs.h <<_ACEOF8692 cat >>confdefs.h <<_ACEOF
8668#define HAVE_SYS_FILIO_H 18693#define HAVE_SYS_FILIO_H 1
8669_ACEOF8694_ACEOF
@@ -8677,7 +8702,7 @@
8677for ac_header in malloc.h8702for ac_header in malloc.h
8678do :8703do :
8679 ac_fn_cxx_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"8704 ac_fn_cxx_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
8680if test "x$ac_cv_header_malloc_h" = x""yes; then :8705if test "x$ac_cv_header_malloc_h" = xyes; then :
8681 cat >>confdefs.h <<_ACEOF8706 cat >>confdefs.h <<_ACEOF
8682#define HAVE_MALLOC_H 18707#define HAVE_MALLOC_H 1
8683_ACEOF8708_ACEOF
@@ -8689,14 +8714,14 @@
8689for ac_func in mallinfo8714for ac_func in mallinfo
8690do :8715do :
8691 ac_fn_cxx_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"8716 ac_fn_cxx_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"
8692if test "x$ac_cv_func_mallinfo" = x""yes; then :8717if test "x$ac_cv_func_mallinfo" = xyes; then :
8693 cat >>confdefs.h <<_ACEOF8718 cat >>confdefs.h <<_ACEOF
8694#define HAVE_MALLINFO 18719#define HAVE_MALLINFO 1
8695_ACEOF8720_ACEOF
86968721
8697 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "usmblks" "ac_cv_member_struct_mallinfo_usmblks" "#include <malloc.h>8722 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "usmblks" "ac_cv_member_struct_mallinfo_usmblks" "#include <malloc.h>
8698"8723"
8699if test "x$ac_cv_member_struct_mallinfo_usmblks" = x""yes; then :8724if test "x$ac_cv_member_struct_mallinfo_usmblks" = xyes; then :
87008725
8701cat >>confdefs.h <<_ACEOF8726cat >>confdefs.h <<_ACEOF
8702#define HAVE_STRUCT_MALLINFO_USMBLKS 18727#define HAVE_STRUCT_MALLINFO_USMBLKS 1
@@ -8706,7 +8731,7 @@
8706fi8731fi
8707ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fsmblks" "ac_cv_member_struct_mallinfo_fsmblks" "#include <malloc.h>8732ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fsmblks" "ac_cv_member_struct_mallinfo_fsmblks" "#include <malloc.h>
8708"8733"
8709if test "x$ac_cv_member_struct_mallinfo_fsmblks" = x""yes; then :8734if test "x$ac_cv_member_struct_mallinfo_fsmblks" = xyes; then :
87108735
8711cat >>confdefs.h <<_ACEOF8736cat >>confdefs.h <<_ACEOF
8712#define HAVE_STRUCT_MALLINFO_FSMBLKS 18737#define HAVE_STRUCT_MALLINFO_FSMBLKS 1
@@ -8716,7 +8741,7 @@
8716fi8741fi
8717ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "uordblks" "ac_cv_member_struct_mallinfo_uordblks" "#include <malloc.h>8742ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "uordblks" "ac_cv_member_struct_mallinfo_uordblks" "#include <malloc.h>
8718"8743"
8719if test "x$ac_cv_member_struct_mallinfo_uordblks" = x""yes; then :8744if test "x$ac_cv_member_struct_mallinfo_uordblks" = xyes; then :
87208745
8721cat >>confdefs.h <<_ACEOF8746cat >>confdefs.h <<_ACEOF
8722#define HAVE_STRUCT_MALLINFO_UORDBLKS 18747#define HAVE_STRUCT_MALLINFO_UORDBLKS 1
@@ -8726,7 +8751,7 @@
8726fi8751fi
8727ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fordblks" "ac_cv_member_struct_mallinfo_fordblks" "#include <malloc.h>8752ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fordblks" "ac_cv_member_struct_mallinfo_fordblks" "#include <malloc.h>
8728"8753"
8729if test "x$ac_cv_member_struct_mallinfo_fordblks" = x""yes; then :8754if test "x$ac_cv_member_struct_mallinfo_fordblks" = xyes; then :
87308755
8731cat >>confdefs.h <<_ACEOF8756cat >>confdefs.h <<_ACEOF
8732#define HAVE_STRUCT_MALLINFO_FORDBLKS 18757#define HAVE_STRUCT_MALLINFO_FORDBLKS 1
@@ -8736,7 +8761,7 @@
8736fi8761fi
8737ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "hblkhd" "ac_cv_member_struct_mallinfo_hblkhd" "#include <malloc.h>8762ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "hblkhd" "ac_cv_member_struct_mallinfo_hblkhd" "#include <malloc.h>
8738"8763"
8739if test "x$ac_cv_member_struct_mallinfo_hblkhd" = x""yes; then :8764if test "x$ac_cv_member_struct_mallinfo_hblkhd" = xyes; then :
87408765
8741cat >>confdefs.h <<_ACEOF8766cat >>confdefs.h <<_ACEOF
8742#define HAVE_STRUCT_MALLINFO_HBLKHD 18767#define HAVE_STRUCT_MALLINFO_HBLKHD 1
@@ -8754,7 +8779,7 @@
8754set dummy freetype-config; ac_word=$28779set dummy freetype-config; ac_word=$2
8755{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&58780{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8756$as_echo_n "checking for $ac_word... " >&6; }8781$as_echo_n "checking for $ac_word... " >&6; }
8757if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then :8782if ${ac_cv_path_FREETYPE_CONFIG+:} false; then :
8758 $as_echo_n "(cached) " >&68783 $as_echo_n "(cached) " >&6
8759else8784else
8760 case $FREETYPE_CONFIG in8785 case $FREETYPE_CONFIG in
@@ -8822,6 +8847,24 @@
88228847
88238848
88248849
8850{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSX platform" >&5
8851$as_echo_n "checking for OSX platform... " >&6; }
8852if test "x$build_vendor" = "xapple" ; then
8853 platform_osx=yes
8854else
8855 platform_osx=no
8856fi
8857{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_osx" >&5
8858$as_echo "$platform_osx" >&6; }
8859 if test "$platform_osx" = "yes"; then
8860 PLATFORM_OSX_TRUE=
8861 PLATFORM_OSX_FALSE='#'
8862else
8863 PLATFORM_OSX_TRUE='#'
8864 PLATFORM_OSX_FALSE=
8865fi
8866
8867
8825{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris platform" >&58868{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris platform" >&5
8826$as_echo_n "checking for Solaris platform... " >&6; }8869$as_echo_n "checking for Solaris platform... " >&6; }
8827case "$host" in8870case "$host" in
@@ -8863,13 +8906,14 @@
88638906
88648907
88658908
8909
8866if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then8910if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
8867 if test -n "$ac_tool_prefix"; then8911 if test -n "$ac_tool_prefix"; then
8868 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.8912 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
8869set dummy ${ac_tool_prefix}pkg-config; ac_word=$28913set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
8870{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&58914{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8871$as_echo_n "checking for $ac_word... " >&6; }8915$as_echo_n "checking for $ac_word... " >&6; }
8872if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :8916if ${ac_cv_path_PKG_CONFIG+:} false; then :
8873 $as_echo_n "(cached) " >&68917 $as_echo_n "(cached) " >&6
8874else8918else
8875 case $PKG_CONFIG in8919 case $PKG_CONFIG in
@@ -8912,7 +8956,7 @@
8912set dummy pkg-config; ac_word=$28956set dummy pkg-config; ac_word=$2
8913{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&58957{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8914$as_echo_n "checking for $ac_word... " >&6; }8958$as_echo_n "checking for $ac_word... " >&6; }
8915if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :8959if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
8916 $as_echo_n "(cached) " >&68960 $as_echo_n "(cached) " >&6
8917else8961else
8918 case $ac_pt_PKG_CONFIG in8962 case $ac_pt_PKG_CONFIG in
@@ -8991,6 +9035,7 @@
8991 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59035 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8992 test $ac_status = 0; }; then9036 test $ac_status = 0; }; then
8993 pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`9037 pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`
9038 test "x$?" != "x0" && pkg_failed=yes
8994else9039else
8995 pkg_failed=yes9040 pkg_failed=yes
8996fi9041fi
@@ -9007,6 +9052,7 @@
9007 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59052 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9008 test $ac_status = 0; }; then9053 test $ac_status = 0; }; then
9009 pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null`9054 pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null`
9055 test "x$?" != "x0" && pkg_failed=yes
9010else9056else
9011 pkg_failed=yes9057 pkg_failed=yes
9012fi9058fi
@@ -9026,9 +9072,9 @@
9026 _pkg_short_errors_supported=no9072 _pkg_short_errors_supported=no
9027fi9073fi
9028 if test $_pkg_short_errors_supported = yes; then9074 if test $_pkg_short_errors_supported = yes; then
9029 XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig" 2>&1`9075 XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig" 2>&1`
9030 else9076 else
9031 XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig" 2>&1`9077 XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig" 2>&1`
9032 fi9078 fi
9033 # Put the nasty error message in config.log where it belongs9079 # Put the nasty error message in config.log where it belongs
9034 echo "$XFT_PKG_ERRORS" >&59080 echo "$XFT_PKG_ERRORS" >&5
@@ -9061,6 +9107,7 @@
9061 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59107 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9062 test $ac_status = 0; }; then9108 test $ac_status = 0; }; then
9063 pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft" 2>/dev/null`9109 pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft" 2>/dev/null`
9110 test "x$?" != "x0" && pkg_failed=yes
9064else9111else
9065 pkg_failed=yes9112 pkg_failed=yes
9066fi9113fi
@@ -9077,6 +9124,7 @@
9077 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59124 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9078 test $ac_status = 0; }; then9125 test $ac_status = 0; }; then
9079 pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft" 2>/dev/null`9126 pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft" 2>/dev/null`
9127 test "x$?" != "x0" && pkg_failed=yes
9080else9128else
9081 pkg_failed=yes9129 pkg_failed=yes
9082fi9130fi
@@ -9096,9 +9144,9 @@
9096 _pkg_short_errors_supported=no9144 _pkg_short_errors_supported=no
9097fi9145fi
9098 if test $_pkg_short_errors_supported = yes; then9146 if test $_pkg_short_errors_supported = yes; then
9099 XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xft" 2>&1`9147 XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xft" 2>&1`
9100 else9148 else
9101 XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xft" 2>&1`9149 XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xft" 2>&1`
9102 fi9150 fi
9103 # Put the nasty error message in config.log where it belongs9151 # Put the nasty error message in config.log where it belongs
9104 echo "$XFT_PKG_ERRORS" >&59152 echo "$XFT_PKG_ERRORS" >&5
@@ -9117,7 +9165,7 @@
9117fi9165fi
9118 if test "x$xft_ok" != "xyes"; then9166 if test "x$xft_ok" != "xyes"; then
9119 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"9167 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
9120if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then :9168if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
9121 xft_ok=yes9169 xft_ok=yes
9122else9170else
9123 xft_ok=no9171 xft_ok=no
@@ -9171,6 +9219,7 @@
9171 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59219 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9172 test $ac_status = 0; }; then9220 test $ac_status = 0; }; then
9173 pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`9221 pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`
9222 test "x$?" != "x0" && pkg_failed=yes
9174else9223else
9175 pkg_failed=yes9224 pkg_failed=yes
9176fi9225fi
@@ -9187,6 +9236,7 @@
9187 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59236 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9188 test $ac_status = 0; }; then9237 test $ac_status = 0; }; then
9189 pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null`9238 pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null`
9239 test "x$?" != "x0" && pkg_failed=yes
9190else9240else
9191 pkg_failed=yes9241 pkg_failed=yes
9192fi9242fi
@@ -9206,9 +9256,9 @@
9206 _pkg_short_errors_supported=no9256 _pkg_short_errors_supported=no
9207fi9257fi
9208 if test $_pkg_short_errors_supported = yes; then9258 if test $_pkg_short_errors_supported = yes; then
9209 PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangoft2" 2>&1`9259 PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pangoft2" 2>&1`
9210 else9260 else
9211 PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2" 2>&1`9261 PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pangoft2" 2>&1`
9212 fi9262 fi
9213 # Put the nasty error message in config.log where it belongs9263 # Put the nasty error message in config.log where it belongs
9214 echo "$PANGOFT2_PKG_ERRORS" >&59264 echo "$PANGOFT2_PKG_ERRORS" >&5
@@ -9259,6 +9309,7 @@
9259 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59309 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9260 test $ac_status = 0; }; then9310 test $ac_status = 0; }; then
9261 pkg_cv_GNOME_VFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null`9311 pkg_cv_GNOME_VFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
9312 test "x$?" != "x0" && pkg_failed=yes
9262else9313else
9263 pkg_failed=yes9314 pkg_failed=yes
9264fi9315fi
@@ -9275,6 +9326,7 @@
9275 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59326 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9276 test $ac_status = 0; }; then9327 test $ac_status = 0; }; then
9277 pkg_cv_GNOME_VFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null`9328 pkg_cv_GNOME_VFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
9329 test "x$?" != "x0" && pkg_failed=yes
9278else9330else
9279 pkg_failed=yes9331 pkg_failed=yes
9280fi9332fi
@@ -9294,9 +9346,9 @@
9294 _pkg_short_errors_supported=no9346 _pkg_short_errors_supported=no
9295fi9347fi
9296 if test $_pkg_short_errors_supported = yes; then9348 if test $_pkg_short_errors_supported = yes; then
9297 GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-vfs-2.0 >= 2.0" 2>&1`9349 GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-vfs-2.0 >= 2.0" 2>&1`
9298 else9350 else
9299 GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-vfs-2.0 >= 2.0" 2>&1`9351 GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-vfs-2.0 >= 2.0" 2>&1`
9300 fi9352 fi
9301 # Put the nasty error message in config.log where it belongs9353 # Put the nasty error message in config.log where it belongs
9302 echo "$GNOME_VFS_PKG_ERRORS" >&59354 echo "$GNOME_VFS_PKG_ERRORS" >&5
@@ -9357,7 +9409,7 @@
93579409
9358 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&59410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
9359$as_echo_n "checking whether byte ordering is bigendian... " >&6; }9411$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
9360if test "${ac_cv_c_bigendian+set}" = set; then :9412if ${ac_cv_c_bigendian+:} false; then :
9361 $as_echo_n "(cached) " >&69413 $as_echo_n "(cached) " >&6
9362else9414else
9363 ac_cv_c_bigendian=unknown9415 ac_cv_c_bigendian=unknown
@@ -9576,13 +9628,13 @@
9576 ;; #(9628 ;; #(
9577 *)9629 *)
9578 as_fn_error $? "unknown endianness9630 as_fn_error $? "unknown endianness
9579 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;9631 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
9580 esac9632 esac
95819633
9582 for ac_header in zlib.h9634 for ac_header in zlib.h
9583do :9635do :
9584 ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"9636 ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
9585if test "x$ac_cv_header_zlib_h" = x""yes; then :9637if test "x$ac_cv_header_zlib_h" = xyes; then :
9586 cat >>confdefs.h <<_ACEOF9638 cat >>confdefs.h <<_ACEOF
9587#define HAVE_ZLIB_H 19639#define HAVE_ZLIB_H 1
9588_ACEOF9640_ACEOF
@@ -9646,7 +9698,7 @@
9646 CFLAGS="$CFLAGS $checkPERL_CFLAGS"9698 CFLAGS="$CFLAGS $checkPERL_CFLAGS"
9647 LIBS="$LIBS $checkPERL_LIBS"9699 LIBS="$LIBS $checkPERL_LIBS"
9648 ac_fn_cxx_check_func "$LINENO" "perl_parse" "ac_cv_func_perl_parse"9700 ac_fn_cxx_check_func "$LINENO" "perl_parse" "ac_cv_func_perl_parse"
9649if test "x$ac_cv_func_perl_parse" = x""yes; then :9701if test "x$ac_cv_func_perl_parse" = xyes; then :
96509702
9651 PERL_CFLAGS="$checkPERL_CFLAGS"9703 PERL_CFLAGS="$checkPERL_CFLAGS"
9652 PERL_LIBS="$checkPERL_LIBS"9704 PERL_LIBS="$checkPERL_LIBS"
@@ -9708,7 +9760,7 @@
9708 CFLAGS="$CFLAGS $checkPYTHON_CFLAGS"9760 CFLAGS="$CFLAGS $checkPYTHON_CFLAGS"
9709 LIBS="$LIBS $checkPYTHON_LIBS"9761 LIBS="$LIBS $checkPYTHON_LIBS"
9710 ac_fn_cxx_check_func "$LINENO" "Py_Initialize" "ac_cv_func_Py_Initialize"9762 ac_fn_cxx_check_func "$LINENO" "Py_Initialize" "ac_cv_func_Py_Initialize"
9711if test "x$ac_cv_func_Py_Initialize" = x""yes; then :9763if test "x$ac_cv_func_Py_Initialize" = xyes; then :
97129764
9713 PYTHON_CFLAGS="$checkPYTHON_CFLAGS"9765 PYTHON_CFLAGS="$checkPYTHON_CFLAGS"
9714 PYTHON_LIBS="$checkPYTHON_LIBS"9766 PYTHON_LIBS="$checkPYTHON_LIBS"
@@ -9763,6 +9815,7 @@
9763 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59815 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9764 test $ac_status = 0; }; then9816 test $ac_status = 0; }; then
9765 pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= 1.13" 2>/dev/null`9817 pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= 1.13" 2>/dev/null`
9818 test "x$?" != "x0" && pkg_failed=yes
9766else9819else
9767 pkg_failed=yes9820 pkg_failed=yes
9768fi9821fi
@@ -9779,6 +9832,7 @@
9779 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59832 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9780 test $ac_status = 0; }; then9833 test $ac_status = 0; }; then
9781 pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms >= 1.13" 2>/dev/null`9834 pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms >= 1.13" 2>/dev/null`
9835 test "x$?" != "x0" && pkg_failed=yes
9782else9836else
9783 pkg_failed=yes9837 pkg_failed=yes
9784fi9838fi
@@ -9798,9 +9852,9 @@
9798 _pkg_short_errors_supported=no9852 _pkg_short_errors_supported=no
9799fi9853fi
9800 if test $_pkg_short_errors_supported = yes; then9854 if test $_pkg_short_errors_supported = yes; then
9801 LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lcms >= 1.13" 2>&1`9855 LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms >= 1.13" 2>&1`
9802 else9856 else
9803 LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "lcms >= 1.13" 2>&1`9857 LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms >= 1.13" 2>&1`
9804 fi9858 fi
9805 # Put the nasty error message in config.log where it belongs9859 # Put the nasty error message in config.log where it belongs
9806 echo "$LCMS_PKG_ERRORS" >&59860 echo "$LCMS_PKG_ERRORS" >&5
@@ -9861,6 +9915,7 @@
9861 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59915 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9862 test $ac_status = 0; }; then9916 test $ac_status = 0; }; then
9863 pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.5.9" 2>/dev/null`9917 pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.5.9" 2>/dev/null`
9918 test "x$?" != "x0" && pkg_failed=yes
9864else9919else
9865 pkg_failed=yes9920 pkg_failed=yes
9866fi9921fi
@@ -9877,6 +9932,7 @@
9877 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59932 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9878 test $ac_status = 0; }; then9933 test $ac_status = 0; }; then
9879 pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.5.9" 2>/dev/null`9934 pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.5.9" 2>/dev/null`
9935 test "x$?" != "x0" && pkg_failed=yes
9880else9936else
9881 pkg_failed=yes9937 pkg_failed=yes
9882fi9938fi
@@ -9896,9 +9952,9 @@
9896 _pkg_short_errors_supported=no9952 _pkg_short_errors_supported=no
9897fi9953fi
9898 if test $_pkg_short_errors_supported = yes; then9954 if test $_pkg_short_errors_supported = yes; then
9899 POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler >= 0.5.9" 2>&1`9955 POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.5.9" 2>&1`
9900 else9956 else
9901 POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler >= 0.5.9" 2>&1`9957 POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.5.9" 2>&1`
9902 fi9958 fi
9903 # Put the nasty error message in config.log where it belongs9959 # Put the nasty error message in config.log where it belongs
9904 echo "$POPPLER_PKG_ERRORS" >&59960 echo "$POPPLER_PKG_ERRORS" >&5
@@ -9932,6 +9988,7 @@
9932 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&59988 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9933 test $ac_status = 0; }; then9989 test $ac_status = 0; }; then
9934 pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "poppler-glib >= 0.5.9" 2>/dev/null`9990 pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "poppler-glib >= 0.5.9" 2>/dev/null`
9991 test "x$?" != "x0" && pkg_failed=yes
9935else9992else
9936 pkg_failed=yes9993 pkg_failed=yes
9937fi9994fi
@@ -9948,6 +10005,7 @@
9948 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510005 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9949 test $ac_status = 0; }; then10006 test $ac_status = 0; }; then
9950 pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "poppler-glib >= 0.5.9" 2>/dev/null`10007 pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "poppler-glib >= 0.5.9" 2>/dev/null`
10008 test "x$?" != "x0" && pkg_failed=yes
9951else10009else
9952 pkg_failed=yes10010 pkg_failed=yes
9953fi10011fi
@@ -9967,9 +10025,9 @@
9967 _pkg_short_errors_supported=no10025 _pkg_short_errors_supported=no
9968fi10026fi
9969 if test $_pkg_short_errors_supported = yes; then10027 if test $_pkg_short_errors_supported = yes; then
9970 POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler-glib >= 0.5.9" 2>&1`10028 POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-glib >= 0.5.9" 2>&1`
9971 else10029 else
9972 POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler-glib >= 0.5.9" 2>&1`10030 POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-glib >= 0.5.9" 2>&1`
9973 fi10031 fi
9974 # Put the nasty error message in config.log where it belongs10032 # Put the nasty error message in config.log where it belongs
9975 echo "$POPPLER_GLIB_PKG_ERRORS" >&510033 echo "$POPPLER_GLIB_PKG_ERRORS" >&5
@@ -10002,6 +10060,7 @@
10002 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510060 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10003 test $ac_status = 0; }; then10061 test $ac_status = 0; }; then
10004 pkg_cv_CAIRO_SVG_CFLAGS=`$PKG_CONFIG --cflags "cairo-svg" 2>/dev/null`10062 pkg_cv_CAIRO_SVG_CFLAGS=`$PKG_CONFIG --cflags "cairo-svg" 2>/dev/null`
10063 test "x$?" != "x0" && pkg_failed=yes
10005else10064else
10006 pkg_failed=yes10065 pkg_failed=yes
10007fi10066fi
@@ -10018,6 +10077,7 @@
10018 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510077 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10019 test $ac_status = 0; }; then10078 test $ac_status = 0; }; then
10020 pkg_cv_CAIRO_SVG_LIBS=`$PKG_CONFIG --libs "cairo-svg" 2>/dev/null`10079 pkg_cv_CAIRO_SVG_LIBS=`$PKG_CONFIG --libs "cairo-svg" 2>/dev/null`
10080 test "x$?" != "x0" && pkg_failed=yes
10021else10081else
10022 pkg_failed=yes10082 pkg_failed=yes
10023fi10083fi
@@ -10037,9 +10097,9 @@
10037 _pkg_short_errors_supported=no10097 _pkg_short_errors_supported=no
10038fi10098fi
10039 if test $_pkg_short_errors_supported = yes; then10099 if test $_pkg_short_errors_supported = yes; then
10040 CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-svg" 2>&1`10100 CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo-svg" 2>&1`
10041 else10101 else
10042 CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-svg" 2>&1`10102 CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo-svg" 2>&1`
10043 fi10103 fi
10044 # Put the nasty error message in config.log where it belongs10104 # Put the nasty error message in config.log where it belongs
10045 echo "$CAIRO_SVG_PKG_ERRORS" >&510105 echo "$CAIRO_SVG_PKG_ERRORS" >&5
@@ -10076,6 +10136,7 @@
10076 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510136 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10077 test $ac_status = 0; }; then10137 test $ac_status = 0; }; then
10078 pkg_cv_POPPLER_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "poppler-cairo >= 0.5.9" 2>/dev/null`10138 pkg_cv_POPPLER_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "poppler-cairo >= 0.5.9" 2>/dev/null`
10139 test "x$?" != "x0" && pkg_failed=yes
10079else10140else
10080 pkg_failed=yes10141 pkg_failed=yes
10081fi10142fi
@@ -10092,6 +10153,7 @@
10092 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510153 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10093 test $ac_status = 0; }; then10154 test $ac_status = 0; }; then
10094 pkg_cv_POPPLER_CAIRO_LIBS=`$PKG_CONFIG --libs "poppler-cairo >= 0.5.9" 2>/dev/null`10155 pkg_cv_POPPLER_CAIRO_LIBS=`$PKG_CONFIG --libs "poppler-cairo >= 0.5.9" 2>/dev/null`
10156 test "x$?" != "x0" && pkg_failed=yes
10095else10157else
10096 pkg_failed=yes10158 pkg_failed=yes
10097fi10159fi
@@ -10111,9 +10173,9 @@
10111 _pkg_short_errors_supported=no10173 _pkg_short_errors_supported=no
10112fi10174fi
10113 if test $_pkg_short_errors_supported = yes; then10175 if test $_pkg_short_errors_supported = yes; then
10114 POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler-cairo >= 0.5.9" 2>&1`10176 POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-cairo >= 0.5.9" 2>&1`
10115 else10177 else
10116 POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler-cairo >= 0.5.9" 2>&1`10178 POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-cairo >= 0.5.9" 2>&1`
10117 fi10179 fi
10118 # Put the nasty error message in config.log where it belongs10180 # Put the nasty error message in config.log where it belongs
10119 echo "$POPPLER_CAIRO_PKG_ERRORS" >&510181 echo "$POPPLER_CAIRO_PKG_ERRORS" >&5
@@ -10172,6 +10234,7 @@
10172 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510234 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10173 test $ac_status = 0; }; then10235 test $ac_status = 0; }; then
10174 pkg_cv_POPPLER_GFXFONT_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.3" 2>/dev/null`10236 pkg_cv_POPPLER_GFXFONT_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.3" 2>/dev/null`
10237 test "x$?" != "x0" && pkg_failed=yes
10175else10238else
10176 pkg_failed=yes10239 pkg_failed=yes
10177fi10240fi
@@ -10188,6 +10251,7 @@
10188 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510251 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10189 test $ac_status = 0; }; then10252 test $ac_status = 0; }; then
10190 pkg_cv_POPPLER_GFXFONT_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.3" 2>/dev/null`10253 pkg_cv_POPPLER_GFXFONT_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.3" 2>/dev/null`
10254 test "x$?" != "x0" && pkg_failed=yes
10191else10255else
10192 pkg_failed=yes10256 pkg_failed=yes
10193fi10257fi
@@ -10207,9 +10271,9 @@
10207 _pkg_short_errors_supported=no10271 _pkg_short_errors_supported=no
10208fi10272fi
10209 if test $_pkg_short_errors_supported = yes; then10273 if test $_pkg_short_errors_supported = yes; then
10210 POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler >= 0.8.3" 2>&1`10274 POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.8.3" 2>&1`
10211 else10275 else
10212 POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler >= 0.8.3" 2>&1`10276 POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.8.3" 2>&1`
10213 fi10277 fi
10214 # Put the nasty error message in config.log where it belongs10278 # Put the nasty error message in config.log where it belongs
10215 echo "$POPPLER_GFXFONT_PKG_ERRORS" >&510279 echo "$POPPLER_GFXFONT_PKG_ERRORS" >&5
@@ -10316,75 +10380,188 @@
1031610380
1031710381
1031810382
1031910383with_libwpg=no
10320pkg_failed=no10384
10321{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG" >&510385
10322$as_echo_n "checking for LIBWPG... " >&6; }10386pkg_failed=no
1032310387{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG01" >&5
10324if test -n "$LIBWPG_CFLAGS"; then10388$as_echo_n "checking for LIBWPG01... " >&6; }
10325 pkg_cv_LIBWPG_CFLAGS="$LIBWPG_CFLAGS"10389
10326 elif test -n "$PKG_CONFIG"; then10390if test -n "$LIBWPG01_CFLAGS"; then
10327 if test -n "$PKG_CONFIG" && \10391 pkg_cv_LIBWPG01_CFLAGS="$LIBWPG01_CFLAGS"
10328 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&510392 elif test -n "$PKG_CONFIG"; then
10329 ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&510393 if test -n "$PKG_CONFIG" && \
10330 ac_status=$?10394 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
10331 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510395 ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
10332 test $ac_status = 0; }; then10396 ac_status=$?
10333 pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`10397 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10334else10398 test $ac_status = 0; }; then
10335 pkg_failed=yes10399 pkg_cv_LIBWPG01_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
10336fi10400 test "x$?" != "x0" && pkg_failed=yes
10337 else10401else
10338 pkg_failed=untried10402 pkg_failed=yes
10339fi10403fi
10340if test -n "$LIBWPG_LIBS"; then10404 else
10341 pkg_cv_LIBWPG_LIBS="$LIBWPG_LIBS"10405 pkg_failed=untried
10342 elif test -n "$PKG_CONFIG"; then10406fi
10343 if test -n "$PKG_CONFIG" && \10407if test -n "$LIBWPG01_LIBS"; then
10344 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&510408 pkg_cv_LIBWPG01_LIBS="$LIBWPG01_LIBS"
10345 ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&510409 elif test -n "$PKG_CONFIG"; then
10346 ac_status=$?10410 if test -n "$PKG_CONFIG" && \
10347 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510411 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
10348 test $ac_status = 0; }; then10412 ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
10349 pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`10413 ac_status=$?
10350else10414 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10351 pkg_failed=yes10415 test $ac_status = 0; }; then
10352fi10416 pkg_cv_LIBWPG01_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
10353 else10417 test "x$?" != "x0" && pkg_failed=yes
10354 pkg_failed=untried10418else
10355fi10419 pkg_failed=yes
1035610420fi
1035710421 else
1035810422 pkg_failed=untried
10359if test $pkg_failed = yes; then10423fi
10360 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&510424
10361$as_echo "no" >&6; }10425
1036210426
10363if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then10427if test $pkg_failed = yes; then
10364 _pkg_short_errors_supported=yes10428 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10365else10429$as_echo "no" >&6; }
10366 _pkg_short_errors_supported=no10430
10367fi10431if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
10368 if test $_pkg_short_errors_supported = yes; then10432 _pkg_short_errors_supported=yes
10369 LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`10433else
10370 else10434 _pkg_short_errors_supported=no
10371 LIBWPG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`10435fi
10372 fi10436 if test $_pkg_short_errors_supported = yes; then
10373 # Put the nasty error message in config.log where it belongs10437 LIBWPG01_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwpg-0.1 libwpg-stream-0.1" 2>&1`
10374 echo "$LIBWPG_PKG_ERRORS" >&510438 else
1037510439 LIBWPG01_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwpg-0.1 libwpg-stream-0.1" 2>&1`
10376 with_libwpg=no10440 fi
10377elif test $pkg_failed = untried; then10441 # Put the nasty error message in config.log where it belongs
10378 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&510442 echo "$LIBWPG01_PKG_ERRORS" >&5
10379$as_echo "no" >&6; }10443
10380 with_libwpg=no10444 with_libwpg01=no
10381else10445elif test $pkg_failed = untried; then
10382 LIBWPG_CFLAGS=$pkg_cv_LIBWPG_CFLAGS10446 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10383 LIBWPG_LIBS=$pkg_cv_LIBWPG_LIBS10447$as_echo "no" >&6; }
10384 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&510448 with_libwpg01=no
10385$as_echo "yes" >&6; }10449else
10386 with_libwpg=yes10450 LIBWPG01_CFLAGS=$pkg_cv_LIBWPG01_CFLAGS
10387fi10451 LIBWPG01_LIBS=$pkg_cv_LIBWPG01_LIBS
10452 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10453$as_echo "yes" >&6; }
10454 with_libwpg01=yes
10455fi
10456if test "x$with_libwpg01" = "xyes"; then
10457
10458$as_echo "#define WITH_LIBWPG01 1" >>confdefs.h
10459
10460 with_libwpg=yes
10461 LIBWPG_LIBS=$LIBWPG01_LIBS
10462
10463 LIBWPG_CFLAGS=$LIBWPG01_CFLAGS
10464
10465fi
10466 if test "x$with_libwpg01" = "xyes"; then
10467 WITH_LIBWPG01_TRUE=
10468 WITH_LIBWPG01_FALSE='#'
10469else
10470 WITH_LIBWPG01_TRUE='#'
10471 WITH_LIBWPG01_FALSE=
10472fi
10473
10474
10475
10476pkg_failed=no
10477{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG02" >&5
10478$as_echo_n "checking for LIBWPG02... " >&6; }
10479
10480if test -n "$LIBWPG02_CFLAGS"; then
10481 pkg_cv_LIBWPG02_CFLAGS="$LIBWPG02_CFLAGS"
10482 elif test -n "$PKG_CONFIG"; then
10483 if test -n "$PKG_CONFIG" && \
10484 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
10485 ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
10486 ac_status=$?
10487 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10488 test $ac_status = 0; }; then
10489 pkg_cv_LIBWPG02_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
10490 test "x$?" != "x0" && pkg_failed=yes
10491else
10492 pkg_failed=yes
10493fi
10494 else
10495 pkg_failed=untried
10496fi
10497if test -n "$LIBWPG02_LIBS"; then
10498 pkg_cv_LIBWPG02_LIBS="$LIBWPG02_LIBS"
10499 elif test -n "$PKG_CONFIG"; then
10500 if test -n "$PKG_CONFIG" && \
10501 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
10502 ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
10503 ac_status=$?
10504 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10505 test $ac_status = 0; }; then
10506 pkg_cv_LIBWPG02_LIBS=`$PKG_CONFIG --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
10507 test "x$?" != "x0" && pkg_failed=yes
10508else
10509 pkg_failed=yes
10510fi
10511 else
10512 pkg_failed=untried
10513fi
10514
10515
10516
10517if test $pkg_failed = yes; then
10518 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10519$as_echo "no" >&6; }
10520
10521if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
10522 _pkg_short_errors_supported=yes
10523else
10524 _pkg_short_errors_supported=no
10525fi
10526 if test $_pkg_short_errors_supported = yes; then
10527 LIBWPG02_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
10528 else
10529 LIBWPG02_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
10530 fi
10531 # Put the nasty error message in config.log where it belongs
10532 echo "$LIBWPG02_PKG_ERRORS" >&5
10533
10534 with_libwpg02=no
10535elif test $pkg_failed = untried; then
10536 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10537$as_echo "no" >&6; }
10538 with_libwpg02=no
10539else
10540 LIBWPG02_CFLAGS=$pkg_cv_LIBWPG02_CFLAGS
10541 LIBWPG02_LIBS=$pkg_cv_LIBWPG02_LIBS
10542 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10543$as_echo "yes" >&6; }
10544 with_libwpg02=yes
10545fi
10546if test "x$with_libwpg02" = "xyes"; then
10547
10548$as_echo "#define WITH_LIBWPG02 1" >>confdefs.h
10549
10550 with_libwpg=yes
10551 LIBWPG_LIBS=$LIBWPG02_LIBS
10552
10553 LIBWPG_CFLAGS=$LIBWPG02_CFLAGS
10554
10555fi
10556 if test "x$with_libwpg02" = "xyes"; then
10557 WITH_LIBWPG02_TRUE=
10558 WITH_LIBWPG02_FALSE='#'
10559else
10560 WITH_LIBWPG02_TRUE='#'
10561 WITH_LIBWPG02_FALSE=
10562fi
10563
10564
10388if test "x$with_libwpg" = "xyes"; then10565if test "x$with_libwpg" = "xyes"; then
1038910566
10390$as_echo "#define WITH_LIBWPG 1" >>confdefs.h10567$as_echo "#define WITH_LIBWPG 1" >>confdefs.h
@@ -10401,9 +10578,6 @@
1040110578
1040210579
1040310580
10404
10405
10406
10407pkg_failed=no10581pkg_failed=no
10408{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAGEMAGICK" >&510582{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAGEMAGICK" >&5
10409$as_echo_n "checking for IMAGEMAGICK... " >&6; }10583$as_echo_n "checking for IMAGEMAGICK... " >&6; }
@@ -10418,6 +10592,7 @@
10418 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510592 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10419 test $ac_status = 0; }; then10593 test $ac_status = 0; }; then
10420 pkg_cv_IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick++" 2>/dev/null`10594 pkg_cv_IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick++" 2>/dev/null`
10595 test "x$?" != "x0" && pkg_failed=yes
10421else10596else
10422 pkg_failed=yes10597 pkg_failed=yes
10423fi10598fi
@@ -10434,6 +10609,7 @@
10434 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510609 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10435 test $ac_status = 0; }; then10610 test $ac_status = 0; }; then
10436 pkg_cv_IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "ImageMagick++" 2>/dev/null`10611 pkg_cv_IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "ImageMagick++" 2>/dev/null`
10612 test "x$?" != "x0" && pkg_failed=yes
10437else10613else
10438 pkg_failed=yes10614 pkg_failed=yes
10439fi10615fi
@@ -10453,9 +10629,9 @@
10453 _pkg_short_errors_supported=no10629 _pkg_short_errors_supported=no
10454fi10630fi
10455 if test $_pkg_short_errors_supported = yes; then10631 if test $_pkg_short_errors_supported = yes; then
10456 IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ImageMagick++" 2>&1`10632 IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ImageMagick++" 2>&1`
10457 else10633 else
10458 IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors "ImageMagick++" 2>&1`10634 IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ImageMagick++" 2>&1`
10459 fi10635 fi
10460 # Put the nasty error message in config.log where it belongs10636 # Put the nasty error message in config.log where it belongs
10461 echo "$IMAGEMAGICK_PKG_ERRORS" >&510637 echo "$IMAGEMAGICK_PKG_ERRORS" >&5
@@ -10505,6 +10681,7 @@
10505 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510681 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10506 test $ac_status = 0; }; then10682 test $ac_status = 0; }; then
10507 pkg_cv_CAIRO_USER_FONTS_CFLAGS=`$PKG_CONFIG --cflags "cairo > 1.7.6" 2>/dev/null`10683 pkg_cv_CAIRO_USER_FONTS_CFLAGS=`$PKG_CONFIG --cflags "cairo > 1.7.6" 2>/dev/null`
10684 test "x$?" != "x0" && pkg_failed=yes
10508else10685else
10509 pkg_failed=yes10686 pkg_failed=yes
10510fi10687fi
@@ -10521,6 +10698,7 @@
10521 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510698 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10522 test $ac_status = 0; }; then10699 test $ac_status = 0; }; then
10523 pkg_cv_CAIRO_USER_FONTS_LIBS=`$PKG_CONFIG --libs "cairo > 1.7.6" 2>/dev/null`10700 pkg_cv_CAIRO_USER_FONTS_LIBS=`$PKG_CONFIG --libs "cairo > 1.7.6" 2>/dev/null`
10701 test "x$?" != "x0" && pkg_failed=yes
10524else10702else
10525 pkg_failed=yes10703 pkg_failed=yes
10526fi10704fi
@@ -10540,9 +10718,9 @@
10540 _pkg_short_errors_supported=no10718 _pkg_short_errors_supported=no
10541fi10719fi
10542 if test $_pkg_short_errors_supported = yes; then10720 if test $_pkg_short_errors_supported = yes; then
10543 CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo > 1.7.6" 2>&1`10721 CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo > 1.7.6" 2>&1`
10544 else10722 else
10545 CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo > 1.7.6" 2>&1`10723 CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo > 1.7.6" 2>&1`
10546 fi10724 fi
10547 # Put the nasty error message in config.log where it belongs10725 # Put the nasty error message in config.log where it belongs
10548 echo "$CAIRO_USER_FONTS_PKG_ERRORS" >&510726 echo "$CAIRO_USER_FONTS_PKG_ERRORS" >&5
@@ -10586,6 +10764,7 @@
10586 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510764 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10587 test $ac_status = 0; }; then10765 test $ac_status = 0; }; then
10588 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`10766 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`
10767 test "x$?" != "x0" && pkg_failed=yes
10589else10768else
10590 pkg_failed=yes10769 pkg_failed=yes
10591fi10770fi
@@ -10602,6 +10781,7 @@
10602 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510781 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10603 test $ac_status = 0; }; then10782 test $ac_status = 0; }; then
10604 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`10783 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`
10784 test "x$?" != "x0" && pkg_failed=yes
10605else10785else
10606 pkg_failed=yes10786 pkg_failed=yes
10607fi10787fi
@@ -10621,9 +10801,9 @@
10621 _pkg_short_errors_supported=no10801 _pkg_short_errors_supported=no
10622fi10802fi
10623 if test $_pkg_short_errors_supported = yes; then10803 if test $_pkg_short_errors_supported = yes; then
10624 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`10804 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`
10625 else10805 else
10626 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`10806 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`
10627 fi10807 fi
10628 # Put the nasty error message in config.log where it belongs10808 # Put the nasty error message in config.log where it belongs
10629 echo "$INKSCAPE_PKG_ERRORS" >&510809 echo "$INKSCAPE_PKG_ERRORS" >&5
@@ -10652,7 +10832,7 @@
10652See the pkg-config man page for more details.10832See the pkg-config man page for more details.
1065310833
10654To get pkg-config, see <http://pkg-config.freedesktop.org/>.10834To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10655See \`config.log' for more details" "$LINENO" 5 ; }10835See \`config.log' for more details" "$LINENO" 5; }
10656else10836else
10657 INKSCAPE_CFLAGS=$pkg_cv_INKSCAPE_CFLAGS10837 INKSCAPE_CFLAGS=$pkg_cv_INKSCAPE_CFLAGS
10658 INKSCAPE_LIBS=$pkg_cv_INKSCAPE_LIBS10838 INKSCAPE_LIBS=$pkg_cv_INKSCAPE_LIBS
@@ -10698,7 +10878,7 @@
10698for ac_header in boost/concept_check.hpp10878for ac_header in boost/concept_check.hpp
10699do :10879do :
10700 ac_fn_cxx_check_header_mongrel "$LINENO" "boost/concept_check.hpp" "ac_cv_header_boost_concept_check_hpp" "$ac_includes_default"10880 ac_fn_cxx_check_header_mongrel "$LINENO" "boost/concept_check.hpp" "ac_cv_header_boost_concept_check_hpp" "$ac_includes_default"
10701if test "x$ac_cv_header_boost_concept_check_hpp" = x""yes; then :10881if test "x$ac_cv_header_boost_concept_check_hpp" = xyes; then :
10702 cat >>confdefs.h <<_ACEOF10882 cat >>confdefs.h <<_ACEOF
10703#define HAVE_BOOST_CONCEPT_CHECK_HPP 110883#define HAVE_BOOST_CONCEPT_CHECK_HPP 1
10704_ACEOF10884_ACEOF
@@ -10725,6 +10905,7 @@
10725 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510905 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10726 test $ac_status = 0; }; then10906 test $ac_status = 0; }; then
10727 pkg_cv_CAIRO_PDF_CFLAGS=`$PKG_CONFIG --cflags "cairo-pdf" 2>/dev/null`10907 pkg_cv_CAIRO_PDF_CFLAGS=`$PKG_CONFIG --cflags "cairo-pdf" 2>/dev/null`
10908 test "x$?" != "x0" && pkg_failed=yes
10728else10909else
10729 pkg_failed=yes10910 pkg_failed=yes
10730fi10911fi
@@ -10741,6 +10922,7 @@
10741 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&510922 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10742 test $ac_status = 0; }; then10923 test $ac_status = 0; }; then
10743 pkg_cv_CAIRO_PDF_LIBS=`$PKG_CONFIG --libs "cairo-pdf" 2>/dev/null`10924 pkg_cv_CAIRO_PDF_LIBS=`$PKG_CONFIG --libs "cairo-pdf" 2>/dev/null`
10925 test "x$?" != "x0" && pkg_failed=yes
10744else10926else
10745 pkg_failed=yes10927 pkg_failed=yes
10746fi10928fi
@@ -10760,9 +10942,9 @@
10760 _pkg_short_errors_supported=no10942 _pkg_short_errors_supported=no
10761fi10943fi
10762 if test $_pkg_short_errors_supported = yes; then10944 if test $_pkg_short_errors_supported = yes; then
10763 CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-pdf" 2>&1`10945 CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo-pdf" 2>&1`
10764 else10946 else
10765 CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-pdf" 2>&1`10947 CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo-pdf" 2>&1`
10766 fi10948 fi
10767 # Put the nasty error message in config.log where it belongs10949 # Put the nasty error message in config.log where it belongs
10768 echo "$CAIRO_PDF_PKG_ERRORS" >&510950 echo "$CAIRO_PDF_PKG_ERRORS" >&5
@@ -10791,7 +10973,7 @@
10791fi10973fi
1079210974
10793ac_fn_cxx_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"10975ac_fn_cxx_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
10794if test "x$ac_cv_header_popt_h" = x""yes; then :10976if test "x$ac_cv_header_popt_h" = xyes; then :
10795 INKSCAPE_LIBS="$INKSCAPE_LIBS -lpopt"10977 INKSCAPE_LIBS="$INKSCAPE_LIBS -lpopt"
10796else10978else
10797 as_fn_error $? "libpopt is required" "$LINENO" 510979 as_fn_error $? "libpopt is required" "$LINENO" 5
@@ -10801,7 +10983,7 @@
1080110983
10802{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&510984{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
10803$as_echo_n "checking for new_aspell_config in -laspell... " >&6; }10985$as_echo_n "checking for new_aspell_config in -laspell... " >&6; }
10804if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then :10986if ${ac_cv_lib_aspell_new_aspell_config+:} false; then :
10805 $as_echo_n "(cached) " >&610987 $as_echo_n "(cached) " >&6
10806else10988else
10807 ac_check_lib_save_LIBS=$LIBS10989 ac_check_lib_save_LIBS=$LIBS
@@ -10835,9 +11017,9 @@
10835fi11017fi
10836{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&511018{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
10837$as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }11019$as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }
10838if test "x$ac_cv_lib_aspell_new_aspell_config" = x""yes; then :11020if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes; then :
10839 ac_fn_cxx_check_header_mongrel "$LINENO" "aspell.h" "ac_cv_header_aspell_h" "$ac_includes_default"11021 ac_fn_cxx_check_header_mongrel "$LINENO" "aspell.h" "ac_cv_header_aspell_h" "$ac_includes_default"
10840if test "x$ac_cv_header_aspell_h" = x""yes; then :11022if test "x$ac_cv_header_aspell_h" = xyes; then :
10841 aspell_ok=yes11023 aspell_ok=yes
10842else11024else
10843 aspell_ok=no11025 aspell_ok=no
@@ -10863,7 +11045,7 @@
10863for ac_func in bind_textdomain_codeset11045for ac_func in bind_textdomain_codeset
10864do :11046do :
10865 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"11047 ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
10866if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :11048if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
10867 cat >>confdefs.h <<_ACEOF11049 cat >>confdefs.h <<_ACEOF
10868#define HAVE_BIND_TEXTDOMAIN_CODESET 111050#define HAVE_BIND_TEXTDOMAIN_CODESET 1
10869_ACEOF11051_ACEOF
@@ -10874,7 +11056,7 @@
10874for ac_func in gtk_window_set_default_icon_from_file11056for ac_func in gtk_window_set_default_icon_from_file
10875do :11057do :
10876 ac_fn_cxx_check_func "$LINENO" "gtk_window_set_default_icon_from_file" "ac_cv_func_gtk_window_set_default_icon_from_file"11058 ac_fn_cxx_check_func "$LINENO" "gtk_window_set_default_icon_from_file" "ac_cv_func_gtk_window_set_default_icon_from_file"
10877if test "x$ac_cv_func_gtk_window_set_default_icon_from_file" = x""yes; then :11059if test "x$ac_cv_func_gtk_window_set_default_icon_from_file" = xyes; then :
10878 cat >>confdefs.h <<_ACEOF11060 cat >>confdefs.h <<_ACEOF
10879#define HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE 111061#define HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE 1
10880_ACEOF11062_ACEOF
@@ -10885,7 +11067,7 @@
10885for ac_func in gtk_window_fullscreen11067for ac_func in gtk_window_fullscreen
10886do :11068do :
10887 ac_fn_cxx_check_func "$LINENO" "gtk_window_fullscreen" "ac_cv_func_gtk_window_fullscreen"11069 ac_fn_cxx_check_func "$LINENO" "gtk_window_fullscreen" "ac_cv_func_gtk_window_fullscreen"
10888if test "x$ac_cv_func_gtk_window_fullscreen" = x""yes; then :11070if test "x$ac_cv_func_gtk_window_fullscreen" = xyes; then :
10889 cat >>confdefs.h <<_ACEOF11071 cat >>confdefs.h <<_ACEOF
10890#define HAVE_GTK_WINDOW_FULLSCREEN 111072#define HAVE_GTK_WINDOW_FULLSCREEN 1
10891_ACEOF11073_ACEOF
@@ -10987,7 +11169,7 @@
10987for ac_func in pow11169for ac_func in pow
10988do :11170do :
10989 ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"11171 ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"
10990if test "x$ac_cv_func_pow" = x""yes; then :11172if test "x$ac_cv_func_pow" = xyes; then :
10991 cat >>confdefs.h <<_ACEOF11173 cat >>confdefs.h <<_ACEOF
10992#define HAVE_POW 111174#define HAVE_POW 1
10993_ACEOF11175_ACEOF
@@ -10999,7 +11181,7 @@
10999if test x"$ac_cv_func_pow" = x"no" ; then11181if test x"$ac_cv_func_pow" = x"no" ; then
11000 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&511182 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
11001$as_echo_n "checking for pow in -lm... " >&6; }11183$as_echo_n "checking for pow in -lm... " >&6; }
11002if test "${ac_cv_lib_m_pow+set}" = set; then :11184if ${ac_cv_lib_m_pow+:} false; then :
11003 $as_echo_n "(cached) " >&611185 $as_echo_n "(cached) " >&6
11004else11186else
11005 ac_check_lib_save_LIBS=$LIBS11187 ac_check_lib_save_LIBS=$LIBS
@@ -11033,7 +11215,7 @@
11033fi11215fi
11034{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&511216{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
11035$as_echo "$ac_cv_lib_m_pow" >&6; }11217$as_echo "$ac_cv_lib_m_pow" >&6; }
11036if test "x$ac_cv_lib_m_pow" = x""yes; then :11218if test "x$ac_cv_lib_m_pow" = xyes; then :
11037 cat >>confdefs.h <<_ACEOF11219 cat >>confdefs.h <<_ACEOF
11038#define HAVE_LIBM 111220#define HAVE_LIBM 1
11039_ACEOF11221_ACEOF
@@ -11046,7 +11228,7 @@
11046for ac_func in sqrt11228for ac_func in sqrt
11047do :11229do :
11048 ac_fn_cxx_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt"11230 ac_fn_cxx_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt"
11049if test "x$ac_cv_func_sqrt" = x""yes; then :11231if test "x$ac_cv_func_sqrt" = xyes; then :
11050 cat >>confdefs.h <<_ACEOF11232 cat >>confdefs.h <<_ACEOF
11051#define HAVE_SQRT 111233#define HAVE_SQRT 1
11052_ACEOF11234_ACEOF
@@ -11057,7 +11239,7 @@
11057for ac_func in floor11239for ac_func in floor
11058do :11240do :
11059 ac_fn_cxx_check_func "$LINENO" "floor" "ac_cv_func_floor"11241 ac_fn_cxx_check_func "$LINENO" "floor" "ac_cv_func_floor"
11060if test "x$ac_cv_func_floor" = x""yes; then :11242if test "x$ac_cv_func_floor" = xyes; then :
11061 cat >>confdefs.h <<_ACEOF11243 cat >>confdefs.h <<_ACEOF
11062#define HAVE_FLOOR 111244#define HAVE_FLOOR 1
11063_ACEOF11245_ACEOF
@@ -11068,7 +11250,7 @@
11068for ac_func in gettimeofday11250for ac_func in gettimeofday
11069do :11251do :
11070 ac_fn_cxx_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"11252 ac_fn_cxx_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
11071if test "x$ac_cv_func_gettimeofday" = x""yes; then :11253if test "x$ac_cv_func_gettimeofday" = xyes; then :
11072 cat >>confdefs.h <<_ACEOF11254 cat >>confdefs.h <<_ACEOF
11073#define HAVE_GETTIMEOFDAY 111255#define HAVE_GETTIMEOFDAY 1
11074_ACEOF11256_ACEOF
@@ -11079,7 +11261,7 @@
11079for ac_func in memmove11261for ac_func in memmove
11080do :11262do :
11081 ac_fn_cxx_check_func "$LINENO" "memmove" "ac_cv_func_memmove"11263 ac_fn_cxx_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
11082if test "x$ac_cv_func_memmove" = x""yes; then :11264if test "x$ac_cv_func_memmove" = xyes; then :
11083 cat >>confdefs.h <<_ACEOF11265 cat >>confdefs.h <<_ACEOF
11084#define HAVE_MEMMOVE 111266#define HAVE_MEMMOVE 1
11085_ACEOF11267_ACEOF
@@ -11090,7 +11272,7 @@
11090for ac_func in memset11272for ac_func in memset
11091do :11273do :
11092 ac_fn_cxx_check_func "$LINENO" "memset" "ac_cv_func_memset"11274 ac_fn_cxx_check_func "$LINENO" "memset" "ac_cv_func_memset"
11093if test "x$ac_cv_func_memset" = x""yes; then :11275if test "x$ac_cv_func_memset" = xyes; then :
11094 cat >>confdefs.h <<_ACEOF11276 cat >>confdefs.h <<_ACEOF
11095#define HAVE_MEMSET 111277#define HAVE_MEMSET 1
11096_ACEOF11278_ACEOF
@@ -11101,7 +11283,7 @@
11101for ac_func in mkdir11283for ac_func in mkdir
11102do :11284do :
11103 ac_fn_cxx_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"11285 ac_fn_cxx_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
11104if test "x$ac_cv_func_mkdir" = x""yes; then :11286if test "x$ac_cv_func_mkdir" = xyes; then :
11105 cat >>confdefs.h <<_ACEOF11287 cat >>confdefs.h <<_ACEOF
11106#define HAVE_MKDIR 111288#define HAVE_MKDIR 1
11107_ACEOF11289_ACEOF
@@ -11112,7 +11294,7 @@
11112for ac_func in strncasecmp11294for ac_func in strncasecmp
11113do :11295do :
11114 ac_fn_cxx_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"11296 ac_fn_cxx_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
11115if test "x$ac_cv_func_strncasecmp" = x""yes; then :11297if test "x$ac_cv_func_strncasecmp" = xyes; then :
11116 cat >>confdefs.h <<_ACEOF11298 cat >>confdefs.h <<_ACEOF
11117#define HAVE_STRNCASECMP 111299#define HAVE_STRNCASECMP 1
11118_ACEOF11300_ACEOF
@@ -11123,7 +11305,7 @@
11123for ac_func in strpbrk11305for ac_func in strpbrk
11124do :11306do :
11125 ac_fn_cxx_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"11307 ac_fn_cxx_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
11126if test "x$ac_cv_func_strpbrk" = x""yes; then :11308if test "x$ac_cv_func_strpbrk" = xyes; then :
11127 cat >>confdefs.h <<_ACEOF11309 cat >>confdefs.h <<_ACEOF
11128#define HAVE_STRPBRK 111310#define HAVE_STRPBRK 1
11129_ACEOF11311_ACEOF
@@ -11134,7 +11316,7 @@
11134for ac_func in strrchr11316for ac_func in strrchr
11135do :11317do :
11136 ac_fn_cxx_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr"11318 ac_fn_cxx_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr"
11137if test "x$ac_cv_func_strrchr" = x""yes; then :11319if test "x$ac_cv_func_strrchr" = xyes; then :
11138 cat >>confdefs.h <<_ACEOF11320 cat >>confdefs.h <<_ACEOF
11139#define HAVE_STRRCHR 111321#define HAVE_STRRCHR 1
11140_ACEOF11322_ACEOF
@@ -11145,7 +11327,7 @@
11145for ac_func in strspn11327for ac_func in strspn
11146do :11328do :
11147 ac_fn_cxx_check_func "$LINENO" "strspn" "ac_cv_func_strspn"11329 ac_fn_cxx_check_func "$LINENO" "strspn" "ac_cv_func_strspn"
11148if test "x$ac_cv_func_strspn" = x""yes; then :11330if test "x$ac_cv_func_strspn" = xyes; then :
11149 cat >>confdefs.h <<_ACEOF11331 cat >>confdefs.h <<_ACEOF
11150#define HAVE_STRSPN 111332#define HAVE_STRSPN 1
11151_ACEOF11333_ACEOF
@@ -11156,7 +11338,7 @@
11156for ac_func in strstr11338for ac_func in strstr
11157do :11339do :
11158 ac_fn_cxx_check_func "$LINENO" "strstr" "ac_cv_func_strstr"11340 ac_fn_cxx_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
11159if test "x$ac_cv_func_strstr" = x""yes; then :11341if test "x$ac_cv_func_strstr" = xyes; then :
11160 cat >>confdefs.h <<_ACEOF11342 cat >>confdefs.h <<_ACEOF
11161#define HAVE_STRSTR 111343#define HAVE_STRSTR 1
11162_ACEOF11344_ACEOF
@@ -11167,7 +11349,7 @@
11167for ac_func in strtoul11349for ac_func in strtoul
11168do :11350do :
11169 ac_fn_cxx_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"11351 ac_fn_cxx_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
11170if test "x$ac_cv_func_strtoul" = x""yes; then :11352if test "x$ac_cv_func_strtoul" = xyes; then :
11171 cat >>confdefs.h <<_ACEOF11353 cat >>confdefs.h <<_ACEOF
11172#define HAVE_STRTOUL 111354#define HAVE_STRTOUL 1
11173_ACEOF11355_ACEOF
@@ -11178,7 +11360,7 @@
11178for ac_func in fpsetmask11360for ac_func in fpsetmask
11179do :11361do :
11180 ac_fn_cxx_check_func "$LINENO" "fpsetmask" "ac_cv_func_fpsetmask"11362 ac_fn_cxx_check_func "$LINENO" "fpsetmask" "ac_cv_func_fpsetmask"
11181if test "x$ac_cv_func_fpsetmask" = x""yes; then :11363if test "x$ac_cv_func_fpsetmask" = xyes; then :
11182 cat >>confdefs.h <<_ACEOF11364 cat >>confdefs.h <<_ACEOF
11183#define HAVE_FPSETMASK 111365#define HAVE_FPSETMASK 1
11184_ACEOF11366_ACEOF
@@ -11189,7 +11371,7 @@
11189for ac_func in ecvt11371for ac_func in ecvt
11190do :11372do :
11191 ac_fn_cxx_check_func "$LINENO" "ecvt" "ac_cv_func_ecvt"11373 ac_fn_cxx_check_func "$LINENO" "ecvt" "ac_cv_func_ecvt"
11192if test "x$ac_cv_func_ecvt" = x""yes; then :11374if test "x$ac_cv_func_ecvt" = xyes; then :
11193 cat >>confdefs.h <<_ACEOF11375 cat >>confdefs.h <<_ACEOF
11194#define HAVE_ECVT 111376#define HAVE_ECVT 1
11195_ACEOF11377_ACEOF
@@ -11200,7 +11382,7 @@
11200for ac_header in ieeefp.h11382for ac_header in ieeefp.h
11201do :11383do :
11202 ac_fn_cxx_check_header_mongrel "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "$ac_includes_default"11384 ac_fn_cxx_check_header_mongrel "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "$ac_includes_default"
11203if test "x$ac_cv_header_ieeefp_h" = x""yes; then :11385if test "x$ac_cv_header_ieeefp_h" = xyes; then :
11204 cat >>confdefs.h <<_ACEOF11386 cat >>confdefs.h <<_ACEOF
11205#define HAVE_IEEEFP_H 111387#define HAVE_IEEEFP_H 1
11206_ACEOF11388_ACEOF
@@ -11212,7 +11394,7 @@
11212for ac_header in fcntl.h11394for ac_header in fcntl.h
11213do :11395do :
11214 ac_fn_cxx_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"11396 ac_fn_cxx_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
11215if test "x$ac_cv_header_fcntl_h" = x""yes; then :11397if test "x$ac_cv_header_fcntl_h" = xyes; then :
11216 cat >>confdefs.h <<_ACEOF11398 cat >>confdefs.h <<_ACEOF
11217#define HAVE_FCNTL_H 111399#define HAVE_FCNTL_H 1
11218_ACEOF11400_ACEOF
@@ -11224,7 +11406,7 @@
11224for ac_header in libintl.h11406for ac_header in libintl.h
11225do :11407do :
11226 ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"11408 ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
11227if test "x$ac_cv_header_libintl_h" = x""yes; then :11409if test "x$ac_cv_header_libintl_h" = xyes; then :
11228 cat >>confdefs.h <<_ACEOF11410 cat >>confdefs.h <<_ACEOF
11229#define HAVE_LIBINTL_H 111411#define HAVE_LIBINTL_H 1
11230_ACEOF11412_ACEOF
@@ -11236,7 +11418,7 @@
11236for ac_header in stddef.h11418for ac_header in stddef.h
11237do :11419do :
11238 ac_fn_cxx_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"11420 ac_fn_cxx_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
11239if test "x$ac_cv_header_stddef_h" = x""yes; then :11421if test "x$ac_cv_header_stddef_h" = xyes; then :
11240 cat >>confdefs.h <<_ACEOF11422 cat >>confdefs.h <<_ACEOF
11241#define HAVE_STDDEF_H 111423#define HAVE_STDDEF_H 1
11242_ACEOF11424_ACEOF
@@ -11248,7 +11430,7 @@
11248for ac_header in sys/time.h11430for ac_header in sys/time.h
11249do :11431do :
11250 ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"11432 ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
11251if test "x$ac_cv_header_sys_time_h" = x""yes; then :11433if test "x$ac_cv_header_sys_time_h" = xyes; then :
11252 cat >>confdefs.h <<_ACEOF11434 cat >>confdefs.h <<_ACEOF
11253#define HAVE_SYS_TIME_H 111435#define HAVE_SYS_TIME_H 1
11254_ACEOF11436_ACEOF
@@ -11259,7 +11441,7 @@
1125911441
11260{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&511442{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
11261$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }11443$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
11262if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :11444if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
11263 $as_echo_n "(cached) " >&611445 $as_echo_n "(cached) " >&6
11264else11446else
11265 rm -f conftest.sym conftest.file11447 rm -f conftest.sym conftest.file
@@ -11321,7 +11503,7 @@
1132111503
11322{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&511504{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
11323$as_echo_n "checking whether stat accepts an empty string... " >&6; }11505$as_echo_n "checking whether stat accepts an empty string... " >&6; }
11324if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :11506if ${ac_cv_func_stat_empty_string_bug+:} false; then :
11325 $as_echo_n "(cached) " >&611507 $as_echo_n "(cached) " >&6
11326else11508else
11327 if test "$cross_compiling" = yes; then :11509 if test "$cross_compiling" = yes; then :
@@ -11368,7 +11550,7 @@
11368for ac_func in strftime11550for ac_func in strftime
11369do :11551do :
11370 ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime"11552 ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
11371if test "x$ac_cv_func_strftime" = x""yes; then :11553if test "x$ac_cv_func_strftime" = xyes; then :
11372 cat >>confdefs.h <<_ACEOF11554 cat >>confdefs.h <<_ACEOF
11373#define HAVE_STRFTIME 111555#define HAVE_STRFTIME 1
11374_ACEOF11556_ACEOF
@@ -11377,7 +11559,7 @@
11377 # strftime is in -lintl on SCO UNIX.11559 # strftime is in -lintl on SCO UNIX.
11378{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&511560{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
11379$as_echo_n "checking for strftime in -lintl... " >&6; }11561$as_echo_n "checking for strftime in -lintl... " >&6; }
11380if test "${ac_cv_lib_intl_strftime+set}" = set; then :11562if ${ac_cv_lib_intl_strftime+:} false; then :
11381 $as_echo_n "(cached) " >&611563 $as_echo_n "(cached) " >&6
11382else11564else
11383 ac_check_lib_save_LIBS=$LIBS11565 ac_check_lib_save_LIBS=$LIBS
@@ -11411,7 +11593,7 @@
11411fi11593fi
11412{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&511594{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
11413$as_echo "$ac_cv_lib_intl_strftime" >&6; }11595$as_echo "$ac_cv_lib_intl_strftime" >&6; }
11414if test "x$ac_cv_lib_intl_strftime" = x""yes; then :11596if test "x$ac_cv_lib_intl_strftime" = xyes; then :
11415 $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h11597 $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
1141611598
11417LIBS="-lintl $LIBS"11599LIBS="-lintl $LIBS"
@@ -11422,7 +11604,7 @@
1142211604
11423{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&511605{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
11424$as_echo_n "checking for working strtod... " >&6; }11606$as_echo_n "checking for working strtod... " >&6; }
11425if test "${ac_cv_func_strtod+set}" = set; then :11607if ${ac_cv_func_strtod+:} false; then :
11426 $as_echo_n "(cached) " >&611608 $as_echo_n "(cached) " >&6
11427else11609else
11428 if test "$cross_compiling" = yes; then :11610 if test "$cross_compiling" = yes; then :
@@ -11481,14 +11663,14 @@
11481esac11663esac
1148211664
11483ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"11665ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"
11484if test "x$ac_cv_func_pow" = x""yes; then :11666if test "x$ac_cv_func_pow" = xyes; then :
1148511667
11486fi11668fi
1148711669
11488if test $ac_cv_func_pow = no; then11670if test $ac_cv_func_pow = no; then
11489 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&511671 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
11490$as_echo_n "checking for pow in -lm... " >&6; }11672$as_echo_n "checking for pow in -lm... " >&6; }
11491if test "${ac_cv_lib_m_pow+set}" = set; then :11673if ${ac_cv_lib_m_pow+:} false; then :
11492 $as_echo_n "(cached) " >&611674 $as_echo_n "(cached) " >&6
11493else11675else
11494 ac_check_lib_save_LIBS=$LIBS11676 ac_check_lib_save_LIBS=$LIBS
@@ -11522,7 +11704,7 @@
11522fi11704fi
11523{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&511705{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
11524$as_echo "$ac_cv_lib_m_pow" >&6; }11706$as_echo "$ac_cv_lib_m_pow" >&6; }
11525if test "x$ac_cv_lib_m_pow" = x""yes; then :11707if test "x$ac_cv_lib_m_pow" = xyes; then :
11526 POW_LIB=-lm11708 POW_LIB=-lm
11527else11709else
11528 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&511710 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
@@ -11535,7 +11717,7 @@
1153511717
11536{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&511718{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
11537$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }11719$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
11538if test "${ac_cv_header_stat_broken+set}" = set; then :11720if ${ac_cv_header_stat_broken+:} false; then :
11539 $as_echo_n "(cached) " >&611721 $as_echo_n "(cached) " >&6
11540else11722else
11541 cat confdefs.h - <<_ACEOF >conftest.$ac_ext11723 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11577,7 +11759,7 @@
1157711759
11578{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&511760{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
11579$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }11761$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
11580if test "${ac_cv_header_time+set}" = set; then :11762if ${ac_cv_header_time+:} false; then :
11581 $as_echo_n "(cached) " >&611763 $as_echo_n "(cached) " >&6
11582else11764else
11583 cat confdefs.h - <<_ACEOF >conftest.$ac_ext11765 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11612,7 +11794,7 @@
1161211794
11613{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&511795{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
11614$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }11796$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
11615if test "${ac_cv_struct_tm+set}" = set; then :11797if ${ac_cv_struct_tm+:} false; then :
11616 $as_echo_n "(cached) " >&611798 $as_echo_n "(cached) " >&6
11617else11799else
11618 cat confdefs.h - <<_ACEOF >conftest.$ac_ext11800 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11646,7 +11828,7 @@
11646fi11828fi
1164711829
11648ac_fn_cxx_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"11830ac_fn_cxx_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
11649if test "x$ac_cv_type_mode_t" = x""yes; then :11831if test "x$ac_cv_type_mode_t" = xyes; then :
1165011832
11651else11833else
1165211834
@@ -11658,7 +11840,7 @@
1165811840
11659{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&511841{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
11660$as_echo_n "checking return type of signal handlers... " >&6; }11842$as_echo_n "checking return type of signal handlers... " >&6; }
11661if test "${ac_cv_type_signal+set}" = set; then :11843if ${ac_cv_type_signal+:} false; then :
11662 $as_echo_n "(cached) " >&611844 $as_echo_n "(cached) " >&6
11663else11845else
11664 cat confdefs.h - <<_ACEOF >conftest.$ac_ext11846 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11840,10 +12022,21 @@
11840 :end' >>confcache12022 :end' >>confcache
11841if diff "$cache_file" confcache >/dev/null 2>&1; then :; else12023if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
11842 if test -w "$cache_file"; then12024 if test -w "$cache_file"; then
11843 test "x$cache_file" != "x/dev/null" &&12025 if test "x$cache_file" != "x/dev/null"; then
11844 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&512026 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
11845$as_echo "$as_me: updating cache $cache_file" >&6;}12027$as_echo "$as_me: updating cache $cache_file" >&6;}
11846 cat confcache >$cache_file12028 if test ! -f "$cache_file" || test -h "$cache_file"; then
12029 cat confcache >"$cache_file"
12030 else
12031 case $cache_file in #(
12032 */* | ?:*)
12033 mv -f confcache "$cache_file"$$ &&
12034 mv -f "$cache_file"$$ "$cache_file" ;; #(
12035 *)
12036 mv -f confcache "$cache_file" ;;
12037 esac
12038 fi
12039 fi
11847 else12040 else
11848 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&512041 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
11849$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}12042$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -11918,6 +12111,10 @@
11918 as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.12111 as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
11919Usually this means the macro was only invoked conditionally." "$LINENO" 512112Usually this means the macro was only invoked conditionally." "$LINENO" 5
11920fi12113fi
12114if test -z "${PLATFORM_OSX_TRUE}" && test -z "${PLATFORM_OSX_FALSE}"; then
12115 as_fn_error $? "conditional \"PLATFORM_OSX\" was never defined.
12116Usually this means the macro was only invoked conditionally." "$LINENO" 5
12117fi
11921if test -z "${PLATFORM_SOLARIS_TRUE}" && test -z "${PLATFORM_SOLARIS_FALSE}"; then12118if test -z "${PLATFORM_SOLARIS_TRUE}" && test -z "${PLATFORM_SOLARIS_FALSE}"; then
11922 as_fn_error $? "conditional \"PLATFORM_SOLARIS\" was never defined.12119 as_fn_error $? "conditional \"PLATFORM_SOLARIS\" was never defined.
11923Usually this means the macro was only invoked conditionally." "$LINENO" 512120Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -11943,6 +12140,14 @@
11943 as_fn_error $? "conditional \"WITH_PYTHON\" was never defined.12140 as_fn_error $? "conditional \"WITH_PYTHON\" was never defined.
11944Usually this means the macro was only invoked conditionally." "$LINENO" 512141Usually this means the macro was only invoked conditionally." "$LINENO" 5
11945fi12142fi
12143if test -z "${WITH_LIBWPG01_TRUE}" && test -z "${WITH_LIBWPG01_FALSE}"; then
12144 as_fn_error $? "conditional \"WITH_LIBWPG01\" was never defined.
12145Usually this means the macro was only invoked conditionally." "$LINENO" 5
12146fi
12147if test -z "${WITH_LIBWPG02_TRUE}" && test -z "${WITH_LIBWPG02_FALSE}"; then
12148 as_fn_error $? "conditional \"WITH_LIBWPG02\" was never defined.
12149Usually this means the macro was only invoked conditionally." "$LINENO" 5
12150fi
11946if test -z "${WITH_LIBWPG_TRUE}" && test -z "${WITH_LIBWPG_FALSE}"; then12151if test -z "${WITH_LIBWPG_TRUE}" && test -z "${WITH_LIBWPG_FALSE}"; then
11947 as_fn_error $? "conditional \"WITH_LIBWPG\" was never defined.12152 as_fn_error $? "conditional \"WITH_LIBWPG\" was never defined.
11948Usually this means the macro was only invoked conditionally." "$LINENO" 512153Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -11956,7 +12161,7 @@
11956Usually this means the macro was only invoked conditionally." "$LINENO" 512161Usually this means the macro was only invoked conditionally." "$LINENO" 5
11957fi12162fi
1195812163
11959: ${CONFIG_STATUS=./config.status}12164: "${CONFIG_STATUS=./config.status}"
11960ac_write_fail=012165ac_write_fail=0
11961ac_clean_files_save=$ac_clean_files12166ac_clean_files_save=$ac_clean_files
11962ac_clean_files="$ac_clean_files $CONFIG_STATUS"12167ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -12057,6 +12262,7 @@
12057IFS=" "" $as_nl"12262IFS=" "" $as_nl"
1205812263
12059# Find who we are. Look in the path if we contain no directory separator.12264# Find who we are. Look in the path if we contain no directory separator.
12265as_myself=
12060case $0 in #((12266case $0 in #((
12061 *[\\/]* ) as_myself=$0 ;;12267 *[\\/]* ) as_myself=$0 ;;
12062 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR12268 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12363,8 +12569,8 @@
12363# report actual input values of CONFIG_FILES etc. instead of their12569# report actual input values of CONFIG_FILES etc. instead of their
12364# values after options handling.12570# values after options handling.
12365ac_log="12571ac_log="
12366This file was extended by inkscape $as_me 0.48.1, which was12572This file was extended by inkscape $as_me 0.48.2, which was
12367generated by GNU Autoconf 2.67. Invocation command line was12573generated by GNU Autoconf 2.68. Invocation command line was
1236812574
12369 CONFIG_FILES = $CONFIG_FILES12575 CONFIG_FILES = $CONFIG_FILES
12370 CONFIG_HEADERS = $CONFIG_HEADERS12576 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -12429,8 +12635,8 @@
12429cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=112635cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12430ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"12636ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
12431ac_cs_version="\\12637ac_cs_version="\\
12432inkscape config.status 0.48.112638inkscape config.status 0.48.2
12433configured by $0, generated by GNU Autoconf 2.67,12639configured by $0, generated by GNU Autoconf 2.68,
12434 with options \\"\$ac_cs_config\\"12640 with options \\"\$ac_cs_config\\"
1243512641
12436Copyright (C) 2010 Free Software Foundation, Inc.12642Copyright (C) 2010 Free Software Foundation, Inc.
@@ -12635,7 +12841,7 @@
12635 "inkview.1") CONFIG_FILES="$CONFIG_FILES inkview.1" ;;12841 "inkview.1") CONFIG_FILES="$CONFIG_FILES inkview.1" ;;
12636 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;12842 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
1263712843
12638 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;12844 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
12639 esac12845 esac
12640done12846done
1264112847
@@ -12658,9 +12864,10 @@
12658# after its creation but before its name has been assigned to `$tmp'.12864# after its creation but before its name has been assigned to `$tmp'.
12659$debug ||12865$debug ||
12660{12866{
12661 tmp=12867 tmp= ac_tmp=
12662 trap 'exit_status=$?12868 trap 'exit_status=$?
12663 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status12869 : "${ac_tmp:=$tmp}"
12870 { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
12664' 012871' 0
12665 trap 'as_fn_exit 1' 1 2 13 1512872 trap 'as_fn_exit 1' 1 2 13 15
12666}12873}
@@ -12668,12 +12875,13 @@
1266812875
12669{12876{
12670 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&12877 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
12671 test -n "$tmp" && test -d "$tmp"12878 test -d "$tmp"
12672} ||12879} ||
12673{12880{
12674 tmp=./conf$$-$RANDOM12881 tmp=./conf$$-$RANDOM
12675 (umask 077 && mkdir "$tmp")12882 (umask 077 && mkdir "$tmp")
12676} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 512883} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
12884ac_tmp=$tmp
1267712885
12678# Set up the scripts for CONFIG_FILES section.12886# Set up the scripts for CONFIG_FILES section.
12679# No need to generate them if there are no CONFIG_FILES.12887# No need to generate them if there are no CONFIG_FILES.
@@ -12695,7 +12903,7 @@
12695 ac_cs_awk_cr=$ac_cr12903 ac_cs_awk_cr=$ac_cr
12696fi12904fi
1269712905
12698echo 'BEGIN {' >"$tmp/subs1.awk" &&12906echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
12699_ACEOF12907_ACEOF
1270012908
1270112909
@@ -12723,7 +12931,7 @@
12723rm -f conf$$subs.sh12931rm -f conf$$subs.sh
1272412932
12725cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=112933cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12726cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&12934cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
12727_ACEOF12935_ACEOF
12728sed -n '12936sed -n '
12729h12937h
@@ -12771,7 +12979,7 @@
12771rm -f conf$$subs.awk12979rm -f conf$$subs.awk
12772cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=112980cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12773_ACAWK12981_ACAWK
12774cat >>"\$tmp/subs1.awk" <<_ACAWK &&12982cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
12775 for (key in S) S_is_set[key] = 112983 for (key in S) S_is_set[key] = 1
12776 FS = ""12984 FS = ""
1277712985
@@ -12803,7 +13011,7 @@
12803 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"13011 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
12804else13012else
12805 cat13013 cat
12806fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \13014fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
12807 || as_fn_error $? "could not setup config files machinery" "$LINENO" 513015 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
12808_ACEOF13016_ACEOF
1280913017
@@ -12837,7 +13045,7 @@
12837# No need to generate them if there are no CONFIG_HEADERS.13045# No need to generate them if there are no CONFIG_HEADERS.
12838# This happens for instance with `./config.status Makefile'.13046# This happens for instance with `./config.status Makefile'.
12839if test -n "$CONFIG_HEADERS"; then13047if test -n "$CONFIG_HEADERS"; then
12840cat >"$tmp/defines.awk" <<\_ACAWK ||13048cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
12841BEGIN {13049BEGIN {
12842_ACEOF13050_ACEOF
1284313051
@@ -12849,8 +13057,8 @@
12849# handling of long lines.13057# handling of long lines.
12850ac_delim='%!_!# '13058ac_delim='%!_!# '
12851for ac_last_try in false false :; do13059for ac_last_try in false false :; do
12852 ac_t=`sed -n "/$ac_delim/p" confdefs.h`13060 ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
12853 if test -z "$ac_t"; then13061 if test -z "$ac_tt"; then
12854 break13062 break
12855 elif $ac_last_try; then13063 elif $ac_last_try; then
12856 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 513064 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -12951,7 +13159,7 @@
12951 esac13159 esac
12952 case $ac_mode$ac_tag in13160 case $ac_mode$ac_tag in
12953 :[FHL]*:*);;13161 :[FHL]*:*);;
12954 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;13162 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
12955 :[FH]-) ac_tag=-:-;;13163 :[FH]-) ac_tag=-:-;;
12956 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;13164 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
12957 esac13165 esac
@@ -12970,7 +13178,7 @@
12970 for ac_f13178 for ac_f
12971 do13179 do
12972 case $ac_f in13180 case $ac_f in
12973 -) ac_f="$tmp/stdin";;13181 -) ac_f="$ac_tmp/stdin";;
12974 *) # Look for the file first in the build tree, then in the source tree13182 *) # Look for the file first in the build tree, then in the source tree
12975 # (if the path is not absolute). The absolute path cannot be DOS-style,13183 # (if the path is not absolute). The absolute path cannot be DOS-style,
12976 # because $ac_f cannot contain `:'.13184 # because $ac_f cannot contain `:'.
@@ -12979,7 +13187,7 @@
12979 [\\/$]*) false;;13187 [\\/$]*) false;;
12980 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;13188 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
12981 esac ||13189 esac ||
12982 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;13190 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
12983 esac13191 esac
12984 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac13192 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
12985 as_fn_append ac_file_inputs " '$ac_f'"13193 as_fn_append ac_file_inputs " '$ac_f'"
@@ -13005,8 +13213,8 @@
13005 esac13213 esac
1300613214
13007 case $ac_tag in13215 case $ac_tag in
13008 *:-:* | *:-) cat >"$tmp/stdin" \13216 *:-:* | *:-) cat >"$ac_tmp/stdin" \
13009 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;13217 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
13010 esac13218 esac
13011 ;;13219 ;;
13012 esac13220 esac
@@ -13142,21 +13350,22 @@
13142s&@MKDIR_P@&$ac_MKDIR_P&;t t13350s&@MKDIR_P@&$ac_MKDIR_P&;t t
13143$ac_datarootdir_hack13351$ac_datarootdir_hack
13144"13352"
13145eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \13353eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
13146 || as_fn_error $? "could not create $ac_file" "$LINENO" 513354 >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1314713355
13148test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&13356test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
13149 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&13357 { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
13150 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&13358 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
13359 "$ac_tmp/out"`; test -z "$ac_out"; } &&
13151 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'13360 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13152which seems to be undefined. Please make sure it is defined" >&513361which seems to be undefined. Please make sure it is defined" >&5
13153$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'13362$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13154which seems to be undefined. Please make sure it is defined" >&2;}13363which seems to be undefined. Please make sure it is defined" >&2;}
1315513364
13156 rm -f "$tmp/stdin"13365 rm -f "$ac_tmp/stdin"
13157 case $ac_file in13366 case $ac_file in
13158 -) cat "$tmp/out" && rm -f "$tmp/out";;13367 -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
13159 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;13368 *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
13160 esac \13369 esac \
13161 || as_fn_error $? "could not create $ac_file" "$LINENO" 513370 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
13162 ;;13371 ;;
@@ -13167,20 +13376,20 @@
13167 if test x"$ac_file" != x-; then13376 if test x"$ac_file" != x-; then
13168 {13377 {
13169 $as_echo "/* $configure_input */" \13378 $as_echo "/* $configure_input */" \
13170 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"13379 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
13171 } >"$tmp/config.h" \13380 } >"$ac_tmp/config.h" \
13172 || as_fn_error $? "could not create $ac_file" "$LINENO" 513381 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
13173 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then13382 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
13174 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&513383 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
13175$as_echo "$as_me: $ac_file is unchanged" >&6;}13384$as_echo "$as_me: $ac_file is unchanged" >&6;}
13176 else13385 else
13177 rm -f "$ac_file"13386 rm -f "$ac_file"
13178 mv "$tmp/config.h" "$ac_file" \13387 mv "$ac_tmp/config.h" "$ac_file" \
13179 || as_fn_error $? "could not create $ac_file" "$LINENO" 513388 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
13180 fi13389 fi
13181 else13390 else
13182 $as_echo "/* $configure_input */" \13391 $as_echo "/* $configure_input */" \
13183 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \13392 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
13184 || as_fn_error $? "could not create -" "$LINENO" 513393 || as_fn_error $? "could not create -" "$LINENO" 5
13185 fi13394 fi
13186# Compute "$ac_file"'s index in $config_headers.13395# Compute "$ac_file"'s index in $config_headers.
1318713396
=== modified file 'configure.ac'
--- configure.ac 2011-02-20 12:07:30 +0000
+++ configure.ac 2011-07-10 11:35:55 +0000
@@ -7,7 +7,7 @@
7# `dpkg --compare-versions'. (ii) We don't always know what the next7# `dpkg --compare-versions'. (ii) We don't always know what the next
8# version is going to be called until about the time we release it8# version is going to be called until about the time we release it
9# (whereas we always know what the previous version was called).9# (whereas we always know what the previous version was called).
10AC_INIT(inkscape, 0.48.1)10AC_INIT(inkscape, 0.48.2)
1111
12AC_CANONICAL_HOST12AC_CANONICAL_HOST
13AC_CONFIG_SRCDIR([src/main.cpp])13AC_CONFIG_SRCDIR([src/main.cpp])
@@ -313,6 +313,18 @@
313AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")313AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
314AC_SUBST(WIN32_CFLAGS)314AC_SUBST(WIN32_CFLAGS)
315315
316dnl ******************************
317dnl MacOS X
318dnl ******************************
319AC_MSG_CHECKING([for OSX platform])
320if test "x$build_vendor" = "xapple" ; then
321 platform_osx=yes
322else
323 platform_osx=no
324fi
325AC_MSG_RESULT([$platform_osx])
326AM_CONDITIONAL(PLATFORM_OSX, test "$platform_osx" = "yes")
327
316AC_MSG_CHECKING([for Solaris platform])328AC_MSG_CHECKING([for Solaris platform])
317case "$host" in329case "$host" in
318 *-solaris2.*)330 *-solaris2.*)
@@ -699,15 +711,31 @@
699dnl Check for libwpg for extension711dnl Check for libwpg for extension
700dnl ******************************712dnl ******************************
701713
702PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)714with_libwpg=no
715
716PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
717if test "x$with_libwpg01" = "xyes"; then
718 AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
719 with_libwpg=yes
720 AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
721 AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
722fi
723AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
724
725PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
726if test "x$with_libwpg02" = "xyes"; then
727 AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x])
728 with_libwpg=yes
729 AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS)
730 AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS)
731fi
732AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes")
733
703if test "x$with_libwpg" = "xyes"; then734if test "x$with_libwpg" = "xyes"; then
704 AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])735 AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
705fi736fi
706AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")737AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
707738
708AC_SUBST(LIBWPG_LIBS)
709AC_SUBST(LIBWPG_CFLAGS)
710
711dnl ******************************739dnl ******************************
712dnl Check for ImageMagick Magick++ 740dnl Check for ImageMagick Magick++
713dnl ******************************741dnl ******************************
714742
=== modified file 'debian/changelog'
--- debian/changelog 2011-06-06 16:50:22 +0000
+++ debian/changelog 2011-07-10 11:35:55 +0000
@@ -1,3 +1,25 @@
1inkscape (0.48.2-0ubuntu1) oneiric; urgency=low
2
3 * New upstream release (LP: #807912). Fixes several Ubuntu bugs:
4 - [SVG Font Editor] Crash when kerning an empty pair (LP: #706506)
5 - Connector tool crash Inkscake (orthogonal mode) (LP: #771738)
6 - Errors printed to console if openclipart search fails (LP: #638844)
7 - pdf export with cairo 1.10 defaults to version PDF-1.5 (LP: #664335)
8 - Cairo rendering broken for "use" elements when scaling or a viewBox
9 (LP: #705345)
10 - gimp_xcf.py crashed with TypeError in effect() (LP: #565296)
11 - Enable build against libwpg-0.2 (LP: #778951)
12 - Please add supported filetypes into MimeType line of inkscape.desktop
13 (LP: #278307)
14 - Inkscape fails to build with gcc 4.6 (LP: #707205)
15 * Drop 01-libwpg0.2.dpatch - Applied upstream
16 * Drop 03-add-missing-mimetypes.dpatch - Applied upstream
17 * Drop 04-fix-build-with-gcc4.6.dpatch - Applied upstream
18 * Drop 05-add-missing-includes.dpatch - Applied upstream