diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-06 20:54:38 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-06 20:54:38 +0200 |
| commit | d501dd160b89673f50f8acf27d171c6847c3cdb5 (patch) | |
| tree | 9c9404aa7034153865d8052cfe293e67d1041edf | |
| parent | 11d6a4ab34354c261dfbb180f625b402bdf807cd (diff) | |
| parent | a789ba60c4fae1070af38da500fb14a5023da79b (diff) | |
Merge branch 'upstream-experimental' into debian-experimental
216 files changed, 9630 insertions, 6145 deletions
@@ -1,5 +1,968 @@ # Generated by configure. Do not edit. +commit cb0bc64c16b3a38cbf0c622830c18ac9ea6e2ffe +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Sep 6 17:15:51 2010 +0100 + + version: 1.10.0 *release* + + /me faints with excitement. + + cairo-version.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 87fad104645c481ab027afbc9fa45c54cacbc9a7 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Sep 6 17:14:41 2010 +0100 + + NEWS: Sum up 2 years of development for 1.10.0 in 60 lines + + NEWS | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 61 insertions(+), 0 deletions(-) + +commit 04623ef9df7274d411a3b7f03129bf43e53e7086 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Sep 6 13:15:55 2010 +0100 + + test: Add subsurface-outside-target refs to REFERENCE_IMAGES + + test/Makefile.am | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit d5b2c2a12ebea33f4d108d4deec2e9111c8c7e12 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Sep 6 13:10:08 2010 +0100 + + test: Rename clip-fill-*-unbounded.image16 ref to match REFERENCE_IMAGES + + test/clip-fill-eo-unbounded.image16.ref.png | Bin 0 -> 2887 bytes + test/clip-fill-eo-unbounded.image16.rgb24.ref.png | Bin 2887 -> 0 bytes + test/clip-fill-nz-unbounded.image16.ref.png | Bin 0 -> 2887 bytes + test/clip-fill-nz-unbounded.image16.rgb24.ref.png | Bin 2887 -> 0 bytes + 4 files changed, 0 insertions(+), 0 deletions(-) + +commit cab9682f9dc4c99dcd51ddb66abd756e2ac7a63c +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Sep 6 12:24:47 2010 +0100 + + check: Ignore the documentation errors. + + Currently it is complaining about having documentation for + unconfigured sections, ignore it for now. + + doc/public/check-doc-coverage.sh | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +commit 8127f1f5d52bb716dbd70efe096894f2a542f4a9 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Sep 6 12:24:14 2010 +0100 + + Bump pixman requirements to 0.18.4 for assorted fixes. + + README | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 21a2f90cdef3d592c1d1614852fe3929ed2aa765 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Sep 2 13:19:26 2010 +0100 + + check: Make the actual error stand out + + doc/public/check-doc-coverage.sh | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 8258532794d0579f6c1b825b8cfb9c8f7ced4369 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Sep 2 13:15:07 2010 +0100 + + Reduce the cairo_device_type_t to only hold the used entries. + + This should help clarify the documentation by not mentioning non-existent + devices and prevent any assumed coupling between surface-type values and + devices. + + src/cairo.h | 49 +++++------------------------- + util/cairo-gobject/cairo-gobject-enums.c | 24 ++------------ + 2 files changed, 12 insertions(+), 61 deletions(-) + +commit e3afbc1875d618c6d7e893971372be8f9889fc8b +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Sep 2 13:07:53 2010 +0100 + + check: Fix for link-time-optimisation + + src/check-def.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit a9e055ff481303428cd9684dca826bc3f5d868c5 +Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> +Date: Thu Sep 2 14:51:30 2010 +0100 + + freelist: Separate freelist inlines from the datatype in headers. + + The cairo-freelist-private.h header has a number of static inline + functions which call hidden functions in libcairo. This poses + a problem on Solaris where the native compiler compiles inline + functions whether they are used or not, thereby adding the + link time requirements on hidden functions from whatever code + that includes cairo-freelist-private.h. Unfortunately the + boilerplate code includes cairo-private headers and indirectly + the freelist header, so linking the boilerplate helper library + fails on Solaris. + + This patch separates the structure definitions from the function + prototypes and static inlines in cairo-freelist-private.h by moving + the datatypes to a new cairo-freelist-type-private.h. + + src/Makefile.sources | 1 + + src/cairo-freelist-private.h | 28 +------------------ + src/cairo-freelist-type-private.h | 54 +++++++++++++++++++++++++++++++++++++ + src/cairo-xlib-display.c | 2 +- + src/cairo-xlib-private.h | 2 +- + 5 files changed, 58 insertions(+), 29 deletions(-) + +commit f5632d641c44a143386ca3b413e90ed3b1a85f89 +Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> +Date: Thu Sep 2 13:55:55 2010 +0300 + + build: Remove stray backslash. + + A stray backslash bwetween two assignment lines apparently + invokes a GNU make extension for conditional assignments. + This patch fixes the build when using the native Solaris make. + + src/Makefile.sources | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 3a8b8fcc2a8a48cef49211c45723862f9fa8db23 +Author: Benjamin Otte <otte@redhat.com> +Date: Wed Sep 1 21:14:40 2010 +0200 + + gobject: Fix header defines + + util/cairo-gobject/cairo-gobject.h | 64 ++++++++++++++++++------------------ + 1 files changed, 32 insertions(+), 32 deletions(-) + +commit 54a651564cdd2510d0a66f6720c4a45733ff3285 +Author: Benjamin Otte <otte@redhat.com> +Date: Wed Sep 1 18:47:16 2010 +0200 + + build: Work around caching not reevaluating uncached variables + + This is a somewhat crude hack to ensure that GOBJECT_CFLAGS/LIBS are + properly cached. + + configure.ac | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 28ba78a9716f3c105cdfb5f7519f2435dd9cb271 +Author: Benjamin Otte <otte@redhat.com> +Date: Wed Sep 1 18:46:46 2010 +0200 + + gobject: Fix pkgconfig file variable + + I confused % and $. I blame it on spec files. + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 61a1835e40d0b6d786951143779077d16ed2486e +Author: Benjamin Otte <otte@redhat.com> +Date: Wed Sep 1 03:17:12 2010 +0200 + + subsurface: Fix acquire_source_surface for out-of-bounds surfaces + + See subsurface-outside-target test. + + src/cairo-surface-subsurface.c | 41 ++++++++++++++++++++++----------------- + 1 files changed, 23 insertions(+), 18 deletions(-) + +commit f54c51e75c7abe872127d559e029bf4383439bca +Author: Benjamin Otte <otte@redhat.com> +Date: Wed Sep 1 02:10:51 2010 +0200 + + test: Add subsurface-outside-target + + This test defines the behavior of subsurfaces when they are created to + be bigger than their target. + + test/Makefile.sources | 1 + + test/subsurface-outside-target.argb32.ref.png | Bin 0 -> 2063 bytes + test/subsurface-outside-target.c | 178 +++++++++++++++++++++++++ + test/subsurface-outside-target.rgb24.ref.png | Bin 0 -> 1648 bytes + 4 files changed, 179 insertions(+), 0 deletions(-) + +commit 6eab5ee10c111cf87dcf62e3f639f44cfd1e5cf6 +Author: Maarten Bosmans <mkbosmans@gmail.com> +Date: Sat Aug 28 13:39:21 2010 +0200 + + build: prefer libpng14 over older versions + + Also move libpng to the front of the list, so that the default + version of the system is first checked. + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 9f98ec6eb915204d59820cf57d32f347f9933517 +Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> +Date: Sun Aug 29 00:05:51 2010 +0300 + + device: Refer the user to per-backend docs about devices. + + The exact semantics of the device API can't be spelled out + out in the device API docs since the effects are so tied + to the specific backend. To use a particular device in + practice the user should refer to the backend docs. + + src/cairo-device.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +commit b0f65054b810d432238ff4986bee3f63e1fc46df +Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> +Date: Sun Aug 29 00:03:07 2010 +0300 + + subsurface: Add a note to the docs about usage restrictions. + + Make our assumptions about constructed subsurfaces explicit + while we work out the correct semantics for the edge cases. + + src/cairo-surface-subsurface.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +commit 92fe2d370d120f4d9bc95e92209d1c1cec7e900b +Author: Benjamin Otte <otte@redhat.com> +Date: Sat Aug 28 17:12:45 2010 +0200 + + surface-offset: Use right variable in mask + + Use source/mask instead of their copies. The copies only get initialized + if we actually need to translate things. + + src/cairo-surface-offset.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit df4b23ff74f3d22fb306f59cdba4dce6b0857cd2 +Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> +Date: Fri Aug 27 20:26:06 2010 +0300 + + subsurface: Fix crash when acquiring a source image. + + The code is passing in the extra info received from + the target surface's acquire_source() method to + _cairo_surface_get_extents() rather than the acquired + source surface itself. + + src/cairo-surface-subsurface.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 2d146867dc4d4e17da2fd1e4776f62aaa999d90f +Author: Andrea Canciani <ranma42@gmail.com> +Date: Thu Aug 26 14:50:34 2010 +0200 + + subsurface: Correct cloning condition + + 72644c6df2c2da1d77ca10a755dbb44bbd960c0d was using the wrong (inverted) + condition to check if the subsurface extents are contained in the + target extents. + + src/cairo-surface-subsurface.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +commit 72644c6df2c2da1d77ca10a755dbb44bbd960c0d +Author: Andrea Canciani <ranma42@gmail.com> +Date: Thu Aug 26 14:24:17 2010 +0200 + + subsurface: Avoid invalid accesses + + Whenever subsurface extents are not contained in the target extents, + using the source image given by the target (with origin corrected by + using an appropriate offset in the data pointer) is not a valid + operation. Fallback to cloning in that case. + + src/cairo-surface-subsurface.c | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +commit df4465bdd11e25a1ed942bc0fc8e7dc5d43f951f +Author: Andrea Canciani <ranma42@gmail.com> +Date: Thu Aug 26 14:23:04 2010 +0200 + + subsurface: Silence compiler warnings + + Commit d1c35f5e65d53f6b8b9060455335424ca0f44bd0 introduced two + unused variable warnings. + + src/cairo-surface-subsurface.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +commit d1c35f5e65d53f6b8b9060455335424ca0f44bd0 +Author: Benjamin Otte <otte@redhat.com> +Date: Thu Aug 26 13:55:02 2010 +0200 + + subsurface: Don't clip size to target size + + This clipping would modify the origin of the subsurface and then the + creator has no easy way to figure this out. + + src/cairo-surface-subsurface.c | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +commit 174fb5f16f93887e2f319edd5b46efae3e7e93ad +Author: Benjamin Otte <otte@redhat.com> +Date: Thu Aug 26 13:21:04 2010 +0200 + + subsurface: Don't apply device transform twice for source/mask + + src/cairo-surface-offset.c | 12 ------------ + 1 files changed, 0 insertions(+), 12 deletions(-) + +commit e79acf47a57b60c83d1f9491aac354161986b29b +Author: Benjamin Otte <otte@redhat.com> +Date: Thu Aug 26 12:54:25 2010 +0200 + + subsurface: Make CAIRO_SURFACE_TYPE_SUBSURFACE public + + src/cairo-analysis-surface.c | 2 +- + src/cairo-image-surface.c | 2 +- + src/cairo-pdf-surface.c | 4 ++-- + src/cairo-ps-surface.c | 4 ++-- + src/cairo-script-surface.c | 2 +- + src/cairo-surface-subsurface.c | 4 ++-- + src/cairo-types-private.h | 3 +-- + src/cairo-xcb-surface-render.c | 4 ++-- + src/cairo-xlib-surface.c | 2 +- + src/cairo.h | 7 ++++++- + src/drm/cairo-drm-i915-shader.c | 6 +++--- + src/drm/cairo-drm-i965-shader.c | 6 +++--- + 12 files changed, 25 insertions(+), 21 deletions(-) + +commit 40459dacb52587cc784faf2635e54797d3989408 +Author: Benjamin Otte <otte@redhat.com> +Date: Thu Aug 26 11:45:28 2010 +0200 + + subsurface: Don't crash when the device transform isn't integer + + Apply the transform before rounding to integer coordinates, so we can + handle doubles easily. + + src/cairo-surface-subsurface.c | 10 ++++------ + 1 files changed, 4 insertions(+), 6 deletions(-) + +commit e19b213e84ab8b8ead5e0c700e5b906590e22aa1 +Author: Benjamin Otte <otte@redhat.com> +Date: Thu Aug 26 11:18:29 2010 +0200 + + subsurface: Make subsurfaces their own type + + Do not try to hide being a subsurface. + This would cause confusion when users where calling surface-type + specific getters on subsurfaces. + + FIXME: We still need public API to access a subsurface's target though. + + src/cairo-surface-subsurface.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit e65bf64c4a6e2c7ff673449b8459b3150e438e21 +Author: Benjamin Otte <otte@redhat.com> +Date: Thu Aug 26 11:17:06 2010 +0200 + + subsurface: Properly account for device offsets in the target + + src/cairo-surface-subsurface.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +commit 8e9c4ea5890a4df3f463e592dc3aa429bb423608 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed Aug 11 12:18:53 2010 +0100 + + Mark the context as invalid on the final cairo_destroy() + + We initialise the context to a non-error state upon creation, but after + destroy there is a window of opportunity where the object is kept alive + inside the context pool and the user could mistakenly keep on passing + the zombie context into cairo functions. As all entry points need to + check error status, flagging the context as an error object upon the + final unreference prevents such misuse (until such as time as the + context is reallocated). + + src/cairo.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit cd52378ae60ab2075d7e9ec7335e990b2f46059e +Author: Andrea Canciani <ranma42@gmail.com> +Date: Tue Aug 10 19:38:59 2010 +0200 + + test: Update linear-gradient-large ref image + + Make linear-gradient-large ref image match xlib gradients (both on nvidia + and on macosx) and pixman gradients (when patched to compute the linear + gradients using floating point math). + + test/linear-gradient-large.ref.png | Bin 3753 -> 4079 bytes + 1 files changed, 0 insertions(+), 0 deletions(-) + +commit a7762e3d6570a6981d8fb74ecc6ae30391c39b89 +Author: Krzysztof Kosiński <tweenk.pl@gmail.com> +Date: Tue Aug 10 17:55:03 2010 +0200 + + tests: Add linear-gradient-large test + + Shows large rounding errors in Pixman when computing gradients. Added as + a test to Cairo to catch similar issues in other backends. + + https://bugs.freedesktop.org/show_bug.cgi?id=29470 + + test/Makefile.am | 5 ++- + test/Makefile.sources | 1 + + test/linear-gradient-large.c | 67 ++++++++++++++++++++++++++++++++++++ + test/linear-gradient-large.ref.png | Bin 0 -> 3753 bytes + 4 files changed, 71 insertions(+), 2 deletions(-) + +commit 56ea51fdcc273531b5e86b921aad19237a1c9415 +Author: Andrea Canciani <ranma42@gmail.com> +Date: Mon Aug 9 20:23:50 2010 +0200 + + Replace insertion sort with mergesort in the scan converter + + Insertion sort can take up to O(n^2), mergesort is guaranteed to run + in O(n*log(n)). + An example showing bad performance for insertion sort is: + https://bugs.freedesktop.org/show_bug.cgi?id=28067 + + The mergesort has been engineered to be fast even when working on + cases where the insertion sort would have performed well and as + expected it shows no changes in the benchmark cairo traces. + + src/cairo-tor-scan-converter.c | 138 ++++++++++++++++++++++++++++++---------- + 1 files changed, 103 insertions(+), 35 deletions(-) + +commit a150371a5d10e03d6c0d781c6fac950a9ac6be18 +Author: Nicolaus L Hepler <nlhepler@gmail.com> +Date: Tue Aug 10 09:34:39 2010 +0200 + + ft-font: Make alpha mapping consistent + + Vertical RGB mapping previously forced opaque pixels. + To be consistent with horizontal RGB/BGR and vertical BGR it + should use an alpha equal to the mid channel (green). + + src/cairo-ft-font.c | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +commit 73470862cbc5895147d5c58ca2647f539e8fe67c +Author: David Schleef <ds@schleef.org> +Date: Tue Aug 10 02:37:38 2010 +0200 + + perf: Fix README to say cairo-perf-micro + + perf/README | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +commit df8f96423429915ef1648310fce8b5aed0917c0a +Author: Benjamin Otte <otte@redhat.com> +Date: Tue Aug 10 01:24:30 2010 +0200 + + build: Fudge the build system some more so it handles extra libs + + Add NONPKGCONFIG_EXTRA_LIBS that are only put into the generated pc file + but not used when linking. This is now used to add -lcairo-gobject to + the cairo-gobject.pc file. + + build/configure.ac.features | 3 +++ + configure.ac | 2 +- + src/cairo-features-uninstalled.pc.in | 2 +- + src/cairo-features.pc.in | 2 +- + 4 files changed, 6 insertions(+), 3 deletions(-) + +commit 01325ad767acf6213135a0bad895de233324f745 +Author: Benjamin Otte <otte@redhat.com> +Date: Tue Aug 10 00:11:25 2010 +0200 + + gobject: Include the extra library in the pkgconfig file + + configure.ac | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 8fb91dc3f6b691f91c322cec4b1d0ee4dbebd69c +Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> +Date: Tue Aug 10 00:53:53 2010 +0300 + + script: Fix script backend build. + + The flight data recorders were missing an include + of cairo-tee.h ever since cairo-tee.h became an optional + backend. + + util/cairo-fdr/fdr.c | 1 + + util/cairo-sphinx/fdr.c | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +commit 766832364904dbf5b8a67ebc1600d2ec45d2734f +Author: Andrea Canciani <ranma42@gmail.com> +Date: Mon Aug 9 18:47:13 2010 +0200 + + perf: Improve calibration + + Make the loops count depend on the actual calibration_loops/calibration_time + instead of calibration_loops/calibration_max_time. + This avoids having some tests take much less/more than the wanted time per iteration + (I was having some tests taking about 1 second, other taking about 7 seconds when + the ms_per_iteration was 2000) + + Spend 0.5-1 times the time wanted for each iteration in calibration, increase the + accuracy of loops count. Just making the loops count be the correct ratio doesn't + guarantee that the iteration time is accurate. By actually measuring iteration + times until it gets greater than 1/4 of the wanted time, the total sum is bound + to be <= the wanted iteration time and last calibration time is between 1/4 and + 1/2 of the wanted time, so it should give a very accurate loop count. + + perf/cairo-perf-micro.c | 17 ++++++++--------- + 1 files changed, 8 insertions(+), 9 deletions(-) + +commit 046b642db0782ab5e2a5c82988b21e05afe8e716 +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 16:30:59 2010 +0300 + + os2: Restore surface type checking in the get_extents method. + + src/cairo-os2-surface.c | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +commit 78bdd87b7545f8e85632ac301a69da145727fcec +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 16:22:26 2010 +0300 + + os2: Fix clipping to bounds when blitting pixels. + + The bounds checks on the rectangle to blit were done + after converting target/source to inclusive/noninclusive + coordinates rather than before, potentially causing an + off-by-one in the sizes, since the same logic was applied + to both inclusive and non-inclusive coordinates. This + patch enforces bounds up front. + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + src/cairo-os2-surface.c | 64 ++++++++++++++++++++-------------------------- + 1 files changed, 28 insertions(+), 36 deletions(-) + +commit d0284687b32161212d6bc52309e2d5bb516dc3e8 +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 03:53:24 2010 +0300 + + os2: Tweak an inline declaration. + + C99 and cairo prefers "static inline <return type>" rather + than "static <return type> inline". + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + src/cairo-os2-surface.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit cb30340064a2ff24dc408e185c5a309a14f6c78c +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 03:33:10 2010 +0300 + + os2: Consolidate error paths of cairo_os2_surface_create(). + + Use a single code path to release the resources acquired + for a surface that's been partially constructed, rather than + have multiple error exits which each release the resources + acquired so far. + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + src/cairo-os2-surface.c | 120 +++++++++++++++++++++++----------------------- + 1 files changed, 60 insertions(+), 60 deletions(-) + +commit 66e3d650fe90754c811195c75579ac7a3512b7be +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 03:12:12 2010 +0300 + + os2: Document ownership of OS/2 objects passed to surfaces. + + Clarify the documentation for cairo_os2_surface_create() + and cairo_os2_surface_set_hwnd() to note that the ownership + of the presentation space and window respectively + remains with the caller. + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + src/cairo-os2-surface.c | 23 ++++++++++++----------- + 1 files changed, 12 insertions(+), 11 deletions(-) + +commit 01525271544d5b88f87027e470fa85038d59bf8d +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 03:08:21 2010 +0300 + + os2: Don't fake an Anchor Block when one isn't needed. + + The code was being tricky about passing in a HAB to + DevOpenDC() even though one isn't needed at all under + OS/2. Pass in NULL instead. + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + src/cairo-os2-surface.c | 16 +++------------- + 1 files changed, 3 insertions(+), 13 deletions(-) + +commit 883d9725e0f844e7d5cc4c50c75a812b5435702b +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 03:01:56 2010 +0300 + + os2: Fix buffer allocator behaviour on arithmetic overflow. + + On arithmetic overflow the buffer allocator would attempt + to allocate zero bytes instead of failing the allocation. + Depending on the implementation of the underlying allocator + being proxied, this may result in an allocation of a zero + length buffer, causing all kinds of grief. This patch + causes arithmetic overflows to explicitly fail the allocation. + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + src/cairo-os2-surface.c | 54 ++++++++++++++++++++--------------------------- + 1 files changed, 23 insertions(+), 31 deletions(-) + +commit b54037828c5b338b2f1dcbe48201225b258c1e1e +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 02:40:20 2010 +0300 + + os2: Fix blitting 24 bpp pixel data. + + There's a format mismatch between cairo's pixel formats + and OS/2 24 bpp data: the individual pixels in OS/2 take + only three bytes per pixel, but there needs to be padding + between lines to make the start of a line always be aligned + at a DWORD boundary. + + This patch fixes the format conversion code to include + the required padding between rows. + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + src/cairo-os2-private.h | 1 + + src/cairo-os2-surface.c | 118 +++++++++++++++++++++++++++-------------------- + 2 files changed, 69 insertions(+), 50 deletions(-) + +commit 5aadecb3ac03d379c2c8113566fa8062843df42e +Author: Rich Walsh <DragText@E-vertise.Com> +Date: Sat Aug 7 02:30:01 2010 +0300 + + os2: New API to create surfaces without a persistent HPS. + + It's not always necessary to create a presentation space (HPS) for + surface tied to a window, as the user may have one already. This patch + introduces three new functions to create a surface without an HPS + and let the user manage an HPS associated with the surface. + + Thread "OS/2 surface fixes" on cairo-l: + http://lists.cairographics.org/archives/cairo/2010-July/020343.html + + Mozilla Bugzilla: + https://bugzilla.mozilla.org/show_bug.cgi?id=557159 + + src/cairo-os2-surface.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++- + src/cairo-os2.h | 14 +++++ + 2 files changed, 153 insertions(+), 3 deletions(-) + +commit 9669faa936fe38da3615d7831e423befa5ecdfad +Author: Benjamin Otte <otte@redhat.com> +Date: Sun Aug 8 17:23:05 2010 +0200 + + gl: Handle errors from _cairo_gl_gradient_render() + + Thanks Andrea for finding this. + + src/cairo-gl-gradient.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +commit e31b56e020df806aa6180cd2efa0a34e55e5adaf +Author: Benjamin Otte <otte@redhat.com> +Date: Sun Aug 8 14:45:24 2010 +0200 + + configure: Fix gobject handling + + 1) Explicitly depend on glib, too. + 2) Don't link gobject into libcairo proper (thanks Joonas for noticing). + + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit ae2b7b13cd5fdeaee44496056bb99f497346e262 +Author: Andrea Canciani <ranma42@gmail.com> +Date: Wed Aug 4 14:22:23 2010 +0200 + + pattern: Simplify degenerate linear pattern to solid colors + + Degenerate linear patterns are considered clear if they have + EXTEND_NONE, the average of the first and the last stop if they are + EXTEND_PAD, the weighted average of the stops (based on the size of + the interpolation range in which they are active, just like integrating + over the whole interpolation range and taking the average) if they are + EXTEND_REPEAT or EXTEND_REFLECT. + + Fixes degenerate-linear-gradient + + src/cairo-pattern.c | 119 ++++++++++++++++++++++++++++++- + test/degenerate-linear-gradient.ref.png | Bin 232 -> 322 bytes + 2 files changed, 117 insertions(+), 2 deletions(-) + +commit d54a5a9fc90857448954d6cbe725d4665efa3d45 +Author: Andrea Canciani <ranma42@gmail.com> +Date: Wed Aug 4 14:16:34 2010 +0200 + + pattern: Add gradient degeneracy testing functions + + Introduce two new (private) functions for testing the degeneracy of linear + and radial gradients and use them instead of verbose (and error-prone) tests. + + src/cairo-pattern.c | 21 +++++++++++++++++---- + 1 files changed, 17 insertions(+), 4 deletions(-) + +commit 63434bc43819e2c7d4db568e82f5a9a7dfb0418d +Author: Andrea Canciani <ranma42@gmail.com> +Date: Wed Aug 4 14:22:01 2010 +0200 + + gstate: Correct comment + + src/cairo-gstate.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 28cd511fb974f886ae65e588413afcfc220a1a7c +Author: Andrea Canciani <ranma42@gmail.com> +Date: Sat Aug 7 22:55:46 2010 +0200 + + Correct color stops comparison function + + Two clear stops with different "underlying" colors must be considered + different, since when interpolated with non-clear colors they will + produce different results. + + src/cairo-color.c | 25 ++++--------------------- + 1 files changed, 4 insertions(+), 21 deletions(-) + +commit f71a618bd2604c8f0beaf4816a38a54f6f271bd9 +Author: Andrea Canciani <ranma42@gmail.com> +Date: Sat Aug 7 21:32:09 2010 +0200 + + Fix configuration if gobject is absent + + Autodetect gobject and only use it if present. + Its absence is not to be considered a failure since it's not required. + + build/Makefile.win32.features | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 661f4859cdbc0394ed0a9db34ced0f4e2bbe78ff +Author: Benjamin Otte <otte@redhat.com> +Date: Sat Aug 7 20:05:42 2010 +0200 + + Add cairo-gobject library + + This library is supposed to contain GType declarations for Cairo types. + It is also meant to support gobject-introspection binding creation. + + boilerplate/Makefile.win32.features | 12 + + build/Makefile.win32.features | 1 + + build/Makefile.win32.features-h | 3 + + configure.ac | 10 + + src/Makefile.win32.features | 16 + + util/Makefile.am | 4 + + util/cairo-gobject/Makefile.am | 15 + + util/cairo-gobject/cairo-gobject-enums.c | 519 ++++++++++++++++++++++++++++ + util/cairo-gobject/cairo-gobject-structs.c | 87 +++++ + util/cairo-gobject/cairo-gobject.h | 186 ++++++++++ + 10 files changed, 853 insertions(+), 0 deletions(-) + +commit fc4e8f036326da1839ec5320eba60823e7efc2db +Author: Søren Sandmann Pedersen <ssp@redhat.com> +Date: Sat Aug 7 12:10:49 2010 -0400 + + Update documentation to reflect that rgb565 is no longer deprecated. + + src/cairo.h | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit de606af5d673df193fc07fbd047ba2cec82d2f1c +Author: Andrea Canciani <ranma42@gmail.com> +Date: Tue Jul 27 18:04:36 2010 +0200 + + quartz: improve backend detection + + Quartz previously crashed with NULL backends and didn't check for + the backend type when getting a CGContext from a quartz surface, + returning meaningless data for subsurfaces. + + src/cairo-quartz-surface.c | 24 +++++++++++++++--------- + 1 files changed, 15 insertions(+), 9 deletions(-) + +commit 056ce165c4377e9cf93fd7a06b6b0d5d4d98cb8c +Author: Andrea Canciani <ranma42@gmail.com> +Date: Tue Jul 27 18:50:55 2010 +0200 + + quartz: fix solid masking fallback + + Falling back when painting would ignore the alpha value (which is + needed to have the correct mask opacity). + _cairo_quartz_surface_paint_cg doesn't fallback, so the usual mask + fallback path is now taken, as expected. + + src/cairo-quartz-surface.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit bdeade14ea86fb5f3ff17accd71711d2c40b1b33 +Author: Andrea Canciani <ranma42@gmail.com> +Date: Wed Jul 28 19:33:53 2010 +0200 + + quartz: fix stroking with unbounded operators + + Self-intersecting strokes were drawn incorrectly when an unbounded + operator was used, since the fixup operation also cleared the + intersection. + + Fixes clip-stroke-unbounded. + + src/cairo-quartz-surface.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) + +commit 8f38d2aa29bc0d69690cbf542c4a2b497b7a0c0a +Author: Andrea Canciani <ranma42@gmail.com> +Date: Thu Jul 29 10:45:59 2010 +0200 + + test: improve clip-*-unbounded tests + + Merge clip-*-unbounded tests and add self-intersections to the paths + that are drawn. This exposes a bug in the unbounded fixup code in quartz. + + Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> + + test/Makefile.am | 35 ++-- + test/Makefile.sources | 3 +- + test/clip-draw-unbounded.c | 184 ++++++++++++++++++++ + test/clip-fill-eo-unbounded.argb32.ref.png | Bin 0 -> 3668 bytes + test/clip-fill-eo-unbounded.image16.rgb24.ref.png | Bin 0 -> 2887 bytes + test/clip-fill-eo-unbounded.quartz.argb32.ref.png | Bin 0 -> 3366 bytes + test/clip-fill-eo-unbounded.quartz.rgb24.ref.png | Bin 0 -> 3061 bytes + test/clip-fill-eo-unbounded.rgb24.ref.png | Bin 0 -> 3201 bytes + test/clip-fill-eo-unbounded.svg12.rgb24.xfail.png | Bin 0 -> 3636 bytes + ...p-fill-eo-unbounded.xlib-fallback.rgb24.ref.png | Bin 0 -> 3208 bytes + test/clip-fill-eo-unbounded.xlib.argb32.ref.png | Bin 0 -> 3693 bytes + test/clip-fill-eo-unbounded.xlib.rgb24.ref.png | Bin 0 -> 3198 bytes + test/clip-fill-nz-unbounded.argb32.ref.png | Bin 0 -> 3668 bytes + test/clip-fill-nz-unbounded.image16.rgb24.ref.png | Bin 0 -> 2887 bytes + test/clip-fill-nz-unbounded.quartz.argb32.ref.png | Bin 0 -> 3366 bytes + test/clip-fill-nz-unbounded.quartz.rgb24.ref.png | Bin 0 -> 3061 bytes + test/clip-fill-nz-unbounded.rgb24.ref.png | Bin 0 -> 3201 bytes + test/clip-fill-nz-unbounded.svg12.rgb24.xfail.png | Bin 0 -> 3636 bytes + ...p-fill-nz-unbounded.xlib-fallback.rgb24.ref.png | Bin 0 -> 3208 bytes + test/clip-fill-nz-unbounded.xlib.argb32.ref.png | Bin 0 -> 3693 bytes + test/clip-fill-nz-unbounded.xlib.rgb24.ref.png | Bin 0 -> 3198 bytes + test/clip-fill-unbounded.argb32.ref.png | Bin 1607 -> 0 bytes + test/clip-fill-unbounded.c | 105 ----------- + test/clip-fill-unbounded.image16.ref.png | Bin 1204 -> 0 bytes + test/clip-fill-unbounded.pdf.argb32.ref.png | Bin 1244 -> 0 bytes + test/clip-fill-unbounded.ps.argb32.xfail.png | Bin 1244 -> 0 bytes + test/clip-fill-unbounded.quartz.argb32.ref.png | Bin 1436 -> 0 bytes + test/clip-fill-unbounded.quartz.rgb24.ref.png | Bin 1368 -> 0 bytes + test/clip-fill-unbounded.rgb24.ref.png | Bin 1304 -> 0 bytes + test/clip-fill-unbounded.svg12.argb32.xfail.png | Bin 1601 -> 0 bytes + test/clip-fill-unbounded.svg12.rgb24.xfail.png | Bin 1601 -> 0 bytes + ...clip-fill-unbounded.xlib-fallback.rgb24.ref.png | Bin 1438 -> 0 bytes + test/clip-fill-unbounded.xlib.argb32.ref.png | Bin 1759 -> 0 bytes + test/clip-fill-unbounded.xlib.rgb24.ref.png | Bin 1430 -> 0 bytes + test/clip-stroke-unbounded.argb32.ref.png | Bin 1694 -> 3545 bytes + test/clip-stroke-unbounded.c | 102 ----------- + test/clip-stroke-unbounded.image16.ref.png | Bin 1255 -> 0 bytes + test/clip-stroke-unbounded.image16.rgb24.ref.png | Bin 0 -> 2778 bytes + test/clip-stroke-unbounded.pdf.argb32.xfail.png | Bin 1351 -> 0 bytes + test/clip-stroke-unbounded.ps.argb32.ref.png | Bin 1351 -> 0 bytes + test/clip-stroke-unbounded.quartz.argb32.ref.png | Bin 1493 -> 3362 bytes + test/clip-stroke-unbounded.quartz.rgb24.ref.png | Bin 1356 -> 3061 bytes + test/clip-stroke-unbounded.rgb24.ref.png | Bin 1372 -> 3063 bytes + test/clip-stroke-unbounded.svg12.argb32.xfail.png | Bin 1697 -> 0 bytes + test/clip-stroke-unbounded.svg12.rgb24.xfail.png | Bin 1697 -> 3569 bytes + ...ip-stroke-unbounded.xlib-fallback.rgb24.ref.png | Bin 1437 -> 3123 bytes + test/clip-stroke-unbounded.xlib.argb32.ref.png | Bin 1785 -> 3620 bytes + test/clip-stroke-unbounded.xlib.rgb24.ref.png | Bin 1442 -> 3109 bytes + 48 files changed, 204 insertions(+), 225 deletions(-) + +commit 142df6f9638e10d0712e092d902f7670965a88f9 +Author: Benjamin Otte <otte@redhat.com> +Date: Fri Jul 30 22:04:44 2010 +0200 + + configure: Disable xml backend by default + + We don't want to enable it by default when nobody uses it. + + boilerplate/Makefile.win32.features | 2 +- + build/Makefile.win32.features | 2 +- + configure.ac | 2 +- + src/Makefile.win32.features | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 9f33f8453b4949cfdc63169d3acd7238f89379c2 +Author: Benjamin Otte <otte@redhat.com> +Date: Fri Jul 30 21:48:14 2010 +0200 + + configure: Disable tee backend by default + + We don't want to enable it by default when nobody uses it. + + boilerplate/Makefile.win32.features | 4 +++- + build/Makefile.win32.features | 1 + + build/Makefile.win32.features-h | 2 ++ + configure.ac | 2 +- + src/Makefile.win32.features | 8 +++++++- + src/cairo-surface.c | 4 ++++ + test/api-special-cases.c | 6 ++++++ + 7 files changed, 24 insertions(+), 3 deletions(-) + +commit 9f4d677e2a6dd0bfbbbe20de39f92177bfdfc0e8 +Author: Benjamin Otte <otte@redhat.com> +Date: Fri Jul 30 22:15:55 2010 +0200 + + tee: Move definitions into separate header + + src/Makefile.sources | 6 +++- + src/cairo-tee-surface.c | 2 + + src/cairo-tee.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++ + src/cairo.h | 17 ------------ + test/api-special-cases.c | 3 ++ + 5 files changed, 75 insertions(+), 19 deletions(-) + +commit 14639e6b8525ada2cb93abb1d70dde827b7bf9e0 +Author: Kristian Høgsberg <krh@bitplanet.net> +Date: Thu Jun 17 18:29:48 2010 -0400 + + egl: Use EGL_KHR_surfaceless_opengl extension when available + + This lets us avoid creating a throwaway pbuffer just to make the + context current. + + src/cairo-egl-context.c | 58 ++++++++++++++++++++++++++++++---------------- + 1 files changed, 38 insertions(+), 20 deletions(-) + +commit b6fd673d37e1c8962d15c0e0e59322a2002fc399 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Jul 26 13:15:38 2010 +0100 + + version: 1.9.15 post-snapshot bump + + cairo-version.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit ed8c6f42540f03a62fd64ad83b7c397528092232 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Mon Jul 26 12:53:44 2010 +0100 @@ -6078,7 +7041,7 @@ Date: Fri Mar 26 19:37:08 2010 +0000 src/drm/cairo-drm-i915-private.h | 153 ++- src/drm/cairo-drm-i915-shader.c | 866 +++++++----- src/drm/cairo-drm-i915-spans.c | 146 ++- - src/drm/cairo-drm-i915-surface.c | 1698 +++++++++++++++++----- + src/drm/cairo-drm-i915-surface.c | 1884 ++++++++++++++++++------ src/drm/cairo-drm-i965-glyphs.c | 36 +- src/drm/cairo-drm-i965-private.h | 2 +- src/drm/cairo-drm-i965-shader.c | 11 +- @@ -6093,7 +7056,7 @@ Date: Fri Mar 26 19:37:08 2010 +0000 src/drm/cairo-drm-radeon-surface.c | 60 +- src/drm/cairo-drm-surface.c | 37 +- src/drm/cairo-drm-xr.c | 2377 +++++++++++++++++++++++++++++++ - 38 files changed, 5323 insertions(+), 1311 deletions(-) + 38 files changed, 5416 insertions(+), 1404 deletions(-) commit c8fba4960339797521afbf8068fcbe62d064f5dc Author: Chris Wilson <chris@chris-wilson.co.uk> @@ -12761,13 +13724,13 @@ Date: Fri Jan 22 21:26:26 2010 +0000 src/cairo-xcb-surface-core.c | 613 +++++ src/cairo-xcb-surface-private.h | 37 + src/cairo-xcb-surface-render.c | 4471 +++++++++++++++++++++++++++++++++++ - src/cairo-xcb-surface.c | 3344 +++++++------------------- + src/cairo-xcb-surface.c | 3382 ++++++++------------------- src/cairo-xcb-xrender.h | 63 - src/cairo-xcb.h | 41 +- src/cairo-xlib-xcb-surface.c | 515 ++++ src/cairoint.h | 16 + test/xcb-surface-source.c | 1 - - 28 files changed, 11689 insertions(+), 2552 deletions(-) + 28 files changed, 11708 insertions(+), 2571 deletions(-) commit 77afe8491ed7038a8399c01f10d8f062a7239225 Author: Chris Wilson <chris@chris-wilson.co.uk> @@ -12857,7 +13820,7 @@ Date: Fri Jan 22 17:57:41 2010 +0000 ▏ image-rgba firefox-talos-svg-0 375273.43 (388250.94 1.60%) -> 356846.09 (370370.08 1.86%): 1.05x speedup - src/cairo-image-surface.c | 3893 ++++++++++++++++++++++++----- + src/cairo-image-surface.c | 3987 ++++++++++++++++++++++++----- src/cairo-mutex-list-private.h | 2 + src/cairo-xcb-surface.c | 10 +- src/cairoint.h | 21 +- @@ -12871,7 +13834,7 @@ Date: Fri Jan 22 17:57:41 2010 +0000 test/scale-offset-image.xfail.png | Bin 9960 -> 9961 bytes test/scale-offset-similar.xfail.png | Bin 9960 -> 9961 bytes test/self-intersecting.ref.png | Bin 213 -> 168 bytes - 14 files changed, 3295 insertions(+), 631 deletions(-) + 14 files changed, 3342 insertions(+), 678 deletions(-) commit ec7cc9dea16f94e1e56720be548cf5520ec4708b Author: Chris Wilson <chris@chris-wilson.co.uk> diff --git a/ChangeLog.pre-1.0 b/ChangeLog.pre-1.0 index 04b4050..7326f5c 100644 --- a/ChangeLog.pre-1.0 +++ b/ChangeLog.pre-1.0 @@ -281,8 +281,8 @@ Date: Wed Aug 24 00:19:52 2005 +0000 Update documentation for most path construction functions. Add discussion of the effects on the current point to all functions. Rephrase the wording of the relative functions. Big rewrite of cairo_arc description. Add discussion of join not caps to cairo_close_path. ChangeLog | 4 ++ - src/cairo.c | 130 ++++++++++++++++++++++++++++++++++++++++------------------ - 2 files changed, 93 insertions(+), 41 deletions(-) + src/cairo.c | 128 ++++++++++++++++++++++++++++++++++++++++------------------ + 2 files changed, 92 insertions(+), 40 deletions(-) commit 4f44cd809db5c72638d14963870848eba9f266d1 Author: Carl Worth <cworth@cworth.org> @@ -743,7 +743,7 @@ Date: Mon Aug 22 22:11:44 2005 +0000 ChangeLog | 33 ++ doc/public/cairo-docs.xml | 50 ++- doc/public/cairo-sections.txt | 262 ++++++---- - doc/public/tmpl/cairo-font-options.sgml | 194 ++++++++ + doc/public/tmpl/cairo-font-options.sgml | 194 +++++++ doc/public/tmpl/cairo-font.sgml | 268 +---------- doc/public/tmpl/cairo-ft.sgml | 18 +- doc/public/tmpl/cairo-glitz.sgml | 4 +- @@ -767,8 +767,8 @@ Date: Mon Aug 22 22:11:44 2005 +0000 doc/public/tmpl/cairo-xcb-xrender.sgml | 4 +- doc/public/tmpl/cairo-xcb.sgml | 4 +- doc/public/tmpl/cairo-xlib.sgml | 4 +- - doc/public/tmpl/cairo.sgml | 819 ++++--------------------------- - 28 files changed, 1581 insertions(+), 1229 deletions(-) + doc/public/tmpl/cairo.sgml | 833 ++++--------------------------- + 28 files changed, 1588 insertions(+), 1236 deletions(-) commit 2d9d744f8c8a9fdf011a292ef6e823605d000f23 Author: Owen Taylor <otaylor@redhat.com> @@ -2499,9 +2499,9 @@ Date: Fri Aug 5 20:30:43 2005 +0000 Rather gratuitous (though mostly harmless) whitespace changes for font backend tables. - ChangeLog | 5 +++ - src/cairoint.h | 104 +++++++++++++++++++++++++++++++------------------------- - 2 files changed, 63 insertions(+), 46 deletions(-) + ChangeLog | 5 ++ + src/cairoint.h | 114 +++++++++++++++++++++++++++++++------------------------- + 2 files changed, 68 insertions(+), 51 deletions(-) commit 4ad365f1834bf0204e44156a62b8e8539fb65ef9 Author: Carl Worth <cworth@cworth.org> @@ -5221,7 +5221,7 @@ Date: Tue Jun 14 19:45:22 2005 +0000 ChangeLog | 36 +++++++ src/cairo-glitz-surface.c | 1 + src/cairo-gstate-private.h | 16 +++- - src/cairo-gstate.c | 222 ++++++++++++++++++++++++++++++-------------- + src/cairo-gstate.c | 220 ++++++++++++++++++++++++++++++-------------- src/cairo-image-surface.c | 1 + src/cairo-pdf-surface.c | 101 +++++++++++++++++++- src/cairo-ps-surface.c | 1 + @@ -5232,8 +5232,8 @@ Date: Tue Jun 14 19:45:22 2005 +0000 src/cairo-xlib-surface.c | 1 + src/cairoint.h | 71 +++++++++++--- test/Makefile.am | 11 ++- - test/pdf-clip.c | 134 ++++++++++++++++++++++++++ - 15 files changed, 583 insertions(+), 131 deletions(-) + test/pdf-clip.c | 134 +++++++++++++++++++++++++++ + 15 files changed, 582 insertions(+), 130 deletions(-) commit 663e39a63c6ae223dc3095d29fd95bc8885c74f2 Author: Carl Worth <cworth@cworth.org> @@ -6692,13 +6692,13 @@ Date: Fri May 6 13:32:53 2005 +0000 test/move-to-show-surface.c | 5 +- test/select-font-no-show-text.c | 6 +- test/set-source.c | 4 +- - test/text-cache-crash.c | 16 ++- + test/text-cache-crash.c | 14 ++- test/text-rotate.c | 6 +- test/transforms.c | 2 +- test/translate-show-surface.c | 5 +- test/trap-clip.c | 8 +- util/cairo-api-update | 48 +++++-- - 24 files changed, 274 insertions(+), 605 deletions(-) + 24 files changed, 273 insertions(+), 604 deletions(-) commit a790a2ea79507cae9564006ac32e27a0fcca8d60 Author: Carl Worth <cworth@cworth.org> @@ -9234,26 +9234,26 @@ Date: Thu Mar 3 18:39:06 2005 +0000 ChangeLog | 16 ++++++ src/cairo-ft-font.c | 7 ++- - src/cairo-glitz-surface.c | 126 +++++++++++++++++++++++++++++++-------------- + src/cairo-glitz-surface.c | 128 +++++++++++++++++++++++++++++++-------------- src/cairo-gstate.c | 21 ++++++- - src/cairo-image-surface.c | 82 ++++++++++++++++------------- - src/cairo-pattern.c | 44 ++++++++++++++++ + src/cairo-image-surface.c | 84 ++++++++++++++++------------- + src/cairo-pattern.c | 44 +++++++++++++++ src/cairo-pdf-surface.c | 11 +++-- src/cairo-ps-surface.c | 2 +- src/cairo-surface.c | 14 +++--- src/cairo-xlib-surface.c | 88 +++++++++++++++++-------------- src/cairo_ft_font.c | 7 ++- - src/cairo_glitz_surface.c | 126 +++++++++++++++++++++++++++++++-------------- + src/cairo_glitz_surface.c | 128 +++++++++++++++++++++++++++++++-------------- src/cairo_gstate.c | 21 ++++++- - src/cairo_image_surface.c | 82 ++++++++++++++++------------- - src/cairo_pattern.c | 44 ++++++++++++++++ + src/cairo_image_surface.c | 84 ++++++++++++++++------------- + src/cairo_pattern.c | 44 +++++++++++++++ src/cairo_pdf_surface.c | 11 +++-- src/cairo_png_surface.c | 4 +- src/cairo_ps_surface.c | 2 +- src/cairo_surface.c | 14 +++--- src/cairo_xlib_surface.c | 88 +++++++++++++++++-------------- src/cairoint.h | 21 ++++++- - 21 files changed, 564 insertions(+), 267 deletions(-) + 21 files changed, 568 insertions(+), 271 deletions(-) commit a97f4cce5e13cfa2dc3b843b3b37cb14cb16cf65 Author: David Reveman <davidr@novell.com> @@ -11439,7 +11439,7 @@ Date: Tue Jan 11 10:03:01 2005 +0000 src/cairo-gstate.c | 164 ++++++++++++++++++++++++++++---------------- src/cairo-hash.c | 6 +- src/cairo-matrix.c | 51 +++++++++++--- - src/cairo-wideint.c | 46 ++++++++----- + src/cairo-wideint.c | 48 ++++++++----- src/cairo-wideint.h | 49 +++++++++----- src/cairo-xlib-surface.c | 33 ++++++--- src/cairo_cache.c | 6 +- @@ -11447,11 +11447,11 @@ Date: Tue Jan 11 10:03:01 2005 +0000 src/cairo_glitz_surface.c | 1 + src/cairo_gstate.c | 164 ++++++++++++++++++++++++++++---------------- src/cairo_matrix.c | 51 +++++++++++--- - src/cairo_wideint.c | 46 ++++++++----- + src/cairo_wideint.c | 48 ++++++++----- src/cairo_wideint.h | 49 +++++++++----- src/cairo_xlib_surface.c | 33 ++++++--- src/cairoint.h | 2 +- - 22 files changed, 733 insertions(+), 289 deletions(-) + 22 files changed, 735 insertions(+), 291 deletions(-) commit dc0d812f6c78bfc3e4cbf717cf09a4524d8f149c Author: Carl Worth <cworth@cworth.org> @@ -12652,49 +12652,49 @@ Date: Sat Sep 4 06:38:34 2004 +0000 COPYING-LGPL-2.1 | 510 ++++++++++++++++++++++++++++++++++++++++++++ COPYING-MPL-1.1 | 470 ++++++++++++++++++++++++++++++++++++++++ ChangeLog | 8 + - src/cairo-color.c | 37 +++- + src/cairo-color.c | 41 +++- src/cairo-features.h.in | 41 +++- src/cairo-fixed.c | 41 +++- - src/cairo-font.c | 37 +++- - src/cairo-gstate.c | 37 +++- - src/cairo-hull.c | 37 +++- - src/cairo-image-surface.c | 37 +++- - src/cairo-matrix.c | 37 +++- - src/cairo-path-bounds.c | 37 +++- - src/cairo-path-fill.c | 37 +++- - src/cairo-path-stroke.c | 37 +++- - src/cairo-path.c | 37 +++- - src/cairo-pen.c | 37 +++- - src/cairo-polygon.c | 37 +++- - src/cairo-ps-surface.c | 37 +++- - src/cairo-slope.c | 37 +++- - src/cairo-spline.c | 37 +++- - src/cairo-surface.c | 37 +++- - src/cairo-xcb-surface.c | 37 +++- - src/cairo-xlib-surface.c | 37 +++- - src/cairo.c | 38 +++- + src/cairo-font.c | 41 +++- + src/cairo-gstate.c | 41 +++- + src/cairo-hull.c | 41 +++- + src/cairo-image-surface.c | 41 +++- + src/cairo-matrix.c | 41 +++- + src/cairo-path-bounds.c | 41 +++- + src/cairo-path-fill.c | 41 +++- + src/cairo-path-stroke.c | 41 +++- + src/cairo-path.c | 41 +++- + src/cairo-pen.c | 41 +++- + src/cairo-polygon.c | 41 +++- + src/cairo-ps-surface.c | 41 +++- + src/cairo-slope.c | 41 +++- + src/cairo-spline.c | 41 +++- + src/cairo-surface.c | 41 +++- + src/cairo-xcb-surface.c | 41 +++- + src/cairo-xlib-surface.c | 41 +++- + src/cairo.c | 42 +++- src/cairo.h | 37 +++- - src/cairo_color.c | 37 +++- + src/cairo_color.c | 41 +++- src/cairo_fixed.c | 41 +++- - src/cairo_font.c | 37 +++- - src/cairo_gstate.c | 37 +++- - src/cairo_hull.c | 37 +++- - src/cairo_image_surface.c | 37 +++- - src/cairo_matrix.c | 37 +++- - src/cairo_path.c | 37 +++- - src/cairo_path_bounds.c | 37 +++- - src/cairo_path_fill.c | 37 +++- - src/cairo_path_stroke.c | 37 +++- - src/cairo_pen.c | 37 +++- - src/cairo_polygon.c | 37 +++- - src/cairo_ps_surface.c | 37 +++- - src/cairo_slope.c | 37 +++- - src/cairo_spline.c | 37 +++- - src/cairo_surface.c | 37 +++- - src/cairo_xcb_surface.c | 37 +++- - src/cairo_xlib_surface.c | 37 +++- - src/cairoint.h | 37 +++- - 46 files changed, 2142 insertions(+), 932 deletions(-) + src/cairo_font.c | 41 +++- + src/cairo_gstate.c | 41 +++- + src/cairo_hull.c | 41 +++- + src/cairo_image_surface.c | 41 +++- + src/cairo_matrix.c | 41 +++- + src/cairo_path.c | 41 +++- + src/cairo_path_bounds.c | 41 +++- + src/cairo_path_fill.c | 41 +++- + src/cairo_path_stroke.c | 41 +++- + src/cairo_pen.c | 41 +++- + src/cairo_polygon.c | 41 +++- + src/cairo_ps_surface.c | 41 +++- + src/cairo_slope.c | 41 +++- + src/cairo_spline.c | 41 +++- + src/cairo_surface.c | 41 +++- + src/cairo_xcb_surface.c | 41 +++- + src/cairo_xlib_surface.c | 41 +++- + src/cairoint.h | 41 +++- + 46 files changed, 2218 insertions(+), 1008 deletions(-) commit 31d0ddbf2a6acecea8ffede9f3f3942dcbc9c035 Author: Carl Worth <cworth@cworth.org> diff --git a/ChangeLog.pre-1.2 b/ChangeLog.pre-1.2 index b356078..de63f57 100644 --- a/ChangeLog.pre-1.2 +++ b/ChangeLog.pre-1.2 @@ -543,7 +543,7 @@ Date: Tue Jun 27 15:38:45 2006 +0200 1 files changed, 1 insertions(+), 1 deletions(-) commit 988a28e259924e7ce50f4d3119bcef7a3b18c931 -Merge: 973c9ab... ce2b9e1... +Merge: 973c9ab ce2b9e1 Author: Carl Worth <cworth@cworth.org> Date: Tue Jun 27 15:37:58 2006 +0200 @@ -1353,7 +1353,7 @@ Date: Fri Jun 16 21:13:21 2006 +0800 1 files changed, 1 insertions(+), 1 deletions(-) commit bf2c0e44d8c8e1e692eafba7bccddd26f1f31c1b -Merge: b8231f8... a8b736c... +Merge: b8231f8 a8b736c Author: Behdad Esfahbod <behdad@behdad.org> Date: Fri Jun 16 00:13:18 2006 -0400 @@ -1416,8 +1416,8 @@ Date: Thu Jun 15 14:15:42 2006 -0700 _cairo_format_from_pixman_format: Add useful error mesage and assertion when failing. - src/cairo-image-surface.c | 62 ++++++++++++++++++++++++++------------------- - 1 files changed, 36 insertions(+), 26 deletions(-) + src/cairo-image-surface.c | 64 ++++++++++++++++++++++++++------------------- + 1 files changed, 37 insertions(+), 27 deletions(-) commit dedc51ba51eaa61e4b11f274fac06c6f0acd8a87 Author: Kristian Høgsberg <krh@redhat.com> @@ -1463,7 +1463,7 @@ Date: Wed Jun 14 20:57:42 2006 +0200 16 files changed, 0 insertions(+), 0 deletions(-) commit 2cea3a2710cd4c6eb68e25eadaaf96cdc921ef14 -Merge: 17ea755... 4932d09... +Merge: 17ea755 4932d09 Author: Kristian Høgsberg <krh@redhat.com> Date: Wed Jun 14 15:00:33 2006 -0400 @@ -1724,7 +1724,7 @@ Date: Tue Jun 13 16:13:23 2006 -0700 4 files changed, 100 insertions(+), 1 deletions(-) commit 1d18af9f5adb0ce2e01bc42578fe117c4e924ce8 -Merge: c7b194c... 27e9e3c... +Merge: c7b194c 27e9e3c Author: Carl Worth <cworth@cworth.org> Date: Tue Jun 13 15:51:57 2006 -0700 @@ -1735,7 +1735,7 @@ Date: Tue Jun 13 15:51:57 2006 -0700 src/cairo-ps-surface.c commit c7b194c59544ff441d1e83827242667c0e86dc5a -Merge: 4b063c6... 127fab4... +Merge: 4b063c6 127fab4 Author: Carl Worth <cworth@cworth.org> Date: Tue Jun 13 15:46:14 2006 -0700 @@ -2285,7 +2285,7 @@ Date: Thu Jun 8 03:33:38 2006 +0800 10 files changed, 132 insertions(+), 0 deletions(-) commit bb66d15a7998740b6ce2525ab5d852fb2966f8f8 -Merge: 3594fd2... b7c7d2e... +Merge: 3594fd2 b7c7d2e Author: Jinghua Luo <sunmoon1997@gmail.com> Date: Thu Jun 8 02:38:17 2006 +0800 @@ -2970,14 +2970,14 @@ Date: Wed May 24 17:05:51 2006 -0700 src/cairo-svg-surface.c | 3 +- src/cairo-win32-surface.c | 6 ++- src/cairo-xcb-surface.c | 29 ++++++++++++- - src/cairo-xlib-surface.c | 93 ++++++++++++++++++++++------------------ + src/cairo-xlib-surface.c | 95 ++++++++++++++++++++++------------------ src/cairo.h | 3 + src/cairoint.h | 5 ++- src/test-fallback-surface.c | 3 +- src/test-meta-surface.c | 3 +- src/test-paginated-surface.c | 3 +- test/cairo-test.c | 18 ++++++++ - 20 files changed, 162 insertions(+), 61 deletions(-) + 20 files changed, 163 insertions(+), 62 deletions(-) commit 0796845ae6923f3ccef5df231b7d9a2c145063fd Author: Carl Worth <cworth@cworth.org> @@ -3570,7 +3570,7 @@ Date: Tue May 16 01:04:16 2006 -0700 1 files changed, 5 insertions(+), 12 deletions(-) commit d70ade00fb67c6f77d23653481079996ec1e1292 -Merge: 41d4354... c7ef4cb... +Merge: 41d4354 c7ef4cb Author: Kristian Høgsberg <krh@dinky.bitplanet.net> Date: Mon May 15 17:53:56 2006 -0400 @@ -4351,7 +4351,7 @@ Date: Wed Feb 15 13:46:53 2006 -0800 6 files changed, 332 insertions(+), 109 deletions(-) commit 5e708b38e00f6b2066028c60a5526bf5d5e66356 -Merge: a6b1b01... 99719bd... +Merge: a6b1b01 99719bd Author: Carl Worth <cworth@cworth.org> Date: Thu May 4 01:46:34 2006 -0700 @@ -4909,7 +4909,7 @@ Date: Tue May 2 23:35:06 2006 +0200 1 files changed, 23 insertions(+), 2 deletions(-) commit 773692b7df9f0ccf250f259c1bc430c343765651 -Merge: bd85701... 8488aae... +Merge: bd85701 8488aae Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr> Date: Tue May 2 21:52:41 2006 +0200 @@ -5216,7 +5216,7 @@ Date: Mon May 1 22:12:20 2006 +0200 1 files changed, 1 insertions(+), 0 deletions(-) commit 6a33993b1510d1c0d311f4a10832ab2bc5ea8f4e -Merge: b920dfd... 3aa5d76... +Merge: b920dfd 3aa5d76 Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr> Date: Mon May 1 22:01:38 2006 +0200 @@ -5564,7 +5564,7 @@ Date: Tue Apr 25 07:07:48 2006 -0700 8 files changed, 0 insertions(+), 0 deletions(-) commit 6237437f412d9d007e1c49c33f6e81117b612d39 -Merge: 22ab0e5... f1c3754... +Merge: 22ab0e5 f1c3754 Author: Carl Worth <cworth@cworth.org> Date: Tue Apr 25 07:02:41 2006 -0700 @@ -5610,7 +5610,7 @@ Date: Tue Apr 25 05:44:08 2006 -0700 3 files changed, 24 insertions(+), 5 deletions(-) commit 6723547f0035e6c41abee165ebefb7406e40b7d8 -Merge: 8d635a3... e912512... +Merge: 8d635a3 e912512 Author: Behdad Esfahbod <behdad@behdad.org> Date: Tue Apr 25 08:28:59 2006 -0400 @@ -5965,7 +5965,7 @@ Date: Tue Apr 18 15:19:36 2006 -0700 1 files changed, 0 insertions(+), 0 deletions(-) commit 448e904b2a64769aa9cfd8ea011c2b5fb6ec883b -Merge: cb77876... ffab259... +Merge: cb77876 ffab259 Author: Carl Worth <cworth@cworth.org> Date: Tue Apr 18 15:18:31 2006 -0700 @@ -5989,7 +5989,7 @@ Date: Tue Apr 18 21:52:06 2006 +0200 1 files changed, 3 insertions(+), 5 deletions(-) commit 9c65dee86b469c1eedf2690334d5a2b4afc849c8 -Merge: 36fb36f... 3f84df9... +Merge: 36fb36f 3f84df9 Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr> Date: Tue Apr 18 21:23:59 2006 +0200 @@ -6515,7 +6515,7 @@ Date: Wed Apr 12 15:48:59 2006 -0700 1 files changed, 109 insertions(+), 0 deletions(-) commit 6a5d8fc7ffb5f425ceffd313b8a875f38126b324 -Merge: b30e281... 0727e3c... +Merge: b30e281 0727e3c Author: Carl Worth <cworth@cworth.org> Date: Wed Apr 12 14:15:08 2006 -0700 @@ -6578,7 +6578,7 @@ Date: Wed Apr 12 13:34:03 2006 -0700 2 files changed, 15 insertions(+), 11 deletions(-) commit a7abf8e4513a7ca03cdb7db6f80a438a4897d208 -Merge: 0386a72... ade195c... +Merge: 0386a72 ade195c Author: Carl Worth <cworth@cworth.org> Date: Wed Apr 12 12:54:28 2006 -0700 @@ -6634,7 +6634,7 @@ Date: Tue Apr 11 12:28:41 2006 -0700 1 files changed, 38 insertions(+), 5 deletions(-) commit 9231ab40437e70818c9525fa9648ff7a5d11e44a -Merge: 1e5f5ae... baa3436... +Merge: 1e5f5ae baa3436 Author: Anders Carlsson <andersca@luminoth.local> Date: Tue Apr 11 01:09:30 2006 +0200 @@ -6746,7 +6746,7 @@ Date: Mon Apr 10 10:54:24 2006 -0700 2 files changed, 0 insertions(+), 0 deletions(-) commit 807f64d57c616e2ce8a61202cd9b59ac7a6a26cb -Merge: 5ee26e3... 732e062... +Merge: 5ee26e3 732e062 Author: Anders Carlsson <andersca@luminoth.local> Date: Mon Apr 10 19:32:47 2006 +0200 @@ -6933,7 +6933,7 @@ Date: Wed Apr 5 21:24:06 2006 +0200 1 files changed, 9 insertions(+), 4 deletions(-) commit 4fd30e6f402ae031c2084c20f136b84307a128cc -Merge: a8e5a77... 66ed981... +Merge: a8e5a77 66ed981 Author: Carl Worth <cworth@cworth.org> Date: Tue Apr 4 15:04:36 2006 -0700 @@ -6949,7 +6949,7 @@ Date: Thu Mar 23 16:02:02 2006 -0800 1 files changed, 1 insertions(+), 0 deletions(-) commit 66ed9811cc542d99cb5a6b6b792c9a9f0832fbf9 -Merge: edb83e3... 45bbdf9... +Merge: edb83e3 45bbdf9 Author: Carl Worth <cworth@cworth.org> Date: Tue Apr 4 14:58:52 2006 -0700 @@ -7264,7 +7264,7 @@ Date: Fri Mar 17 21:26:27 2006 +0100 1 files changed, 7 insertions(+), 6 deletions(-) commit 0623f8a7d1452c27892f938fe28e6e173e67e136 -Merge: 26b06b3... a7f58f8... +Merge: 26b06b3 a7f58f8 Author: Behdad Esfahbod <behdad@home.(none)> Date: Wed Mar 15 15:25:59 2006 -0500 @@ -7446,7 +7446,7 @@ Date: Mon Mar 13 12:14:47 2006 -0800 1 files changed, 3 insertions(+), 1 deletions(-) commit 25cccaaa1f6d337a1a0423a298f94456e72a820a -Merge: c780f4a... 118f71b... +Merge: c780f4a 118f71b Author: Carl Worth <cworth@cworth.org> Date: Mon Mar 13 12:05:37 2006 -0800 @@ -7467,7 +7467,7 @@ Date: Mon Mar 13 12:05:13 2006 -0800 1 files changed, 4 insertions(+), 2 deletions(-) commit 118f71b43870551db520ad56234c650aa4b61296 -Merge: 6659991... 92e09ee... +Merge: 6659991 92e09ee Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr> Date: Sun Mar 12 19:30:29 2006 +0100 @@ -7516,7 +7516,7 @@ Date: Sun Mar 5 23:49:38 2006 +0100 1 files changed, 18 insertions(+), 13 deletions(-) commit 3333bba82d26a0b11961af3cb5c29c79a1a0d07b -Merge: 62812b2... 3370cd6... +Merge: 62812b2 3370cd6 Author: Carl Worth <cworth@cworth.org> Date: Fri Mar 3 15:41:14 2006 -0800 @@ -7579,7 +7579,7 @@ Date: Wed Mar 1 19:16:01 2006 +0100 1 files changed, 1 insertions(+), 1 deletions(-) commit 2fb016c75b950b3b1fe077dc349713f61118fd7c -Merge: 8176c93... 3490ed9... +Merge: 8176c93 3490ed9 Author: Vladimir Vukicevic <vladimir@pobox.com> Date: Wed Mar 1 11:26:48 2006 +0100 @@ -7611,14 +7611,14 @@ Date: Tue Feb 28 14:10:36 2006 -0800 1 files changed, 1 insertions(+), 1 deletions(-) commit e3017c3c8de2b90e1d3470866f9bd6cc2cd313fa -Merge: ce683a2... 2984f60... +Merge: ce683a2 2984f60 Author: Carl Worth <cworth@cworth.org> Date: Tue Feb 28 12:07:14 2006 -0800 Merge in upstream 'ps-surface' changes commit f5566c9b20edf04b44f60bba164c226f2718a935 -Merge: 49b4fe1... d985a9d... +Merge: 49b4fe1 d985a9d Author: Vladimir Vukicevic <vladimir@pobox.com> Date: Tue Feb 28 16:29:45 2006 +0100 @@ -7689,7 +7689,7 @@ Date: Tue Feb 28 16:21:46 2006 +0100 3 files changed, 6 insertions(+), 26 deletions(-) commit 6fe93cbf5b368a9a6daf54370aa0e7735b411474 -Merge: f2245a7... 210dd59... +Merge: f2245a7 210dd59 Author: Carl Worth <cworth@cworth.org> Date: Tue Feb 28 02:36:45 2006 -0800 @@ -9041,10 +9041,10 @@ Date: Wed Jan 4 16:39:23 2006 +0000 Some major performance improvements to the general composite code used for gradients and transformed images. Like fetching of mask scanline before source scanline so that only the necessary pixels from source needs to be computed in case of gradients or transformed images as source. This patch also include some gradient specific fixes and performance improvement. pixman/ChangeLog | 22 +- - pixman/src/fbcompose.c | 1187 ++++++++++++++++++++++++++++++------------------ + pixman/src/fbcompose.c | 1205 ++++++++++++++++++++++++++++++------------------ pixman/src/icimage.c | 17 +- pixman/src/icimage.h | 9 + - 4 files changed, 776 insertions(+), 459 deletions(-) + 4 files changed, 785 insertions(+), 468 deletions(-) commit 305a83721f5c6423fc1e7fbb0cf1d67c0f92ecb7 Author: Carl Worth <cworth@cworth.org> @@ -11206,8 +11206,8 @@ Date: Tue Sep 13 12:26:29 2005 +0000 Expand locking to encapsulate any modification to the reference count of a scaled font, rather than just modifcations of the scaled_font_map, since scaled fonts are shared between threads. ChangeLog | 8 ++++ - src/cairo-scaled-font.c | 87 ++++++++++++++++++++++++++-------------------- - 2 files changed, 57 insertions(+), 38 deletions(-) + src/cairo-scaled-font.c | 89 ++++++++++++++++++++++++++-------------------- + 2 files changed, 58 insertions(+), 39 deletions(-) commit 258f6f4903eb91187384c2df7591413d9041f184 Author: Carl Worth <cworth@cworth.org> diff --git a/ChangeLog.pre-1.4 b/ChangeLog.pre-1.4 index ecd6d56..14094c1 100644 --- a/ChangeLog.pre-1.4 +++ b/ChangeLog.pre-1.4 @@ -887,7 +887,7 @@ Date: Thu Mar 1 23:34:34 2007 -0800 1 files changed, 4 insertions(+), 1 deletions(-) commit df2d42ac7fb71997abd406fb5716c0bd85037c04 -Merge: ec11ca3... 97dbbae... +Merge: ec11ca3 97dbbae Author: Carl Worth <cworth@cworth.org> Date: Thu Mar 1 17:08:03 2007 -0800 @@ -2439,8 +2439,8 @@ Date: Thu Feb 8 15:28:14 2007 -0800 [cairo-surface] Use a macro definition for all nil surfaces - src/cairo-surface.c | 139 ++++++++++++++------------------------------------- - 1 files changed, 38 insertions(+), 101 deletions(-) + src/cairo-surface.c | 137 ++++++++++++++------------------------------------- + 1 files changed, 37 insertions(+), 100 deletions(-) commit aea0831d24c3fca59b9eb9dd8acce9d9cdd13f26 Author: Kalle Vahlman <kalle.vahlman@gmail.com> @@ -2692,8 +2692,8 @@ Date: Tue Feb 6 17:21:22 2007 -0800 This also allows some cleanup of the error-handling in cairo_scaled_font_create, (no more goto statements). - src/cairo-scaled-font.c | 48 +++++++++++++++++++++++----------------------- - 1 files changed, 24 insertions(+), 24 deletions(-) + src/cairo-scaled-font.c | 52 +++++++++++++++++++++++----------------------- + 1 files changed, 26 insertions(+), 26 deletions(-) commit fc660511ec7a51be909e5ed940354d39ef7ad633 Author: Adrian Johnson <ajohnson@redneon.com> @@ -3029,7 +3029,7 @@ Date: Wed Jan 24 15:51:00 2007 -0500 1 files changed, 1 insertions(+), 1 deletions(-) commit bb02b4e5ec40ac37462f487f2ad74b0123814277 -Merge: 48c2896... 3b77512... +Merge: 48c2896 3b77512 Author: Michael Emmel <memmel@debian.localdomain> Date: Tue Jan 23 22:22:20 2007 -0800 @@ -3302,7 +3302,7 @@ Date: Fri Jan 19 15:52:06 2007 -0800 4 files changed, 75 insertions(+), 0 deletions(-) commit d08502d939b44956591f2865a73264713427194b -Merge: eefcfbf... 28d6a22... +Merge: eefcfbf 28d6a22 Author: Vladimir Vukicevic <vladimir@pobox.com> Date: Thu Jan 18 16:50:41 2007 -0800 @@ -3388,7 +3388,7 @@ Date: Wed Jan 17 15:07:12 2007 -0800 1 files changed, 13 insertions(+), 3 deletions(-) commit d9df44d8071d038060e0cc987871c185f7733a3d -Merge: 4e1c2b1... b02b86d... +Merge: 4e1c2b1 b02b86d Author: Vladimir Vukicevic <vladimir@pobox.com> Date: Wed Jan 17 15:08:21 2007 -0800 @@ -4267,7 +4267,7 @@ Date: Sat Dec 16 13:55:21 2006 -0500 1 files changed, 6 insertions(+), 1 deletions(-) commit fa618df6e216f9418d4769ba01cd305f3f12a113 -Merge: 2b946cb... 81a620f... +Merge: 2b946cb 81a620f Author: Carl Worth <cworth@cworth.org> Date: Thu Dec 14 21:10:21 2006 -0800 @@ -4309,7 +4309,7 @@ Date: Fri Dec 15 04:52:28 2006 +0100 0 files changed, 0 insertions(+), 0 deletions(-) commit 15e8486ef1558b8049a4c7a5c2f50a7e4a2599da -Merge: bf78be6... 8b31038... +Merge: bf78be6 8b31038 Author: U-JONATHAN-X60S\jonathan <jonathan@Jonathan-X60s.(none)> Date: Fri Dec 15 02:31:13 2006 +0100 @@ -4362,7 +4362,7 @@ Date: Thu Dec 14 06:55:58 2006 -0800 image-rgb stroke_linear_rgba_over-256 5.68 -> 4.10: 1.39x speedup ▍ - pixman/src/fbcompose.c | 425 +++++++++++++++++++++++---------- + pixman/src/fbcompose.c | 435 +++++++++++++++++++++++---------- test/clip-operator-ref.png | Bin 36956 -> 8262 bytes test/clip-operator-rgb24-ref.png | Bin 16507 -> 3258 bytes test/clip-operator.c | 6 +- @@ -4386,7 +4386,7 @@ Date: Thu Dec 14 06:55:58 2006 -0800 test/unbounded-operator-ref.png | Bin 11964 -> 2777 bytes test/unbounded-operator-rgb24-ref.png | Bin 6047 -> 1315 bytes test/unbounded-operator.c | 6 +- - 24 files changed, 316 insertions(+), 145 deletions(-) + 24 files changed, 321 insertions(+), 150 deletions(-) commit af9cce6aa295327b5256f55900b3debf9112b6ca Author: Carl Worth <cworth@cworth.org> @@ -5714,8 +5714,8 @@ Date: Mon Nov 20 03:14:20 2006 +0200 Tweak comparators. - src/cairo-bentley-ottmann.c | 60 ++++++++++++++++++++---------------------- - 1 files changed, 29 insertions(+), 31 deletions(-) + src/cairo-bentley-ottmann.c | 62 ++++++++++++++++++++---------------------- + 1 files changed, 30 insertions(+), 32 deletions(-) commit 67359d7a58c14851936345417833b1e610987c19 Author: Joonas Pihlaja <jpihlaja@cc.helsinki.fi> @@ -6105,7 +6105,7 @@ Date: Mon Nov 20 09:32:00 2006 -0800 4 files changed, 8 insertions(+), 8 deletions(-) commit 10920c1326362b4fadfa01019223647c23351127 -Merge: 1ed3811... 2928f6e... +Merge: 1ed3811 2928f6e Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr> Date: Sat Nov 18 12:59:12 2006 +0100 @@ -6255,8 +6255,8 @@ Date: Sat Nov 11 10:43:11 2006 -0800 xlib-rgb world_map-800 562.31 0.64% -> 460.51 0.83%: 1.22x speedup ▎ - src/cairo-path-stroke.c | 20 +++++++------------- - 1 files changed, 7 insertions(+), 13 deletions(-) + src/cairo-path-stroke.c | 22 ++++++++-------------- + 1 files changed, 8 insertions(+), 14 deletions(-) commit 3d53f623faed4aed2517e207d77a6da7e3b74fbd Author: Carl Worth <cworth@cworth.org> @@ -6278,8 +6278,8 @@ Date: Fri Nov 10 12:56:32 2006 -0800 xlib-rgba world_map-800 663.71 0.46% -> 567.74 0.19%: 1.17x speedup ▏ - src/cairo-path-stroke.c | 31 ++++++------------------------- - 1 files changed, 6 insertions(+), 25 deletions(-) + src/cairo-path-stroke.c | 33 +++++++-------------------------- + 1 files changed, 7 insertions(+), 26 deletions(-) commit fefa7d9b993b1fc0759cfe1f8faff8dec9dc5c85 Author: Carl Worth <cworth@cworth.org> @@ -7450,7 +7450,7 @@ Date: Wed Oct 18 15:18:11 2006 -0700 4 files changed, 3 insertions(+), 0 deletions(-) commit e21c155e73569f6533dd01bdd7ec62461e7f215f -Merge: a53eabf... 10cd23d... +Merge: a53eabf 10cd23d Author: Carl Worth <cworth@cworth.org> Date: Wed Oct 18 15:03:04 2006 -0700 @@ -7529,7 +7529,7 @@ Date: Tue Oct 17 17:53:43 2006 -0700 1 files changed, 1 insertions(+), 1 deletions(-) commit c1f134fa13928f31c903d513920448b127749a4b -Merge: 968ceee... 157663e... +Merge: 968ceee 157663e Author: Ian Osgood <iano@quirkster.com> Date: Wed Oct 18 08:15:47 2006 -0700 @@ -7754,7 +7754,7 @@ Date: Thu Oct 12 23:42:50 2006 -0700 1 files changed, 1 insertions(+), 1 deletions(-) commit 02e7b892bcb75a69eb28902e7f67e2e7778bfe7b -Merge: 151e29d... 648f4bc... +Merge: 151e29d 648f4bc Author: Michael Emmel <memmel@debian.localdomain> Date: Thu Oct 12 20:40:11 2006 -0700 @@ -8805,7 +8805,7 @@ Date: Sat Sep 9 19:52:48 2006 -0700 1 files changed, 9 insertions(+), 4 deletions(-) commit d3076a1843bc2f05bab0df913d0c27f125bea162 -Merge: dfe3e20... 78b8555... +Merge: dfe3e20 78b8555 Author: Vladimir Vukicevic <vladimir@pobox.com> Date: Sat Sep 9 18:57:57 2006 -0700 @@ -8877,7 +8877,7 @@ Date: Sat Sep 9 16:40:58 2006 -0700 4 files changed, 91 insertions(+), 70 deletions(-) commit 97f26c523590dcb208a7c0e4d00fd66f4ca58605 -Merge: 0e59041... 416e945... +Merge: 0e59041 416e945 Author: Vladimir Vukicevic <vladimir@pobox.com> Date: Sat Sep 9 17:09:03 2006 -0700 @@ -10417,7 +10417,7 @@ Date: Fri Aug 18 12:04:16 2006 -0400 2 files changed, 0 insertions(+), 0 deletions(-) commit 861f1cb4f70cdbd7702eaf642b999a21ad01037d -Merge: c2d92d4... fbb1758... +Merge: c2d92d4 fbb1758 Author: Carl Worth <cworth@cworth.org> Date: Fri Aug 18 07:56:52 2006 -0700 @@ -11508,7 +11508,7 @@ Date: Tue Aug 8 00:43:09 2006 -0700 2 files changed, 0 insertions(+), 0 deletions(-) commit 401f0ce3c444e263f03055174791e993e6270c39 -Merge: 77fd0ef... 02b54ca... +Merge: 77fd0ef 02b54ca Author: Carl Worth <cworth@cworth.org> Date: Tue Aug 8 00:19:51 2006 -0700 @@ -11720,7 +11720,7 @@ Date: Mon Aug 7 15:18:38 2006 -0700 7 files changed, 17 insertions(+), 18 deletions(-) commit 959b85e98c8a0f546c9117da83f84c99ed00370f -Merge: f1c70a0... 7ee94c0... +Merge: f1c70a0 7ee94c0 Author: Carl Worth <cworth@cworth.org> Date: Mon Aug 7 15:06:47 2006 -0700 @@ -11992,7 +11992,7 @@ Date: Wed Aug 2 19:12:51 2006 -0400 9 files changed, 347 insertions(+), 181 deletions(-) commit c05dd48ac1afe0e4f3ec0c24797a9fbc3f98ce85 -Merge: e0bec64... 0da4b93... +Merge: e0bec64 0da4b93 Author: Michael Emmel <memmel@debian.localdomain> Date: Wed Aug 2 14:32:50 2006 -0700 @@ -12420,7 +12420,7 @@ Date: Wed Jul 26 15:48:56 2006 -0700 1 files changed, 22 insertions(+), 6 deletions(-) commit 8601c2c68306c956744399099a941363d446b906 -Merge: cd2f50e... b719188... +Merge: cd2f50e b719188 Author: Michael Emmel <memmel@debian.localdomain> Date: Thu Jul 20 23:04:37 2006 -0700 @@ -12553,7 +12553,7 @@ Date: Thu Jul 13 15:56:12 2006 -0700 2 files changed, 0 insertions(+), 0 deletions(-) commit 5d64efdbb8fc4e17d4fa44d21068870cd2aea7ce -Merge: 9907813... 6a5d66f... +Merge: 9907813 6a5d66f Author: Michael Emmel <memmel@debian.localdomain> Date: Fri Jul 14 09:37:22 2006 -0700 @@ -12638,7 +12638,7 @@ Date: Thu Jul 13 15:00:16 2006 -0700 1 files changed, 3 insertions(+), 3 deletions(-) commit 307a17f78cd2adda8a59ef16385df3be5786d2bd -Merge: 5ed64e3... 1409b8b... +Merge: 5ed64e3 1409b8b Author: Michael Emmel <memmel@debian.localdomain> Date: Thu Jul 13 12:17:25 2006 -0700 diff --git a/ChangeLog.pre-1.6 b/ChangeLog.pre-1.6 index ccaf238..7af500a 100644 --- a/ChangeLog.pre-1.6 +++ b/ChangeLog.pre-1.6 @@ -3110,7 +3110,7 @@ Date: Thu Feb 28 16:32:55 2008 -0800 1 files changed, 0 insertions(+), 1 deletions(-) commit 4a73471087f42baf07988e0f2de323ed3b18dac9 -Merge: 54a6191... 523c7db... +Merge: 54a6191 523c7db Author: Carl Worth <cworth@cworth.org> Date: Thu Feb 28 16:21:11 2008 -0800 @@ -3280,7 +3280,7 @@ Date: Thu Feb 28 12:56:31 2008 -0800 1 files changed, 22 insertions(+), 6 deletions(-) commit a95b22858fa5d65600faf5163966e18760a3cf35 -Merge: c84ec58... 67d5437... +Merge: c84ec58 67d5437 Author: Carl Worth <cworth@cworth.org> Date: Thu Feb 28 12:30:13 2008 -0800 @@ -5143,7 +5143,7 @@ Date: Thu Jan 31 16:13:44 2008 +1100 1 files changed, 2 insertions(+), 2 deletions(-) commit cb9f9086a1c8ad312cfc5314fc8e352a6046d75e -Merge: c11b036... a9b0e54... +Merge: c11b036 a9b0e54 Author: Peter Weilbacher <mozilla@weilbacher.org> Date: Thu Feb 7 00:07:20 2008 +0100 @@ -7885,7 +7885,7 @@ Date: Fri Jan 11 21:13:05 2008 +0000 4 files changed, 10 insertions(+), 23 deletions(-) commit bcf0c442b91b553b226c78d254906f7127013391 -Merge: ecb8958... 8a6a0b4... +Merge: ecb8958 8a6a0b4 Author: Carl Worth <cworth@cworth.org> Date: Fri Jan 11 12:30:15 2008 -0800 @@ -9338,7 +9338,7 @@ Date: Tue Dec 11 15:50:05 2007 +0100 2 files changed, 88 insertions(+), 23 deletions(-) commit f3cec9d1c2a4d43cd734aae4bc7f8e7410a5e89a -Merge: 08516d9... c26084a... +Merge: 08516d9 c26084a Author: Claudio Ciccani <klan@directfb.org> Date: Mon Dec 10 22:58:06 2007 +0100 @@ -9936,7 +9936,7 @@ Date: Sat Nov 10 10:24:21 2007 +0100 1 files changed, 65 insertions(+), 65 deletions(-) commit 8edc3ed4857795387007e7c4997f30d7ceec57ac -Merge: 3bc8a8d... 77e9b05... +Merge: 3bc8a8d 77e9b05 Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr> Date: Sat Nov 10 10:10:50 2007 +0100 @@ -10569,7 +10569,7 @@ Date: Tue Oct 30 13:13:29 2007 -0700 2 files changed, 5 insertions(+), 4 deletions(-) commit 6957aa27e8df55ed3ef1e0cfc62c714ad9b644ee -Merge: 00d701f... 8d8724e... +Merge: 00d701f 8d8724e Author: Carl Worth <cworth@cworth.org> Date: Tue Oct 30 09:45:59 2007 -0700 @@ -13682,7 +13682,7 @@ Date: Thu Sep 6 12:56:59 2007 -0700 1 files changed, 22 insertions(+), 0 deletions(-) commit 3c01efb0ee0c8911fba7627d056ec3b53dfab6e3 -Merge: 0682b9a... 1e21220... +Merge: 0682b9a 1e21220 Author: Carl Worth <cworth@cworth.org> Date: Wed Sep 5 14:38:40 2007 -0700 @@ -13772,7 +13772,7 @@ Date: Wed Sep 5 00:26:56 2007 -0400 1 files changed, 5 insertions(+), 1 deletions(-) commit 1d788da5175dac34ed0298204753bf1b40dfc2b0 -Merge: 49ae376... e1819a2... +Merge: 49ae376 e1819a2 Author: Behdad Esfahbod <behdad@behdad.org> Date: Tue Sep 4 19:12:48 2007 -0400 @@ -14347,7 +14347,7 @@ Date: Sat Jul 28 17:37:24 2007 +0200 1 files changed, 1 insertions(+), 1 deletions(-) commit 3ceaa6e74e4bd3f5935016c3639411b26d7f576f -Merge: e3b5a65... 24075f1... +Merge: e3b5a65 24075f1 Author: Carl Worth <cworth@cworth.org> Date: Fri Aug 24 08:03:44 2007 -0700 @@ -15473,7 +15473,7 @@ Date: Thu Jul 5 15:24:11 2007 +0100 2 files changed, 15 insertions(+), 1 deletions(-) commit ef967be630dd8d0bf81ad5889d6264bebe7631d4 -Merge: 0c42dbb... 5c7d2d1... +Merge: 0c42dbb 5c7d2d1 Author: Søren Sandmann Pedersen <sandmann@annarchy.freedesktop.org> Date: Mon Jul 2 08:33:29 2007 -0700 @@ -15615,7 +15615,7 @@ Date: Wed Jun 27 11:07:07 2007 -0700 1 files changed, 0 insertions(+), 2 deletions(-) commit 6d021eb4b6e319dd2bb3e5e126de07c6844d5c07 -Merge: 9109946... 0791f34... +Merge: 9109946 0791f34 Author: Carl Worth <cworth@cworth.org> Date: Wed Jun 27 11:01:00 2007 -0700 @@ -18190,7 +18190,7 @@ Date: Tue Apr 24 17:33:37 2007 -0400 1 files changed, 5 insertions(+), 0 deletions(-) commit ac0ef0302e68ba17ec5a59c689579f1854c7386c -Merge: d3cf214... 260dcb3... +Merge: d3cf214 260dcb3 Author: Peter Weilbacher <mozilla@weilbacher.org> Date: Mon Apr 23 23:18:05 2007 +0200 @@ -18321,7 +18321,7 @@ Date: Sat Apr 21 08:21:01 2007 -0400 4 files changed, 701 insertions(+), 0 deletions(-) commit d3cf2144dbd42737d5e2c45908fbca082dd54022 -Merge: 6c12961... abdcbf8... +Merge: 6c12961 abdcbf8 Author: Peter Weilbacher <mozilla@weilbacher.org> Date: Sat Apr 21 13:50:30 2007 +0200 @@ -19718,7 +19718,7 @@ Date: Tue Apr 17 15:30:20 2007 -0400 1 files changed, 1 insertions(+), 1 deletions(-) commit f7a2787685d640dd35ef7ef1314c4e754771c512 -Merge: 2efaf3a... cab4d41... +Merge: 2efaf3a cab4d41 Author: Mathias Hasselmann <mathias.hasselmann@gmx.de> Date: Mon Apr 16 23:05:10 2007 +0200 @@ -20163,7 +20163,7 @@ Date: Thu Apr 12 10:51:17 2007 -0700 2 files changed, 52 insertions(+), 0 deletions(-) commit e240048a14333d5c61a0d4ae5c30acd12bcb5805 -Merge: 29a1fe1... 977a898... +Merge: 29a1fe1 977a898 Author: Michael Emmel <memmel@debian.localdomain> Date: Wed Apr 11 21:43:15 2007 -0700 @@ -20258,7 +20258,7 @@ Date: Wed Apr 11 19:42:34 2007 -0400 1 files changed, 1 insertions(+), 0 deletions(-) commit c8645c85de94b83fe2fd60a4d881cb639eb79b46 -Merge: be98123... 52435e9... +Merge: be98123 52435e9 Author: Carl Worth <cworth@cworth.org> Date: Wed Apr 11 16:38:46 2007 -0700 @@ -20287,7 +20287,7 @@ Date: Wed Apr 11 23:34:24 2007 +0100 7 files changed, 202 insertions(+), 295 deletions(-) commit be98123b2c30a3102629afff74b9233c18e0535d -Merge: efedf57... a6506c6... +Merge: efedf57 a6506c6 Author: Carl Worth <cworth@cworth.org> Date: Wed Apr 11 16:02:08 2007 -0700 @@ -20391,7 +20391,7 @@ Date: Thu Apr 12 06:32:29 2007 +0930 1 files changed, 1 insertions(+), 1 deletions(-) commit e36794ad34282a4d671d7cc5527e9c650c2736fe -Merge: b692472... b745126... +Merge: b692472 b745126 Author: Carl Worth <cworth@cworth.org> Date: Wed Apr 11 13:15:57 2007 -0700 @@ -22426,7 +22426,7 @@ Date: Sat Mar 24 13:25:03 2007 +0000 1 files changed, 8 insertions(+), 2 deletions(-) commit 2efaf3a7a47a281ca02009d371cd7a06a8a4f282 -Merge: abac4d2... 25ddc08... +Merge: abac4d2 25ddc08 Author: Mathias Hasselmann <mathias.hasselmann@gmx.de> Date: Sat Mar 24 00:29:04 2007 +0100 @@ -22660,7 +22660,7 @@ Date: Tue Mar 20 08:47:45 2007 -0400 2 files changed, 8 insertions(+), 6 deletions(-) commit 94c367f7d7637fc74ed6d1fbe13d73662c08246b -Merge: c4bd7cf... d3177a6... +Merge: c4bd7cf d3177a6 Author: Mathias Hasselmann <mathias.hasselmann@gmx.de> Date: Tue Mar 20 13:33:50 2007 +0100 diff --git a/ChangeLog.pre-1.8 b/ChangeLog.pre-1.8 index f98bf88..6746f09 100644 --- a/ChangeLog.pre-1.8 +++ b/ChangeLog.pre-1.8 @@ -8306,7 +8306,7 @@ Date: Tue Apr 29 11:56:21 2008 +0100 4 files changed, 35 insertions(+), 57 deletions(-) commit c57b1eca18db12b8d56d73093d5cae28ed388298 -Merge: b9acf62... cba1543... +Merge: b9acf62 cba1543 Author: Søren Sandmann <sandmann@redhat.com> Date: Fri Jun 13 16:18:13 2008 -0400 @@ -11082,7 +11082,7 @@ Date: Mon Apr 14 16:52:40 2008 -0700 1 files changed, 7 insertions(+), 6 deletions(-) commit 9db764c732ef6e3405866a60762592625aa94ca4 -Merge: d96fdd5... 44e6cdd... +Merge: d96fdd5 44e6cdd Author: Carl Worth <cworth@cworth.org> Date: Mon Apr 14 16:39:27 2008 -0700 @@ -11233,7 +11233,7 @@ Date: Fri Apr 11 13:48:38 2008 -0700 2 files changed, 10 insertions(+), 22 deletions(-) commit 75001079c1c6361f116409dc13263e87081637d1 -Merge: a5770c3... f57100a... +Merge: a5770c3 f57100a Author: Carl Worth <cworth@cworth.org> Date: Fri Apr 11 10:08:14 2008 -0700 @@ -11480,7 +11480,7 @@ Date: Fri Apr 11 21:42:19 2008 +0930 1 files changed, 5 insertions(+), 4 deletions(-) commit 0ac8130ae3d74a09343f4b9a2d69f938910b4ab9 -Merge: eac9251... 11299ae... +Merge: eac9251 11299ae Author: Carl Worth <cworth@cworth.org> Date: Thu Apr 10 18:07:12 2008 -0700 diff --git a/Makefile.in b/Makefile.in index 34dce52..6830051 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(top_srcdir)/src/cairo-uninstalled.pc.in AUTHORS COPYING \ ChangeLog INSTALL NEWS build/compile build/config.guess \ build/config.sub build/depcomp build/install-sh \ - build/ltmain.sh build/missing depcomp missing + build/ltmain.sh build/missing EXTRA_PROGRAMS = TESTS = check_PROGRAMS = @@ -110,7 +110,8 @@ CONFIG_CLEAN_FILES = cairo-uninstalled.pc cairo-xlib-uninstalled.pc \ cairo-wgl-uninstalled.pc cairo-script-uninstalled.pc \ cairo-ft-uninstalled.pc cairo-fc-uninstalled.pc \ cairo-ps-uninstalled.pc cairo-pdf-uninstalled.pc \ - cairo-svg-uninstalled.pc cairo-xml-uninstalled.pc + cairo-svg-uninstalled.pc cairo-tee-uninstalled.pc \ + cairo-xml-uninstalled.pc cairo-gobject-uninstalled.pc CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -225,6 +226,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -338,7 +341,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ @@ -564,8 +566,12 @@ cairo-pdf-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/cairo- cd $(top_builddir) && $(SHELL) ./config.status $@ cairo-svg-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/cairo-features-uninstalled.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +cairo-tee-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/cairo-features-uninstalled.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ cairo-xml-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/cairo-features-uninstalled.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +cairo-gobject-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/cairo-features-uninstalled.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -1,3 +1,64 @@ +Release 1.10.0 (2010-09-06 Chris Wilson <chris@chris-wilson.co.uk>) +=================================================================== +The cairo community is astounded (and flabbergast) to finally announce +the 1.10.0 release of the cairo graphics library. This is a major update +to cairo, with new features and enhanced functionality which maintains +compatibility for applications written using any previous major cairo +release, (1.8, 1.6, 1.4, 1.2, or 1.0). We recommend that anybody using +a previous version of cairo upgrade to cairo 1.10.0. + +One of the more interesting departures for cairo for this release is the +inclusion of a tracing utility, cairo-trace. cairo-trace generates a +human-readable, replayable, compact representation of the sequences of +drawing commands made by an application. This can be used to inspecting +applications to understand issues and as a means for profiling +real-world usage of cairo. + +The traces generated by cairo-trace have been collected in + + git://git.cairographics.org/git/cairo-traces + +and have driven the performance tuning of cairo over the last couple of +years. In particular, the image backend is much faster with a new +polygon rasterisation and a complete overhaul of the tessellator. Not +only is this faster, but also eliminates visual artifacts from +self-intersecting strokes. Not only has cairo-trace been driving +performance improvements within cairo, but as a repeatable means of +driving complex graphics it has been used to tune OpenGL, DDX, and +pixman. + +Cairo's API has been extended to better support printing, notably +through the ability to include a single compressed representation of an +image for patterns used throughout a document, leading to dramatic file +size reductions. Also the meta-surface used to record the vector +commands compromising a drawing sequence is now exposed as a +CAIRO_SURFACE_TYPE_RECORDING, along with a new surface that is a child of a +larger surface, CAIRO_SURFACE_TYPE_SUBSURFACE. One typical usage of a +subsurface would be as a source glyph in a texture atlas, or as a +restricted subwindow within a canvas. + +Cairo's API has also resurrected the RGB16 format from the past as +the prevalence of 16-bit framebuffers has not diminished and is a +fore-taste of the extended format support we anticipate in the future. +Increasing cairo's utility, we introduce the cairo_region_t for handling +sets of pixel aligned rectangles commonly used in graphics applications. +This is a merger of the GdkRegion and the pixman_region_t, hopefully +providing the utility of the former with the speed of the latter. + +Furthermore cairo has been reworked to interoperate more closely with +various acceleration architectures, gaining the ability to share +those hardware resources through the new cairo_device_t. For instance, +with the new OpenGL backend that supersedes the Glitz backend, hardware +and rendering operations can be shared between a classic OpenGL +application mixing libVA for the hardware assisted video decode with +cairo for high quality overlays all within the same OpenGL canvas. + +Many thanks for the hard work of Adrian Johnson, Andrea Canciani, Behdad +Esfahbod, Benjamin Otte, Carl Worth, Carlos Garcia Campos, Chris Wilson, +Eric Anholt, Jeff Muizelaar, Karl Tomlinson, M Joonas Pihlaja, Søren +Sandmann Pedersen and many others that have contributed over the last +couple of years to cairo. Thank you all! + Snapshot 1.9.14 (2010-07-26) ============================ @@ -89,7 +89,7 @@ Supported, "standard" surface backends ------------------------------------ image backend (required) ------------------------ - pixman >= 0.12.0 http://cairographics.org/releases + pixman >= 0.18.4 http://cairographics.org/releases png support (can be left out if desired, but many ----------- applications expect it to be present) @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, +[m4_warning([this file was generated for autoconf 2.66. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff --git a/boilerplate/Makefile.am.features b/boilerplate/Makefile.am.features index 3fee916..b9db792 100644 --- a/boilerplate/Makefile.am.features +++ b/boilerplate/Makefile.am.features @@ -416,17 +416,19 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_recording_private) enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_recording_cxx_sources) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_recording_sources) -supported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) +unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_tee_private) all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources) all_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources) +if CAIRO_HAS_TEE_SURFACE enabled_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) enabled_cairo_boilerplate_private += $(cairo_boilerplate_tee_private) enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources) +endif -supported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers) +unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_xml_private) all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xml_cxx_sources) @@ -457,6 +459,18 @@ enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources) endif +supported_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +all_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +all_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private) +all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources) +all_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources) +if CAIRO_HAS_GOBJECT_FUNCTIONS +enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private) +enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources) +endif + all_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers) all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_trace_cxx_sources) all_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources) diff --git a/boilerplate/Makefile.in b/boilerplate/Makefile.in index ecd6611..0d13b97 100644 --- a/boilerplate/Makefile.in +++ b/boilerplate/Makefile.in @@ -176,25 +176,33 @@ check_PROGRAMS = check-link$(EXEEXT) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_125 = $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_126 = $(cairo_boilerplate_test_surfaces_cxx_sources) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_127 = $(cairo_boilerplate_test_surfaces_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_128 = $(cairo_boilerplate_xml_headers) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_129 = $(cairo_boilerplate_xml_private) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_130 = $(cairo_boilerplate_xml_cxx_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_131 = $(cairo_boilerplate_xml_sources) -@CAIRO_HAS_PTHREAD_TRUE@am__append_132 = $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers) -@CAIRO_HAS_PTHREAD_TRUE@am__append_133 = $(cairo_boilerplate_pthread_cxx_sources) -@CAIRO_HAS_PTHREAD_TRUE@am__append_134 = $(cairo_boilerplate_pthread_sources) -@CAIRO_HAS_TRACE_TRUE@am__append_135 = $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers) -@CAIRO_HAS_TRACE_TRUE@am__append_136 = $(cairo_boilerplate_trace_cxx_sources) -@CAIRO_HAS_TRACE_TRUE@am__append_137 = $(cairo_boilerplate_trace_sources) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_138 = $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_139 = $(cairo_boilerplate_interpreter_cxx_sources) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_140 = $(cairo_boilerplate_interpreter_sources) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_141 = $(cairo_boilerplate_symbol_lookup_private) $(cairo_boilerplate_symbol_lookup_headers) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_142 = $(cairo_boilerplate_symbol_lookup_cxx_sources) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_143 = $(cairo_boilerplate_symbol_lookup_sources) -@CAIRO_HAS_DL_TRUE@am__append_144 = -ldl -@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_145 = -lwinspool -@CROSS_COMPILING_FALSE@am__append_146 = check-link$(EXEEXT) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_128 = $(cairo_boilerplate_tee_headers) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_129 = $(cairo_boilerplate_tee_private) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_130 = $(cairo_boilerplate_tee_cxx_sources) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_131 = $(cairo_boilerplate_tee_sources) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_132 = $(cairo_boilerplate_xml_headers) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_133 = $(cairo_boilerplate_xml_private) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_134 = $(cairo_boilerplate_xml_cxx_sources) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_135 = $(cairo_boilerplate_xml_sources) +@CAIRO_HAS_PTHREAD_TRUE@am__append_136 = $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers) +@CAIRO_HAS_PTHREAD_TRUE@am__append_137 = $(cairo_boilerplate_pthread_cxx_sources) +@CAIRO_HAS_PTHREAD_TRUE@am__append_138 = $(cairo_boilerplate_pthread_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_139 = $(cairo_boilerplate_gobject_headers) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_140 = $(cairo_boilerplate_gobject_private) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_141 = $(cairo_boilerplate_gobject_cxx_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_142 = $(cairo_boilerplate_gobject_sources) +@CAIRO_HAS_TRACE_TRUE@am__append_143 = $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers) +@CAIRO_HAS_TRACE_TRUE@am__append_144 = $(cairo_boilerplate_trace_cxx_sources) +@CAIRO_HAS_TRACE_TRUE@am__append_145 = $(cairo_boilerplate_trace_sources) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_146 = $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_147 = $(cairo_boilerplate_interpreter_cxx_sources) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_148 = $(cairo_boilerplate_interpreter_sources) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_149 = $(cairo_boilerplate_symbol_lookup_private) $(cairo_boilerplate_symbol_lookup_headers) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_150 = $(cairo_boilerplate_symbol_lookup_cxx_sources) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_151 = $(cairo_boilerplate_symbol_lookup_sources) +@CAIRO_HAS_DL_TRUE@am__append_152 = -ldl +@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_153 = -lwinspool +@CROSS_COMPILING_FALSE@am__append_154 = check-link$(EXEEXT) subdir = boilerplate ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ @@ -254,7 +262,8 @@ am__objects_3 = $(am__objects_1) $(am__objects_2) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_1) $(am__objects_1) + $(am__objects_1) $(am__objects_1) $(am__objects_1) \ + $(am__objects_1) $(am__objects_1) am__objects_4 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ @@ -267,7 +276,8 @@ am__objects_4 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_1) + $(am__objects_1) $(am__objects_1) $(am__objects_1) \ + $(am__objects_1) am__objects_5 = cairo-boilerplate-getopt.lo \ cairo-boilerplate-system.lo cairo-boilerplate.lo am__objects_6 = cairo-boilerplate-xlib.lo @@ -315,7 +325,8 @@ am__objects_38 = $(am__objects_5) $(am__objects_7) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_31) \ $(am__objects_33) $(am__objects_35) $(am__objects_37) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_1) + $(am__objects_1) $(am__objects_1) $(am__objects_1) \ + $(am__objects_1) am_libcairoboilerplate_la_OBJECTS = $(am__objects_3) $(am__objects_4) \ $(am__objects_38) cairo-boilerplate-constructors.lo libcairoboilerplate_la_OBJECTS = $(am_libcairoboilerplate_la_OBJECTS) @@ -343,7 +354,7 @@ am__objects_43 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) + $(am__objects_1) $(am__objects_1) $(am__objects_1) am_libcairoboilerplate_cxx_la_OBJECTS = $(am__objects_43) libcairoboilerplate_cxx_la_OBJECTS = \ $(am_libcairoboilerplate_cxx_la_OBJECTS) @@ -459,6 +470,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -572,7 +585,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ @@ -622,7 +634,7 @@ EXTRA_DIST = Makefile.win32 Makefile.win32.features $(BUILT_SOURCES) \ make-cairo-boilerplate-constructors.sh EXTRA_LTLIBRARIES = libcairoboilerplate.la $(cxx_boilerplate_lib) MAINTAINERCLEANFILES = Makefile.in -TESTS = $(am__append_146) +TESTS = $(am__append_154) cairo_boilerplate_headers = \ cairo-boilerplate-getopt.h \ cairo-boilerplate-scaled-font.h \ @@ -678,9 +690,8 @@ supported_cairo_boilerplate_headers = $(cairo_boilerplate_headers) \ $(cairo_boilerplate_svg_headers) \ $(cairo_boilerplate_image_headers) \ $(cairo_boilerplate_recording_headers) \ - $(cairo_boilerplate_tee_headers) \ - $(cairo_boilerplate_xml_headers) \ - $(cairo_boilerplate_user_headers) + $(cairo_boilerplate_user_headers) \ + $(cairo_boilerplate_gobject_headers) unsupported_cairo_boilerplate_headers = \ $(cairo_boilerplate_xcb_headers) \ $(cairo_boilerplate_xlib_xcb_headers) \ @@ -696,7 +707,9 @@ unsupported_cairo_boilerplate_headers = \ $(cairo_boilerplate_gl_headers) \ $(cairo_boilerplate_directfb_headers) \ $(cairo_boilerplate_vg_headers) \ - $(cairo_boilerplate_script_headers) + $(cairo_boilerplate_script_headers) \ + $(cairo_boilerplate_tee_headers) \ + $(cairo_boilerplate_xml_headers) all_cairo_boilerplate_headers = $(cairo_boilerplate_headers) \ $(cairo_boilerplate_xlib_headers) \ $(cairo_boilerplate_xlib_xrender_headers) \ @@ -733,7 +746,8 @@ all_cairo_boilerplate_headers = $(cairo_boilerplate_headers) \ $(cairo_boilerplate_recording_headers) \ $(cairo_boilerplate_tee_headers) \ $(cairo_boilerplate_xml_headers) \ - $(cairo_boilerplate_user_headers) + $(cairo_boilerplate_user_headers) \ + $(cairo_boilerplate_gobject_headers) all_cairo_boilerplate_private = $(cairo_boilerplate_private) \ $(cairo_boilerplate_xlib_private) \ $(cairo_boilerplate_xlib_xrender_private) \ @@ -775,6 +789,7 @@ all_cairo_boilerplate_private = $(cairo_boilerplate_private) \ $(cairo_boilerplate_user_private) \ $(cairo_boilerplate_pthread_private) \ $(cairo_boilerplate_pthread_headers) \ + $(cairo_boilerplate_gobject_private) \ $(cairo_boilerplate_trace_private) \ $(cairo_boilerplate_trace_headers) \ $(cairo_boilerplate_interpreter_private) \ @@ -820,6 +835,7 @@ all_cairo_boilerplate_cxx_sources = $(cairo_boilerplate_cxx_sources) \ $(cairo_boilerplate_xml_cxx_sources) \ $(cairo_boilerplate_user_cxx_sources) \ $(cairo_boilerplate_pthread_cxx_sources) \ + $(cairo_boilerplate_gobject_cxx_sources) \ $(cairo_boilerplate_trace_cxx_sources) \ $(cairo_boilerplate_interpreter_cxx_sources) \ $(cairo_boilerplate_symbol_lookup_cxx_sources) @@ -862,6 +878,7 @@ all_cairo_boilerplate_sources = $(cairo_boilerplate_sources) \ $(cairo_boilerplate_xml_sources) \ $(cairo_boilerplate_user_sources) \ $(cairo_boilerplate_pthread_sources) \ + $(cairo_boilerplate_gobject_sources) \ $(cairo_boilerplate_trace_sources) \ $(cairo_boilerplate_interpreter_sources) \ $(cairo_boilerplate_symbol_lookup_sources) @@ -877,9 +894,9 @@ enabled_cairo_boilerplate_headers = $(cairo_boilerplate_headers) \ $(am__append_97) $(am__append_101) $(am__append_105) \ $(am__append_109) $(am__append_113) $(am__append_117) \ $(am__append_121) $(cairo_boilerplate_image_headers) \ - $(cairo_boilerplate_recording_headers) \ - $(cairo_boilerplate_tee_headers) $(am__append_128) \ - $(cairo_boilerplate_user_headers) + $(cairo_boilerplate_recording_headers) $(am__append_128) \ + $(am__append_132) $(cairo_boilerplate_user_headers) \ + $(am__append_139) enabled_cairo_boilerplate_private = $(cairo_boilerplate_private) \ $(am__append_2) $(am__append_6) $(am__append_10) \ $(am__append_14) $(am__append_18) $(am__append_22) \ @@ -893,10 +910,10 @@ enabled_cairo_boilerplate_private = $(cairo_boilerplate_private) \ $(am__append_110) $(am__append_114) $(am__append_118) \ $(am__append_122) $(am__append_125) \ $(cairo_boilerplate_image_private) \ - $(cairo_boilerplate_recording_private) \ - $(cairo_boilerplate_tee_private) $(am__append_129) \ - $(cairo_boilerplate_user_private) $(am__append_132) \ - $(am__append_135) $(am__append_138) $(am__append_141) + $(cairo_boilerplate_recording_private) $(am__append_129) \ + $(am__append_133) $(cairo_boilerplate_user_private) \ + $(am__append_136) $(am__append_140) $(am__append_143) \ + $(am__append_146) $(am__append_149) enabled_cairo_boilerplate_cxx_sources = \ $(cairo_boilerplate_cxx_sources) $(am__append_3) \ $(am__append_7) $(am__append_11) $(am__append_15) \ @@ -910,10 +927,10 @@ enabled_cairo_boilerplate_cxx_sources = \ $(am__append_103) $(am__append_107) $(am__append_111) \ $(am__append_115) $(am__append_119) $(am__append_123) \ $(am__append_126) $(cairo_boilerplate_image_cxx_sources) \ - $(cairo_boilerplate_recording_cxx_sources) \ - $(cairo_boilerplate_tee_cxx_sources) $(am__append_130) \ - $(cairo_boilerplate_user_cxx_sources) $(am__append_133) \ - $(am__append_136) $(am__append_139) $(am__append_142) + $(cairo_boilerplate_recording_cxx_sources) $(am__append_130) \ + $(am__append_134) $(cairo_boilerplate_user_cxx_sources) \ + $(am__append_137) $(am__append_141) $(am__append_144) \ + $(am__append_147) $(am__append_150) enabled_cairo_boilerplate_sources = $(cairo_boilerplate_sources) \ $(am__append_4) $(am__append_8) $(am__append_12) \ $(am__append_16) $(am__append_20) $(am__append_24) \ @@ -927,10 +944,10 @@ enabled_cairo_boilerplate_sources = $(cairo_boilerplate_sources) \ $(am__append_112) $(am__append_116) $(am__append_120) \ $(am__append_124) $(am__append_127) \ $(cairo_boilerplate_image_sources) \ - $(cairo_boilerplate_recording_sources) \ - $(cairo_boilerplate_tee_sources) $(am__append_131) \ - $(cairo_boilerplate_user_sources) $(am__append_134) \ - $(am__append_137) $(am__append_140) $(am__append_143) + $(cairo_boilerplate_recording_sources) $(am__append_131) \ + $(am__append_135) $(cairo_boilerplate_user_sources) \ + $(am__append_138) $(am__append_142) $(am__append_145) \ + $(am__append_148) $(am__append_151) #MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features AM_CPPFLAGS = \ -I$(srcdir) \ @@ -955,7 +972,7 @@ libcairoboilerplate_cxx_la_SOURCES = \ libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la \ $(cxx_boilerplate_lib) $(CAIRO_LIBS) $(CAIROBOILERPLATE_LIBS) \ - $(NULL) $(am__append_144) $(am__append_145) + $(NULL) $(am__append_152) $(am__append_153) libcairoboilerplate_cxx_la_LIBADD = $(top_builddir)/src/libcairo.la \ $(CAIRO_LIBS) \ $(CAIROBOILERPLATE_LIBS) \ diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index c2177da..a72d233 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -420,17 +420,19 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_recording_private) enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_recording_cxx_sources) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_recording_sources) -supported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) +unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_tee_private) all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources) all_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources) +ifeq ($(CAIRO_HAS_TEE_SURFACE),1) enabled_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) enabled_cairo_boilerplate_private += $(cairo_boilerplate_tee_private) enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources) +endif -supported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers) +unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_xml_private) all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xml_cxx_sources) @@ -461,6 +463,18 @@ enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources) endif +supported_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +all_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +all_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private) +all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources) +all_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources) +ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1) +enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private) +enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources) +endif + all_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers) all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_trace_cxx_sources) all_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources) diff --git a/boilerplate/cairo-boilerplate-constructors.c b/boilerplate/cairo-boilerplate-constructors.c index 4b66c9b..8e17a62 100644 --- a/boilerplate/cairo-boilerplate-constructors.c +++ b/boilerplate/cairo-boilerplate-constructors.c @@ -9,6 +9,7 @@ extern void _register_xlib (void); extern void _register_ps (void); extern void _register_pdf (void); extern void _register_svg (void); +extern void _register_test (void); void _cairo_boilerplate_register_all (void) @@ -18,4 +19,5 @@ _cairo_boilerplate_register_all (void) _register_ps (); _register_pdf (); _register_svg (); + _register_test (); } diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index e80153f..d76cf0e 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -32,8 +32,10 @@ CAIRO_HAS_PS_SURFACE=1 CAIRO_HAS_PDF_SURFACE=1 CAIRO_HAS_SVG_SURFACE=1 CAIRO_HAS_TEST_SURFACES=0 -CAIRO_HAS_XML_SURFACE=1 +CAIRO_HAS_TEE_SURFACE=0 +CAIRO_HAS_XML_SURFACE=0 CAIRO_HAS_PTHREAD=0 +CAIRO_HAS_GOBJECT_FUNCTIONS=0 CAIRO_HAS_TRACE=0 CAIRO_HAS_INTERPRETER=1 CAIRO_HAS_SYMBOL_LOOKUP=0 diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index 16cca7f..f5cbcf1 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -103,7 +103,9 @@ ifeq ($(CAIRO_HAS_TEST_SURFACES),1) endif @echo "#define CAIRO_HAS_IMAGE_SURFACE 1" >> src/cairo-features.h @echo "#define CAIRO_HAS_RECORDING_SURFACE 1" >> src/cairo-features.h +ifeq ($(CAIRO_HAS_TEE_SURFACE),1) @echo "#define CAIRO_HAS_TEE_SURFACE 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_XML_SURFACE),1) @echo "#define CAIRO_HAS_XML_SURFACE 1" >> src/cairo-features.h endif @@ -111,6 +113,9 @@ endif ifeq ($(CAIRO_HAS_PTHREAD),1) @echo "#define CAIRO_HAS_PTHREAD 1" >> src/cairo-features.h endif +ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1) + @echo "#define CAIRO_HAS_GOBJECT_FUNCTIONS 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_TRACE),1) @echo "#define CAIRO_HAS_TRACE 1" >> src/cairo-features.h endif diff --git a/build/compile b/build/compile index ec64c62..c0096a7 100755 --- a/build/compile +++ b/build/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-04-28.21; # UTC +scriptversion=2009-10-06.20; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software # Foundation, Inc. @@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15 ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" diff --git a/build/config.guess b/build/config.guess index da83314..dc84c68 100755 --- a/build/config.guess +++ b/build/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2009-11-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ timestamp='2009-04-27' # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner <per@bothner.com>. -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to <config-patches@gnu.org> and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -656,7 +659,7 @@ EOF # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -807,12 +810,12 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -822,6 +825,9 @@ EOF [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -851,6 +857,20 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -873,6 +893,17 @@ EOF frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -882,78 +913,34 @@ EOF m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -962,8 +949,11 @@ EOF *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -986,66 +976,6 @@ EOF xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1074,7 +1004,7 @@ EOF i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1182,7 +1112,7 @@ EOF rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1275,6 +1205,16 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff --git a/build/config.sub b/build/config.sub index a39437d..2a55a50 100755 --- a/build/config.sub +++ b/build/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ timestamp='2009-04-17' # Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -149,10 +152,13 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -281,6 +287,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -288,13 +295,14 @@ case $basic_machine in | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -337,7 +345,7 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -365,7 +373,7 @@ case $basic_machine in | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* \ + | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -374,6 +382,7 @@ case $basic_machine in | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -467,6 +476,10 @@ case $basic_machine in basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos @@ -719,6 +732,9 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1240,6 +1256,9 @@ case $os in # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1260,9 +1279,9 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1283,7 +1302,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1613,7 +1632,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff --git a/build/configure.ac.features b/build/configure.ac.features index d349a84..176349e 100644 --- a/build/configure.ac.features +++ b/build/configure.ac.features @@ -145,6 +145,7 @@ CAIRO_FEATURE_VARS_REGISTER([BASE],[cairo])dnl CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([REQUIRES],,[ ])dnl CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([CFLAGS NONPKGCONFIG_CFLAGS],,[ ])dnl CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([LIBS NONPKGCONFIG_LIBS],,[ ],[$LIBS])dnl +CAIRO_FEATURE_VARS_REGISTER([NONPKGCONFIG_EXTRA_LIBS])dnl AC_SUBST(CAIRO_REQUIRES)dnl AC_SUBST(CAIRO_CFLAGS)dnl AC_SUBST(CAIRO_LDFLAGS)dnl @@ -170,6 +171,7 @@ m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE], s%@FEATURE_BASE@%$$1_BASE%g;dnl s%@FEATURE_REQUIRES@%$$1_REQUIRES%g;dnl s%@FEATURE_NONPKGCONFIG_LIBS@%$$1_NONPKGCONFIG_LIBS%g;dnl + s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$$1_NONPKGCONFIG_EXTRA_LIBS%g;dnl s%@FEATURE_NONPKGCONFIG_CFLAGS@%$$1_NONPKGCONFIG_CFLAGS%g;dnl " < "$3.tmp" > "$3" && rm -f "$3.tmp" || AC_MSG_ERROR(failed to update $3) @@ -178,6 +180,7 @@ m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE], $1_BASE='$$1_BASE' $1_REQUIRES='$$1_REQUIRES' $1_NONPKGCONFIG_LIBS='$$1_NONPKGCONFIG_LIBS' + $1_NONPKGCONFIG_EXTRA_LIBS='$$1_NONPKGCONFIG_EXTRA_LIBS' $1_NONPKGCONFIG_CFLAGS='$$1_NONPKGCONFIG_CFLAGS' ])dnl ])dnl diff --git a/build/libtool.m4 b/build/libtool.m4 index a3fee53..8c99a62 100644 --- a/build/libtool.m4 +++ b/build/libtool.m4 @@ -1,7 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,7 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 56 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -66,6 +68,7 @@ esac # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME], *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ]) @@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -179,7 +187,6 @@ fi _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -193,23 +200,6 @@ aix3*) ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -250,6 +240,28 @@ _LT_CONFIG_COMMANDS ])# _LT_SETUP +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -408,7 +420,7 @@ m4_define([_lt_decl_all_varnames], # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -418,7 +430,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -517,12 +529,20 @@ LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -533,9 +553,9 @@ done # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -543,16 +563,38 @@ for var in lt_decl_all_varnames([[ \ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - _LT_OUTPUT_LIBTOOL_INIT ]) +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -562,20 +604,11 @@ _LT_OUTPUT_LIBTOOL_INIT AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 +lt_cl_silent=false exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -601,7 +634,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -646,15 +679,13 @@ chmod +x "$CONFIG_LT" # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) ])# LT_OUTPUT @@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -940,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -967,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -987,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@ -995,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -1041,170 +1103,65 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + # _LT_PROG_ECHO_BACKSLASH # ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -AC_SUBST(lt_ECHO) -]) _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH @@ -1236,7 +1193,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -1388,10 +1345,19 @@ if test -n "$RANLIB"; then esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1416,15 +1382,15 @@ AC_CACHE_CHECK([$1], [$2], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1464,7 +1430,7 @@ AC_CACHE_CHECK([$1], [$2], if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1527,6 +1493,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -1591,8 +1562,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1643,7 +1614,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" +[#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1684,7 +1655,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1693,7 +1670,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -1869,16 +1850,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2037,6 +2018,7 @@ m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2045,16 +2027,23 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -2067,7 +2056,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2087,7 +2076,13 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2175,7 +2170,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -2228,23 +2223,12 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -2344,6 +2328,19 @@ gnu*) hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -2386,8 +2383,10 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[[3-9]]*) @@ -2454,26 +2453,35 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2485,18 +2493,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -2717,6 +2713,8 @@ _LT_DECL([], [library_names_spec], [1], The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -2829,6 +2827,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -2958,8 +2957,8 @@ case $host_os in fi ;; esac -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_DECL([], [reload_cmds], [2])dnl +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_TAGDECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3011,16 +3010,18 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -3050,6 +3051,10 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3058,11 +3063,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -3088,7 +3093,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3226,7 +3231,19 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3239,13 +3256,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3268,7 +3285,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3296,7 +3313,12 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3313,6 +3335,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3438,7 +3461,7 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3600,6 +3623,11 @@ m4_if([$1], [CXX], [ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3738,8 +3766,8 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -3769,7 +3797,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3801,7 +3829,7 @@ m4_if([$1], [CXX], [ ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -3905,6 +3933,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -3947,6 +3981,13 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -4010,7 +4051,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4022,25 +4063,25 @@ m4_if([$1], [CXX], [ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *Sun\ C*) + # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; esac ;; @@ -4072,7 +4113,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4182,8 +4223,10 @@ m4_if([$1], [CXX], [ aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4194,9 +4237,6 @@ m4_if([$1], [CXX], [ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4261,13 +4301,36 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4301,11 +4364,12 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -4341,6 +4405,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4362,6 +4427,11 @@ _LT_EOF fi ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4391,11 +4461,12 @@ _LT_EOF tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4406,13 +4477,17 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4428,17 +4503,17 @@ _LT_EOF fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4447,7 +4522,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4559,8 +4634,10 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4622,7 +4699,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4650,7 +4726,7 @@ _LT_EOF # empty executable. _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -4665,8 +4741,13 @@ _LT_EOF # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -4705,7 +4786,7 @@ _LT_EOF # Tell ltmain to make .dll files, not .so files. shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. @@ -4772,7 +4853,7 @@ _LT_EOF ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' @@ -4791,7 +4872,7 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -4812,7 +4893,14 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi @@ -4840,19 +4928,19 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ) LDFLAGS="$save_LDFLAGS" else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4861,7 +4949,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -4914,17 +5002,17 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4934,13 +5022,13 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5131,36 +5219,38 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) ;; esac fi @@ -5330,37 +5420,21 @@ CC="$lt_save_CC" ])# _LT_LANG_C_CONFIG -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - # _LT_LANG_CXX_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write # the compiler configuration to `libtool'. m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5382,6 +5456,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5484,7 +5560,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -5596,7 +5672,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5611,8 +5687,13 @@ if test "$_lt_caught_CXX_error" != yes; then # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -5645,6 +5726,7 @@ if test "$_lt_caught_CXX_error" != yes; then # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5705,6 +5787,11 @@ if test "$_lt_caught_CXX_error" != yes; then gnu*) ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -5729,7 +5816,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5794,7 +5881,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5837,7 +5924,7 @@ if test "$_lt_caught_CXX_error" != yes; then case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -5848,9 +5935,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -5879,7 +5966,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5916,26 +6003,26 @@ if test "$_lt_caught_CXX_error" != yes; then pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -5943,7 +6030,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -5962,9 +6049,9 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5984,13 +6071,13 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6059,7 +6146,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6094,15 +6181,15 @@ if test "$_lt_caught_CXX_error" != yes; then case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6118,17 +6205,17 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6138,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6174,7 +6261,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6195,7 +6282,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6222,7 +6309,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6233,7 +6320,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6287,6 +6374,10 @@ if test "$_lt_caught_CXX_error" != yes; then CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6533,7 +6624,7 @@ linux*) solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -6577,32 +6668,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], ])# _LT_SYS_HIDDEN_LIBDEPS -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6621,6 +6696,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6720,32 +6797,17 @@ AC_LANG_POP ])# _LT_LANG_F77_CONFIG -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6764,6 +6826,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6909,6 +6973,8 @@ _LT_CC_BASENAME([$compiler]) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7276,7 +7342,7 @@ _LT_EOF func_dirname () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else @@ -7287,7 +7353,7 @@ func_dirname () # func_basename file func_basename () { - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED "$basename"` } dnl func_dirname_and_basename @@ -7303,10 +7369,8 @@ dnl so there is no need for it here. func_stripname () { case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } @@ -7317,20 +7381,20 @@ my_sed_long_arg='1s/^-[[^=]]*=//' # func_opt_split func_opt_split () { - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` } # func_lo2o object func_lo2o () { - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` } # func_xform libobj-or-source func_xform () { - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` + func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` } # func_arith arithmetic-term... diff --git a/build/ltmain.sh b/build/ltmain.sh index 7ed280b..d8efb57 100755 --- a/build/ltmain.sh +++ b/build/ltmain.sh @@ -1,9 +1,10 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6b +# libtool (GNU libtool) 2.2.10 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,50 +33,54 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.10 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to <bug-libtool@gnu.org>. -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" +VERSION=2.2.10 TIMESTAMP="" -package_revision=1.3017 +package_revision=1.3175 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +96,15 @@ fi BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + # NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -107,15 +117,24 @@ do lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL $lt_unset CDPATH +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" : ${CP="cp -f"} -: ${ECHO="echo"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${EGREP="/bin/grep -E"} : ${FGREP="/bin/grep -F"} : ${GREP="/bin/grep"} @@ -159,32 +178,168 @@ basename="s,^.*/,," func_dirname_and_basename () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else func_dirname_result="$func_dirname_result${2}" fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` } # Generated shell functions inserted here. -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} # The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -258,6 +413,13 @@ func_verbose () : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () @@ -326,9 +488,9 @@ func_mkdir_p () case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +540,7 @@ func_mktempdir () func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +554,7 @@ func_quote_for_eval () { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +581,7 @@ func_quote_for_expand () { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -489,14 +651,19 @@ func_show_eval_locale () } - - - # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -509,19 +676,20 @@ func_version () # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { $SED -n '/^# Usage:/,/# Report bugs to/ { @@ -538,7 +706,10 @@ func_help () s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p }' < "$progpath" - exit $? + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,7 +717,7 @@ func_help () # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + func_error "missing argument for $1." exit_cmd=exit } @@ -556,29 +727,6 @@ exit_cmd=: -# Check that we have a working $ECHO. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell, and then maybe $ECHO will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<EOF -$* -EOF - exit $EXIT_SUCCESS -fi magic="%%%MAGIC variable%%%" magic_exe="%%%MAGIC EXE variable%%%" @@ -636,16 +784,16 @@ func_config () # Display the features supported by this script. func_features () { - $ECHO "host: $host" + echo "host: $host" if test "$build_libtool_libs" = yes; then - $ECHO "enable shared libraries" + echo "enable shared libraries" else - $ECHO "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $ECHO "enable static libraries" + echo "enable static libraries" else - $ECHO "disable static libraries" + echo "disable static libraries" fi exit $? @@ -772,10 +920,21 @@ func_enable_tag () --quiet|--silent) preserve_args="$preserve_args $opt" opt_silent=: + opt_verbose=false + ;; + + --no-quiet|--no-silent) + preserve_args="$preserve_args $opt" + opt_silent=false ;; --verbose| -v) preserve_args="$preserve_args $opt" opt_silent=false + opt_verbose=: + ;; + + --no-verbose) preserve_args="$preserve_args $opt" + opt_verbose=false ;; --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break @@ -793,6 +952,7 @@ func_enable_tag () -\?|-h) func_usage ;; --help) opt_help=: ;; + --help-all) opt_help=': help-all' ;; --version) func_version ;; -*) func_fatal_help "unrecognized option \`$opt'" ;; @@ -1016,10 +1176,13 @@ func_infer_tag () func_quote_for_eval "$arg" CC_quoted="$CC_quoted $func_quote_for_eval_result" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1033,8 +1196,11 @@ func_infer_tag () func_quote_for_eval "$arg" CC_quoted="$CC_quoted $func_quote_for_eval_result" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1213,7 +1379,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx) + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1288,7 +1454,7 @@ func_mode_compile () # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -1445,7 +1611,7 @@ compiler." } $opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () @@ -1482,10 +1648,11 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -1538,7 +1705,7 @@ either the \`install' or \`cp' program. The following components of INSTALL-COMMAND are treated specially: - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -1558,6 +1725,8 @@ The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -1586,6 +1755,11 @@ The following components of LINK-COMMAND are treated specially: -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -1623,14 +1797,40 @@ Otherwise, only FILE itself is deleted using RM." ;; esac - $ECHO + echo $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? } - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi # func_mode_execute arg... @@ -1712,7 +1912,7 @@ func_mode_execute () for file do case $file in - -*) ;; + -* | *.la | *.lo ) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -1754,7 +1954,7 @@ func_mode_execute () # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" + echo "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS @@ -1795,23 +1995,23 @@ func_mode_finish () # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - $ECHO "X----------------------------------------------------------------------" | $Xsed - $ECHO "Libraries have been installed in:" + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" for libdir in $libdirs; do $ECHO " $libdir" done - $ECHO - $ECHO "If you ever happen to want to link against installed libraries" - $ECHO "in a given directory, LIBDIR, you must either use libtool, and" - $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" - $ECHO "flag during linking and do at least one of the following:" + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" - $ECHO " during execution" + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" fi if test -n "$runpath_var"; then - $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" - $ECHO " during linking" + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR @@ -1823,21 +2023,21 @@ func_mode_finish () $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" fi - $ECHO + echo - $ECHO "See any operating system documentation about shared libraries for" + echo "See any operating system documentation about shared libraries for" case $host in solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." ;; *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + echo "more information, such as the ld(1) and ld.so(8) manual pages." ;; esac - $ECHO "X----------------------------------------------------------------------" | $Xsed + echo "----------------------------------------------------------------------" exit $EXIT_SUCCESS } @@ -1852,7 +2052,7 @@ func_mode_install () # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1867,6 +2067,11 @@ func_mode_install () # Aesthetically quote it. func_quote_for_eval "$arg" install_prog="$install_prog$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac # We need to accept at least all the BSD install flags. dest= @@ -1876,8 +2081,10 @@ func_mode_install () install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then files="$files $dest" dest=$arg @@ -1887,10 +2094,9 @@ func_mode_install () case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1904,6 +2110,10 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1915,6 +2125,10 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" install_prog="$install_prog $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + install_shared_prog="$install_shared_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +2137,13 @@ func_mode_install () test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + fi + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -2010,7 +2231,7 @@ func_mode_install () if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2023,9 +2244,9 @@ func_mode_install () if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2043,7 +2264,7 @@ func_mode_install () test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -2183,7 +2404,7 @@ func_mode_install () if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -2202,7 +2423,7 @@ func_mode_install () file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2221,7 +2442,7 @@ func_mode_install () } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2323,6 +2544,10 @@ func_generate_dlsyms () extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + /* External symbol declarations for the compiler. */\ " @@ -2332,7 +2557,7 @@ extern \"C\" { $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_verbose "extracting global C symbols from \`$progfile'" $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" @@ -2371,7 +2596,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2415,10 +2640,10 @@ extern \"C\" { if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { @@ -2428,7 +2653,7 @@ typedef struct { " case $host in *cygwin* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */" @@ -2441,7 +2666,7 @@ typedef struct { lt_dlsym_const=const ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ extern $lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; $lt_dlsym_const lt_dlsymlist @@ -2457,7 +2682,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2515,16 +2740,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2538,8 +2763,8 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2549,6 +2774,7 @@ static const void *lt_preloaded_setup() { # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -2559,8 +2785,9 @@ func_win32_libid () win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then win32_nmres=`eval $NM -f posix -A $1 | $SED -n -e ' 1,100{ @@ -2598,7 +2825,18 @@ func_extract_an_archive () $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -2669,7 +2907,7 @@ func_extract_archives () darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2684,25 +2922,30 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done func_extract_archives_result="$my_oldobjs" } - -# func_emit_wrapper_part1 [arg=no] +# func_emit_wrapper [arg=no] # -# Emit the first part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part1 () +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () { - func_emit_wrapper_part1_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part1_arg1=$1 - fi + func_emit_wrapper_arg1=${1-no} $ECHO "\ #! $SHELL @@ -2718,7 +2961,6 @@ func_emit_wrapper_part1 () # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -2749,31 +2991,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$ECHO works! - : - else - # Restart under the correct shell, and then maybe \$ECHO will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ " - $ECHO "\ + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2783,30 +3126,13 @@ else esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done -" -} -# end: func_emit_wrapper_part1 - -# func_emit_wrapper_part2 [arg=no] -# -# Emit the second part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part2 () -{ - func_emit_wrapper_part2_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part2_arg1=$1 - fi - - $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -2814,7 +3140,7 @@ func_emit_wrapper_part2 () fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2877,7 +3203,7 @@ func_emit_wrapper_part2 () # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " @@ -2894,64 +3220,18 @@ func_emit_wrapper_part2 () $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 + func_exec_program \${1+\"\$@\"} fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } -# end: func_emit_wrapper_part2 - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi - - # split this up so that func_emit_cwrapperexe_src - # can call each part independently. - func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" - func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -} # func_to_host_path arg @@ -2978,23 +3258,19 @@ func_emit_wrapper () func_to_host_path () { func_to_host_path_result="$1" - if test -n "$1" ; then + if test -n "$1"; then case $host in *mingw* ) lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' case $build in *mingw* ) # actually, msys # awkward: cmd appends spaces to result - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_path_tmp1=`( cmd //c echo "$1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` + func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ;; *cygwin* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` + func_to_host_path_result=`cygpath -w "$1" | + $SED -e "$lt_sed_naive_backslashify"` ;; * ) # Unfortunately, winepath does not exit with a non-zero @@ -3006,17 +3282,17 @@ func_to_host_path () # the odd construction: func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | $SED -e "$lt_sed_naive_backslashify"` else # Allow warning below. - func_to_host_path_result="" + func_to_host_path_result= fi ;; esac if test -z "$func_to_host_path_result" ; then func_error "Could not determine host path corresponding to" - func_error " '$1'" + func_error " \`$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: func_to_host_path_result="$1" @@ -3049,30 +3325,24 @@ func_to_host_path () func_to_host_pathlist () { func_to_host_pathlist_result="$1" - if test -n "$1" ; then + if test -n "$1"; then case $host in *mingw* ) lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them # into '.;' and ';.', and winepath ignores them completely. - func_to_host_pathlist_tmp2="$1" - # Once set for this call, this variable should not be - # reassigned. It is used in tha fallback case. - func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e 's|^:*||' -e 's|:*$||'` + func_stripname : : "$1" + func_to_host_pathlist_tmp1=$func_stripname_result case $build in *mingw* ) # Actually, msys. # Awkward: cmd appends spaces to result. - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` + func_to_host_pathlist_result=` + ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ;; *cygwin* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | $SED -e "$lt_sed_naive_backslashify"` ;; * ) @@ -3088,18 +3358,17 @@ func_to_host_pathlist () if test -z "$func_to_host_pathlist_result" ; then func_to_host_pathlist_result="$func_to_host_path_result" else - func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + func_append func_to_host_pathlist_result ";$func_to_host_path_result" fi fi fi - IFS=: done IFS=$func_to_host_pathlist_oldIFS ;; esac - if test -z "$func_to_host_pathlist_result" ; then + if test -z "$func_to_host_pathlist_result"; then func_error "Could not determine the host path(s) corresponding to" - func_error " '$1'" + func_error " \`$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This may break if $1 contains DOS-style drive # specifications. The fix is not to complicate the expression @@ -3116,7 +3385,7 @@ func_to_host_pathlist () ;; esac case "$1" in - *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + *: ) func_append func_to_host_pathlist_result ";" ;; esac ;; @@ -3141,31 +3410,23 @@ func_emit_cwrapperexe_src () This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "$SHELL $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. */ EOF cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include <stdio.h> #include <stdlib.h> #ifdef _MSC_VER # include <direct.h> # include <process.h> # include <io.h> -# define setmode _setmode #else # include <unistd.h> # include <stdint.h> # ifdef __CYGWIN__ # include <io.h> -# define HAVE_SETENV -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif # endif #endif #include <malloc.h> @@ -3177,6 +3438,44 @@ int setenv (const char *, const char *, int); #include <fcntl.h> #include <sys/stat.h> +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX #elif defined(MAXPATHLEN) @@ -3192,14 +3491,7 @@ int setenv (const char *, const char *, int); # define S_IXGRP 0 #endif -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3230,10 +3522,6 @@ int setenv (const char *, const char *, int); # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -3246,22 +3534,13 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3271,31 +3550,17 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_opt_process_env_set (const char *arg); -void lt_opt_process_env_prepend (const char *arg); -void lt_opt_process_env_append (const char *arg); -int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); - -static const char *script_text_part1 = -EOF - - func_emit_wrapper_part1 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" - cat <<EOF - -static const char *script_text_part2 = +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); EOF - func_emit_wrapper_part2 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" cat <<EOF const char * MAGIC_EXE = "$magic_exe"; @@ -3340,24 +3605,10 @@ EOF cat <<"EOF" #define LTWRAPPER_OPTION_PREFIX "--lt-" -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; - static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; - -static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; -static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; - /* argument is putenv-style "foo=bar", value of foo is set to bar */ - -static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; -static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; - /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ - -static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; -static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; - /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; int main (int argc, char *argv[]) @@ -3374,10 +3625,13 @@ main (int argc, char *argv[]) int i; program_name = (char *) xstrdup (base_name (argv[0])); - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); + newargz = XMALLOC (char *, argc + 1); - /* very simple arg parsing; don't want to rely on getopt */ + /* very simple arg parsing; don't want to rely on getopt + * also, copy all non cwrapper options to newargz, except + * argz[0], which is handled differently + */ + newargc=0; for (i = 1; i < argc; i++) { if (strcmp (argv[i], dumpscript_opt) == 0) @@ -3391,25 +3645,57 @@ EOF esac cat <<"EOF" - printf ("%s", script_text_part1); - printf ("%s", script_text_part2); + lt_dump_script (stdout); return 0; } + if (strcmp (argv[i], debug_opt) == 0) + { + lt_debug = 1; + continue; + } + if (strcmp (argv[i], ltwrapper_option_prefix) == 0) + { + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX + namespace, but it is not one of the ones we know about and + have already dealt with, above (inluding dump-script), then + report an error. Otherwise, targets might begin to believe + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX + namespace. The first time any user complains about this, we'll + need to make LTWRAPPER_OPTION_PREFIX a configure-time option + or a configure.ac-settable value. + */ + lt_fatal (__FILE__, __LINE__, + "unrecognized %s option: '%s'", + ltwrapper_option_prefix, argv[i]); + } + /* otherwise ... */ + newargz[++newargc] = xstrdup (argv[i]); } + newargz[++newargc] = NULL; + +EOF + cat <<EOF + /* The GNU banner must be the first non-error debug message */ + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); +EOF + cat <<"EOF" + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); - newargz = XMALLOC (char *, argc + 1); tmp_pathspec = find_executable (argv[0]); if (tmp_pathspec == NULL) - lt_fatal ("Couldn't find %s", argv[0]); - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", - tmp_pathspec)); + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); + lt_debugprintf (__FILE__, __LINE__, + "(main) found exe (before symlink chase) at: %s\n", + tmp_pathspec); actual_cwrapper_path = chase_symlinks (tmp_pathspec); - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", - actual_cwrapper_path)); + lt_debugprintf (__FILE__, __LINE__, + "(main) found exe (after symlink chase) at: %s\n", + actual_cwrapper_path); XFREE (tmp_pathspec); - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); strendzap (actual_cwrapper_path, actual_cwrapper_name); /* wrapper name transforms */ @@ -3427,8 +3713,9 @@ EOF target_name = tmp_pathspec; tmp_pathspec = 0; - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", - target_name)); + lt_debugprintf (__FILE__, __LINE__, + "(main) libtool target name: %s\n", + target_name); EOF cat <<EOF @@ -3481,77 +3768,12 @@ EOF lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); - newargc=0; - for (i = 1; i < argc; i++) - { - if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) - { - if (argv[i][env_set_opt_len] == '=') - { - const char *p = argv[i] + env_set_opt_len + 1; - lt_opt_process_env_set (p); - } - else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) - { - lt_opt_process_env_set (argv[++i]); /* don't copy */ - } - else - lt_fatal ("%s missing required argument", env_set_opt); - continue; - } - if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) - { - if (argv[i][env_prepend_opt_len] == '=') - { - const char *p = argv[i] + env_prepend_opt_len + 1; - lt_opt_process_env_prepend (p); - } - else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) - { - lt_opt_process_env_prepend (argv[++i]); /* don't copy */ - } - else - lt_fatal ("%s missing required argument", env_prepend_opt); - continue; - } - if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) - { - if (argv[i][env_append_opt_len] == '=') - { - const char *p = argv[i] + env_append_opt_len + 1; - lt_opt_process_env_append (p); - } - else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) - { - lt_opt_process_env_append (argv[++i]); /* don't copy */ - } - else - lt_fatal ("%s missing required argument", env_append_opt); - continue; - } - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) - { - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX - namespace, but it is not one of the ones we know about and - have already dealt with, above (inluding dump-script), then - report an error. Otherwise, targets might begin to believe - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX - namespace. The first time any user complains about this, we'll - need to make LTWRAPPER_OPTION_PREFIX a configure-time option - or a configure.ac-settable value. - */ - lt_fatal ("Unrecognized option in %s namespace: '%s'", - ltwrapper_option_prefix, argv[i]); - } - /* otherwise ... */ - newargz[++newargc] = xstrdup (argv[i]); - } - newargz[++newargc] = NULL; - - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", + nonnull (lt_argv_zero)); for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", + i, nonnull (newargz[i])); } EOF @@ -3560,11 +3782,14 @@ EOF mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3586,7 +3811,7 @@ xmalloc (size_t num) { void *p = (void *) malloc (num); if (!p) - lt_fatal ("Memory exhausted"); + lt_fatal (__FILE__, __LINE__, "memory exhausted"); return p; } @@ -3620,8 +3845,8 @@ check_executable (const char *path) { struct stat st; - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3638,8 +3863,8 @@ make_executable (const char *path) int rval = 0; struct stat st; - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3665,8 +3890,8 @@ find_executable (const char *wrapper) int tmp_len; char *concat_name; - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -3719,7 +3944,8 @@ find_executable (const char *wrapper) { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -3744,7 +3970,8 @@ find_executable (const char *wrapper) } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -3770,8 +3997,9 @@ chase_symlinks (const char *pathspec) int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -3793,8 +4021,9 @@ chase_symlinks (const char *pathspec) } else { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); @@ -3807,7 +4036,8 @@ chase_symlinks (const char *pathspec) tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal ("Could not follow symlinks for %s", pathspec); + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -3833,11 +4063,25 @@ strendzap (char *str, const char *pat) return str; } +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + static void -lt_error_core (int exit_status, const char *mode, +lt_error_core (int exit_status, const char *file, + int line, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s: %s: ", program_name, mode); + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -3846,20 +4090,32 @@ lt_error_core (int exit_status, const char *mode, } void -lt_fatal (const char *message, ...) +lt_fatal (const char *file, int line, const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); va_end (ap); } +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + void lt_setenv (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", - (name ? name : "<NULL>"), - (value ? value : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -3904,95 +4160,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) return new_value; } -int -lt_split_name_value (const char *arg, char** name, char** value) -{ - const char *p; - int len; - if (!arg || !*arg) - return 1; - - p = strchr (arg, (int)'='); - - if (!p) - return 1; - - *value = xstrdup (++p); - - len = strlen (arg) - strlen (*value); - *name = XMALLOC (char, len); - strncpy (*name, arg, len-1); - (*name)[len - 1] = '\0'; - - return 0; -} - -void -lt_opt_process_env_set (const char *arg) -{ - char *name = NULL; - char *value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); - } - - lt_setenv (name, value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_prepend (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_append (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 1); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - void lt_update_exe_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - (name ? name : "<NULL>"), - (value ? value : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4011,9 +4184,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - (name ? name : "<NULL>"), - (value ? value : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4023,11 +4196,152 @@ lt_update_lib_path (const char *name, const char *value) } } +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' + cat <<"EOF" +} EOF } # end: func_emit_cwrapperexe_src +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + # func_mode_link arg... func_mode_link () { @@ -4072,6 +4386,7 @@ func_mode_link () new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -4164,6 +4479,11 @@ func_mode_link () esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -4425,6 +4745,11 @@ func_mode_link () continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -4503,7 +4828,7 @@ func_mode_link () esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; @@ -4522,7 +4847,7 @@ func_mode_link () -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4708,7 +5033,7 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" + arg="$arg $func_quote_for_eval_result" compiler_flags="$compiler_flags $func_quote_for_eval_result" done IFS="$save_ifs" @@ -4754,18 +5079,19 @@ func_mode_link () arg="$func_quote_for_eval_result" ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" @@ -4925,7 +5251,7 @@ func_mode_link () if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -5033,10 +5359,7 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -5051,7 +5374,8 @@ func_mode_link () # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; *) deplibs="$deplibs $deplib" ;; @@ -5230,7 +5554,7 @@ func_mode_link () match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -5240,15 +5564,15 @@ func_mode_link () ;; esac if test "$valid_a_lib" != yes; then - $ECHO + echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" - $ECHO "*** that it is just a static archive that I should not use here." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -5321,7 +5645,7 @@ func_mode_link () # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; @@ -5329,7 +5653,7 @@ func_mode_link () esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then @@ -5347,19 +5671,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done continue fi # $pass = conv @@ -5583,7 +5907,7 @@ func_mode_link () fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5686,9 +6010,9 @@ func_mode_link () if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - $ECHO - $ECHO "*** And there doesn't seem to be a static archive available" - $ECHO "*** The link will probably fail, sorry" + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -5828,21 +6152,21 @@ func_mode_link () # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + echo $ECHO "*** Warning: This system can not link to static lib archive $lib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - $ECHO "*** But as you try to build a module library, libtool will still create " - $ECHO "*** a static module, that should work as long as the dlopening application" - $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -5962,7 +6286,7 @@ func_mode_link () compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -6130,7 +6454,7 @@ func_mode_link () if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" libobjs="$libobjs $objs" @@ -6198,7 +6522,7 @@ func_mode_link () age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -6210,9 +6534,6 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) @@ -6435,14 +6756,14 @@ func_mode_link () oldlibs="$oldlibs $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` #done if test -n "$xrpath"; then @@ -6483,7 +6804,7 @@ func_mode_link () if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) @@ -6568,13 +6889,13 @@ EOF newdeplibs="$newdeplibs $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which I believe you do not have" - $ECHO "*** because a test_compile did reveal that the linker did not use it for" - $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which I believe you do not have" + echo "*** because a test_compile did reveal that the linker did not use it for" + echo "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; @@ -6611,22 +6932,22 @@ EOF newdeplibs="$newdeplibs $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because a test_compile did reveal that the linker did not use this one" - $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because a test_compile did reveal that the linker did not use this one" + echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - $ECHO "*** make it link in! You will probably need to install it or some" - $ECHO "*** library that it depends on before this library will be fully" - $ECHO "*** functional. Installing it before continuing would be even better." + echo "*** make it link in! You will probably need to install it or some" + echo "*** library that it depends on before this library will be fully" + echo "*** functional. Installing it before continuing would be even better." fi ;; *) @@ -6672,7 +6993,7 @@ EOF potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | @@ -6687,12 +7008,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -6730,7 +7051,7 @@ EOF potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" @@ -6741,12 +7062,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -6764,25 +7085,25 @@ EOF ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6794,23 +7115,23 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - $ECHO "*** a static module, that should work as long as the dlopening" - $ECHO "*** application is linked with the -dlopen flag." + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -6820,16 +7141,16 @@ EOF build_libtool_libs=no fi else - $ECHO "*** The inter-library dependencies that have been dropped here will be" - $ECHO "*** automatically added whenever a program is linked with this library" - $ECHO "*** or is declared to -dlopen it." + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - $ECHO - $ECHO "*** Since this library must not contain undefined symbols," - $ECHO "*** because either the platform does not support them or" - $ECHO "*** it was explicitly requested with -no-undefined," - $ECHO "*** libtool will only create a static version of it." + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -6846,9 +7167,9 @@ EOF # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6970,7 +7291,7 @@ EOF done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= @@ -7036,7 +7357,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -7137,7 +7458,8 @@ EOF save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -7150,12 +7472,12 @@ EOF if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output + echo 'INPUT (' > $output for obj in $save_libobjs do $ECHO "$obj" >> $output done - $ECHO ')' >> $output + echo ')' >> $output delfiles="$delfiles $output" elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk @@ -7197,17 +7519,19 @@ EOF # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" else # All subsequent reloadable object files will link in # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=$obj + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -7217,7 +7541,8 @@ EOF # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi @@ -7276,7 +7601,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -7441,7 +7766,7 @@ EOF if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -7452,7 +7777,7 @@ EOF fi # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -7512,8 +7837,8 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -7530,8 +7855,8 @@ EOF esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7668,8 +7993,8 @@ EOF if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -7681,15 +8006,15 @@ EOF wrappers_required=yes case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; - *cegcc) - # Disable wrappers for cegcc, we are cross compiling anyway. - wrappers_required=no - ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7698,7 +8023,7 @@ EOF esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -7745,7 +8070,7 @@ EOF # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit @@ -7764,7 +8089,7 @@ EOF if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -7776,7 +8101,7 @@ EOF fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname @@ -7800,18 +8125,7 @@ EOF fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $ECHO for shipping. - if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7932,7 +8246,7 @@ EOF done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" generated="$generated $gentop" func_mkdir_p "$gentop" @@ -8043,7 +8357,7 @@ EOF done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -8128,9 +8442,27 @@ EOF fi $RM $output # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; esac $ECHO > $output "\ # $outputname - a libtool library file diff --git a/build/ltoptions.m4 b/build/ltoptions.m4 index 34151a3..17cfd51 100644 --- a/build/ltoptions.m4 +++ b/build/ltoptions.m4 @@ -1,13 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 6 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -133,13 +134,13 @@ case $host in esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl +_LT_DECL([], [AS], [1], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], diff --git a/build/ltversion.m4 b/build/ltversion.m4 index f3c5309..93fc771 100644 --- a/build/ltversion.m4 +++ b/build/ltversion.m4 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3017 ltversion.m4 +# serial 3175 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_VERSION], [2.2.10]) +m4_define([LT_PACKAGE_REVISION], [1.3175]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' +[macro_version='2.2.10' +macro_revision='1.3175' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/build/lt~obsolete.m4 b/build/lt~obsolete.m4 index 637bb20..c573da9 100644 --- a/build/lt~obsolete.m4 +++ b/build/lt~obsolete.m4 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 lt~obsolete.m4 +# serial 5 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/cairo-version.h b/cairo-version.h index 7d673de..020bd2a 100644 --- a/cairo-version.h +++ b/cairo-version.h @@ -2,7 +2,7 @@ #define CAIRO_VERSION_H #define CAIRO_VERSION_MAJOR 1 -#define CAIRO_VERSION_MINOR 9 -#define CAIRO_VERSION_MICRO 14 +#define CAIRO_VERSION_MINOR 10 +#define CAIRO_VERSION_MICRO 0 #endif @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for cairo 1.9.14. +# Generated by GNU Autoconf 2.66 for cairo 1.10.0. # # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=cairo>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -173,7 +173,15 @@ test x\$exitcode = x0 || exit 1" as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" +test \$(( 1 + 1 )) = 2 || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes else @@ -320,7 +328,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -360,19 +368,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -529,161 +537,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - test -n "$DJDIR" || exec 7<&0 </dev/null exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -702,8 +563,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='cairo' PACKAGE_TARNAME='cairo' -PACKAGE_VERSION='1.9.14' -PACKAGE_STRING='cairo 1.9.14' +PACKAGE_VERSION='1.10.0' +PACKAGE_STRING='cairo 1.10.0' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=cairo' PACKAGE_URL='' @@ -772,6 +633,10 @@ SHLIB_EXT BUILD_ANY2PPM_FALSE BUILD_ANY2PPM_TRUE CAIRO_TEST_MODE +CAIRO_HAS_GOBJECT_FUNCTIONS_FALSE +CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE +GOBJECT_LIBS +GOBJECT_CFLAGS real_pthread_LIBS real_pthread_CFLAGS pthread_LIBS @@ -784,6 +649,8 @@ CAIRO_HAS_PTHREAD_FALSE CAIRO_HAS_PTHREAD_TRUE CAIRO_HAS_XML_SURFACE_FALSE CAIRO_HAS_XML_SURFACE_TRUE +CAIRO_HAS_TEE_SURFACE_FALSE +CAIRO_HAS_TEE_SURFACE_TRUE pixman_LIBS pixman_CFLAGS CAIRO_HAS_TEST_SURFACES_FALSE @@ -971,7 +838,6 @@ OTOOL LIPO NMEDIT DSYMUTIL -lt_ECHO RANLIB AR LN_S @@ -1127,8 +993,10 @@ enable_ps enable_pdf enable_svg enable_test_surfaces +enable_tee enable_xml enable_pthread +enable_gobject enable_full_testing enable_trace enable_interpreter @@ -1191,6 +1059,8 @@ LIBRSVG_CFLAGS LIBRSVG_LIBS pixman_CFLAGS pixman_LIBS +GOBJECT_CFLAGS +GOBJECT_LIBS glib_CFLAGS glib_LIBS gtk_CFLAGS @@ -1303,7 +1173,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1329,7 +1199,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1533,7 +1403,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1549,7 +1419,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1579,8 +1449,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1588,7 +1458,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1606,13 +1476,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1635,7 +1505,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1649,8 +1519,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1665,9 +1535,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1706,11 +1576,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1736,7 +1606,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cairo 1.9.14 to adapt to many kinds of systems. +\`configure' configures cairo 1.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1750,7 +1620,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1810,7 +1680,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cairo 1.9.14:";; + short | recursive ) echo "Configuration of cairo 1.10.0:";; esac cat <<\_ACEOF @@ -1923,11 +1793,17 @@ Optional Features: [default=yes] --enable-test-surfaces=[no/auto/yes] Enable cairo's test surfaces feature [default=no] + --enable-tee=[no/auto/yes] + Enable cairo's tee surface backend feature + [default=no] --enable-xml=[no/auto/yes] Enable cairo's xml surface backend feature - [default=yes] + [default=no] --enable-pthread=[no/auto/yes] Enable cairo's pthread feature [default=auto] + --enable-gobject=[no/auto/yes] + Enable cairo's gobject functions feature + [default=auto] --enable-full-testing Sets the test suite to perform full testing by default, which will dramatically slow down make check, but is a *requirement* before release. @@ -2038,6 +1914,10 @@ Some influential environment variables: pixman_CFLAGS C compiler flags for pixman, overriding pkg-config pixman_LIBS linker flags for pixman, overriding pkg-config + GOBJECT_CFLAGS + C compiler flags for GOBJECT, overriding pkg-config + GOBJECT_LIBS + linker flags for GOBJECT, overriding pkg-config glib_CFLAGS C compiler flags for glib, overriding pkg-config glib_LIBS linker flags for glib, overriding pkg-config gtk_CFLAGS C compiler flags for gtk, overriding pkg-config @@ -2109,10 +1989,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cairo configure 1.9.14 -generated by GNU Autoconf 2.65 +cairo configure 1.10.0 +generated by GNU Autoconf 2.66 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2206,10 +2086,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2268,17 +2148,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## +( $as_echo "## ---------------------------------------------------------------------- ## ## Report this to http://bugs.freedesktop.org/enter_bug.cgi?product=cairo ## -## ---------------------------------------------------------------------- ## -_ASBOX +## ---------------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2342,7 +2220,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2418,7 +2296,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2785,7 +2663,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2839,7 +2717,7 @@ ac_fn_c_check_member () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$4+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2890,8 +2768,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cairo $as_me 1.9.14, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by cairo $as_me 1.10.0, which was +generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -3001,11 +2879,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -3039,11 +2915,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -3056,11 +2930,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -3074,11 +2946,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -3133,7 +3003,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -3148,7 +3023,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -3224,7 +3103,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -3537,8 +3416,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3652,9 +3531,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3696,8 +3574,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3754,9 +3632,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3807,8 +3685,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4156,8 +4034,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4218,7 +4096,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4284,7 +4162,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4416,8 +4294,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4495,16 +4372,22 @@ ac_config_headers="$ac_config_headers config.h" ac_aux_dir= for ac_dir in build "$srcdir"/build; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -4623,11 +4506,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -4649,7 +4532,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -4659,7 +4542,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -4897,7 +4780,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -4905,7 +4788,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -5001,7 +4884,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -5017,7 +4900,7 @@ fi # Define the identity of the package. PACKAGE='cairo' - VERSION='1.9.14' + VERSION='1.10.0' # Some tools Automake needs. @@ -5189,7 +5072,7 @@ AM_BACKSLASH='\' # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -5200,16 +5083,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -5234,7 +5117,7 @@ else ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -5242,7 +5125,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -5261,7 +5144,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -5568,8 +5451,8 @@ esac -macro_version='2.2.6b' -macro_revision='1.3017' +macro_version='2.2.10' +macro_revision='1.3175' @@ -5585,6 +5468,75 @@ macro_revision='1.3017' ltmain="$ac_aux_dir/ltmain.sh" +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if test "${ac_cv_path_SED+set}" = set; then : @@ -5642,7 +5594,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -5721,7 +5673,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -5837,7 +5789,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -5920,8 +5872,11 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -5965,7 +5920,7 @@ fi fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6020,6 +5975,15 @@ esac fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -6039,13 +6003,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6042: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6045: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6048: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6102,6 +6066,11 @@ else lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -6166,8 +6135,8 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -6435,16 +6404,18 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -6474,6 +6445,10 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -6482,11 +6457,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -6512,7 +6487,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6924,6 +6899,18 @@ if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -7093,8 +7080,8 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then @@ -7247,7 +7234,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7250 "configure"' > conftest.$ac_ext + echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7959,6 +7946,38 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if test "${lt_cv_ld_force_load+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7986,7 +8005,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -8009,6 +8028,8 @@ done + + # Set options @@ -8159,6 +8180,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + test -z "$LN_S" && LN_S="ln -s" @@ -8208,19 +8230,6 @@ _ACEOF - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -8233,23 +8242,6 @@ aix3*) ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -8278,7 +8270,7 @@ for cc_temp in $compiler""; do *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -8487,7 +8479,12 @@ if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } @@ -8507,15 +8504,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8510: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8514: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -8593,6 +8590,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -8635,6 +8638,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + lt_prog_compiler_pic='-Xcompiler -fPIC' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -8697,7 +8707,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -8709,25 +8719,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_wl='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *Sun\ C*) + # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' + lt_prog_compiler_wl='-Wl,' ;; esac ;; @@ -8759,7 +8769,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -8846,15 +8856,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8849: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8853: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -8902,7 +8912,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -8951,16 +8961,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8954: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8958: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9006,16 +9016,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9009: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9013: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9125,13 +9135,36 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) - link_all_deplibs=no - ;; esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -9165,11 +9198,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -9205,6 +9239,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9226,6 +9261,11 @@ _LT_EOF fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -9255,11 +9295,12 @@ _LT_EOF tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9270,13 +9311,17 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -9292,17 +9337,17 @@ _LT_EOF fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9311,7 +9356,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9423,8 +9468,10 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -9486,7 +9533,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9543,7 +9589,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -9587,8 +9633,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -9627,7 +9678,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .dll files, not .so files. shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_from_new_cmds='true' # FIXME: Should let the user specify the lib program. @@ -9643,7 +9694,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -9651,7 +9706,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -9717,7 +9772,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' @@ -9736,7 +9791,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -9757,7 +9812,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if test "${lt_cv_prog_compiler__b+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + ;; esac fi @@ -9785,7 +9879,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -9796,15 +9890,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi int foo(void) {} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -9813,7 +9907,7 @@ rm -f core conftest.err conftest.$ac_objext \ link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9866,17 +9960,17 @@ rm -f core conftest.err conftest.$ac_objext \ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -9886,13 +9980,13 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10095,44 +10189,50 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -10303,16 +10403,23 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -10325,7 +10432,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -10345,7 +10452,13 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -10433,7 +10546,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -10486,23 +10599,12 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -10602,6 +10704,19 @@ gnu*) hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -10644,8 +10759,10 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) @@ -10712,12 +10829,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10730,23 +10852,31 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - shlibpath_overrides_runpath=yes + lt_cv_shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10758,18 +10888,6 @@ rm -f core conftest.err conftest.$ac_objext \ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -11060,6 +11178,11 @@ fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= @@ -11390,7 +11513,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11393 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11431,7 +11554,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11440,7 +11569,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -11486,7 +11619,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11489 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11527,7 +11660,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11536,7 +11675,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -11857,7 +12000,7 @@ fi test $ac_status = 0; }; then : else - as_fn_error "You need to have gtk-doc >= 1.6 installed to build gtk-doc" "$LINENO" 5 + as_fn_error $? "You need to have gtk-doc >= 1.6 installed to build gtk-doc" "$LINENO" 5 fi fi @@ -12142,11 +12285,11 @@ fi CAIRO_VERSION_MAJOR=1 -CAIRO_VERSION_MINOR=9 -CAIRO_VERSION_MICRO=14 +CAIRO_VERSION_MINOR=10 +CAIRO_VERSION_MICRO=0 CAIRO_VERSION_SONUM=2 -CAIRO_RELEASE_STATUS=snapshot -CAIRO_LIBTOOL_VERSION_INFO=10916:0:10914 +CAIRO_RELEASE_STATUS=release +CAIRO_LIBTOOL_VERSION_INFO=11002:0:11000 @@ -12535,8 +12678,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -12902,8 +13045,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -13296,392 +13439,7 @@ else fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && + if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then ac_ext=cpp @@ -13807,7 +13565,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -_lt_caught_CXX_error=yes; } +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -13820,9 +13579,6 @@ else _lt_caught_CXX_error=yes fi - - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -13848,6 +13604,8 @@ module_cmds_CXX= module_expsym_cmds_CXX= link_all_deplibs_CXX=unknown old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= enable_shared_with_static_runtimes_CXX=no @@ -13930,7 +13688,7 @@ $RM -r conftest* *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` if test -n "$compiler"; then @@ -14030,7 +13788,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -14092,7 +13850,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -14234,7 +13992,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' @@ -14278,8 +14036,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -14312,6 +14075,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes @@ -14338,7 +14102,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec_CXX='' + fi link_all_deplibs_CXX=yes allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in @@ -14346,7 +14114,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -14399,6 +14167,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi gnu*) ;; + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes + ;; + hpux9*) hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -14423,7 +14196,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -14488,7 +14261,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -14531,7 +14304,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -14542,9 +14315,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -14573,7 +14346,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -14610,26 +14383,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -14637,7 +14410,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -14656,9 +14429,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -14678,13 +14451,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -14753,7 +14526,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else ld_shlibs_CXX=no fi @@ -14788,15 +14561,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host in osf3*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; @@ -14812,17 +14585,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -14832,7 +14605,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -14868,7 +14641,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' @@ -14889,7 +14662,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -14916,7 +14689,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -14927,7 +14700,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' @@ -14981,6 +14754,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi CC*) archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" ;; *) archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -15162,7 +14939,7 @@ linux*) solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -15278,6 +15055,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -15416,8 +15198,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-qpic' lt_prog_compiler_static_CXX='-qstaticlink' @@ -15447,7 +15229,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -15479,7 +15261,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' @@ -15571,15 +15353,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15574: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15578: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works_CXX=yes @@ -15624,7 +15406,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works_CXX=yes @@ -15670,16 +15452,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15673: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15677: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -15722,16 +15504,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15725: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15729: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -15786,8 +15568,10 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -15798,9 +15582,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie cygwin* | mingw* | cegcc*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ;; - linux* | k*bsd*-gnu) - link_all_deplibs_CXX=no - ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -15837,44 +15618,50 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac fi @@ -16031,7 +15818,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -16084,23 +15871,11 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -16199,6 +15974,19 @@ gnu*) hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -16241,8 +16029,10 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) @@ -16309,12 +16099,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -16327,23 +16122,31 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - shlibpath_overrides_runpath=yes + lt_cv_shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -16355,18 +16158,6 @@ rm -f core conftest.err conftest.$ac_objext \ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -16606,6 +16397,8 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= @@ -16678,7 +16471,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16956,7 +16749,7 @@ $as_echo "no" >&6; } fi if test "x$PKG_CONFIG" = x; then - as_fn_error "pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)" "$LINENO" 5 + as_fn_error $? "pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)" "$LINENO" 5 fi case `$PKG_CONFIG --version` in @@ -17755,7 +17548,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - as_fn_error "unknown endianness + as_fn_error $? "unknown endianness presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -17815,7 +17608,7 @@ $as_echo "#define FLOAT_WORDS_BIGENDIAN 1" >>confdefs.h no) ;; *) - as_fn_error " + as_fn_error $? " Unknown float word ordering. You need to manually preset ax_cv_c_float_words_bigendian=no (or yes) according to your system. @@ -17945,9 +17738,8 @@ else if test "$ac_cv_type_void_p" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (void *) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (void *) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_void_p=0 fi @@ -17979,9 +17771,8 @@ else if test "$ac_cv_type_int" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -18013,9 +17804,8 @@ else if test "$ac_cv_type_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi @@ -18047,9 +17837,8 @@ else if test "$ac_cv_type_long_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -18081,9 +17870,8 @@ else if test "$ac_cv_type_size_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (size_t) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (size_t) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_size_t=0 fi @@ -18139,7 +17927,7 @@ $as_echo "$solaris_posix_pthread" >&6; } LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -18449,8 +18237,7 @@ for ac_header in stdint.h inttypes.h sys/int_types.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -18492,8 +18279,7 @@ for ac_header in fcntl.h unistd.h signal.h sys/stat.h sys/socket.h sys/poll.h sy do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -18593,8 +18379,7 @@ if test "x$ac_cv_header_fenv_h" = x""yes; then : do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -18610,8 +18395,7 @@ for ac_header in libgen.h byteswap.h signal.h setjmp.h fenv.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -18624,8 +18408,7 @@ for ac_func in vasnprintf link ctime_r drand48 flockfile ffs do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -18654,8 +18437,7 @@ for ac_header in sys/stat.h io.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -18736,8 +18518,7 @@ for ac_func in fork waitpid raise do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -18757,7 +18538,7 @@ fi if test "x$use_gcov" = "xyes"; then if test "$GCC" != "yes"; then - as_fn_error "GCC is required for --enable-gcov" "$LINENO" 5 + as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 fi # Extract the first word of "shtool", so it can be a program name with args. @@ -18803,7 +18584,7 @@ fi esac if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then - as_fn_error "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 + as_fn_error $? "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 fi ltp_version_list="1.7 1.6 1.5 1.4" @@ -18911,12 +18692,12 @@ $as_echo "$cairo_cv_ltp_version" >&6; } esac if test "x$cairo_has_lcov" != "xyes"; then - as_fn_error "To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list. + as_fn_error $? "To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list. Please install the Linux Test Project [http://ltp.sourceforge.net/], and try again." "$LINENO" 5 fi if test -z "$LTP_GENHTML"; then - as_fn_error "Could not find genhtml from the LTP package. + as_fn_error $? "Could not find genhtml from the LTP package. Please install the Linux Test Project [http://ltp.sourceforge.net/], and try again." "$LINENO" 5 fi @@ -19392,7 +19173,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -19410,7 +19191,7 @@ libdir: @echo libdir='${LIBDIR}' _ACEOF if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. for ac_var in incroot usrlibdir libdir; do eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done @@ -19584,7 +19365,7 @@ fi yes|auto) : if test "x$cairo_cv_xlib_cache_version" != "x6" -o \ "x$cairo_cv_xlib_cache_commands_len" != "x373" -o \ - "x$cairo_cv_xlib_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_xlib_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_xlib_use fi if test "x$enable_xlib" = xyes -a "x$cairo_cv_xlib_use" != xyes; then : @@ -19604,6 +19385,7 @@ xlib_CFLAGS="$ac_env_xlib_CFLAGS_value" xlib_NONPKGCONFIG_CFLAGS="$ac_env_xlib_NONPKGCONFIG_CFLAGS_value" xlib_LIBS="$ac_env_xlib_LIBS_value" xlib_NONPKGCONFIG_LIBS="$ac_env_xlib_NONPKGCONFIG_LIBS_value" +xlib_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xlib_NONPKGCONFIG_EXTRA_LIBS_value" xlib_REQUIRES="x11" @@ -20672,7 +20454,7 @@ $as_echo "yes" >&6; } fi cairo_cv_xlib_use=$use_xlib - cairo_cv_xlib_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_xlib_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_xlib_cache_commands_len="373" cairo_cv_xlib_cache_version="6" cairo_cv_xlib_BASE=$xlib_BASE @@ -20681,6 +20463,7 @@ cairo_cv_xlib_CFLAGS=$xlib_CFLAGS cairo_cv_xlib_NONPKGCONFIG_CFLAGS=$xlib_NONPKGCONFIG_CFLAGS cairo_cv_xlib_LIBS=$xlib_LIBS cairo_cv_xlib_NONPKGCONFIG_LIBS=$xlib_NONPKGCONFIG_LIBS +cairo_cv_xlib_NONPKGCONFIG_EXTRA_LIBS=$xlib_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Xlib surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Xlib surface backend feature could be enabled... " >&6; } @@ -20691,11 +20474,11 @@ $as_echo "$cairo_cv_xlib_use" >&6; } use_xlib=$cairo_cv_xlib_use if test "x$enable_xlib" = "xyes" -a "x$use_xlib" != xyes; then : - as_fn_error " Xlib surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Xlib surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-xlib: \`$use_xlib', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-xlib: \`$use_xlib', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_xlib" = "xyes"; then : @@ -20705,6 +20488,7 @@ xlib_CFLAGS=$cairo_cv_xlib_CFLAGS xlib_NONPKGCONFIG_CFLAGS=$cairo_cv_xlib_NONPKGCONFIG_CFLAGS xlib_LIBS=$cairo_cv_xlib_LIBS xlib_NONPKGCONFIG_LIBS=$cairo_cv_xlib_NONPKGCONFIG_LIBS +xlib_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xlib_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$xlib_REQUIRES"" ${CAIRO_REQUIRES}" @@ -20724,6 +20508,7 @@ xlib_CFLAGS=$cairo_cv_xlib_CFLAGS xlib_NONPKGCONFIG_CFLAGS=$cairo_cv_xlib_NONPKGCONFIG_CFLAGS xlib_LIBS=$cairo_cv_xlib_LIBS xlib_NONPKGCONFIG_LIBS=$cairo_cv_xlib_NONPKGCONFIG_LIBS +xlib_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xlib_NONPKGCONFIG_EXTRA_LIBS fi @@ -20918,7 +20703,7 @@ fi yes|auto) : if test "x$cairo_cv_xlib_xrender_cache_version" != "x6" -o \ "x$cairo_cv_xlib_xrender_cache_commands_len" != "x742" -o \ - "x$cairo_cv_xlib_xrender_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_xlib_xrender_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_xlib_xrender_use fi if test "x$enable_xlib_xrender" = xyes -a "x$cairo_cv_xlib_xrender_use" != xyes; then : @@ -20938,6 +20723,7 @@ xlib_xrender_CFLAGS="$ac_env_xlib_xrender_CFLAGS_value" xlib_xrender_NONPKGCONFIG_CFLAGS="$ac_env_xlib_xrender_NONPKGCONFIG_CFLAGS_value" xlib_xrender_LIBS="$ac_env_xlib_xrender_LIBS_value" xlib_xrender_NONPKGCONFIG_LIBS="$ac_env_xlib_xrender_NONPKGCONFIG_LIBS_value" +xlib_xrender_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xlib_xrender_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$use_xlib" != "xyes"; then @@ -21043,7 +20829,7 @@ fi fi cairo_cv_xlib_xrender_use=$use_xlib_xrender - cairo_cv_xlib_xrender_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_xlib_xrender_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_xlib_xrender_cache_commands_len="742" cairo_cv_xlib_xrender_cache_version="6" cairo_cv_xlib_xrender_BASE=$xlib_xrender_BASE @@ -21052,6 +20838,7 @@ cairo_cv_xlib_xrender_CFLAGS=$xlib_xrender_CFLAGS cairo_cv_xlib_xrender_NONPKGCONFIG_CFLAGS=$xlib_xrender_NONPKGCONFIG_CFLAGS cairo_cv_xlib_xrender_LIBS=$xlib_xrender_LIBS cairo_cv_xlib_xrender_NONPKGCONFIG_LIBS=$xlib_xrender_NONPKGCONFIG_LIBS +cairo_cv_xlib_xrender_NONPKGCONFIG_EXTRA_LIBS=$xlib_xrender_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Xlib Xrender surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Xlib Xrender surface backend feature could be enabled... " >&6; } @@ -21062,11 +20849,11 @@ $as_echo "$cairo_cv_xlib_xrender_use" >&6; } use_xlib_xrender=$cairo_cv_xlib_xrender_use if test "x$enable_xlib_xrender" = "xyes" -a "x$use_xlib_xrender" != xyes; then : - as_fn_error " Xlib Xrender surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Xlib Xrender surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-xlib-xrender: \`$use_xlib_xrender', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-xlib-xrender: \`$use_xlib_xrender', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_xlib_xrender" = "xyes"; then : @@ -21076,6 +20863,7 @@ xlib_xrender_CFLAGS=$cairo_cv_xlib_xrender_CFLAGS xlib_xrender_NONPKGCONFIG_CFLAGS=$cairo_cv_xlib_xrender_NONPKGCONFIG_CFLAGS xlib_xrender_LIBS=$cairo_cv_xlib_xrender_LIBS xlib_xrender_NONPKGCONFIG_LIBS=$cairo_cv_xlib_xrender_NONPKGCONFIG_LIBS +xlib_xrender_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xlib_xrender_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$xlib_xrender_REQUIRES"" ${CAIRO_REQUIRES}" @@ -21095,6 +20883,7 @@ xlib_xrender_CFLAGS=$cairo_cv_xlib_xrender_CFLAGS xlib_xrender_NONPKGCONFIG_CFLAGS=$cairo_cv_xlib_xrender_NONPKGCONFIG_CFLAGS xlib_xrender_LIBS=$cairo_cv_xlib_xrender_LIBS xlib_xrender_NONPKGCONFIG_LIBS=$cairo_cv_xlib_xrender_NONPKGCONFIG_LIBS +xlib_xrender_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xlib_xrender_NONPKGCONFIG_EXTRA_LIBS fi @@ -21290,7 +21079,7 @@ fi yes|auto) : if test "x$cairo_cv_xcb_cache_version" != "x6" -o \ "x$cairo_cv_xcb_cache_commands_len" != "x322" -o \ - "x$cairo_cv_xcb_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_xcb_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_xcb_use fi if test "x$enable_xcb" = xyes -a "x$cairo_cv_xcb_use" != xyes; then : @@ -21310,6 +21099,7 @@ xcb_CFLAGS="$ac_env_xcb_CFLAGS_value" xcb_NONPKGCONFIG_CFLAGS="$ac_env_xcb_NONPKGCONFIG_CFLAGS_value" xcb_LIBS="$ac_env_xcb_LIBS_value" xcb_NONPKGCONFIG_LIBS="$ac_env_xcb_NONPKGCONFIG_LIBS_value" +xcb_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xcb_NONPKGCONFIG_EXTRA_LIBS_value" xcb_REQUIRES="xcb >= 1.1.92 xcb-render >= 0.9.92" @@ -21389,7 +21179,7 @@ fi fi cairo_cv_xcb_use=$use_xcb - cairo_cv_xcb_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_xcb_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_xcb_cache_commands_len="322" cairo_cv_xcb_cache_version="6" cairo_cv_xcb_BASE=$xcb_BASE @@ -21398,6 +21188,7 @@ cairo_cv_xcb_CFLAGS=$xcb_CFLAGS cairo_cv_xcb_NONPKGCONFIG_CFLAGS=$xcb_NONPKGCONFIG_CFLAGS cairo_cv_xcb_LIBS=$xcb_LIBS cairo_cv_xcb_NONPKGCONFIG_LIBS=$xcb_NONPKGCONFIG_LIBS +cairo_cv_xcb_NONPKGCONFIG_EXTRA_LIBS=$xcb_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's XCB surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's XCB surface backend feature could be enabled... " >&6; } @@ -21408,11 +21199,11 @@ $as_echo "$cairo_cv_xcb_use" >&6; } use_xcb=$cairo_cv_xcb_use if test "x$enable_xcb" = "xyes" -a "x$use_xcb" != xyes; then : - as_fn_error " XCB surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " XCB surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-xcb: \`$use_xcb', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-xcb: \`$use_xcb', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_xcb" = "xyes"; then : @@ -21422,6 +21213,7 @@ xcb_CFLAGS=$cairo_cv_xcb_CFLAGS xcb_NONPKGCONFIG_CFLAGS=$cairo_cv_xcb_NONPKGCONFIG_CFLAGS xcb_LIBS=$cairo_cv_xcb_LIBS xcb_NONPKGCONFIG_LIBS=$cairo_cv_xcb_NONPKGCONFIG_LIBS +xcb_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xcb_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$xcb_REQUIRES"" ${CAIRO_REQUIRES}" @@ -21441,6 +21233,7 @@ xcb_CFLAGS=$cairo_cv_xcb_CFLAGS xcb_NONPKGCONFIG_CFLAGS=$cairo_cv_xcb_NONPKGCONFIG_CFLAGS xcb_LIBS=$cairo_cv_xcb_LIBS xcb_NONPKGCONFIG_LIBS=$cairo_cv_xcb_NONPKGCONFIG_LIBS +xcb_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xcb_NONPKGCONFIG_EXTRA_LIBS fi @@ -21631,7 +21424,7 @@ fi yes|auto) : if test "x$cairo_cv_xlib_xcb_cache_version" != "x6" -o \ "x$cairo_cv_xlib_xcb_cache_commands_len" != "x318" -o \ - "x$cairo_cv_xlib_xcb_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_xlib_xcb_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_xlib_xcb_use fi if test "x$enable_xlib_xcb" = xyes -a "x$cairo_cv_xlib_xcb_use" != xyes; then : @@ -21651,6 +21444,7 @@ xlib_xcb_CFLAGS="$ac_env_xlib_xcb_CFLAGS_value" xlib_xcb_NONPKGCONFIG_CFLAGS="$ac_env_xlib_xcb_NONPKGCONFIG_CFLAGS_value" xlib_xcb_LIBS="$ac_env_xlib_xcb_LIBS_value" xlib_xcb_NONPKGCONFIG_LIBS="$ac_env_xlib_xcb_NONPKGCONFIG_LIBS_value" +xlib_xcb_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xlib_xcb_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$use_xcb" == "xyes" -a "x$use_xlib" == "xyes"; then @@ -21727,7 +21521,7 @@ fi fi cairo_cv_xlib_xcb_use=$use_xlib_xcb - cairo_cv_xlib_xcb_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_xlib_xcb_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_xlib_xcb_cache_commands_len="318" cairo_cv_xlib_xcb_cache_version="6" cairo_cv_xlib_xcb_BASE=$xlib_xcb_BASE @@ -21736,6 +21530,7 @@ cairo_cv_xlib_xcb_CFLAGS=$xlib_xcb_CFLAGS cairo_cv_xlib_xcb_NONPKGCONFIG_CFLAGS=$xlib_xcb_NONPKGCONFIG_CFLAGS cairo_cv_xlib_xcb_LIBS=$xlib_xcb_LIBS cairo_cv_xlib_xcb_NONPKGCONFIG_LIBS=$xlib_xcb_NONPKGCONFIG_LIBS +cairo_cv_xlib_xcb_NONPKGCONFIG_EXTRA_LIBS=$xlib_xcb_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Xlib/XCB functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's Xlib/XCB functions feature could be enabled... " >&6; } @@ -21746,11 +21541,11 @@ $as_echo "$cairo_cv_xlib_xcb_use" >&6; } use_xlib_xcb=$cairo_cv_xlib_xcb_use if test "x$enable_xlib_xcb" = "xyes" -a "x$use_xlib_xcb" != xyes; then : - as_fn_error " Xlib/XCB functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Xlib/XCB functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-xlib-xcb: \`$use_xlib_xcb', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-xlib-xcb: \`$use_xlib_xcb', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_xlib_xcb" = "xyes"; then : @@ -21760,6 +21555,7 @@ xlib_xcb_CFLAGS=$cairo_cv_xlib_xcb_CFLAGS xlib_xcb_NONPKGCONFIG_CFLAGS=$cairo_cv_xlib_xcb_NONPKGCONFIG_CFLAGS xlib_xcb_LIBS=$cairo_cv_xlib_xcb_LIBS xlib_xcb_NONPKGCONFIG_LIBS=$cairo_cv_xlib_xcb_NONPKGCONFIG_LIBS +xlib_xcb_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xlib_xcb_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$xlib_xcb_REQUIRES"" ${CAIRO_REQUIRES}" @@ -21779,6 +21575,7 @@ xlib_xcb_CFLAGS=$cairo_cv_xlib_xcb_CFLAGS xlib_xcb_NONPKGCONFIG_CFLAGS=$cairo_cv_xlib_xcb_NONPKGCONFIG_CFLAGS xlib_xcb_LIBS=$cairo_cv_xlib_xcb_LIBS xlib_xcb_NONPKGCONFIG_LIBS=$cairo_cv_xlib_xcb_NONPKGCONFIG_LIBS +xlib_xcb_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xlib_xcb_NONPKGCONFIG_EXTRA_LIBS fi @@ -21977,7 +21774,7 @@ fi yes|auto) : if test "x$cairo_cv_xcb_shm_cache_version" != "x6" -o \ "x$cairo_cv_xcb_shm_cache_commands_len" != "x279" -o \ - "x$cairo_cv_xcb_shm_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_xcb_shm_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_xcb_shm_use fi if test "x$enable_xcb_shm" = xyes -a "x$cairo_cv_xcb_shm_use" != xyes; then : @@ -21997,6 +21794,7 @@ xcb_shm_CFLAGS="$ac_env_xcb_shm_CFLAGS_value" xcb_shm_NONPKGCONFIG_CFLAGS="$ac_env_xcb_shm_NONPKGCONFIG_CFLAGS_value" xcb_shm_LIBS="$ac_env_xcb_shm_LIBS_value" xcb_shm_NONPKGCONFIG_LIBS="$ac_env_xcb_shm_NONPKGCONFIG_LIBS_value" +xcb_shm_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xcb_shm_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$use_xcb" == "xyes"; then @@ -22077,7 +21875,7 @@ fi fi cairo_cv_xcb_shm_use=$use_xcb_shm - cairo_cv_xcb_shm_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_xcb_shm_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_xcb_shm_cache_commands_len="279" cairo_cv_xcb_shm_cache_version="6" cairo_cv_xcb_shm_BASE=$xcb_shm_BASE @@ -22086,6 +21884,7 @@ cairo_cv_xcb_shm_CFLAGS=$xcb_shm_CFLAGS cairo_cv_xcb_shm_NONPKGCONFIG_CFLAGS=$xcb_shm_NONPKGCONFIG_CFLAGS cairo_cv_xcb_shm_LIBS=$xcb_shm_LIBS cairo_cv_xcb_shm_NONPKGCONFIG_LIBS=$xcb_shm_NONPKGCONFIG_LIBS +cairo_cv_xcb_shm_NONPKGCONFIG_EXTRA_LIBS=$xcb_shm_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's XCB/SHM functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's XCB/SHM functions feature could be enabled... " >&6; } @@ -22096,11 +21895,11 @@ $as_echo "$cairo_cv_xcb_shm_use" >&6; } use_xcb_shm=$cairo_cv_xcb_shm_use if test "x$enable_xcb_shm" = "xyes" -a "x$use_xcb_shm" != xyes; then : - as_fn_error " XCB/SHM functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? " XCB/SHM functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-xcb-shm: \`$use_xcb_shm', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-xcb-shm: \`$use_xcb_shm', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_xcb_shm" = "xyes"; then : @@ -22110,6 +21909,7 @@ xcb_shm_CFLAGS=$cairo_cv_xcb_shm_CFLAGS xcb_shm_NONPKGCONFIG_CFLAGS=$cairo_cv_xcb_shm_NONPKGCONFIG_CFLAGS xcb_shm_LIBS=$cairo_cv_xcb_shm_LIBS xcb_shm_NONPKGCONFIG_LIBS=$cairo_cv_xcb_shm_NONPKGCONFIG_LIBS +xcb_shm_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xcb_shm_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$xcb_shm_REQUIRES"" ${CAIRO_REQUIRES}" @@ -22129,6 +21929,7 @@ xcb_shm_CFLAGS=$cairo_cv_xcb_shm_CFLAGS xcb_shm_NONPKGCONFIG_CFLAGS=$cairo_cv_xcb_shm_NONPKGCONFIG_CFLAGS xcb_shm_LIBS=$cairo_cv_xcb_shm_LIBS xcb_shm_NONPKGCONFIG_LIBS=$cairo_cv_xcb_shm_NONPKGCONFIG_LIBS +xcb_shm_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xcb_shm_NONPKGCONFIG_EXTRA_LIBS fi @@ -22326,7 +22127,7 @@ fi yes|auto) : if test "x$cairo_cv_qt_cache_version" != "x6" -o \ "x$cairo_cv_qt_cache_commands_len" != "x185" -o \ - "x$cairo_cv_qt_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_qt_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_qt_use fi if test "x$enable_qt" = xyes -a "x$cairo_cv_qt_use" != xyes; then : @@ -22346,6 +22147,7 @@ qt_CFLAGS="$ac_env_qt_CFLAGS_value" qt_NONPKGCONFIG_CFLAGS="$ac_env_qt_NONPKGCONFIG_CFLAGS_value" qt_LIBS="$ac_env_qt_LIBS_value" qt_NONPKGCONFIG_LIBS="$ac_env_qt_NONPKGCONFIG_LIBS_value" +qt_NONPKGCONFIG_EXTRA_LIBS="$ac_env_qt_NONPKGCONFIG_EXTRA_LIBS_value" qt_REQUIRES="QtGui >= 4.4.0" @@ -22426,7 +22228,7 @@ $as_echo "yes" >&6; } fi cairo_cv_qt_use=$use_qt - cairo_cv_qt_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_qt_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_qt_cache_commands_len="185" cairo_cv_qt_cache_version="6" cairo_cv_qt_BASE=$qt_BASE @@ -22435,6 +22237,7 @@ cairo_cv_qt_CFLAGS=$qt_CFLAGS cairo_cv_qt_NONPKGCONFIG_CFLAGS=$qt_NONPKGCONFIG_CFLAGS cairo_cv_qt_LIBS=$qt_LIBS cairo_cv_qt_NONPKGCONFIG_LIBS=$qt_NONPKGCONFIG_LIBS +cairo_cv_qt_NONPKGCONFIG_EXTRA_LIBS=$qt_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Qt surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Qt surface backend feature could be enabled... " >&6; } @@ -22445,11 +22248,11 @@ $as_echo "$cairo_cv_qt_use" >&6; } use_qt=$cairo_cv_qt_use if test "x$enable_qt" = "xyes" -a "x$use_qt" != xyes; then : - as_fn_error " Qt surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Qt surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-qt: \`$use_qt', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-qt: \`$use_qt', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_qt" = "xyes"; then : @@ -22459,6 +22262,7 @@ qt_CFLAGS=$cairo_cv_qt_CFLAGS qt_NONPKGCONFIG_CFLAGS=$cairo_cv_qt_NONPKGCONFIG_CFLAGS qt_LIBS=$cairo_cv_qt_LIBS qt_NONPKGCONFIG_LIBS=$cairo_cv_qt_NONPKGCONFIG_LIBS +qt_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_qt_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$qt_REQUIRES"" ${CAIRO_REQUIRES}" @@ -22478,6 +22282,7 @@ qt_CFLAGS=$cairo_cv_qt_CFLAGS qt_NONPKGCONFIG_CFLAGS=$cairo_cv_qt_NONPKGCONFIG_CFLAGS qt_LIBS=$cairo_cv_qt_LIBS qt_NONPKGCONFIG_LIBS=$cairo_cv_qt_NONPKGCONFIG_LIBS +qt_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_qt_NONPKGCONFIG_EXTRA_LIBS fi @@ -22669,7 +22474,7 @@ fi yes|auto) : if test "x$cairo_cv_quartz_cache_version" != "x6" -o \ "x$cairo_cv_quartz_cache_commands_len" != "x527" -o \ - "x$cairo_cv_quartz_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_quartz_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_quartz_use fi if test "x$enable_quartz" = xyes -a "x$cairo_cv_quartz_use" != xyes; then : @@ -22689,6 +22494,7 @@ quartz_CFLAGS="$ac_env_quartz_CFLAGS_value" quartz_NONPKGCONFIG_CFLAGS="$ac_env_quartz_NONPKGCONFIG_CFLAGS_value" quartz_LIBS="$ac_env_quartz_LIBS_value" quartz_NONPKGCONFIG_LIBS="$ac_env_quartz_NONPKGCONFIG_LIBS_value" +quartz_NONPKGCONFIG_EXTRA_LIBS="$ac_env_quartz_NONPKGCONFIG_EXTRA_LIBS_value" ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" @@ -22714,7 +22520,7 @@ fi fi cairo_cv_quartz_use=$use_quartz - cairo_cv_quartz_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_quartz_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_quartz_cache_commands_len="527" cairo_cv_quartz_cache_version="6" cairo_cv_quartz_BASE=$quartz_BASE @@ -22723,6 +22529,7 @@ cairo_cv_quartz_CFLAGS=$quartz_CFLAGS cairo_cv_quartz_NONPKGCONFIG_CFLAGS=$quartz_NONPKGCONFIG_CFLAGS cairo_cv_quartz_LIBS=$quartz_LIBS cairo_cv_quartz_NONPKGCONFIG_LIBS=$quartz_NONPKGCONFIG_LIBS +cairo_cv_quartz_NONPKGCONFIG_EXTRA_LIBS=$quartz_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Quartz surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Quartz surface backend feature could be enabled... " >&6; } @@ -22733,11 +22540,11 @@ $as_echo "$cairo_cv_quartz_use" >&6; } use_quartz=$cairo_cv_quartz_use if test "x$enable_quartz" = "xyes" -a "x$use_quartz" != xyes; then : - as_fn_error " Quartz surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Quartz surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-quartz: \`$use_quartz', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-quartz: \`$use_quartz', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_quartz" = "xyes"; then : @@ -22747,6 +22554,7 @@ quartz_CFLAGS=$cairo_cv_quartz_CFLAGS quartz_NONPKGCONFIG_CFLAGS=$cairo_cv_quartz_NONPKGCONFIG_CFLAGS quartz_LIBS=$cairo_cv_quartz_LIBS quartz_NONPKGCONFIG_LIBS=$cairo_cv_quartz_NONPKGCONFIG_LIBS +quartz_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_quartz_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$quartz_REQUIRES"" ${CAIRO_REQUIRES}" @@ -22766,6 +22574,7 @@ quartz_CFLAGS=$cairo_cv_quartz_CFLAGS quartz_NONPKGCONFIG_CFLAGS=$cairo_cv_quartz_NONPKGCONFIG_CFLAGS quartz_LIBS=$cairo_cv_quartz_LIBS quartz_NONPKGCONFIG_LIBS=$cairo_cv_quartz_NONPKGCONFIG_LIBS +quartz_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_quartz_NONPKGCONFIG_EXTRA_LIBS fi @@ -22960,7 +22769,7 @@ fi yes|auto) : if test "x$cairo_cv_quartz_font_cache_version" != "x6" -o \ "x$cairo_cv_quartz_font_cache_commands_len" != "x31" -o \ - "x$cairo_cv_quartz_font_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_quartz_font_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_quartz_font_use fi if test "x$enable_quartz_font" = xyes -a "x$cairo_cv_quartz_font_use" != xyes; then : @@ -22980,12 +22789,13 @@ quartz_font_CFLAGS="$ac_env_quartz_font_CFLAGS_value" quartz_font_NONPKGCONFIG_CFLAGS="$ac_env_quartz_font_NONPKGCONFIG_CFLAGS_value" quartz_font_LIBS="$ac_env_quartz_font_LIBS_value" quartz_font_NONPKGCONFIG_LIBS="$ac_env_quartz_font_NONPKGCONFIG_LIBS_value" +quartz_font_NONPKGCONFIG_EXTRA_LIBS="$ac_env_quartz_font_NONPKGCONFIG_EXTRA_LIBS_value" use_quartz_font=$use_quartz cairo_cv_quartz_font_use=$use_quartz_font - cairo_cv_quartz_font_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_quartz_font_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_quartz_font_cache_commands_len="31" cairo_cv_quartz_font_cache_version="6" cairo_cv_quartz_font_BASE=$quartz_font_BASE @@ -22994,6 +22804,7 @@ cairo_cv_quartz_font_CFLAGS=$quartz_font_CFLAGS cairo_cv_quartz_font_NONPKGCONFIG_CFLAGS=$quartz_font_NONPKGCONFIG_CFLAGS cairo_cv_quartz_font_LIBS=$quartz_font_LIBS cairo_cv_quartz_font_NONPKGCONFIG_LIBS=$quartz_font_NONPKGCONFIG_LIBS +cairo_cv_quartz_font_NONPKGCONFIG_EXTRA_LIBS=$quartz_font_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Quartz font backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Quartz font backend feature could be enabled... " >&6; } @@ -23004,11 +22815,11 @@ $as_echo "$cairo_cv_quartz_font_use" >&6; } use_quartz_font=$cairo_cv_quartz_font_use if test "x$enable_quartz_font" = "xyes" -a "x$use_quartz_font" != xyes; then : - as_fn_error " Quartz font backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Quartz font backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-quartz-font: \`$use_quartz_font', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-quartz-font: \`$use_quartz_font', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_quartz_font" = "xyes"; then : @@ -23018,6 +22829,7 @@ quartz_font_CFLAGS=$cairo_cv_quartz_font_CFLAGS quartz_font_NONPKGCONFIG_CFLAGS=$cairo_cv_quartz_font_NONPKGCONFIG_CFLAGS quartz_font_LIBS=$cairo_cv_quartz_font_LIBS quartz_font_NONPKGCONFIG_LIBS=$cairo_cv_quartz_font_NONPKGCONFIG_LIBS +quartz_font_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_quartz_font_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$quartz_font_REQUIRES"" ${CAIRO_REQUIRES}" @@ -23037,6 +22849,7 @@ quartz_font_CFLAGS=$cairo_cv_quartz_font_CFLAGS quartz_font_NONPKGCONFIG_CFLAGS=$cairo_cv_quartz_font_NONPKGCONFIG_CFLAGS quartz_font_LIBS=$cairo_cv_quartz_font_LIBS quartz_font_NONPKGCONFIG_LIBS=$cairo_cv_quartz_font_NONPKGCONFIG_LIBS +quartz_font_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_quartz_font_NONPKGCONFIG_EXTRA_LIBS fi @@ -23231,7 +23044,7 @@ fi yes|auto) : if test "x$cairo_cv_quartz_image_cache_version" != "x6" -o \ "x$cairo_cv_quartz_image_cache_commands_len" != "x32" -o \ - "x$cairo_cv_quartz_image_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_quartz_image_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_quartz_image_use fi if test "x$enable_quartz_image" = xyes -a "x$cairo_cv_quartz_image_use" != xyes; then : @@ -23251,12 +23064,13 @@ quartz_image_CFLAGS="$ac_env_quartz_image_CFLAGS_value" quartz_image_NONPKGCONFIG_CFLAGS="$ac_env_quartz_image_NONPKGCONFIG_CFLAGS_value" quartz_image_LIBS="$ac_env_quartz_image_LIBS_value" quartz_image_NONPKGCONFIG_LIBS="$ac_env_quartz_image_NONPKGCONFIG_LIBS_value" +quartz_image_NONPKGCONFIG_EXTRA_LIBS="$ac_env_quartz_image_NONPKGCONFIG_EXTRA_LIBS_value" use_quartz_image=$use_quartz cairo_cv_quartz_image_use=$use_quartz_image - cairo_cv_quartz_image_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_quartz_image_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_quartz_image_cache_commands_len="32" cairo_cv_quartz_image_cache_version="6" cairo_cv_quartz_image_BASE=$quartz_image_BASE @@ -23265,6 +23079,7 @@ cairo_cv_quartz_image_CFLAGS=$quartz_image_CFLAGS cairo_cv_quartz_image_NONPKGCONFIG_CFLAGS=$quartz_image_NONPKGCONFIG_CFLAGS cairo_cv_quartz_image_LIBS=$quartz_image_LIBS cairo_cv_quartz_image_NONPKGCONFIG_LIBS=$quartz_image_NONPKGCONFIG_LIBS +cairo_cv_quartz_image_NONPKGCONFIG_EXTRA_LIBS=$quartz_image_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Quartz Image surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Quartz Image surface backend feature could be enabled... " >&6; } @@ -23275,11 +23090,11 @@ $as_echo "$cairo_cv_quartz_image_use" >&6; } use_quartz_image=$cairo_cv_quartz_image_use if test "x$enable_quartz_image" = "xyes" -a "x$use_quartz_image" != xyes; then : - as_fn_error " Quartz Image surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Quartz Image surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-quartz-image: \`$use_quartz_image', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-quartz-image: \`$use_quartz_image', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_quartz_image" = "xyes"; then : @@ -23289,6 +23104,7 @@ quartz_image_CFLAGS=$cairo_cv_quartz_image_CFLAGS quartz_image_NONPKGCONFIG_CFLAGS=$cairo_cv_quartz_image_NONPKGCONFIG_CFLAGS quartz_image_LIBS=$cairo_cv_quartz_image_LIBS quartz_image_NONPKGCONFIG_LIBS=$cairo_cv_quartz_image_NONPKGCONFIG_LIBS +quartz_image_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_quartz_image_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$quartz_image_REQUIRES"" ${CAIRO_REQUIRES}" @@ -23308,6 +23124,7 @@ quartz_image_CFLAGS=$cairo_cv_quartz_image_CFLAGS quartz_image_NONPKGCONFIG_CFLAGS=$cairo_cv_quartz_image_NONPKGCONFIG_CFLAGS quartz_image_LIBS=$cairo_cv_quartz_image_LIBS quartz_image_NONPKGCONFIG_LIBS=$cairo_cv_quartz_image_NONPKGCONFIG_LIBS +quartz_image_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_quartz_image_NONPKGCONFIG_EXTRA_LIBS fi @@ -23499,7 +23316,7 @@ fi yes|auto) : if test "x$cairo_cv_win32_cache_version" != "x6" -o \ "x$cairo_cv_win32_cache_commands_len" != "x127" -o \ - "x$cairo_cv_win32_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_win32_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_win32_use fi if test "x$enable_win32" = xyes -a "x$cairo_cv_win32_use" != xyes; then : @@ -23519,6 +23336,7 @@ win32_CFLAGS="$ac_env_win32_CFLAGS_value" win32_NONPKGCONFIG_CFLAGS="$ac_env_win32_NONPKGCONFIG_CFLAGS_value" win32_LIBS="$ac_env_win32_LIBS_value" win32_NONPKGCONFIG_LIBS="$ac_env_win32_NONPKGCONFIG_LIBS_value" +win32_NONPKGCONFIG_EXTRA_LIBS="$ac_env_win32_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$have_windows" != xyes; then @@ -23527,7 +23345,7 @@ win32_NONPKGCONFIG_LIBS="$ac_env_win32_NONPKGCONFIG_LIBS_value" win32_LIBS="-lgdi32 -lmsimg32" cairo_cv_win32_use=$use_win32 - cairo_cv_win32_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_win32_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_win32_cache_commands_len="127" cairo_cv_win32_cache_version="6" cairo_cv_win32_BASE=$win32_BASE @@ -23536,6 +23354,7 @@ cairo_cv_win32_CFLAGS=$win32_CFLAGS cairo_cv_win32_NONPKGCONFIG_CFLAGS=$win32_NONPKGCONFIG_CFLAGS cairo_cv_win32_LIBS=$win32_LIBS cairo_cv_win32_NONPKGCONFIG_LIBS=$win32_NONPKGCONFIG_LIBS +cairo_cv_win32_NONPKGCONFIG_EXTRA_LIBS=$win32_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Microsoft Windows surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Microsoft Windows surface backend feature could be enabled... " >&6; } @@ -23546,11 +23365,11 @@ $as_echo "$cairo_cv_win32_use" >&6; } use_win32=$cairo_cv_win32_use if test "x$enable_win32" = "xyes" -a "x$use_win32" != xyes; then : - as_fn_error " Microsoft Windows surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Microsoft Windows surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-win32: \`$use_win32', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-win32: \`$use_win32', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_win32" = "xyes"; then : @@ -23560,6 +23379,7 @@ win32_CFLAGS=$cairo_cv_win32_CFLAGS win32_NONPKGCONFIG_CFLAGS=$cairo_cv_win32_NONPKGCONFIG_CFLAGS win32_LIBS=$cairo_cv_win32_LIBS win32_NONPKGCONFIG_LIBS=$cairo_cv_win32_NONPKGCONFIG_LIBS +win32_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_win32_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$win32_REQUIRES"" ${CAIRO_REQUIRES}" @@ -23579,6 +23399,7 @@ win32_CFLAGS=$cairo_cv_win32_CFLAGS win32_NONPKGCONFIG_CFLAGS=$cairo_cv_win32_NONPKGCONFIG_CFLAGS win32_LIBS=$cairo_cv_win32_LIBS win32_NONPKGCONFIG_LIBS=$cairo_cv_win32_NONPKGCONFIG_LIBS +win32_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_win32_NONPKGCONFIG_EXTRA_LIBS fi @@ -23773,7 +23594,7 @@ fi yes|auto) : if test "x$cairo_cv_win32_font_cache_version" != "x6" -o \ "x$cairo_cv_win32_font_cache_commands_len" != "x29" -o \ - "x$cairo_cv_win32_font_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_win32_font_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_win32_font_use fi if test "x$enable_win32_font" = xyes -a "x$cairo_cv_win32_font_use" != xyes; then : @@ -23793,12 +23614,13 @@ win32_font_CFLAGS="$ac_env_win32_font_CFLAGS_value" win32_font_NONPKGCONFIG_CFLAGS="$ac_env_win32_font_NONPKGCONFIG_CFLAGS_value" win32_font_LIBS="$ac_env_win32_font_LIBS_value" win32_font_NONPKGCONFIG_LIBS="$ac_env_win32_font_NONPKGCONFIG_LIBS_value" +win32_font_NONPKGCONFIG_EXTRA_LIBS="$ac_env_win32_font_NONPKGCONFIG_EXTRA_LIBS_value" use_win32_font=$use_win32 cairo_cv_win32_font_use=$use_win32_font - cairo_cv_win32_font_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_win32_font_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_win32_font_cache_commands_len="29" cairo_cv_win32_font_cache_version="6" cairo_cv_win32_font_BASE=$win32_font_BASE @@ -23807,6 +23629,7 @@ cairo_cv_win32_font_CFLAGS=$win32_font_CFLAGS cairo_cv_win32_font_NONPKGCONFIG_CFLAGS=$win32_font_NONPKGCONFIG_CFLAGS cairo_cv_win32_font_LIBS=$win32_font_LIBS cairo_cv_win32_font_NONPKGCONFIG_LIBS=$win32_font_NONPKGCONFIG_LIBS +cairo_cv_win32_font_NONPKGCONFIG_EXTRA_LIBS=$win32_font_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Microsoft Windows font backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Microsoft Windows font backend feature could be enabled... " >&6; } @@ -23817,11 +23640,11 @@ $as_echo "$cairo_cv_win32_font_use" >&6; } use_win32_font=$cairo_cv_win32_font_use if test "x$enable_win32_font" = "xyes" -a "x$use_win32_font" != xyes; then : - as_fn_error " Microsoft Windows font backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Microsoft Windows font backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-win32-font: \`$use_win32_font', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-win32-font: \`$use_win32_font', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_win32_font" = "xyes"; then : @@ -23831,6 +23654,7 @@ win32_font_CFLAGS=$cairo_cv_win32_font_CFLAGS win32_font_NONPKGCONFIG_CFLAGS=$cairo_cv_win32_font_NONPKGCONFIG_CFLAGS win32_font_LIBS=$cairo_cv_win32_font_LIBS win32_font_NONPKGCONFIG_LIBS=$cairo_cv_win32_font_NONPKGCONFIG_LIBS +win32_font_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_win32_font_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$win32_font_REQUIRES"" ${CAIRO_REQUIRES}" @@ -23850,6 +23674,7 @@ win32_font_CFLAGS=$cairo_cv_win32_font_CFLAGS win32_font_NONPKGCONFIG_CFLAGS=$cairo_cv_win32_font_NONPKGCONFIG_CFLAGS win32_font_LIBS=$cairo_cv_win32_font_LIBS win32_font_NONPKGCONFIG_LIBS=$cairo_cv_win32_font_NONPKGCONFIG_LIBS +win32_font_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_win32_font_NONPKGCONFIG_EXTRA_LIBS fi @@ -24105,7 +23930,7 @@ fi yes|auto) : if test "x$cairo_cv_skia_cache_version" != "x6" -o \ "x$cairo_cv_skia_cache_commands_len" != "x375" -o \ - "x$cairo_cv_skia_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_skia_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_skia_use fi if test "x$enable_skia" = xyes -a "x$cairo_cv_skia_use" != xyes; then : @@ -24125,6 +23950,7 @@ skia_CFLAGS="$ac_env_skia_CFLAGS_value" skia_NONPKGCONFIG_CFLAGS="$ac_env_skia_NONPKGCONFIG_CFLAGS_value" skia_LIBS="$ac_env_skia_LIBS_value" skia_NONPKGCONFIG_LIBS="$ac_env_skia_NONPKGCONFIG_LIBS_value" +skia_NONPKGCONFIG_EXTRA_LIBS="$ac_env_skia_NONPKGCONFIG_EXTRA_LIBS_value" @@ -24140,7 +23966,7 @@ fi cairo_cv_skia_use=$use_skia - cairo_cv_skia_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_skia_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_skia_cache_commands_len="375" cairo_cv_skia_cache_version="6" cairo_cv_skia_BASE=$skia_BASE @@ -24149,6 +23975,7 @@ cairo_cv_skia_CFLAGS=$skia_CFLAGS cairo_cv_skia_NONPKGCONFIG_CFLAGS=$skia_NONPKGCONFIG_CFLAGS cairo_cv_skia_LIBS=$skia_LIBS cairo_cv_skia_NONPKGCONFIG_LIBS=$skia_NONPKGCONFIG_LIBS +cairo_cv_skia_NONPKGCONFIG_EXTRA_LIBS=$skia_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Skia surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Skia surface backend feature could be enabled... " >&6; } @@ -24159,11 +23986,11 @@ $as_echo "$cairo_cv_skia_use" >&6; } use_skia=$cairo_cv_skia_use if test "x$enable_skia" = "xyes" -a "x$use_skia" != xyes; then : - as_fn_error " Skia surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Skia surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-skia: \`$use_skia', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-skia: \`$use_skia', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_skia" = "xyes"; then : @@ -24173,6 +24000,7 @@ skia_CFLAGS=$cairo_cv_skia_CFLAGS skia_NONPKGCONFIG_CFLAGS=$cairo_cv_skia_NONPKGCONFIG_CFLAGS skia_LIBS=$cairo_cv_skia_LIBS skia_NONPKGCONFIG_LIBS=$cairo_cv_skia_NONPKGCONFIG_LIBS +skia_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_skia_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$skia_REQUIRES"" ${CAIRO_REQUIRES}" @@ -24192,6 +24020,7 @@ skia_CFLAGS=$cairo_cv_skia_CFLAGS skia_NONPKGCONFIG_CFLAGS=$cairo_cv_skia_NONPKGCONFIG_CFLAGS skia_LIBS=$cairo_cv_skia_LIBS skia_NONPKGCONFIG_LIBS=$cairo_cv_skia_NONPKGCONFIG_LIBS +skia_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_skia_NONPKGCONFIG_EXTRA_LIBS fi @@ -24383,7 +24212,7 @@ fi yes|auto) : if test "x$cairo_cv_os2_cache_version" != "x6" -o \ "x$cairo_cv_os2_cache_commands_len" != "x120" -o \ - "x$cairo_cv_os2_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_os2_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_os2_use fi if test "x$enable_os2" = xyes -a "x$cairo_cv_os2_use" != xyes; then : @@ -24403,6 +24232,7 @@ os2_CFLAGS="$ac_env_os2_CFLAGS_value" os2_NONPKGCONFIG_CFLAGS="$ac_env_os2_NONPKGCONFIG_CFLAGS_value" os2_LIBS="$ac_env_os2_LIBS_value" os2_NONPKGCONFIG_LIBS="$ac_env_os2_NONPKGCONFIG_LIBS_value" +os2_NONPKGCONFIG_EXTRA_LIBS="$ac_env_os2_NONPKGCONFIG_EXTRA_LIBS_value" case "$host" in @@ -24415,7 +24245,7 @@ os2_NONPKGCONFIG_LIBS="$ac_env_os2_NONPKGCONFIG_LIBS_value" esac cairo_cv_os2_use=$use_os2 - cairo_cv_os2_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_os2_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_os2_cache_commands_len="120" cairo_cv_os2_cache_version="6" cairo_cv_os2_BASE=$os2_BASE @@ -24424,6 +24254,7 @@ cairo_cv_os2_CFLAGS=$os2_CFLAGS cairo_cv_os2_NONPKGCONFIG_CFLAGS=$os2_NONPKGCONFIG_CFLAGS cairo_cv_os2_LIBS=$os2_LIBS cairo_cv_os2_NONPKGCONFIG_LIBS=$os2_NONPKGCONFIG_LIBS +cairo_cv_os2_NONPKGCONFIG_EXTRA_LIBS=$os2_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's OS/2 surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's OS/2 surface backend feature could be enabled... " >&6; } @@ -24434,11 +24265,11 @@ $as_echo "$cairo_cv_os2_use" >&6; } use_os2=$cairo_cv_os2_use if test "x$enable_os2" = "xyes" -a "x$use_os2" != xyes; then : - as_fn_error " OS/2 surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " OS/2 surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-os2: \`$use_os2', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-os2: \`$use_os2', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_os2" = "xyes"; then : @@ -24448,6 +24279,7 @@ os2_CFLAGS=$cairo_cv_os2_CFLAGS os2_NONPKGCONFIG_CFLAGS=$cairo_cv_os2_NONPKGCONFIG_CFLAGS os2_LIBS=$cairo_cv_os2_LIBS os2_NONPKGCONFIG_LIBS=$cairo_cv_os2_NONPKGCONFIG_LIBS +os2_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_os2_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$os2_REQUIRES"" ${CAIRO_REQUIRES}" @@ -24467,6 +24299,7 @@ os2_CFLAGS=$cairo_cv_os2_CFLAGS os2_NONPKGCONFIG_CFLAGS=$cairo_cv_os2_NONPKGCONFIG_CFLAGS os2_LIBS=$cairo_cv_os2_LIBS os2_NONPKGCONFIG_LIBS=$cairo_cv_os2_NONPKGCONFIG_LIBS +os2_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_os2_NONPKGCONFIG_EXTRA_LIBS fi @@ -24658,7 +24491,7 @@ fi yes|auto) : if test "x$cairo_cv_beos_cache_version" != "x6" -o \ "x$cairo_cv_beos_cache_commands_len" != "x292" -o \ - "x$cairo_cv_beos_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_beos_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_beos_use fi if test "x$enable_beos" = xyes -a "x$cairo_cv_beos_use" != xyes; then : @@ -24678,6 +24511,7 @@ beos_CFLAGS="$ac_env_beos_CFLAGS_value" beos_NONPKGCONFIG_CFLAGS="$ac_env_beos_NONPKGCONFIG_CFLAGS_value" beos_LIBS="$ac_env_beos_LIBS_value" beos_NONPKGCONFIG_LIBS="$ac_env_beos_NONPKGCONFIG_LIBS_value" +beos_NONPKGCONFIG_EXTRA_LIBS="$ac_env_beos_NONPKGCONFIG_EXTRA_LIBS_value" case "$host" in @@ -24758,7 +24592,7 @@ fi esac cairo_cv_beos_use=$use_beos - cairo_cv_beos_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_beos_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_beos_cache_commands_len="292" cairo_cv_beos_cache_version="6" cairo_cv_beos_BASE=$beos_BASE @@ -24767,6 +24601,7 @@ cairo_cv_beos_CFLAGS=$beos_CFLAGS cairo_cv_beos_NONPKGCONFIG_CFLAGS=$beos_NONPKGCONFIG_CFLAGS cairo_cv_beos_LIBS=$beos_LIBS cairo_cv_beos_NONPKGCONFIG_LIBS=$beos_NONPKGCONFIG_LIBS +cairo_cv_beos_NONPKGCONFIG_EXTRA_LIBS=$beos_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's BeOS/Zeta surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's BeOS/Zeta surface backend feature could be enabled... " >&6; } @@ -24777,11 +24612,11 @@ $as_echo "$cairo_cv_beos_use" >&6; } use_beos=$cairo_cv_beos_use if test "x$enable_beos" = "xyes" -a "x$use_beos" != xyes; then : - as_fn_error " BeOS/Zeta surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " BeOS/Zeta surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-beos: \`$use_beos', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-beos: \`$use_beos', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_beos" = "xyes"; then : @@ -24791,6 +24626,7 @@ beos_CFLAGS=$cairo_cv_beos_CFLAGS beos_NONPKGCONFIG_CFLAGS=$cairo_cv_beos_NONPKGCONFIG_CFLAGS beos_LIBS=$cairo_cv_beos_LIBS beos_NONPKGCONFIG_LIBS=$cairo_cv_beos_NONPKGCONFIG_LIBS +beos_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_beos_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$beos_REQUIRES"" ${CAIRO_REQUIRES}" @@ -24810,6 +24646,7 @@ beos_CFLAGS=$cairo_cv_beos_CFLAGS beos_NONPKGCONFIG_CFLAGS=$cairo_cv_beos_NONPKGCONFIG_CFLAGS beos_LIBS=$cairo_cv_beos_LIBS beos_NONPKGCONFIG_LIBS=$cairo_cv_beos_NONPKGCONFIG_LIBS +beos_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_beos_NONPKGCONFIG_EXTRA_LIBS fi @@ -25001,7 +24838,7 @@ fi yes|auto) : if test "x$cairo_cv_drm_cache_version" != "x6" -o \ "x$cairo_cv_drm_cache_commands_len" != "x212" -o \ - "x$cairo_cv_drm_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_drm_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_drm_use fi if test "x$enable_drm" = xyes -a "x$cairo_cv_drm_use" != xyes; then : @@ -25021,6 +24858,7 @@ drm_CFLAGS="$ac_env_drm_CFLAGS_value" drm_NONPKGCONFIG_CFLAGS="$ac_env_drm_NONPKGCONFIG_CFLAGS_value" drm_LIBS="$ac_env_drm_LIBS_value" drm_NONPKGCONFIG_LIBS="$ac_env_drm_NONPKGCONFIG_LIBS_value" +drm_NONPKGCONFIG_EXTRA_LIBS="$ac_env_drm_NONPKGCONFIG_EXTRA_LIBS_value" drm_REQUIRES="libudev >= 136" @@ -25097,7 +24935,7 @@ $as_echo "yes" >&6; } fi cairo_cv_drm_use=$use_drm - cairo_cv_drm_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_drm_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_drm_cache_commands_len="212" cairo_cv_drm_cache_version="6" cairo_cv_drm_BASE=$drm_BASE @@ -25106,6 +24944,7 @@ cairo_cv_drm_CFLAGS=$drm_CFLAGS cairo_cv_drm_NONPKGCONFIG_CFLAGS=$drm_NONPKGCONFIG_CFLAGS cairo_cv_drm_LIBS=$drm_LIBS cairo_cv_drm_NONPKGCONFIG_LIBS=$drm_NONPKGCONFIG_LIBS +cairo_cv_drm_NONPKGCONFIG_EXTRA_LIBS=$drm_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's DRM surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's DRM surface backend feature could be enabled... " >&6; } @@ -25116,11 +24955,11 @@ $as_echo "$cairo_cv_drm_use" >&6; } use_drm=$cairo_cv_drm_use if test "x$enable_drm" = "xyes" -a "x$use_drm" != xyes; then : - as_fn_error " DRM surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " DRM surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-drm: \`$use_drm', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-drm: \`$use_drm', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_drm" = "xyes"; then : @@ -25130,6 +24969,7 @@ drm_CFLAGS=$cairo_cv_drm_CFLAGS drm_NONPKGCONFIG_CFLAGS=$cairo_cv_drm_NONPKGCONFIG_CFLAGS drm_LIBS=$cairo_cv_drm_LIBS drm_NONPKGCONFIG_LIBS=$cairo_cv_drm_NONPKGCONFIG_LIBS +drm_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_drm_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$drm_REQUIRES"" ${CAIRO_REQUIRES}" @@ -25149,6 +24989,7 @@ drm_CFLAGS=$cairo_cv_drm_CFLAGS drm_NONPKGCONFIG_CFLAGS=$cairo_cv_drm_NONPKGCONFIG_CFLAGS drm_LIBS=$cairo_cv_drm_LIBS drm_NONPKGCONFIG_LIBS=$cairo_cv_drm_NONPKGCONFIG_LIBS +drm_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_drm_NONPKGCONFIG_EXTRA_LIBS fi @@ -25339,7 +25180,7 @@ fi yes|auto) : if test "x$cairo_cv_drm_xr_cache_version" != "x6" -o \ "x$cairo_cv_drm_xr_cache_commands_len" != "x378" -o \ - "x$cairo_cv_drm_xr_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_drm_xr_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_drm_xr_use fi if test "x$enable_drm_xr" = xyes -a "x$cairo_cv_drm_xr_use" != xyes; then : @@ -25359,6 +25200,7 @@ drm_xr_CFLAGS="$ac_env_drm_xr_CFLAGS_value" drm_xr_NONPKGCONFIG_CFLAGS="$ac_env_drm_xr_NONPKGCONFIG_CFLAGS_value" drm_xr_LIBS="$ac_env_drm_xr_LIBS_value" drm_xr_NONPKGCONFIG_LIBS="$ac_env_drm_xr_NONPKGCONFIG_LIBS_value" +drm_xr_NONPKGCONFIG_EXTRA_LIBS="$ac_env_drm_xr_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$use_drm" == "xyes"; then @@ -25440,7 +25282,7 @@ fi fi cairo_cv_drm_xr_use=$use_drm_xr - cairo_cv_drm_xr_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_drm_xr_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_drm_xr_cache_commands_len="378" cairo_cv_drm_xr_cache_version="6" cairo_cv_drm_xr_BASE=$drm_xr_BASE @@ -25449,6 +25291,7 @@ cairo_cv_drm_xr_CFLAGS=$drm_xr_CFLAGS cairo_cv_drm_xr_NONPKGCONFIG_CFLAGS=$drm_xr_NONPKGCONFIG_CFLAGS cairo_cv_drm_xr_LIBS=$drm_xr_LIBS cairo_cv_drm_xr_NONPKGCONFIG_LIBS=$drm_xr_NONPKGCONFIG_LIBS +cairo_cv_drm_xr_NONPKGCONFIG_EXTRA_LIBS=$drm_xr_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's DRM Xr (DDX) functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's DRM Xr (DDX) functions feature could be enabled... " >&6; } @@ -25459,11 +25302,11 @@ $as_echo "$cairo_cv_drm_xr_use" >&6; } use_drm_xr=$cairo_cv_drm_xr_use if test "x$enable_drm_xr" = "xyes" -a "x$use_drm_xr" != xyes; then : - as_fn_error " DRM Xr (DDX) functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? " DRM Xr (DDX) functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-drm-xr: \`$use_drm_xr', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-drm-xr: \`$use_drm_xr', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_drm_xr" = "xyes"; then : @@ -25473,6 +25316,7 @@ drm_xr_CFLAGS=$cairo_cv_drm_xr_CFLAGS drm_xr_NONPKGCONFIG_CFLAGS=$cairo_cv_drm_xr_NONPKGCONFIG_CFLAGS drm_xr_LIBS=$cairo_cv_drm_xr_LIBS drm_xr_NONPKGCONFIG_LIBS=$cairo_cv_drm_xr_NONPKGCONFIG_LIBS +drm_xr_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_drm_xr_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$drm_xr_REQUIRES"" ${CAIRO_REQUIRES}" @@ -25492,6 +25336,7 @@ drm_xr_CFLAGS=$cairo_cv_drm_xr_CFLAGS drm_xr_NONPKGCONFIG_CFLAGS=$cairo_cv_drm_xr_NONPKGCONFIG_CFLAGS drm_xr_LIBS=$cairo_cv_drm_xr_LIBS drm_xr_NONPKGCONFIG_LIBS=$cairo_cv_drm_xr_NONPKGCONFIG_LIBS +drm_xr_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_drm_xr_NONPKGCONFIG_EXTRA_LIBS fi @@ -25690,7 +25535,7 @@ fi yes|auto) : if test "x$cairo_cv_gallium_cache_version" != "x6" -o \ "x$cairo_cv_gallium_cache_commands_len" != "x544" -o \ - "x$cairo_cv_gallium_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_gallium_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_gallium_use fi if test "x$enable_gallium" = xyes -a "x$cairo_cv_gallium_use" != xyes; then : @@ -25710,6 +25555,7 @@ gallium_CFLAGS="$ac_env_gallium_CFLAGS_value" gallium_NONPKGCONFIG_CFLAGS="$ac_env_gallium_NONPKGCONFIG_CFLAGS_value" gallium_LIBS="$ac_env_gallium_LIBS_value" gallium_NONPKGCONFIG_LIBS="$ac_env_gallium_NONPKGCONFIG_LIBS_value" +gallium_NONPKGCONFIG_EXTRA_LIBS="$ac_env_gallium_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$use_drm" = "xyes"; then @@ -25731,7 +25577,7 @@ fi fi cairo_cv_gallium_use=$use_gallium - cairo_cv_gallium_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_gallium_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_gallium_cache_commands_len="544" cairo_cv_gallium_cache_version="6" cairo_cv_gallium_BASE=$gallium_BASE @@ -25740,6 +25586,7 @@ cairo_cv_gallium_CFLAGS=$gallium_CFLAGS cairo_cv_gallium_NONPKGCONFIG_CFLAGS=$gallium_NONPKGCONFIG_CFLAGS cairo_cv_gallium_LIBS=$gallium_LIBS cairo_cv_gallium_NONPKGCONFIG_LIBS=$gallium_NONPKGCONFIG_LIBS +cairo_cv_gallium_NONPKGCONFIG_EXTRA_LIBS=$gallium_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Gallium3D surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Gallium3D surface backend feature could be enabled... " >&6; } @@ -25750,11 +25597,11 @@ $as_echo "$cairo_cv_gallium_use" >&6; } use_gallium=$cairo_cv_gallium_use if test "x$enable_gallium" = "xyes" -a "x$use_gallium" != xyes; then : - as_fn_error " Gallium3D surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Gallium3D surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-gallium: \`$use_gallium', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-gallium: \`$use_gallium', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_gallium" = "xyes"; then : @@ -25764,6 +25611,7 @@ gallium_CFLAGS=$cairo_cv_gallium_CFLAGS gallium_NONPKGCONFIG_CFLAGS=$cairo_cv_gallium_NONPKGCONFIG_CFLAGS gallium_LIBS=$cairo_cv_gallium_LIBS gallium_NONPKGCONFIG_LIBS=$cairo_cv_gallium_NONPKGCONFIG_LIBS +gallium_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_gallium_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$gallium_REQUIRES"" ${CAIRO_REQUIRES}" @@ -25783,6 +25631,7 @@ gallium_CFLAGS=$cairo_cv_gallium_CFLAGS gallium_NONPKGCONFIG_CFLAGS=$cairo_cv_gallium_NONPKGCONFIG_CFLAGS gallium_LIBS=$cairo_cv_gallium_LIBS gallium_NONPKGCONFIG_LIBS=$cairo_cv_gallium_NONPKGCONFIG_LIBS +gallium_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_gallium_NONPKGCONFIG_EXTRA_LIBS fi @@ -25973,7 +25822,7 @@ fi yes|auto) : if test "x$cairo_cv_xcb_drm_cache_version" != "x6" -o \ "x$cairo_cv_xcb_drm_cache_commands_len" != "x331" -o \ - "x$cairo_cv_xcb_drm_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_xcb_drm_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_xcb_drm_use fi if test "x$enable_xcb_drm" = xyes -a "x$cairo_cv_xcb_drm_use" != xyes; then : @@ -25993,6 +25842,7 @@ xcb_drm_CFLAGS="$ac_env_xcb_drm_CFLAGS_value" xcb_drm_NONPKGCONFIG_CFLAGS="$ac_env_xcb_drm_NONPKGCONFIG_CFLAGS_value" xcb_drm_LIBS="$ac_env_xcb_drm_LIBS_value" xcb_drm_NONPKGCONFIG_LIBS="$ac_env_xcb_drm_NONPKGCONFIG_LIBS_value" +xcb_drm_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xcb_drm_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$use_xcb" == "xyes" -a "x$use_drm" == "xyes"; then @@ -26073,7 +25923,7 @@ fi fi cairo_cv_xcb_drm_use=$use_xcb_drm - cairo_cv_xcb_drm_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_xcb_drm_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_xcb_drm_cache_commands_len="331" cairo_cv_xcb_drm_cache_version="6" cairo_cv_xcb_drm_BASE=$xcb_drm_BASE @@ -26082,6 +25932,7 @@ cairo_cv_xcb_drm_CFLAGS=$xcb_drm_CFLAGS cairo_cv_xcb_drm_NONPKGCONFIG_CFLAGS=$xcb_drm_NONPKGCONFIG_CFLAGS cairo_cv_xcb_drm_LIBS=$xcb_drm_LIBS cairo_cv_xcb_drm_NONPKGCONFIG_LIBS=$xcb_drm_NONPKGCONFIG_LIBS +cairo_cv_xcb_drm_NONPKGCONFIG_EXTRA_LIBS=$xcb_drm_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's XCB/DRM functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's XCB/DRM functions feature could be enabled... " >&6; } @@ -26092,11 +25943,11 @@ $as_echo "$cairo_cv_xcb_drm_use" >&6; } use_xcb_drm=$cairo_cv_xcb_drm_use if test "x$enable_xcb_drm" = "xyes" -a "x$use_xcb_drm" != xyes; then : - as_fn_error " XCB/DRM functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? " XCB/DRM functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-xcb-drm: \`$use_xcb_drm', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-xcb-drm: \`$use_xcb_drm', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_xcb_drm" = "xyes"; then : @@ -26106,6 +25957,7 @@ xcb_drm_CFLAGS=$cairo_cv_xcb_drm_CFLAGS xcb_drm_NONPKGCONFIG_CFLAGS=$cairo_cv_xcb_drm_NONPKGCONFIG_CFLAGS xcb_drm_LIBS=$cairo_cv_xcb_drm_LIBS xcb_drm_NONPKGCONFIG_LIBS=$cairo_cv_xcb_drm_NONPKGCONFIG_LIBS +xcb_drm_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xcb_drm_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$xcb_drm_REQUIRES"" ${CAIRO_REQUIRES}" @@ -26125,6 +25977,7 @@ xcb_drm_CFLAGS=$cairo_cv_xcb_drm_CFLAGS xcb_drm_NONPKGCONFIG_CFLAGS=$cairo_cv_xcb_drm_NONPKGCONFIG_CFLAGS xcb_drm_LIBS=$cairo_cv_xcb_drm_LIBS xcb_drm_NONPKGCONFIG_LIBS=$cairo_cv_xcb_drm_NONPKGCONFIG_LIBS +xcb_drm_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xcb_drm_NONPKGCONFIG_EXTRA_LIBS fi @@ -26315,8 +26168,8 @@ fi ;; #( yes|auto) : if test "x$cairo_cv_png_cache_version" != "x6" -o \ - "x$cairo_cv_png_cache_commands_len" != "x568" -o \ - "x$cairo_cv_png_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_png_cache_commands_len" != "x577" -o \ + "x$cairo_cv_png_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_png_use fi if test "x$enable_png" = xyes -a "x$cairo_cv_png_use" != xyes; then : @@ -26336,13 +26189,14 @@ png_CFLAGS="$ac_env_png_CFLAGS_value" png_NONPKGCONFIG_CFLAGS="$ac_env_png_NONPKGCONFIG_CFLAGS_value" png_LIBS="$ac_env_png_LIBS_value" png_NONPKGCONFIG_LIBS="$ac_env_png_NONPKGCONFIG_LIBS_value" +png_NONPKGCONFIG_EXTRA_LIBS="$ac_env_png_NONPKGCONFIG_EXTRA_LIBS_value" use_png=no if test "x$png_REQUIRES" = x; then # libpng13 is GnuWin32's libpng-1.2.8 :-( - for l in libpng12 libpng13 libpng10 libpng; do + for l in libpng libpng14 libpng12 libpng13 libpng10; do if $PKG_CONFIG --exists $l ; then png_REQUIRES=$l use_png=yes @@ -26429,8 +26283,8 @@ $as_echo "$as_me: WARNING: Could not find libpng in the pkg-config search path" fi cairo_cv_png_use=$use_png - cairo_cv_png_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" - cairo_cv_png_cache_commands_len="568" + cairo_cv_png_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" + cairo_cv_png_cache_commands_len="577" cairo_cv_png_cache_version="6" cairo_cv_png_BASE=$png_BASE cairo_cv_png_REQUIRES=$png_REQUIRES @@ -26438,6 +26292,7 @@ cairo_cv_png_CFLAGS=$png_CFLAGS cairo_cv_png_NONPKGCONFIG_CFLAGS=$png_NONPKGCONFIG_CFLAGS cairo_cv_png_LIBS=$png_LIBS cairo_cv_png_NONPKGCONFIG_LIBS=$png_NONPKGCONFIG_LIBS +cairo_cv_png_NONPKGCONFIG_EXTRA_LIBS=$png_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PNG functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's PNG functions feature could be enabled... " >&6; } @@ -26448,11 +26303,11 @@ $as_echo "$cairo_cv_png_use" >&6; } use_png=$cairo_cv_png_use if test "x$enable_png" = "xyes" -a "x$use_png" != xyes; then : - as_fn_error "recommended PNG functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? "recommended PNG functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-png: \`$use_png', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-png: \`$use_png', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_png" = "xyes"; then : @@ -26462,6 +26317,7 @@ png_CFLAGS=$cairo_cv_png_CFLAGS png_NONPKGCONFIG_CFLAGS=$cairo_cv_png_NONPKGCONFIG_CFLAGS png_LIBS=$cairo_cv_png_LIBS png_NONPKGCONFIG_LIBS=$cairo_cv_png_NONPKGCONFIG_LIBS +png_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_png_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$png_REQUIRES"" ${CAIRO_REQUIRES}" @@ -26481,6 +26337,7 @@ png_CFLAGS=$cairo_cv_png_CFLAGS png_NONPKGCONFIG_CFLAGS=$cairo_cv_png_NONPKGCONFIG_CFLAGS png_LIBS=$cairo_cv_png_LIBS png_NONPKGCONFIG_LIBS=$cairo_cv_png_NONPKGCONFIG_LIBS +png_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_png_NONPKGCONFIG_EXTRA_LIBS fi @@ -26679,7 +26536,7 @@ fi yes|auto) : if test "x$cairo_cv_gl_cache_version" != "x6" -o \ "x$cairo_cv_gl_cache_commands_len" != "x954" -o \ - "x$cairo_cv_gl_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_gl_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_gl_use fi if test "x$enable_gl" = xyes -a "x$cairo_cv_gl_use" != xyes; then : @@ -26699,6 +26556,7 @@ gl_CFLAGS="$ac_env_gl_CFLAGS_value" gl_NONPKGCONFIG_CFLAGS="$ac_env_gl_NONPKGCONFIG_CFLAGS_value" gl_LIBS="$ac_env_gl_LIBS_value" gl_NONPKGCONFIG_LIBS="$ac_env_gl_NONPKGCONFIG_LIBS_value" +gl_NONPKGCONFIG_EXTRA_LIBS="$ac_env_gl_NONPKGCONFIG_EXTRA_LIBS_value" gl_REQUIRES="gl" @@ -26904,7 +26762,7 @@ fi need_egl_functions=yes cairo_cv_gl_use=$use_gl - cairo_cv_gl_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_gl_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_gl_cache_commands_len="954" cairo_cv_gl_cache_version="6" cairo_cv_gl_BASE=$gl_BASE @@ -26913,6 +26771,7 @@ cairo_cv_gl_CFLAGS=$gl_CFLAGS cairo_cv_gl_NONPKGCONFIG_CFLAGS=$gl_NONPKGCONFIG_CFLAGS cairo_cv_gl_LIBS=$gl_LIBS cairo_cv_gl_NONPKGCONFIG_LIBS=$gl_NONPKGCONFIG_LIBS +cairo_cv_gl_NONPKGCONFIG_EXTRA_LIBS=$gl_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's OpenGL surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's OpenGL surface backend feature could be enabled... " >&6; } @@ -26923,11 +26782,11 @@ $as_echo "$cairo_cv_gl_use" >&6; } use_gl=$cairo_cv_gl_use if test "x$enable_gl" = "xyes" -a "x$use_gl" != xyes; then : - as_fn_error " OpenGL surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " OpenGL surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-gl: \`$use_gl', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-gl: \`$use_gl', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_gl" = "xyes"; then : @@ -26937,6 +26796,7 @@ gl_CFLAGS=$cairo_cv_gl_CFLAGS gl_NONPKGCONFIG_CFLAGS=$cairo_cv_gl_NONPKGCONFIG_CFLAGS gl_LIBS=$cairo_cv_gl_LIBS gl_NONPKGCONFIG_LIBS=$cairo_cv_gl_NONPKGCONFIG_LIBS +gl_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_gl_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$gl_REQUIRES"" ${CAIRO_REQUIRES}" @@ -26956,6 +26816,7 @@ gl_CFLAGS=$cairo_cv_gl_CFLAGS gl_NONPKGCONFIG_CFLAGS=$cairo_cv_gl_NONPKGCONFIG_CFLAGS gl_LIBS=$cairo_cv_gl_LIBS gl_NONPKGCONFIG_LIBS=$cairo_cv_gl_NONPKGCONFIG_LIBS +gl_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_gl_NONPKGCONFIG_EXTRA_LIBS fi @@ -27155,7 +27016,7 @@ fi yes|auto) : if test "x$cairo_cv_directfb_cache_version" != "x6" -o \ "x$cairo_cv_directfb_cache_commands_len" != "x181" -o \ - "x$cairo_cv_directfb_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_directfb_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_directfb_use fi if test "x$enable_directfb" = xyes -a "x$cairo_cv_directfb_use" != xyes; then : @@ -27175,6 +27036,7 @@ directfb_CFLAGS="$ac_env_directfb_CFLAGS_value" directfb_NONPKGCONFIG_CFLAGS="$ac_env_directfb_NONPKGCONFIG_CFLAGS_value" directfb_LIBS="$ac_env_directfb_LIBS_value" directfb_NONPKGCONFIG_LIBS="$ac_env_directfb_NONPKGCONFIG_LIBS_value" +directfb_NONPKGCONFIG_EXTRA_LIBS="$ac_env_directfb_NONPKGCONFIG_EXTRA_LIBS_value" directfb_REQUIRES=directfb @@ -27251,7 +27113,7 @@ $as_echo "yes" >&6; } fi cairo_cv_directfb_use=$use_directfb - cairo_cv_directfb_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_directfb_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_directfb_cache_commands_len="181" cairo_cv_directfb_cache_version="6" cairo_cv_directfb_BASE=$directfb_BASE @@ -27260,6 +27122,7 @@ cairo_cv_directfb_CFLAGS=$directfb_CFLAGS cairo_cv_directfb_NONPKGCONFIG_CFLAGS=$directfb_NONPKGCONFIG_CFLAGS cairo_cv_directfb_LIBS=$directfb_LIBS cairo_cv_directfb_NONPKGCONFIG_LIBS=$directfb_NONPKGCONFIG_LIBS +cairo_cv_directfb_NONPKGCONFIG_EXTRA_LIBS=$directfb_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's directfb surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's directfb surface backend feature could be enabled... " >&6; } @@ -27270,11 +27133,11 @@ $as_echo "$cairo_cv_directfb_use" >&6; } use_directfb=$cairo_cv_directfb_use if test "x$enable_directfb" = "xyes" -a "x$use_directfb" != xyes; then : - as_fn_error " directfb surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " directfb surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-directfb: \`$use_directfb', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-directfb: \`$use_directfb', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_directfb" = "xyes"; then : @@ -27284,6 +27147,7 @@ directfb_CFLAGS=$cairo_cv_directfb_CFLAGS directfb_NONPKGCONFIG_CFLAGS=$cairo_cv_directfb_NONPKGCONFIG_CFLAGS directfb_LIBS=$cairo_cv_directfb_LIBS directfb_NONPKGCONFIG_LIBS=$cairo_cv_directfb_NONPKGCONFIG_LIBS +directfb_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_directfb_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$directfb_REQUIRES"" ${CAIRO_REQUIRES}" @@ -27303,6 +27167,7 @@ directfb_CFLAGS=$cairo_cv_directfb_CFLAGS directfb_NONPKGCONFIG_CFLAGS=$cairo_cv_directfb_NONPKGCONFIG_CFLAGS directfb_LIBS=$cairo_cv_directfb_LIBS directfb_NONPKGCONFIG_LIBS=$cairo_cv_directfb_NONPKGCONFIG_LIBS +directfb_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_directfb_NONPKGCONFIG_EXTRA_LIBS fi @@ -27494,7 +27359,7 @@ fi yes|auto) : if test "x$cairo_cv_vg_cache_version" != "x6" -o \ "x$cairo_cv_vg_cache_commands_len" != "x305" -o \ - "x$cairo_cv_vg_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_vg_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_vg_use fi if test "x$enable_vg" = xyes -a "x$cairo_cv_vg_use" != xyes; then : @@ -27514,6 +27379,7 @@ vg_CFLAGS="$ac_env_vg_CFLAGS_value" vg_NONPKGCONFIG_CFLAGS="$ac_env_vg_NONPKGCONFIG_CFLAGS_value" vg_LIBS="$ac_env_vg_LIBS_value" vg_NONPKGCONFIG_LIBS="$ac_env_vg_NONPKGCONFIG_LIBS_value" +vg_NONPKGCONFIG_EXTRA_LIBS="$ac_env_vg_NONPKGCONFIG_EXTRA_LIBS_value" ac_fn_c_check_header_mongrel "$LINENO" "VG/openvg.h" "ac_cv_header_VG_openvg_h" "$ac_includes_default" @@ -27532,7 +27398,7 @@ fi fi cairo_cv_vg_use=$use_vg - cairo_cv_vg_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_vg_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_vg_cache_commands_len="305" cairo_cv_vg_cache_version="6" cairo_cv_vg_BASE=$vg_BASE @@ -27541,6 +27407,7 @@ cairo_cv_vg_CFLAGS=$vg_CFLAGS cairo_cv_vg_NONPKGCONFIG_CFLAGS=$vg_NONPKGCONFIG_CFLAGS cairo_cv_vg_LIBS=$vg_LIBS cairo_cv_vg_NONPKGCONFIG_LIBS=$vg_NONPKGCONFIG_LIBS +cairo_cv_vg_NONPKGCONFIG_EXTRA_LIBS=$vg_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's OpenVG surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's OpenVG surface backend feature could be enabled... " >&6; } @@ -27551,11 +27418,11 @@ $as_echo "$cairo_cv_vg_use" >&6; } use_vg=$cairo_cv_vg_use if test "x$enable_vg" = "xyes" -a "x$use_vg" != xyes; then : - as_fn_error " OpenVG surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " OpenVG surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-vg: \`$use_vg', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-vg: \`$use_vg', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_vg" = "xyes"; then : @@ -27565,6 +27432,7 @@ vg_CFLAGS=$cairo_cv_vg_CFLAGS vg_NONPKGCONFIG_CFLAGS=$cairo_cv_vg_NONPKGCONFIG_CFLAGS vg_LIBS=$cairo_cv_vg_LIBS vg_NONPKGCONFIG_LIBS=$cairo_cv_vg_NONPKGCONFIG_LIBS +vg_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_vg_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$vg_REQUIRES"" ${CAIRO_REQUIRES}" @@ -27584,6 +27452,7 @@ vg_CFLAGS=$cairo_cv_vg_CFLAGS vg_NONPKGCONFIG_CFLAGS=$cairo_cv_vg_NONPKGCONFIG_CFLAGS vg_LIBS=$cairo_cv_vg_LIBS vg_NONPKGCONFIG_LIBS=$cairo_cv_vg_NONPKGCONFIG_LIBS +vg_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_vg_NONPKGCONFIG_EXTRA_LIBS fi @@ -27774,7 +27643,7 @@ fi yes|auto) : if test "x$cairo_cv_egl_cache_version" != "x6" -o \ "x$cairo_cv_egl_cache_commands_len" != "x990" -o \ - "x$cairo_cv_egl_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_egl_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_egl_use fi if test "x$enable_egl" = xyes -a "x$cairo_cv_egl_use" != xyes; then : @@ -27794,6 +27663,7 @@ egl_CFLAGS="$ac_env_egl_CFLAGS_value" egl_NONPKGCONFIG_CFLAGS="$ac_env_egl_NONPKGCONFIG_CFLAGS_value" egl_LIBS="$ac_env_egl_LIBS_value" egl_NONPKGCONFIG_LIBS="$ac_env_egl_NONPKGCONFIG_LIBS_value" +egl_NONPKGCONFIG_EXTRA_LIBS="$ac_env_egl_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$need_egl_functions" = "xyes"; then @@ -27916,7 +27786,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$egl_lib''_eglGetError" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglGetError in -l$egl_lib" >&5 $as_echo_n "checking for eglGetError in -l$egl_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27951,8 +27821,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : egl_NONPKGCONFIG_LIBS="-l$egl_lib" fi @@ -28028,7 +27897,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$egl_lib''_eglGetError" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglGetError in -l$egl_lib" >&5 $as_echo_n "checking for eglGetError in -l$egl_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28063,8 +27932,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : egl_NONPKGCONFIG_LIBS="-l$egl_lib" fi @@ -28090,7 +27958,7 @@ fi fi cairo_cv_egl_use=$use_egl - cairo_cv_egl_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_egl_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_egl_cache_commands_len="990" cairo_cv_egl_cache_version="6" cairo_cv_egl_BASE=$egl_BASE @@ -28099,6 +27967,7 @@ cairo_cv_egl_CFLAGS=$egl_CFLAGS cairo_cv_egl_NONPKGCONFIG_CFLAGS=$egl_NONPKGCONFIG_CFLAGS cairo_cv_egl_LIBS=$egl_LIBS cairo_cv_egl_NONPKGCONFIG_LIBS=$egl_NONPKGCONFIG_LIBS +cairo_cv_egl_NONPKGCONFIG_EXTRA_LIBS=$egl_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's EGL functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's EGL functions feature could be enabled... " >&6; } @@ -28109,11 +27978,11 @@ $as_echo "$cairo_cv_egl_use" >&6; } use_egl=$cairo_cv_egl_use if test "x$enable_egl" = "xyes" -a "x$use_egl" != xyes; then : - as_fn_error " EGL functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? " EGL functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-egl: \`$use_egl', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-egl: \`$use_egl', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_egl" = "xyes"; then : @@ -28123,6 +27992,7 @@ egl_CFLAGS=$cairo_cv_egl_CFLAGS egl_NONPKGCONFIG_CFLAGS=$cairo_cv_egl_NONPKGCONFIG_CFLAGS egl_LIBS=$cairo_cv_egl_LIBS egl_NONPKGCONFIG_LIBS=$cairo_cv_egl_NONPKGCONFIG_LIBS +egl_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_egl_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$egl_REQUIRES"" ${CAIRO_REQUIRES}" @@ -28142,6 +28012,7 @@ egl_CFLAGS=$cairo_cv_egl_CFLAGS egl_NONPKGCONFIG_CFLAGS=$cairo_cv_egl_NONPKGCONFIG_CFLAGS egl_LIBS=$cairo_cv_egl_LIBS egl_NONPKGCONFIG_LIBS=$cairo_cv_egl_NONPKGCONFIG_LIBS +egl_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_egl_NONPKGCONFIG_EXTRA_LIBS fi @@ -28330,7 +28201,7 @@ fi yes|auto) : if test "x$cairo_cv_glx_cache_version" != "x6" -o \ "x$cairo_cv_glx_cache_commands_len" != "x351" -o \ - "x$cairo_cv_glx_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_glx_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_glx_use fi if test "x$enable_glx" = xyes -a "x$cairo_cv_glx_use" != xyes; then : @@ -28350,6 +28221,7 @@ glx_CFLAGS="$ac_env_glx_CFLAGS_value" glx_NONPKGCONFIG_CFLAGS="$ac_env_glx_NONPKGCONFIG_CFLAGS_value" glx_LIBS="$ac_env_glx_LIBS_value" glx_NONPKGCONFIG_LIBS="$ac_env_glx_NONPKGCONFIG_LIBS_value" +glx_NONPKGCONFIG_EXTRA_LIBS="$ac_env_glx_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$need_glx_functions" = "xyes"; then @@ -28371,7 +28243,7 @@ fi fi cairo_cv_glx_use=$use_glx - cairo_cv_glx_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_glx_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_glx_cache_commands_len="351" cairo_cv_glx_cache_version="6" cairo_cv_glx_BASE=$glx_BASE @@ -28380,6 +28252,7 @@ cairo_cv_glx_CFLAGS=$glx_CFLAGS cairo_cv_glx_NONPKGCONFIG_CFLAGS=$glx_NONPKGCONFIG_CFLAGS cairo_cv_glx_LIBS=$glx_LIBS cairo_cv_glx_NONPKGCONFIG_LIBS=$glx_NONPKGCONFIG_LIBS +cairo_cv_glx_NONPKGCONFIG_EXTRA_LIBS=$glx_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's GLX functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's GLX functions feature could be enabled... " >&6; } @@ -28390,11 +28263,11 @@ $as_echo "$cairo_cv_glx_use" >&6; } use_glx=$cairo_cv_glx_use if test "x$enable_glx" = "xyes" -a "x$use_glx" != xyes; then : - as_fn_error " GLX functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? " GLX functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-glx: \`$use_glx', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-glx: \`$use_glx', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_glx" = "xyes"; then : @@ -28404,6 +28277,7 @@ glx_CFLAGS=$cairo_cv_glx_CFLAGS glx_NONPKGCONFIG_CFLAGS=$cairo_cv_glx_NONPKGCONFIG_CFLAGS glx_LIBS=$cairo_cv_glx_LIBS glx_NONPKGCONFIG_LIBS=$cairo_cv_glx_NONPKGCONFIG_LIBS +glx_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_glx_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$glx_REQUIRES"" ${CAIRO_REQUIRES}" @@ -28423,6 +28297,7 @@ glx_CFLAGS=$cairo_cv_glx_CFLAGS glx_NONPKGCONFIG_CFLAGS=$cairo_cv_glx_NONPKGCONFIG_CFLAGS glx_LIBS=$cairo_cv_glx_LIBS glx_NONPKGCONFIG_LIBS=$cairo_cv_glx_NONPKGCONFIG_LIBS +glx_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_glx_NONPKGCONFIG_EXTRA_LIBS fi @@ -28611,7 +28486,7 @@ fi yes|auto) : if test "x$cairo_cv_wgl_cache_version" != "x6" -o \ "x$cairo_cv_wgl_cache_commands_len" != "x182" -o \ - "x$cairo_cv_wgl_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_wgl_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_wgl_use fi if test "x$enable_wgl" = xyes -a "x$cairo_cv_wgl_use" != xyes; then : @@ -28631,6 +28506,7 @@ wgl_CFLAGS="$ac_env_wgl_CFLAGS_value" wgl_NONPKGCONFIG_CFLAGS="$ac_env_wgl_NONPKGCONFIG_CFLAGS_value" wgl_LIBS="$ac_env_wgl_LIBS_value" wgl_NONPKGCONFIG_LIBS="$ac_env_wgl_NONPKGCONFIG_LIBS_value" +wgl_NONPKGCONFIG_EXTRA_LIBS="$ac_env_wgl_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$need_wgl_functions" = "xyes"; then @@ -28647,7 +28523,7 @@ fi fi cairo_cv_wgl_use=$use_wgl - cairo_cv_wgl_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_wgl_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_wgl_cache_commands_len="182" cairo_cv_wgl_cache_version="6" cairo_cv_wgl_BASE=$wgl_BASE @@ -28656,6 +28532,7 @@ cairo_cv_wgl_CFLAGS=$wgl_CFLAGS cairo_cv_wgl_NONPKGCONFIG_CFLAGS=$wgl_NONPKGCONFIG_CFLAGS cairo_cv_wgl_LIBS=$wgl_LIBS cairo_cv_wgl_NONPKGCONFIG_LIBS=$wgl_NONPKGCONFIG_LIBS +cairo_cv_wgl_NONPKGCONFIG_EXTRA_LIBS=$wgl_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's WGL functions feature could be enabled" >&5 $as_echo_n "checking whether cairo's WGL functions feature could be enabled... " >&6; } @@ -28666,11 +28543,11 @@ $as_echo "$cairo_cv_wgl_use" >&6; } use_wgl=$cairo_cv_wgl_use if test "x$enable_wgl" = "xyes" -a "x$use_wgl" != xyes; then : - as_fn_error " WGL functions feature could not be enabled" "$LINENO" 5 + as_fn_error $? " WGL functions feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-wgl: \`$use_wgl', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-wgl: \`$use_wgl', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_wgl" = "xyes"; then : @@ -28680,6 +28557,7 @@ wgl_CFLAGS=$cairo_cv_wgl_CFLAGS wgl_NONPKGCONFIG_CFLAGS=$cairo_cv_wgl_NONPKGCONFIG_CFLAGS wgl_LIBS=$cairo_cv_wgl_LIBS wgl_NONPKGCONFIG_LIBS=$cairo_cv_wgl_NONPKGCONFIG_LIBS +wgl_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_wgl_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$wgl_REQUIRES"" ${CAIRO_REQUIRES}" @@ -28699,6 +28577,7 @@ wgl_CFLAGS=$cairo_cv_wgl_CFLAGS wgl_NONPKGCONFIG_CFLAGS=$cairo_cv_wgl_NONPKGCONFIG_CFLAGS wgl_LIBS=$cairo_cv_wgl_LIBS wgl_NONPKGCONFIG_LIBS=$cairo_cv_wgl_NONPKGCONFIG_LIBS +wgl_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_wgl_NONPKGCONFIG_EXTRA_LIBS fi @@ -28889,7 +28768,7 @@ fi yes|auto) : if test "x$cairo_cv_script_cache_version" != "x6" -o \ "x$cairo_cv_script_cache_commands_len" != "x18" -o \ - "x$cairo_cv_script_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_script_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_script_use fi if test "x$enable_script" = xyes -a "x$cairo_cv_script_use" != xyes; then : @@ -28909,12 +28788,13 @@ script_CFLAGS="$ac_env_script_CFLAGS_value" script_NONPKGCONFIG_CFLAGS="$ac_env_script_NONPKGCONFIG_CFLAGS_value" script_LIBS="$ac_env_script_LIBS_value" script_NONPKGCONFIG_LIBS="$ac_env_script_NONPKGCONFIG_LIBS_value" +script_NONPKGCONFIG_EXTRA_LIBS="$ac_env_script_NONPKGCONFIG_EXTRA_LIBS_value" any2ppm_cs=yes cairo_cv_script_use=$use_script - cairo_cv_script_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_script_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_script_cache_commands_len="18" cairo_cv_script_cache_version="6" cairo_cv_script_BASE=$script_BASE @@ -28923,6 +28803,7 @@ cairo_cv_script_CFLAGS=$script_CFLAGS cairo_cv_script_NONPKGCONFIG_CFLAGS=$script_NONPKGCONFIG_CFLAGS cairo_cv_script_LIBS=$script_LIBS cairo_cv_script_NONPKGCONFIG_LIBS=$script_NONPKGCONFIG_LIBS +cairo_cv_script_NONPKGCONFIG_EXTRA_LIBS=$script_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's script surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's script surface backend feature could be enabled... " >&6; } @@ -28933,11 +28814,11 @@ $as_echo "$cairo_cv_script_use" >&6; } use_script=$cairo_cv_script_use if test "x$enable_script" = "xyes" -a "x$use_script" != xyes; then : - as_fn_error " script surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " script surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-script: \`$use_script', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-script: \`$use_script', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_script" = "xyes"; then : @@ -28947,6 +28828,7 @@ script_CFLAGS=$cairo_cv_script_CFLAGS script_NONPKGCONFIG_CFLAGS=$cairo_cv_script_NONPKGCONFIG_CFLAGS script_LIBS=$cairo_cv_script_LIBS script_NONPKGCONFIG_LIBS=$cairo_cv_script_NONPKGCONFIG_LIBS +script_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_script_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$script_REQUIRES"" ${CAIRO_REQUIRES}" @@ -28966,6 +28848,7 @@ script_CFLAGS=$cairo_cv_script_CFLAGS script_NONPKGCONFIG_CFLAGS=$cairo_cv_script_NONPKGCONFIG_CFLAGS script_LIBS=$cairo_cv_script_LIBS script_NONPKGCONFIG_LIBS=$cairo_cv_script_NONPKGCONFIG_LIBS +script_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_script_NONPKGCONFIG_EXTRA_LIBS fi @@ -29177,7 +29060,7 @@ fi yes|auto) : if test "x$cairo_cv_ft_cache_version" != "x6" -o \ "x$cairo_cv_ft_cache_commands_len" != "x1138" -o \ - "x$cairo_cv_ft_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_ft_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_ft_use fi if test "x$enable_ft" = xyes -a "x$cairo_cv_ft_use" != xyes; then : @@ -29197,6 +29080,7 @@ ft_CFLAGS="$ac_env_ft_CFLAGS_value" ft_NONPKGCONFIG_CFLAGS="$ac_env_ft_NONPKGCONFIG_CFLAGS_value" ft_LIBS="$ac_env_ft_LIBS_value" ft_NONPKGCONFIG_LIBS="$ac_env_ft_NONPKGCONFIG_LIBS_value" +ft_NONPKGCONFIG_EXTRA_LIBS="$ac_env_ft_NONPKGCONFIG_EXTRA_LIBS_value" @@ -29372,7 +29256,7 @@ $as_echo "$FREETYPE_VERSION - Too old" >&6; } ft_LIBS="$FREETYPE_LIBS" cairo_cv_ft_use=$use_ft - cairo_cv_ft_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_ft_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_ft_cache_commands_len="1138" cairo_cv_ft_cache_version="6" cairo_cv_ft_BASE=$ft_BASE @@ -29381,6 +29265,7 @@ cairo_cv_ft_CFLAGS=$ft_CFLAGS cairo_cv_ft_NONPKGCONFIG_CFLAGS=$ft_NONPKGCONFIG_CFLAGS cairo_cv_ft_LIBS=$ft_LIBS cairo_cv_ft_NONPKGCONFIG_LIBS=$ft_NONPKGCONFIG_LIBS +cairo_cv_ft_NONPKGCONFIG_EXTRA_LIBS=$ft_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's FreeType font backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's FreeType font backend feature could be enabled... " >&6; } @@ -29391,11 +29276,11 @@ $as_echo "$cairo_cv_ft_use" >&6; } use_ft=$cairo_cv_ft_use if test "x$enable_ft" = "xyes" -a "x$use_ft" != xyes; then : - as_fn_error " FreeType font backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " FreeType font backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-ft: \`$use_ft', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-ft: \`$use_ft', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_ft" = "xyes"; then : @@ -29405,6 +29290,7 @@ ft_CFLAGS=$cairo_cv_ft_CFLAGS ft_NONPKGCONFIG_CFLAGS=$cairo_cv_ft_NONPKGCONFIG_CFLAGS ft_LIBS=$cairo_cv_ft_LIBS ft_NONPKGCONFIG_LIBS=$cairo_cv_ft_NONPKGCONFIG_LIBS +ft_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_ft_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$ft_REQUIRES"" ${CAIRO_REQUIRES}" @@ -29424,6 +29310,7 @@ ft_CFLAGS=$cairo_cv_ft_CFLAGS ft_NONPKGCONFIG_CFLAGS=$cairo_cv_ft_NONPKGCONFIG_CFLAGS ft_LIBS=$cairo_cv_ft_LIBS ft_NONPKGCONFIG_LIBS=$cairo_cv_ft_NONPKGCONFIG_LIBS +ft_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_ft_NONPKGCONFIG_EXTRA_LIBS fi @@ -29619,7 +29506,7 @@ fi yes|auto) : if test "x$cairo_cv_fc_cache_version" != "x6" -o \ "x$cairo_cv_fc_cache_commands_len" != "x292" -o \ - "x$cairo_cv_fc_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_fc_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_fc_use fi if test "x$enable_fc" = xyes -a "x$cairo_cv_fc_use" != xyes; then : @@ -29639,6 +29526,7 @@ fc_CFLAGS="$ac_env_fc_CFLAGS_value" fc_NONPKGCONFIG_CFLAGS="$ac_env_fc_NONPKGCONFIG_CFLAGS_value" fc_LIBS="$ac_env_fc_LIBS_value" fc_NONPKGCONFIG_LIBS="$ac_env_fc_NONPKGCONFIG_LIBS_value" +fc_NONPKGCONFIG_EXTRA_LIBS="$ac_env_fc_NONPKGCONFIG_EXTRA_LIBS_value" use_fc=$use_ft @@ -29718,7 +29606,7 @@ fi fc_LIBS="$FONTCONFIG_LIBS" cairo_cv_fc_use=$use_fc - cairo_cv_fc_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_fc_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_fc_cache_commands_len="292" cairo_cv_fc_cache_version="6" cairo_cv_fc_BASE=$fc_BASE @@ -29727,6 +29615,7 @@ cairo_cv_fc_CFLAGS=$fc_CFLAGS cairo_cv_fc_NONPKGCONFIG_CFLAGS=$fc_NONPKGCONFIG_CFLAGS cairo_cv_fc_LIBS=$fc_LIBS cairo_cv_fc_NONPKGCONFIG_LIBS=$fc_NONPKGCONFIG_LIBS +cairo_cv_fc_NONPKGCONFIG_EXTRA_LIBS=$fc_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's Fontconfig font backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's Fontconfig font backend feature could be enabled... " >&6; } @@ -29737,11 +29626,11 @@ $as_echo "$cairo_cv_fc_use" >&6; } use_fc=$cairo_cv_fc_use if test "x$enable_fc" = "xyes" -a "x$use_fc" != xyes; then : - as_fn_error " Fontconfig font backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " Fontconfig font backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-fc: \`$use_fc', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-fc: \`$use_fc', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_fc" = "xyes"; then : @@ -29751,6 +29640,7 @@ fc_CFLAGS=$cairo_cv_fc_CFLAGS fc_NONPKGCONFIG_CFLAGS=$cairo_cv_fc_NONPKGCONFIG_CFLAGS fc_LIBS=$cairo_cv_fc_LIBS fc_NONPKGCONFIG_LIBS=$cairo_cv_fc_NONPKGCONFIG_LIBS +fc_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_fc_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$fc_REQUIRES"" ${CAIRO_REQUIRES}" @@ -29770,6 +29660,7 @@ fc_CFLAGS=$cairo_cv_fc_CFLAGS fc_NONPKGCONFIG_CFLAGS=$cairo_cv_fc_NONPKGCONFIG_CFLAGS fc_LIBS=$cairo_cv_fc_LIBS fc_NONPKGCONFIG_LIBS=$cairo_cv_fc_NONPKGCONFIG_LIBS +fc_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_fc_NONPKGCONFIG_EXTRA_LIBS fi @@ -29974,8 +29865,7 @@ _ACEOF do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -29997,8 +29887,7 @@ if test "x$use_fc" = "xyes"; then do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -30026,7 +29915,7 @@ fi yes|auto) : if test "x$cairo_cv_ps_cache_version" != "x6" -o \ "x$cairo_cv_ps_cache_commands_len" != "x88" -o \ - "x$cairo_cv_ps_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_ps_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_ps_use fi if test "x$enable_ps" = xyes -a "x$cairo_cv_ps_use" != xyes; then : @@ -30046,6 +29935,7 @@ ps_CFLAGS="$ac_env_ps_CFLAGS_value" ps_NONPKGCONFIG_CFLAGS="$ac_env_ps_NONPKGCONFIG_CFLAGS_value" ps_LIBS="$ac_env_ps_LIBS_value" ps_NONPKGCONFIG_LIBS="$ac_env_ps_NONPKGCONFIG_LIBS_value" +ps_NONPKGCONFIG_EXTRA_LIBS="$ac_env_ps_NONPKGCONFIG_EXTRA_LIBS_value" # The ps backend requires zlib. @@ -30053,7 +29943,7 @@ ps_NONPKGCONFIG_LIBS="$ac_env_ps_NONPKGCONFIG_LIBS_value" ps_NONPKGCONFIG_LIBS=-lz cairo_cv_ps_use=$use_ps - cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_ps_cache_commands_len="88" cairo_cv_ps_cache_version="6" cairo_cv_ps_BASE=$ps_BASE @@ -30062,6 +29952,7 @@ cairo_cv_ps_CFLAGS=$ps_CFLAGS cairo_cv_ps_NONPKGCONFIG_CFLAGS=$ps_NONPKGCONFIG_CFLAGS cairo_cv_ps_LIBS=$ps_LIBS cairo_cv_ps_NONPKGCONFIG_LIBS=$ps_NONPKGCONFIG_LIBS +cairo_cv_ps_NONPKGCONFIG_EXTRA_LIBS=$ps_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PostScript surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's PostScript surface backend feature could be enabled... " >&6; } @@ -30072,11 +29963,11 @@ $as_echo "$cairo_cv_ps_use" >&6; } use_ps=$cairo_cv_ps_use if test "x$enable_ps" = "xyes" -a "x$use_ps" != xyes; then : - as_fn_error "recommended PostScript surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? "recommended PostScript surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-ps: \`$use_ps', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-ps: \`$use_ps', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_ps" = "xyes"; then : @@ -30086,6 +29977,7 @@ ps_CFLAGS=$cairo_cv_ps_CFLAGS ps_NONPKGCONFIG_CFLAGS=$cairo_cv_ps_NONPKGCONFIG_CFLAGS ps_LIBS=$cairo_cv_ps_LIBS ps_NONPKGCONFIG_LIBS=$cairo_cv_ps_NONPKGCONFIG_LIBS +ps_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_ps_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$ps_REQUIRES"" ${CAIRO_REQUIRES}" @@ -30105,6 +29997,7 @@ ps_CFLAGS=$cairo_cv_ps_CFLAGS ps_NONPKGCONFIG_CFLAGS=$cairo_cv_ps_NONPKGCONFIG_CFLAGS ps_LIBS=$cairo_cv_ps_LIBS ps_NONPKGCONFIG_LIBS=$cairo_cv_ps_NONPKGCONFIG_LIBS +ps_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_ps_NONPKGCONFIG_EXTRA_LIBS fi @@ -30450,7 +30343,7 @@ fi yes|auto) : if test "x$cairo_cv_pdf_cache_version" != "x6" -o \ "x$cairo_cv_pdf_cache_commands_len" != "x91" -o \ - "x$cairo_cv_pdf_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_pdf_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_pdf_use fi if test "x$enable_pdf" = xyes -a "x$cairo_cv_pdf_use" != xyes; then : @@ -30470,6 +30363,7 @@ pdf_CFLAGS="$ac_env_pdf_CFLAGS_value" pdf_NONPKGCONFIG_CFLAGS="$ac_env_pdf_NONPKGCONFIG_CFLAGS_value" pdf_LIBS="$ac_env_pdf_LIBS_value" pdf_NONPKGCONFIG_LIBS="$ac_env_pdf_NONPKGCONFIG_LIBS_value" +pdf_NONPKGCONFIG_EXTRA_LIBS="$ac_env_pdf_NONPKGCONFIG_EXTRA_LIBS_value" # The pdf backend requires zlib. @@ -30477,7 +30371,7 @@ pdf_NONPKGCONFIG_LIBS="$ac_env_pdf_NONPKGCONFIG_LIBS_value" pdf_NONPKGCONFIG_LIBS=-lz cairo_cv_pdf_use=$use_pdf - cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_pdf_cache_commands_len="91" cairo_cv_pdf_cache_version="6" cairo_cv_pdf_BASE=$pdf_BASE @@ -30486,6 +30380,7 @@ cairo_cv_pdf_CFLAGS=$pdf_CFLAGS cairo_cv_pdf_NONPKGCONFIG_CFLAGS=$pdf_NONPKGCONFIG_CFLAGS cairo_cv_pdf_LIBS=$pdf_LIBS cairo_cv_pdf_NONPKGCONFIG_LIBS=$pdf_NONPKGCONFIG_LIBS +cairo_cv_pdf_NONPKGCONFIG_EXTRA_LIBS=$pdf_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PDF surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's PDF surface backend feature could be enabled... " >&6; } @@ -30496,11 +30391,11 @@ $as_echo "$cairo_cv_pdf_use" >&6; } use_pdf=$cairo_cv_pdf_use if test "x$enable_pdf" = "xyes" -a "x$use_pdf" != xyes; then : - as_fn_error "recommended PDF surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? "recommended PDF surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-pdf: \`$use_pdf', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-pdf: \`$use_pdf', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_pdf" = "xyes"; then : @@ -30510,6 +30405,7 @@ pdf_CFLAGS=$cairo_cv_pdf_CFLAGS pdf_NONPKGCONFIG_CFLAGS=$cairo_cv_pdf_NONPKGCONFIG_CFLAGS pdf_LIBS=$cairo_cv_pdf_LIBS pdf_NONPKGCONFIG_LIBS=$cairo_cv_pdf_NONPKGCONFIG_LIBS +pdf_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_pdf_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$pdf_REQUIRES"" ${CAIRO_REQUIRES}" @@ -30529,6 +30425,7 @@ pdf_CFLAGS=$cairo_cv_pdf_CFLAGS pdf_NONPKGCONFIG_CFLAGS=$cairo_cv_pdf_NONPKGCONFIG_CFLAGS pdf_LIBS=$cairo_cv_pdf_LIBS pdf_NONPKGCONFIG_LIBS=$cairo_cv_pdf_NONPKGCONFIG_LIBS +pdf_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_pdf_NONPKGCONFIG_EXTRA_LIBS fi @@ -30851,7 +30748,7 @@ fi yes|auto) : if test "x$cairo_cv_svg_cache_version" != "x6" -o \ "x$cairo_cv_svg_cache_commands_len" != "x85" -o \ - "x$cairo_cv_svg_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_svg_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_svg_use fi if test "x$enable_svg" = xyes -a "x$cairo_cv_svg_use" != xyes; then : @@ -30871,6 +30768,7 @@ svg_CFLAGS="$ac_env_svg_CFLAGS_value" svg_NONPKGCONFIG_CFLAGS="$ac_env_svg_NONPKGCONFIG_CFLAGS_value" svg_LIBS="$ac_env_svg_LIBS_value" svg_NONPKGCONFIG_LIBS="$ac_env_svg_NONPKGCONFIG_LIBS_value" +svg_NONPKGCONFIG_EXTRA_LIBS="$ac_env_svg_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$use_png" != "xyes"; then @@ -30878,7 +30776,7 @@ svg_NONPKGCONFIG_LIBS="$ac_env_svg_NONPKGCONFIG_LIBS_value" fi cairo_cv_svg_use=$use_svg - cairo_cv_svg_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_svg_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_svg_cache_commands_len="85" cairo_cv_svg_cache_version="6" cairo_cv_svg_BASE=$svg_BASE @@ -30887,6 +30785,7 @@ cairo_cv_svg_CFLAGS=$svg_CFLAGS cairo_cv_svg_NONPKGCONFIG_CFLAGS=$svg_NONPKGCONFIG_CFLAGS cairo_cv_svg_LIBS=$svg_LIBS cairo_cv_svg_NONPKGCONFIG_LIBS=$svg_NONPKGCONFIG_LIBS +cairo_cv_svg_NONPKGCONFIG_EXTRA_LIBS=$svg_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's SVG surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's SVG surface backend feature could be enabled... " >&6; } @@ -30897,11 +30796,11 @@ $as_echo "$cairo_cv_svg_use" >&6; } use_svg=$cairo_cv_svg_use if test "x$enable_svg" = "xyes" -a "x$use_svg" != xyes; then : - as_fn_error "recommended SVG surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? "recommended SVG surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-svg: \`$use_svg', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-svg: \`$use_svg', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_svg" = "xyes"; then : @@ -30911,6 +30810,7 @@ svg_CFLAGS=$cairo_cv_svg_CFLAGS svg_NONPKGCONFIG_CFLAGS=$cairo_cv_svg_NONPKGCONFIG_CFLAGS svg_LIBS=$cairo_cv_svg_LIBS svg_NONPKGCONFIG_LIBS=$cairo_cv_svg_NONPKGCONFIG_LIBS +svg_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_svg_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$svg_REQUIRES"" ${CAIRO_REQUIRES}" @@ -30930,6 +30830,7 @@ svg_CFLAGS=$cairo_cv_svg_CFLAGS svg_NONPKGCONFIG_CFLAGS=$cairo_cv_svg_NONPKGCONFIG_CFLAGS svg_LIBS=$cairo_cv_svg_LIBS svg_NONPKGCONFIG_LIBS=$cairo_cv_svg_NONPKGCONFIG_LIBS +svg_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_svg_NONPKGCONFIG_EXTRA_LIBS fi @@ -31240,7 +31141,7 @@ fi yes|auto) : if test "x$cairo_cv_test_surfaces_cache_version" != "x6" -o \ "x$cairo_cv_test_surfaces_cache_commands_len" != "x0" -o \ - "x$cairo_cv_test_surfaces_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_test_surfaces_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_test_surfaces_use fi if test "x$enable_test_surfaces" = xyes -a "x$cairo_cv_test_surfaces_use" != xyes; then : @@ -31260,10 +31161,11 @@ test_surfaces_CFLAGS="$ac_env_test_surfaces_CFLAGS_value" test_surfaces_NONPKGCONFIG_CFLAGS="$ac_env_test_surfaces_NONPKGCONFIG_CFLAGS_value" test_surfaces_LIBS="$ac_env_test_surfaces_LIBS_value" test_surfaces_NONPKGCONFIG_LIBS="$ac_env_test_surfaces_NONPKGCONFIG_LIBS_value" +test_surfaces_NONPKGCONFIG_EXTRA_LIBS="$ac_env_test_surfaces_NONPKGCONFIG_EXTRA_LIBS_value" cairo_cv_test_surfaces_use=$use_test_surfaces - cairo_cv_test_surfaces_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_test_surfaces_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_test_surfaces_cache_commands_len="0" cairo_cv_test_surfaces_cache_version="6" cairo_cv_test_surfaces_BASE=$test_surfaces_BASE @@ -31272,6 +31174,7 @@ cairo_cv_test_surfaces_CFLAGS=$test_surfaces_CFLAGS cairo_cv_test_surfaces_NONPKGCONFIG_CFLAGS=$test_surfaces_NONPKGCONFIG_CFLAGS cairo_cv_test_surfaces_LIBS=$test_surfaces_LIBS cairo_cv_test_surfaces_NONPKGCONFIG_LIBS=$test_surfaces_NONPKGCONFIG_LIBS +cairo_cv_test_surfaces_NONPKGCONFIG_EXTRA_LIBS=$test_surfaces_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's test surfaces feature could be enabled" >&5 $as_echo_n "checking whether cairo's test surfaces feature could be enabled... " >&6; } @@ -31282,11 +31185,11 @@ $as_echo "$cairo_cv_test_surfaces_use" >&6; } use_test_surfaces=$cairo_cv_test_surfaces_use if test "x$enable_test_surfaces" = "xyes" -a "x$use_test_surfaces" != xyes; then : - as_fn_error " test surfaces feature could not be enabled" "$LINENO" 5 + as_fn_error $? " test surfaces feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-test-surfaces: \`$use_test_surfaces', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-test-surfaces: \`$use_test_surfaces', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_test_surfaces" = "xyes"; then : @@ -31296,6 +31199,7 @@ test_surfaces_CFLAGS=$cairo_cv_test_surfaces_CFLAGS test_surfaces_NONPKGCONFIG_CFLAGS=$cairo_cv_test_surfaces_NONPKGCONFIG_CFLAGS test_surfaces_LIBS=$cairo_cv_test_surfaces_LIBS test_surfaces_NONPKGCONFIG_LIBS=$cairo_cv_test_surfaces_NONPKGCONFIG_LIBS +test_surfaces_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_test_surfaces_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$test_surfaces_REQUIRES"" ${CAIRO_REQUIRES}" @@ -31315,6 +31219,7 @@ test_surfaces_CFLAGS=$cairo_cv_test_surfaces_CFLAGS test_surfaces_NONPKGCONFIG_CFLAGS=$cairo_cv_test_surfaces_NONPKGCONFIG_CFLAGS test_surfaces_LIBS=$cairo_cv_test_surfaces_LIBS test_surfaces_NONPKGCONFIG_LIBS=$cairo_cv_test_surfaces_NONPKGCONFIG_LIBS +test_surfaces_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_test_surfaces_NONPKGCONFIG_EXTRA_LIBS fi @@ -31442,7 +31347,7 @@ fi yes|auto) : if test "x$cairo_cv_image_cache_version" != "x6" -o \ "x$cairo_cv_image_cache_commands_len" != "x279" -o \ - "x$cairo_cv_image_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_image_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_image_use fi if test "x$enable_image" = xyes -a "x$cairo_cv_image_use" != xyes; then : @@ -31462,9 +31367,10 @@ image_CFLAGS="$ac_env_image_CFLAGS_value" image_NONPKGCONFIG_CFLAGS="$ac_env_image_NONPKGCONFIG_CFLAGS_value" image_LIBS="$ac_env_image_LIBS_value" image_NONPKGCONFIG_LIBS="$ac_env_image_NONPKGCONFIG_LIBS_value" +image_NONPKGCONFIG_EXTRA_LIBS="$ac_env_image_NONPKGCONFIG_EXTRA_LIBS_value" - pixman_REQUIRES="pixman-1 >= 0.17.5" + pixman_REQUIRES="pixman-1 >= 0.18.4" pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pixman" >&5 @@ -31541,7 +31447,7 @@ fi image_LIBS=$pixman_LIBS cairo_cv_image_use=$use_image - cairo_cv_image_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_image_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_image_cache_commands_len="279" cairo_cv_image_cache_version="6" cairo_cv_image_BASE=$image_BASE @@ -31550,6 +31456,7 @@ cairo_cv_image_CFLAGS=$image_CFLAGS cairo_cv_image_NONPKGCONFIG_CFLAGS=$image_NONPKGCONFIG_CFLAGS cairo_cv_image_LIBS=$image_LIBS cairo_cv_image_NONPKGCONFIG_LIBS=$image_NONPKGCONFIG_LIBS +cairo_cv_image_NONPKGCONFIG_EXTRA_LIBS=$image_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's image surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's image surface backend feature could be enabled... " >&6; } @@ -31560,11 +31467,11 @@ $as_echo "$cairo_cv_image_use" >&6; } use_image=$cairo_cv_image_use if test "x$enable_image" = "xyes" -a "x$use_image" != xyes; then : - as_fn_error "mandatory image surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? "mandatory image surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-image: \`$use_image', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-image: \`$use_image', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_image" = "xyes"; then : @@ -31574,6 +31481,7 @@ image_CFLAGS=$cairo_cv_image_CFLAGS image_NONPKGCONFIG_CFLAGS=$cairo_cv_image_NONPKGCONFIG_CFLAGS image_LIBS=$cairo_cv_image_LIBS image_NONPKGCONFIG_LIBS=$cairo_cv_image_NONPKGCONFIG_LIBS +image_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_image_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$image_REQUIRES"" ${CAIRO_REQUIRES}" @@ -31593,6 +31501,7 @@ image_CFLAGS=$cairo_cv_image_CFLAGS image_NONPKGCONFIG_CFLAGS=$cairo_cv_image_NONPKGCONFIG_CFLAGS image_LIBS=$cairo_cv_image_LIBS image_NONPKGCONFIG_LIBS=$cairo_cv_image_NONPKGCONFIG_LIBS +image_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_image_NONPKGCONFIG_EXTRA_LIBS fi @@ -31712,7 +31621,7 @@ fi yes|auto) : if test "x$cairo_cv_recording_cache_version" != "x6" -o \ "x$cairo_cv_recording_cache_commands_len" != "x0" -o \ - "x$cairo_cv_recording_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_recording_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_recording_use fi if test "x$enable_recording" = xyes -a "x$cairo_cv_recording_use" != xyes; then : @@ -31732,10 +31641,11 @@ recording_CFLAGS="$ac_env_recording_CFLAGS_value" recording_NONPKGCONFIG_CFLAGS="$ac_env_recording_NONPKGCONFIG_CFLAGS_value" recording_LIBS="$ac_env_recording_LIBS_value" recording_NONPKGCONFIG_LIBS="$ac_env_recording_NONPKGCONFIG_LIBS_value" +recording_NONPKGCONFIG_EXTRA_LIBS="$ac_env_recording_NONPKGCONFIG_EXTRA_LIBS_value" cairo_cv_recording_use=$use_recording - cairo_cv_recording_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_recording_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_recording_cache_commands_len="0" cairo_cv_recording_cache_version="6" cairo_cv_recording_BASE=$recording_BASE @@ -31744,6 +31654,7 @@ cairo_cv_recording_CFLAGS=$recording_CFLAGS cairo_cv_recording_NONPKGCONFIG_CFLAGS=$recording_NONPKGCONFIG_CFLAGS cairo_cv_recording_LIBS=$recording_LIBS cairo_cv_recording_NONPKGCONFIG_LIBS=$recording_NONPKGCONFIG_LIBS +cairo_cv_recording_NONPKGCONFIG_EXTRA_LIBS=$recording_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's recording surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's recording surface backend feature could be enabled... " >&6; } @@ -31754,11 +31665,11 @@ $as_echo "$cairo_cv_recording_use" >&6; } use_recording=$cairo_cv_recording_use if test "x$enable_recording" = "xyes" -a "x$use_recording" != xyes; then : - as_fn_error "mandatory recording surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? "mandatory recording surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-recording: \`$use_recording', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-recording: \`$use_recording', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_recording" = "xyes"; then : @@ -31768,6 +31679,7 @@ recording_CFLAGS=$cairo_cv_recording_CFLAGS recording_NONPKGCONFIG_CFLAGS=$cairo_cv_recording_NONPKGCONFIG_CFLAGS recording_LIBS=$cairo_cv_recording_LIBS recording_NONPKGCONFIG_LIBS=$cairo_cv_recording_NONPKGCONFIG_LIBS +recording_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_recording_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$recording_REQUIRES"" ${CAIRO_REQUIRES}" @@ -31787,6 +31699,7 @@ recording_CFLAGS=$cairo_cv_recording_CFLAGS recording_NONPKGCONFIG_CFLAGS=$cairo_cv_recording_NONPKGCONFIG_CFLAGS recording_LIBS=$cairo_cv_recording_LIBS recording_NONPKGCONFIG_LIBS=$cairo_cv_recording_NONPKGCONFIG_LIBS +recording_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_recording_NONPKGCONFIG_EXTRA_LIBS fi @@ -31896,7 +31809,13 @@ fi - enable_tee=yes + # Check whether --enable-tee was given. +if test "${enable_tee+set}" = set; then : + enableval=$enable_tee; enable_tee=$enableval +else + enable_tee=no +fi + case $enable_tee in #( no) : use_tee="no (disabled, use --enable-tee to enable)" @@ -31904,7 +31823,7 @@ fi yes|auto) : if test "x$cairo_cv_tee_cache_version" != "x6" -o \ "x$cairo_cv_tee_cache_commands_len" != "x0" -o \ - "x$cairo_cv_tee_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_tee_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_tee_use fi if test "x$enable_tee" = xyes -a "x$cairo_cv_tee_use" != xyes; then : @@ -31924,10 +31843,11 @@ tee_CFLAGS="$ac_env_tee_CFLAGS_value" tee_NONPKGCONFIG_CFLAGS="$ac_env_tee_NONPKGCONFIG_CFLAGS_value" tee_LIBS="$ac_env_tee_LIBS_value" tee_NONPKGCONFIG_LIBS="$ac_env_tee_NONPKGCONFIG_LIBS_value" +tee_NONPKGCONFIG_EXTRA_LIBS="$ac_env_tee_NONPKGCONFIG_EXTRA_LIBS_value" cairo_cv_tee_use=$use_tee - cairo_cv_tee_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_tee_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_tee_cache_commands_len="0" cairo_cv_tee_cache_version="6" cairo_cv_tee_BASE=$tee_BASE @@ -31936,6 +31856,7 @@ cairo_cv_tee_CFLAGS=$tee_CFLAGS cairo_cv_tee_NONPKGCONFIG_CFLAGS=$tee_NONPKGCONFIG_CFLAGS cairo_cv_tee_LIBS=$tee_LIBS cairo_cv_tee_NONPKGCONFIG_LIBS=$tee_NONPKGCONFIG_LIBS +cairo_cv_tee_NONPKGCONFIG_EXTRA_LIBS=$tee_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's tee surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's tee surface backend feature could be enabled... " >&6; } @@ -31946,11 +31867,11 @@ $as_echo "$cairo_cv_tee_use" >&6; } use_tee=$cairo_cv_tee_use if test "x$enable_tee" = "xyes" -a "x$use_tee" != xyes; then : - as_fn_error "mandatory tee surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " tee surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-tee: \`$use_tee', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-tee: \`$use_tee', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_tee" = "xyes"; then : @@ -31960,6 +31881,7 @@ tee_CFLAGS=$cairo_cv_tee_CFLAGS tee_NONPKGCONFIG_CFLAGS=$cairo_cv_tee_NONPKGCONFIG_CFLAGS tee_LIBS=$cairo_cv_tee_LIBS tee_NONPKGCONFIG_LIBS=$cairo_cv_tee_NONPKGCONFIG_LIBS +tee_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_tee_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$tee_REQUIRES"" ${CAIRO_REQUIRES}" @@ -31979,11 +31901,24 @@ tee_CFLAGS=$cairo_cv_tee_CFLAGS tee_NONPKGCONFIG_CFLAGS=$cairo_cv_tee_NONPKGCONFIG_CFLAGS tee_LIBS=$cairo_cv_tee_LIBS tee_NONPKGCONFIG_LIBS=$cairo_cv_tee_NONPKGCONFIG_LIBS +tee_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_tee_NONPKGCONFIG_EXTRA_LIBS + +fi + if test "x$use_tee" = xyes; then + CAIRO_HAS_TEE_SURFACE_TRUE= + CAIRO_HAS_TEE_SURFACE_FALSE='#' +else + CAIRO_HAS_TEE_SURFACE_TRUE='#' + CAIRO_HAS_TEE_SURFACE_FALSE= fi + cr_make_tmp='CAIRO_HAS_TEE_SURFACE=0' + CAIRO_MAKEFILE___WIN32="${CAIRO_MAKEFILE___WIN32} +""$cr_make_tmp" + cr_make_tmp='' CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} @@ -31999,13 +31934,14 @@ fi ""$cr_make_tmp" - cr_make_tmp='supported_cairo_headers += $(cairo_tee_headers)' + + cr_make_tmp='unsupported_cairo_headers += $(cairo_tee_headers)' CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} ""$cr_make_tmp" CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} ""$cr_make_tmp" - cr_make_tmp='supported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)' + cr_make_tmp='unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)' CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} ""$cr_make_tmp" @@ -32013,7 +31949,6 @@ fi ""$cr_make_tmp" - cr_make_tmp='all_cairo_headers += $(cairo_tee_headers) all_cairo_private += $(cairo_tee_private) all_cairo_cxx_sources += $(cairo_tee_cxx_sources) @@ -32038,52 +31973,106 @@ all_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources)' enabled_cairo_private += $(cairo_tee_private) enabled_cairo_cxx_sources += $(cairo_tee_cxx_sources) enabled_cairo_sources += $(cairo_tee_sources)' - CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'if CAIRO_HAS_TEE_SURFACE' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} ""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'endif' - CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'ifeq ($(CAIRO_HAS_TEE_SURFACE),1)' + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} ""$cr_make_tmp" - cr_make_tmp='enabled_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'endif' + cr_make_tmp='enabled_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers) enabled_cairo_boilerplate_private += $(cairo_boilerplate_tee_private) enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources)' - CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +"'if CAIRO_HAS_TEE_SURFACE' + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} ""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +"'endif' - CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +"'ifeq ($(CAIRO_HAS_TEE_SURFACE),1)' + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} ""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +"'endif' + if test "x$use_tee" = xyes; then : + : + ac_config_files="$ac_config_files src/cairo-tee.pc:src/cairo-features.pc.in" - - +fi if test "x$use_tee" = xyes; then : : - CAIRO_FEATURES="${CAIRO_FEATURES} "'CAIRO_HAS_TEE_SURFACE' + ac_config_files="$ac_config_files cairo-tee-uninstalled.pc:src/cairo-features-uninstalled.pc.in" fi - CAIRO_SUPPORTED_FEATURES="${CAIRO_SUPPORTED_FEATURES} "'CAIRO_HAS_TEE_SURFACE' + cr_make_tmp='all_cairo_pkgconf += cairo-tee.pc' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" - if test "x$use_tee" != xyes; then : - : - CAIRO_NO_FEATURES="${CAIRO_NO_FEATURES} "'CAIRO_HAS_TEE_SURFACE' + cr_make_tmp='enabled_cairo_pkgconf += cairo-tee.pc' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'if CAIRO_HAS_TEE_SURFACE' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'endif' + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'ifeq ($(CAIRO_HAS_TEE_SURFACE),1)' + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'endif' + + + if test "x$use_tee" = xyes; then : + : + CAIRO_FEATURES="${CAIRO_FEATURES} "'CAIRO_HAS_TEE_SURFACE' fi + + cr_make_tmp=' @echo "#define CAIRO_HAS_TEE_SURFACE 1" >> src/cairo-features.h' - CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} + CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} +"'ifeq ($(CAIRO_HAS_TEE_SURFACE),1)' + CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} ""$cr_make_tmp" + CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} +"'endif' + + + if test "x$use_tee" = xyes; then : + : + CAIRO_WARNING_MESSAGE="${CAIRO_WARNING_MESSAGE} + +"'--- The tee surface backend feature is still under active development and is +--- included in this release only as a preview. It does NOT fully work yet +--- and incompatible changes may yet be made to tee surface backend specific +--- API.' +fi @@ -32092,7 +32081,7 @@ fi if test "${enable_xml+set}" = set; then : enableval=$enable_xml; enable_xml=$enableval else - enable_xml=yes + enable_xml=no fi case $enable_xml in #( @@ -32102,7 +32091,7 @@ fi yes|auto) : if test "x$cairo_cv_xml_cache_version" != "x6" -o \ "x$cairo_cv_xml_cache_commands_len" != "x54" -o \ - "x$cairo_cv_xml_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_xml_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_xml_use fi if test "x$enable_xml" = xyes -a "x$cairo_cv_xml_use" != xyes; then : @@ -32122,13 +32111,14 @@ xml_CFLAGS="$ac_env_xml_CFLAGS_value" xml_NONPKGCONFIG_CFLAGS="$ac_env_xml_NONPKGCONFIG_CFLAGS_value" xml_LIBS="$ac_env_xml_LIBS_value" xml_NONPKGCONFIG_LIBS="$ac_env_xml_NONPKGCONFIG_LIBS_value" +xml_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xml_NONPKGCONFIG_EXTRA_LIBS_value" use_xml=$have_libz xml_NONPKGCONFIG_LIBS=-lz cairo_cv_xml_use=$use_xml - cairo_cv_xml_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_xml_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_xml_cache_commands_len="54" cairo_cv_xml_cache_version="6" cairo_cv_xml_BASE=$xml_BASE @@ -32137,6 +32127,7 @@ cairo_cv_xml_CFLAGS=$xml_CFLAGS cairo_cv_xml_NONPKGCONFIG_CFLAGS=$xml_NONPKGCONFIG_CFLAGS cairo_cv_xml_LIBS=$xml_LIBS cairo_cv_xml_NONPKGCONFIG_LIBS=$xml_NONPKGCONFIG_LIBS +cairo_cv_xml_NONPKGCONFIG_EXTRA_LIBS=$xml_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's xml surface backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's xml surface backend feature could be enabled... " >&6; } @@ -32147,11 +32138,11 @@ $as_echo "$cairo_cv_xml_use" >&6; } use_xml=$cairo_cv_xml_use if test "x$enable_xml" = "xyes" -a "x$use_xml" != xyes; then : - as_fn_error "recommended xml surface backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? " xml surface backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-xml: \`$use_xml', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-xml: \`$use_xml', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_xml" = "xyes"; then : @@ -32161,6 +32152,7 @@ xml_CFLAGS=$cairo_cv_xml_CFLAGS xml_NONPKGCONFIG_CFLAGS=$cairo_cv_xml_NONPKGCONFIG_CFLAGS xml_LIBS=$cairo_cv_xml_LIBS xml_NONPKGCONFIG_LIBS=$cairo_cv_xml_NONPKGCONFIG_LIBS +xml_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xml_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$xml_REQUIRES"" ${CAIRO_REQUIRES}" @@ -32180,6 +32172,7 @@ xml_CFLAGS=$cairo_cv_xml_CFLAGS xml_NONPKGCONFIG_CFLAGS=$cairo_cv_xml_NONPKGCONFIG_CFLAGS xml_LIBS=$cairo_cv_xml_LIBS xml_NONPKGCONFIG_LIBS=$cairo_cv_xml_NONPKGCONFIG_LIBS +xml_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_xml_NONPKGCONFIG_EXTRA_LIBS fi @@ -32193,7 +32186,7 @@ else fi - cr_make_tmp='CAIRO_HAS_XML_SURFACE=1' + cr_make_tmp='CAIRO_HAS_XML_SURFACE=0' CAIRO_MAKEFILE___WIN32="${CAIRO_MAKEFILE___WIN32} ""$cr_make_tmp" @@ -32212,13 +32205,14 @@ fi ""$cr_make_tmp" - cr_make_tmp='supported_cairo_headers += $(cairo_xml_headers)' + + cr_make_tmp='unsupported_cairo_headers += $(cairo_xml_headers)' CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} ""$cr_make_tmp" CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} ""$cr_make_tmp" - cr_make_tmp='supported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)' + cr_make_tmp='unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)' CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} ""$cr_make_tmp" @@ -32226,7 +32220,6 @@ fi ""$cr_make_tmp" - cr_make_tmp='all_cairo_headers += $(cairo_xml_headers) all_cairo_private += $(cairo_xml_private) all_cairo_cxx_sources += $(cairo_xml_cxx_sources) @@ -32327,18 +32320,9 @@ fi fi - CAIRO_SUPPORTED_FEATURES="${CAIRO_SUPPORTED_FEATURES} "'CAIRO_HAS_XML_SURFACE' - if test "x$use_xml" != xyes; then : - : - CAIRO_NO_FEATURES="${CAIRO_NO_FEATURES} "'CAIRO_HAS_XML_SURFACE' - - - -fi - cr_make_tmp=' @echo "#define CAIRO_HAS_XML_SURFACE 1" >> src/cairo-features.h' CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} "'ifeq ($(CAIRO_HAS_XML_SURFACE),1)' @@ -32348,13 +32332,14 @@ fi "'endif' - - if test "x$use_xml" != xyes; then : + if test "x$use_xml" = xyes; then : : CAIRO_WARNING_MESSAGE="${CAIRO_WARNING_MESSAGE} -"'+++ It is strongly recommended that you do NOT disable the xml surface -+++ backend feature.' +"'--- The xml surface backend feature is still under active development and is +--- included in this release only as a preview. It does NOT fully work yet +--- and incompatible changes may yet be made to xml surface backend specific +--- API.' @@ -32364,6 +32349,7 @@ fi + enable_user=yes case $enable_user in #( no) : @@ -32372,7 +32358,7 @@ fi yes|auto) : if test "x$cairo_cv_user_cache_version" != "x6" -o \ "x$cairo_cv_user_cache_commands_len" != "x0" -o \ - "x$cairo_cv_user_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_user_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_user_use fi if test "x$enable_user" = xyes -a "x$cairo_cv_user_use" != xyes; then : @@ -32392,10 +32378,11 @@ user_CFLAGS="$ac_env_user_CFLAGS_value" user_NONPKGCONFIG_CFLAGS="$ac_env_user_NONPKGCONFIG_CFLAGS_value" user_LIBS="$ac_env_user_LIBS_value" user_NONPKGCONFIG_LIBS="$ac_env_user_NONPKGCONFIG_LIBS_value" +user_NONPKGCONFIG_EXTRA_LIBS="$ac_env_user_NONPKGCONFIG_EXTRA_LIBS_value" cairo_cv_user_use=$use_user - cairo_cv_user_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_user_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_user_cache_commands_len="0" cairo_cv_user_cache_version="6" cairo_cv_user_BASE=$user_BASE @@ -32404,6 +32391,7 @@ cairo_cv_user_CFLAGS=$user_CFLAGS cairo_cv_user_NONPKGCONFIG_CFLAGS=$user_NONPKGCONFIG_CFLAGS cairo_cv_user_LIBS=$user_LIBS cairo_cv_user_NONPKGCONFIG_LIBS=$user_NONPKGCONFIG_LIBS +cairo_cv_user_NONPKGCONFIG_EXTRA_LIBS=$user_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's user font backend feature could be enabled" >&5 $as_echo_n "checking whether cairo's user font backend feature could be enabled... " >&6; } @@ -32414,11 +32402,11 @@ $as_echo "$cairo_cv_user_use" >&6; } use_user=$cairo_cv_user_use if test "x$enable_user" = "xyes" -a "x$use_user" != xyes; then : - as_fn_error "mandatory user font backend feature could not be enabled" "$LINENO" 5 + as_fn_error $? "mandatory user font backend feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-user: \`$use_user', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-user: \`$use_user', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_user" = "xyes"; then : @@ -32428,6 +32416,7 @@ user_CFLAGS=$cairo_cv_user_CFLAGS user_NONPKGCONFIG_CFLAGS=$cairo_cv_user_NONPKGCONFIG_CFLAGS user_LIBS=$cairo_cv_user_LIBS user_NONPKGCONFIG_LIBS=$cairo_cv_user_NONPKGCONFIG_LIBS +user_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_user_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$user_REQUIRES"" ${CAIRO_REQUIRES}" @@ -32447,6 +32436,7 @@ user_CFLAGS=$cairo_cv_user_CFLAGS user_NONPKGCONFIG_CFLAGS=$cairo_cv_user_NONPKGCONFIG_CFLAGS user_LIBS=$cairo_cv_user_LIBS user_NONPKGCONFIG_LIBS=$cairo_cv_user_NONPKGCONFIG_LIBS +user_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_user_NONPKGCONFIG_EXTRA_LIBS fi @@ -32573,7 +32563,7 @@ fi yes|auto) : if test "x$cairo_cv_pthread_cache_version" != "x6" -o \ "x$cairo_cv_pthread_cache_commands_len" != "x23" -o \ - "x$cairo_cv_pthread_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_pthread_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_pthread_use fi if test "x$enable_pthread" = xyes -a "x$cairo_cv_pthread_use" != xyes; then : @@ -32593,6 +32583,7 @@ pthread_CFLAGS="$ac_env_pthread_CFLAGS_value" pthread_NONPKGCONFIG_CFLAGS="$ac_env_pthread_NONPKGCONFIG_CFLAGS_value" pthread_LIBS="$ac_env_pthread_LIBS_value" pthread_NONPKGCONFIG_LIBS="$ac_env_pthread_NONPKGCONFIG_LIBS_value" +pthread_NONPKGCONFIG_EXTRA_LIBS="$ac_env_pthread_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$PTHREAD_CFLAGS" = "x"; then PTHREAD_CFLAGS="-D_REENTRANT" @@ -32939,14 +32930,14 @@ $as_echo "#define CAIRO_HAS_PTHREAD 1" >>confdefs.h fi if test "x$enable_pthread" = "xyes" -a "x$have_pthread" != "xyes"; then - as_fn_error "pthread requested but not found" "$LINENO" 5 + as_fn_error $? "pthread requested but not found" "$LINENO" 5 fi use_pthread="$have_pthread" pthread_REQUIRES="" cairo_cv_pthread_use=$use_pthread - cairo_cv_pthread_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_pthread_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_pthread_cache_commands_len="23" cairo_cv_pthread_cache_version="6" cairo_cv_pthread_BASE=$pthread_BASE @@ -32955,6 +32946,7 @@ cairo_cv_pthread_CFLAGS=$pthread_CFLAGS cairo_cv_pthread_NONPKGCONFIG_CFLAGS=$pthread_NONPKGCONFIG_CFLAGS cairo_cv_pthread_LIBS=$pthread_LIBS cairo_cv_pthread_NONPKGCONFIG_LIBS=$pthread_NONPKGCONFIG_LIBS +cairo_cv_pthread_NONPKGCONFIG_EXTRA_LIBS=$pthread_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's pthread feature could be enabled" >&5 $as_echo_n "checking whether cairo's pthread feature could be enabled... " >&6; } @@ -32965,11 +32957,11 @@ $as_echo "$cairo_cv_pthread_use" >&6; } use_pthread=$cairo_cv_pthread_use if test "x$enable_pthread" = "xyes" -a "x$use_pthread" != xyes; then : - as_fn_error " pthread feature could not be enabled" "$LINENO" 5 + as_fn_error $? " pthread feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-pthread: \`$use_pthread', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-pthread: \`$use_pthread', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_pthread" = "xyes"; then : @@ -32979,6 +32971,7 @@ pthread_CFLAGS=$cairo_cv_pthread_CFLAGS pthread_NONPKGCONFIG_CFLAGS=$cairo_cv_pthread_NONPKGCONFIG_CFLAGS pthread_LIBS=$cairo_cv_pthread_LIBS pthread_NONPKGCONFIG_LIBS=$cairo_cv_pthread_NONPKGCONFIG_LIBS +pthread_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_pthread_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$pthread_REQUIRES"" ${CAIRO_REQUIRES}" @@ -32998,6 +32991,7 @@ pthread_CFLAGS=$cairo_cv_pthread_CFLAGS pthread_NONPKGCONFIG_CFLAGS=$cairo_cv_pthread_NONPKGCONFIG_CFLAGS pthread_LIBS=$cairo_cv_pthread_LIBS pthread_NONPKGCONFIG_LIBS=$cairo_cv_pthread_NONPKGCONFIG_LIBS +pthread_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_pthread_NONPKGCONFIG_EXTRA_LIBS fi @@ -33138,6 +33132,436 @@ fi + # Check whether --enable-gobject was given. +if test "${enable_gobject+set}" = set; then : + enableval=$enable_gobject; enable_gobject=$enableval +else + enable_gobject=auto +fi + + case $enable_gobject in #( + no) : + use_gobject="no (disabled, use --enable-gobject to enable)" + ;; #( + yes|auto) : + if test "x$cairo_cv_gobject_cache_version" != "x6" -o \ + "x$cairo_cv_gobject_cache_commands_len" != "x277" -o \ + "x$cairo_cv_gobject_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : + unset cairo_cv_gobject_use +fi + if test "x$enable_gobject" = xyes -a "x$cairo_cv_gobject_use" != xyes; then : + unset cairo_cv_gobject_use +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo's gobject functions feature" >&5 +$as_echo_n "checking for cairo's gobject functions feature... " >&6; } +if test "${cairo_cv_gobject_use+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + echo + use_gobject=yes + gobject_BASE="cairo" +gobject_REQUIRES="$ac_env_gobject_REQUIRES_value" +gobject_CFLAGS="$ac_env_gobject_CFLAGS_value" +gobject_NONPKGCONFIG_CFLAGS="$ac_env_gobject_NONPKGCONFIG_CFLAGS_value" +gobject_LIBS="$ac_env_gobject_LIBS_value" +gobject_NONPKGCONFIG_LIBS="$ac_env_gobject_NONPKGCONFIG_LIBS_value" +gobject_NONPKGCONFIG_EXTRA_LIBS="$ac_env_gobject_NONPKGCONFIG_EXTRA_LIBS_value" + + + gobject_REQUIRES="gobject-2.0 glib-2.0" + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT" >&5 +$as_echo_n "checking for GOBJECT... " >&6; } + +if test -n "$GOBJECT_CFLAGS"; then + pkg_cv_GOBJECT_CFLAGS="$GOBJECT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gobject_REQUIRES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gobject_REQUIRES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "$gobject_REQUIRES" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GOBJECT_LIBS"; then + pkg_cv_GOBJECT_LIBS="$GOBJECT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gobject_REQUIRES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gobject_REQUIRES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "$gobject_REQUIRES" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gobject_REQUIRES" 2>&1` + else + GOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gobject_REQUIRES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GOBJECT_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)" +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)" +else + GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS + GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + gobject_NONPKGCONFIG_EXTRA_LIBS="-L\${libdir} -lcairo-gobject" + + cairo_cv_gobject_use=$use_gobject + cairo_cv_gobject_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" + cairo_cv_gobject_cache_commands_len="277" + cairo_cv_gobject_cache_version="6" + cairo_cv_gobject_BASE=$gobject_BASE +cairo_cv_gobject_REQUIRES=$gobject_REQUIRES +cairo_cv_gobject_CFLAGS=$gobject_CFLAGS +cairo_cv_gobject_NONPKGCONFIG_CFLAGS=$gobject_NONPKGCONFIG_CFLAGS +cairo_cv_gobject_LIBS=$gobject_LIBS +cairo_cv_gobject_NONPKGCONFIG_LIBS=$gobject_NONPKGCONFIG_LIBS +cairo_cv_gobject_NONPKGCONFIG_EXTRA_LIBS=$gobject_NONPKGCONFIG_EXTRA_LIBS + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's gobject functions feature could be enabled" >&5 +$as_echo_n "checking whether cairo's gobject functions feature could be enabled... " >&6; } + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cairo_cv_gobject_use" >&5 +$as_echo "$cairo_cv_gobject_use" >&6; } + use_gobject=$cairo_cv_gobject_use + + if test "x$enable_gobject" = "xyes" -a "x$use_gobject" != xyes; then : + as_fn_error $? " gobject functions feature could not be enabled" "$LINENO" 5 + +fi ;; #( + *) : + as_fn_error $? "invalid argument passed to --enable-gobject: \`$use_gobject', should be one of [no/auto/yes]" "$LINENO" 5 + ;; +esac + if test "x$use_gobject" = "xyes"; then : + gobject_BASE=$cairo_cv_gobject_BASE +gobject_REQUIRES=$cairo_cv_gobject_REQUIRES +gobject_CFLAGS=$cairo_cv_gobject_CFLAGS +gobject_NONPKGCONFIG_CFLAGS=$cairo_cv_gobject_NONPKGCONFIG_CFLAGS +gobject_LIBS=$cairo_cv_gobject_LIBS +gobject_NONPKGCONFIG_LIBS=$cairo_cv_gobject_NONPKGCONFIG_LIBS +gobject_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_gobject_NONPKGCONFIG_EXTRA_LIBS + + CAIRO_REQUIRES="$gobject_REQUIRES"" ${CAIRO_REQUIRES}" + + CAIRO_CFLAGS="$gobject_CFLAGS"" ${CAIRO_CFLAGS}" + + CAIRO_NONPKGCONFIG_CFLAGS="$gobject_NONPKGCONFIG_CFLAGS"" ${CAIRO_NONPKGCONFIG_CFLAGS}" + + CAIRO_LIBS="$gobject_LIBS"" ${CAIRO_LIBS}" + + CAIRO_NONPKGCONFIG_LIBS="$gobject_NONPKGCONFIG_LIBS"" ${CAIRO_NONPKGCONFIG_LIBS}" + + +else + gobject_BASE=$cairo_cv_gobject_BASE +gobject_REQUIRES=$cairo_cv_gobject_REQUIRES +gobject_CFLAGS=$cairo_cv_gobject_CFLAGS +gobject_NONPKGCONFIG_CFLAGS=$cairo_cv_gobject_NONPKGCONFIG_CFLAGS +gobject_LIBS=$cairo_cv_gobject_LIBS +gobject_NONPKGCONFIG_LIBS=$cairo_cv_gobject_NONPKGCONFIG_LIBS +gobject_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_gobject_NONPKGCONFIG_EXTRA_LIBS + + +fi + + if test "x$use_gobject" = xyes; then + CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE= + CAIRO_HAS_GOBJECT_FUNCTIONS_FALSE='#' +else + CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE='#' + CAIRO_HAS_GOBJECT_FUNCTIONS_FALSE= +fi + + + cr_make_tmp='CAIRO_HAS_GOBJECT_FUNCTIONS=0' + CAIRO_MAKEFILE___WIN32="${CAIRO_MAKEFILE___WIN32} +""$cr_make_tmp" + + + cr_make_tmp='' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" + cr_make_tmp='' + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +""$cr_make_tmp" + + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +""$cr_make_tmp" + + + cr_make_tmp='supported_cairo_headers += $(cairo_gobject_headers)' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" + cr_make_tmp='supported_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers)' + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +""$cr_make_tmp" + + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +""$cr_make_tmp" + + + + cr_make_tmp='all_cairo_headers += $(cairo_gobject_headers) +all_cairo_private += $(cairo_gobject_private) +all_cairo_cxx_sources += $(cairo_gobject_cxx_sources) +all_cairo_sources += $(cairo_gobject_sources)' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" + cr_make_tmp='all_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +all_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private) +all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources) +all_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources)' + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +""$cr_make_tmp" + + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +""$cr_make_tmp" + + + cr_make_tmp='enabled_cairo_headers += $(cairo_gobject_headers) +enabled_cairo_private += $(cairo_gobject_private) +enabled_cairo_cxx_sources += $(cairo_gobject_cxx_sources) +enabled_cairo_sources += $(cairo_gobject_sources)' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'if CAIRO_HAS_GOBJECT_FUNCTIONS' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'endif' + + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1)' + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'endif' + cr_make_tmp='enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private) +enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources)' + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +"'if CAIRO_HAS_GOBJECT_FUNCTIONS' + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_boilerplate_AMAKE="${CAIRO_MAKEFILE_cairo_boilerplate_AMAKE} +"'endif' + + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +"'ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1)' + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_boilerplate_WIN32="${CAIRO_MAKEFILE_cairo_boilerplate_WIN32} +"'endif' + + + + + if test "x$use_gobject" = xyes; then : + : + ac_config_files="$ac_config_files src/cairo-gobject.pc:src/cairo-features.pc.in" + + +fi + if test "x$use_gobject" = xyes; then : + : + ac_config_files="$ac_config_files cairo-gobject-uninstalled.pc:src/cairo-features-uninstalled.pc.in" + + +fi + cr_make_tmp='all_cairo_pkgconf += cairo-gobject.pc' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" + + + cr_make_tmp='enabled_cairo_pkgconf += cairo-gobject.pc' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'if CAIRO_HAS_GOBJECT_FUNCTIONS' + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_AMAKE="${CAIRO_MAKEFILE_cairo_AMAKE} +"'endif' + + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1)' + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +""$cr_make_tmp" + CAIRO_MAKEFILE_cairo_WIN32="${CAIRO_MAKEFILE_cairo_WIN32} +"'endif' + + + if test "x$use_gobject" = xyes; then : + : + CAIRO_FEATURES="${CAIRO_FEATURES} "'CAIRO_HAS_GOBJECT_FUNCTIONS' + + +fi + CAIRO_SUPPORTED_FEATURES="${CAIRO_SUPPORTED_FEATURES} "'CAIRO_HAS_GOBJECT_FUNCTIONS' + + + + if test "x$use_gobject" != xyes; then : + : + CAIRO_NO_FEATURES="${CAIRO_NO_FEATURES} "'CAIRO_HAS_GOBJECT_FUNCTIONS' + + + +fi + + cr_make_tmp=' @echo "#define CAIRO_HAS_GOBJECT_FUNCTIONS 1" >> src/cairo-features.h' + CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} +"'ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1)' + CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} +""$cr_make_tmp" + CAIRO_MAKEFILE_win32_features_h_WIN32="${CAIRO_MAKEFILE_win32_features_h_WIN32} +"'endif' + + + + + + + +if test "x$use_gobject" = "xyes"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT" >&5 +$as_echo_n "checking for GOBJECT... " >&6; } + +if test -n "$GOBJECT_CFLAGS"; then + pkg_cv_GOBJECT_CFLAGS="$GOBJECT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gobject_REQUIRES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gobject_REQUIRES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "$gobject_REQUIRES" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GOBJECT_LIBS"; then + pkg_cv_GOBJECT_LIBS="$GOBJECT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gobject_REQUIRES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gobject_REQUIRES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "$gobject_REQUIRES" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gobject_REQUIRES" 2>&1` + else + GOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gobject_REQUIRES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GOBJECT_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($gobject_REQUIRES) were not met: + +$GOBJECT_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GOBJECT_CFLAGS +and GOBJECT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GOBJECT_CFLAGS +and GOBJECT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS + GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi +fi + + # Check whether --enable-full-testing was given. if test "${enable_full_testing+set}" = set; then : enableval=$enable_full_testing; @@ -33201,7 +33625,7 @@ fi yes|auto) : if test "x$cairo_cv_trace_cache_version" != "x6" -o \ "x$cairo_cv_trace_cache_commands_len" != "x222" -o \ - "x$cairo_cv_trace_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_trace_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_trace_use fi if test "x$enable_trace" = xyes -a "x$cairo_cv_trace_use" != xyes; then : @@ -33221,6 +33645,7 @@ trace_CFLAGS="$ac_env_trace_CFLAGS_value" trace_NONPKGCONFIG_CFLAGS="$ac_env_trace_NONPKGCONFIG_CFLAGS_value" trace_LIBS="$ac_env_trace_LIBS_value" trace_NONPKGCONFIG_LIBS="$ac_env_trace_NONPKGCONFIG_LIBS_value" +trace_NONPKGCONFIG_EXTRA_LIBS="$ac_env_trace_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$have_ld_preload" != "xyes" -o \ @@ -33231,7 +33656,7 @@ trace_NONPKGCONFIG_LIBS="$ac_env_trace_NONPKGCONFIG_LIBS_value" fi cairo_cv_trace_use=$use_trace - cairo_cv_trace_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_trace_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_trace_cache_commands_len="222" cairo_cv_trace_cache_version="6" cairo_cv_trace_BASE=$trace_BASE @@ -33240,6 +33665,7 @@ cairo_cv_trace_CFLAGS=$trace_CFLAGS cairo_cv_trace_NONPKGCONFIG_CFLAGS=$trace_NONPKGCONFIG_CFLAGS cairo_cv_trace_LIBS=$trace_LIBS cairo_cv_trace_NONPKGCONFIG_LIBS=$trace_NONPKGCONFIG_LIBS +cairo_cv_trace_NONPKGCONFIG_EXTRA_LIBS=$trace_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's cairo-trace feature could be enabled" >&5 $as_echo_n "checking whether cairo's cairo-trace feature could be enabled... " >&6; } @@ -33250,11 +33676,11 @@ $as_echo "$cairo_cv_trace_use" >&6; } use_trace=$cairo_cv_trace_use if test "x$enable_trace" = "xyes" -a "x$use_trace" != xyes; then : - as_fn_error " cairo-trace feature could not be enabled" "$LINENO" 5 + as_fn_error $? " cairo-trace feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-trace: \`$use_trace', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-trace: \`$use_trace', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_trace" = "xyes"; then : @@ -33264,6 +33690,7 @@ trace_CFLAGS=$cairo_cv_trace_CFLAGS trace_NONPKGCONFIG_CFLAGS=$cairo_cv_trace_NONPKGCONFIG_CFLAGS trace_LIBS=$cairo_cv_trace_LIBS trace_NONPKGCONFIG_LIBS=$cairo_cv_trace_NONPKGCONFIG_LIBS +trace_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_trace_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$trace_REQUIRES"" ${CAIRO_REQUIRES}" @@ -33283,6 +33710,7 @@ trace_CFLAGS=$cairo_cv_trace_CFLAGS trace_NONPKGCONFIG_CFLAGS=$cairo_cv_trace_NONPKGCONFIG_CFLAGS trace_LIBS=$cairo_cv_trace_LIBS trace_NONPKGCONFIG_LIBS=$cairo_cv_trace_NONPKGCONFIG_LIBS +trace_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_trace_NONPKGCONFIG_EXTRA_LIBS fi @@ -33415,7 +33843,7 @@ fi yes|auto) : if test "x$cairo_cv_interpreter_cache_version" != "x6" -o \ "x$cairo_cv_interpreter_cache_commands_len" != "x83" -o \ - "x$cairo_cv_interpreter_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_interpreter_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_interpreter_use fi if test "x$enable_interpreter" = xyes -a "x$cairo_cv_interpreter_use" != xyes; then : @@ -33435,6 +33863,7 @@ interpreter_CFLAGS="$ac_env_interpreter_CFLAGS_value" interpreter_NONPKGCONFIG_CFLAGS="$ac_env_interpreter_NONPKGCONFIG_CFLAGS_value" interpreter_LIBS="$ac_env_interpreter_LIBS_value" interpreter_NONPKGCONFIG_LIBS="$ac_env_interpreter_NONPKGCONFIG_LIBS_value" +interpreter_NONPKGCONFIG_EXTRA_LIBS="$ac_env_interpreter_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$have_libz" != "xyes"; then @@ -33442,7 +33871,7 @@ interpreter_NONPKGCONFIG_LIBS="$ac_env_interpreter_NONPKGCONFIG_LIBS_value" fi cairo_cv_interpreter_use=$use_interpreter - cairo_cv_interpreter_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_interpreter_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_interpreter_cache_commands_len="83" cairo_cv_interpreter_cache_version="6" cairo_cv_interpreter_BASE=$interpreter_BASE @@ -33451,6 +33880,7 @@ cairo_cv_interpreter_CFLAGS=$interpreter_CFLAGS cairo_cv_interpreter_NONPKGCONFIG_CFLAGS=$interpreter_NONPKGCONFIG_CFLAGS cairo_cv_interpreter_LIBS=$interpreter_LIBS cairo_cv_interpreter_NONPKGCONFIG_LIBS=$interpreter_NONPKGCONFIG_LIBS +cairo_cv_interpreter_NONPKGCONFIG_EXTRA_LIBS=$interpreter_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's cairo-script-interpreter feature could be enabled" >&5 $as_echo_n "checking whether cairo's cairo-script-interpreter feature could be enabled... " >&6; } @@ -33461,11 +33891,11 @@ $as_echo "$cairo_cv_interpreter_use" >&6; } use_interpreter=$cairo_cv_interpreter_use if test "x$enable_interpreter" = "xyes" -a "x$use_interpreter" != xyes; then : - as_fn_error "recommended cairo-script-interpreter feature could not be enabled" "$LINENO" 5 + as_fn_error $? "recommended cairo-script-interpreter feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-interpreter: \`$use_interpreter', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-interpreter: \`$use_interpreter', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_interpreter" = "xyes"; then : @@ -33475,6 +33905,7 @@ interpreter_CFLAGS=$cairo_cv_interpreter_CFLAGS interpreter_NONPKGCONFIG_CFLAGS=$cairo_cv_interpreter_NONPKGCONFIG_CFLAGS interpreter_LIBS=$cairo_cv_interpreter_LIBS interpreter_NONPKGCONFIG_LIBS=$cairo_cv_interpreter_NONPKGCONFIG_LIBS +interpreter_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_interpreter_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$interpreter_REQUIRES"" ${CAIRO_REQUIRES}" @@ -33494,6 +33925,7 @@ interpreter_CFLAGS=$cairo_cv_interpreter_CFLAGS interpreter_NONPKGCONFIG_CFLAGS=$cairo_cv_interpreter_NONPKGCONFIG_CFLAGS interpreter_LIBS=$cairo_cv_interpreter_LIBS interpreter_NONPKGCONFIG_LIBS=$cairo_cv_interpreter_NONPKGCONFIG_LIBS +interpreter_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_interpreter_NONPKGCONFIG_EXTRA_LIBS fi @@ -33700,7 +34132,7 @@ fi yes|auto) : if test "x$cairo_cv_symbol_lookup_cache_version" != "x6" -o \ "x$cairo_cv_symbol_lookup_cache_commands_len" != "x83" -o \ - "x$cairo_cv_symbol_lookup_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"; then : + "x$cairo_cv_symbol_lookup_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then : unset cairo_cv_symbol_lookup_use fi if test "x$enable_symbol_lookup" = xyes -a "x$cairo_cv_symbol_lookup_use" != xyes; then : @@ -33720,6 +34152,7 @@ symbol_lookup_CFLAGS="$ac_env_symbol_lookup_CFLAGS_value" symbol_lookup_NONPKGCONFIG_CFLAGS="$ac_env_symbol_lookup_NONPKGCONFIG_CFLAGS_value" symbol_lookup_LIBS="$ac_env_symbol_lookup_LIBS_value" symbol_lookup_NONPKGCONFIG_LIBS="$ac_env_symbol_lookup_NONPKGCONFIG_LIBS_value" +symbol_lookup_NONPKGCONFIG_EXTRA_LIBS="$ac_env_symbol_lookup_NONPKGCONFIG_EXTRA_LIBS_value" if test "x$have_bfd" != "xyes"; then @@ -33727,7 +34160,7 @@ symbol_lookup_NONPKGCONFIG_LIBS="$ac_env_symbol_lookup_NONPKGCONFIG_LIBS_value" fi cairo_cv_symbol_lookup_use=$use_symbol_lookup - cairo_cv_symbol_lookup_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" + cairo_cv_symbol_lookup_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS" cairo_cv_symbol_lookup_cache_commands_len="83" cairo_cv_symbol_lookup_cache_version="6" cairo_cv_symbol_lookup_BASE=$symbol_lookup_BASE @@ -33736,6 +34169,7 @@ cairo_cv_symbol_lookup_CFLAGS=$symbol_lookup_CFLAGS cairo_cv_symbol_lookup_NONPKGCONFIG_CFLAGS=$symbol_lookup_NONPKGCONFIG_CFLAGS cairo_cv_symbol_lookup_LIBS=$symbol_lookup_LIBS cairo_cv_symbol_lookup_NONPKGCONFIG_LIBS=$symbol_lookup_NONPKGCONFIG_LIBS +cairo_cv_symbol_lookup_NONPKGCONFIG_EXTRA_LIBS=$symbol_lookup_NONPKGCONFIG_EXTRA_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's symbol-lookup feature could be enabled" >&5 $as_echo_n "checking whether cairo's symbol-lookup feature could be enabled... " >&6; } @@ -33746,11 +34180,11 @@ $as_echo "$cairo_cv_symbol_lookup_use" >&6; } use_symbol_lookup=$cairo_cv_symbol_lookup_use if test "x$enable_symbol_lookup" = "xyes" -a "x$use_symbol_lookup" != xyes; then : - as_fn_error " symbol-lookup feature could not be enabled" "$LINENO" 5 + as_fn_error $? " symbol-lookup feature could not be enabled" "$LINENO" 5 fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-symbol-lookup: \`$use_symbol_lookup', should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-symbol-lookup: \`$use_symbol_lookup', should be one of [no/auto/yes]" "$LINENO" 5 ;; esac if test "x$use_symbol_lookup" = "xyes"; then : @@ -33760,6 +34194,7 @@ symbol_lookup_CFLAGS=$cairo_cv_symbol_lookup_CFLAGS symbol_lookup_NONPKGCONFIG_CFLAGS=$cairo_cv_symbol_lookup_NONPKGCONFIG_CFLAGS symbol_lookup_LIBS=$cairo_cv_symbol_lookup_LIBS symbol_lookup_NONPKGCONFIG_LIBS=$cairo_cv_symbol_lookup_NONPKGCONFIG_LIBS +symbol_lookup_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_symbol_lookup_NONPKGCONFIG_EXTRA_LIBS CAIRO_REQUIRES="$symbol_lookup_REQUIRES"" ${CAIRO_REQUIRES}" @@ -33779,6 +34214,7 @@ symbol_lookup_CFLAGS=$cairo_cv_symbol_lookup_CFLAGS symbol_lookup_NONPKGCONFIG_CFLAGS=$cairo_cv_symbol_lookup_NONPKGCONFIG_CFLAGS symbol_lookup_LIBS=$cairo_cv_symbol_lookup_LIBS symbol_lookup_NONPKGCONFIG_LIBS=$cairo_cv_symbol_lookup_NONPKGCONFIG_LIBS +symbol_lookup_NONPKGCONFIG_EXTRA_LIBS=$cairo_cv_symbol_lookup_NONPKGCONFIG_EXTRA_LIBS fi @@ -34147,7 +34583,7 @@ else fi -ac_config_files="$ac_config_files Makefile boilerplate/Makefile src/Makefile test/Makefile test/pdiff/Makefile perf/Makefile util/Makefile util/cairo-fdr/Makefile util/cairo-script/Makefile util/cairo-script/examples/Makefile util/cairo-sphinx/Makefile util/cairo-trace/Makefile util/cairo-trace/cairo-trace doc/Makefile doc/public/Makefile" +ac_config_files="$ac_config_files Makefile boilerplate/Makefile src/Makefile test/Makefile test/pdiff/Makefile perf/Makefile util/Makefile util/cairo-fdr/Makefile util/cairo-gobject/Makefile util/cairo-script/Makefile util/cairo-script/examples/Makefile util/cairo-sphinx/Makefile util/cairo-trace/Makefile util/cairo-trace/cairo-trace doc/Makefile doc/public/Makefile" cat >confcache <<\_ACEOF @@ -34233,6 +34669,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -34248,11 +34685,11 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -n "$EXEEXT"; then @@ -34264,19 +34701,15 @@ else fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then - as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. + as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi CAIRO_CFLAGS="$CAIRO_CFLAGS $CAIRO_NONPKGCONFIG_CFLAGS" @@ -34308,240 +34741,248 @@ fi fi if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then - as_fn_error "conditional \"CROSS_COMPILING\" was never defined. + as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then - as_fn_error "conditional \"OS_WIN32\" was never defined. + as_fn_error $? "conditional \"OS_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_SHM_TRUE}" && test -z "${HAVE_SHM_FALSE}"; then - as_fn_error "conditional \"HAVE_SHM\" was never defined. + as_fn_error $? "conditional \"HAVE_SHM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_LCOV_TRUE}" && test -z "${CAIRO_HAS_LCOV_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_LCOV\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_LCOV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_DL_TRUE}" && test -z "${CAIRO_HAS_DL_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_DL\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_DL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_XLIB_SURFACE_TRUE}" && test -z "${CAIRO_HAS_XLIB_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_XLIB_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_XLIB_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE}" && test -z "${CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_XLIB_XRENDER_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_XLIB_XRENDER_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_XCB_SURFACE_TRUE}" && test -z "${CAIRO_HAS_XCB_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_XCB_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_XCB_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_XLIB_XCB_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_XLIB_XCB_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_XLIB_XCB_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_XLIB_XCB_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_XLIB_XCB_TRUE}" && test -z "${BUILD_XLIB_XCB_FALSE}"; then - as_fn_error "conditional \"BUILD_XLIB_XCB\" was never defined. + as_fn_error $? "conditional \"BUILD_XLIB_XCB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_XCB_SHM_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_XCB_SHM_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_XCB_SHM_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_XCB_SHM_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_XCB_SHM_TRUE}" && test -z "${BUILD_XCB_SHM_FALSE}"; then - as_fn_error "conditional \"BUILD_XCB_SHM\" was never defined. + as_fn_error $? "conditional \"BUILD_XCB_SHM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_QT_SURFACE_TRUE}" && test -z "${CAIRO_HAS_QT_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_QT_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_QT_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_QUARTZ_SURFACE_TRUE}" && test -z "${CAIRO_HAS_QUARTZ_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_QUARTZ_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_QUARTZ_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_QUARTZ_FONT_TRUE}" && test -z "${CAIRO_HAS_QUARTZ_FONT_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_QUARTZ_FONT\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_QUARTZ_FONT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE}" && test -z "${CAIRO_HAS_QUARTZ_IMAGE_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_QUARTZ_IMAGE_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_QUARTZ_IMAGE_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_WIN32_SURFACE_TRUE}" && test -z "${CAIRO_HAS_WIN32_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_WIN32_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_WIN32_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_WIN32_FONT_TRUE}" && test -z "${CAIRO_HAS_WIN32_FONT_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_WIN32_FONT\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_WIN32_FONT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE_TRUE}" && test -z "${CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_SKIA_SURFACE_TRUE}" && test -z "${CAIRO_HAS_SKIA_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_SKIA_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_SKIA_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_OS2_SURFACE_TRUE}" && test -z "${CAIRO_HAS_OS2_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_OS2_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_OS2_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_BEOS_SURFACE_TRUE}" && test -z "${CAIRO_HAS_BEOS_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_BEOS_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_BEOS_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_DRM_SURFACE_TRUE}" && test -z "${CAIRO_HAS_DRM_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_DRM_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_DRM_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_DRM_XR_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_DRM_XR_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_DRM_XR_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_DRM_XR_TRUE}" && test -z "${BUILD_DRM_XR_FALSE}"; then - as_fn_error "conditional \"BUILD_DRM_XR\" was never defined. + as_fn_error $? "conditional \"BUILD_DRM_XR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_GALLIUM_SURFACE_TRUE}" && test -z "${CAIRO_HAS_GALLIUM_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_GALLIUM_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_GALLIUM_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_XCB_DRM_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_XCB_DRM_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_XCB_DRM_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_XCB_DRM_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_PNG_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_PNG_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_PNG_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_PNG_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_GL_SURFACE_TRUE}" && test -z "${CAIRO_HAS_GL_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_GL_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_GL_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_PRIVATE_GLEW_TRUE}" && test -z "${BUILD_PRIVATE_GLEW_FALSE}"; then - as_fn_error "conditional \"BUILD_PRIVATE_GLEW\" was never defined. + as_fn_error $? "conditional \"BUILD_PRIVATE_GLEW\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_DIRECTFB_SURFACE_TRUE}" && test -z "${CAIRO_HAS_DIRECTFB_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_DIRECTFB_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_DIRECTFB_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_VG_SURFACE_TRUE}" && test -z "${CAIRO_HAS_VG_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_VG_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_VG_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_EGL_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_EGL_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_EGL_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_EGL_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_GLX_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_GLX_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_GLX_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_GLX_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_WGL_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_WGL_FUNCTIONS_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_WGL_FUNCTIONS\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_WGL_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_SCRIPT_SURFACE_TRUE}" && test -z "${CAIRO_HAS_SCRIPT_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_SCRIPT_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_SCRIPT_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_FT_FONT_TRUE}" && test -z "${CAIRO_HAS_FT_FONT_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_FT_FONT\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_FT_FONT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_FC_FONT_TRUE}" && test -z "${CAIRO_HAS_FC_FONT_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_FC_FONT\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_FC_FONT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_PS_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PS_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_PS_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_PS_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_CAN_TEST_PS_SURFACE_TRUE}" && test -z "${CAIRO_CAN_TEST_PS_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_CAN_TEST_PS_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_CAN_TEST_PS_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_SPECTRE_TRUE}" && test -z "${CAIRO_HAS_SPECTRE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_SPECTRE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_SPECTRE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_PDF_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PDF_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_CAN_TEST_PDF_SURFACE_TRUE}" && test -z "${CAIRO_CAN_TEST_PDF_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_CAN_TEST_PDF_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_CAN_TEST_PDF_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_MULTI_PAGE_SURFACES_TRUE}" && test -z "${CAIRO_HAS_MULTI_PAGE_SURFACES_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_MULTI_PAGE_SURFACES\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_MULTI_PAGE_SURFACES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_SVG_SURFACE_TRUE}" && test -z "${CAIRO_HAS_SVG_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_SVG_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_SVG_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_CAN_TEST_SVG_SURFACE_TRUE}" && test -z "${CAIRO_CAN_TEST_SVG_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_CAN_TEST_SVG_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_CAN_TEST_SVG_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_TEST_SURFACES_TRUE}" && test -z "${CAIRO_HAS_TEST_SURFACES_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_TEST_SURFACES\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_TEST_SURFACES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${CAIRO_HAS_TEE_SURFACE_TRUE}" && test -z "${CAIRO_HAS_TEE_SURFACE_FALSE}"; then + as_fn_error $? "conditional \"CAIRO_HAS_TEE_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_XML_SURFACE_TRUE}" && test -z "${CAIRO_HAS_XML_SURFACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_XML_SURFACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_XML_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_PTHREAD_TRUE}" && test -z "${CAIRO_HAS_PTHREAD_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_PTHREAD\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_PTHREAD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_REAL_PTHREAD_TRUE}" && test -z "${HAVE_REAL_PTHREAD_FALSE}"; then - as_fn_error "conditional \"HAVE_REAL_PTHREAD\" was never defined. + as_fn_error $? "conditional \"HAVE_REAL_PTHREAD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PTHREAD_TRUE}" && test -z "${HAVE_PTHREAD_FALSE}"; then - as_fn_error "conditional \"HAVE_PTHREAD\" was never defined. + as_fn_error $? "conditional \"HAVE_PTHREAD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE}" && test -z "${CAIRO_HAS_GOBJECT_FUNCTIONS_FALSE}"; then + as_fn_error $? "conditional \"CAIRO_HAS_GOBJECT_FUNCTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_ANY2PPM_TRUE}" && test -z "${BUILD_ANY2PPM_FALSE}"; then - as_fn_error "conditional \"BUILD_ANY2PPM\" was never defined. + as_fn_error $? "conditional \"BUILD_ANY2PPM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_TRACE_TRUE}" && test -z "${CAIRO_HAS_TRACE_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_TRACE\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_TRACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_INTERPRETER_TRUE}" && test -z "${CAIRO_HAS_INTERPRETER_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_INTERPRETER\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_INTERPRETER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CAIRO_HAS_SYMBOL_LOOKUP_TRUE}" && test -z "${CAIRO_HAS_SYMBOL_LOOKUP_FALSE}"; then - as_fn_error "conditional \"CAIRO_HAS_SYMBOL_LOOKUP\" was never defined. + as_fn_error $? "conditional \"CAIRO_HAS_SYMBOL_LOOKUP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_SPHINX_TRUE}" && test -z "${BUILD_SPHINX_FALSE}"; then - as_fn_error "conditional \"BUILD_SPHINX\" was never defined. + as_fn_error $? "conditional \"BUILD_SPHINX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DISABLE_SOME_FLOATING_POINT_TRUE}" && test -z "${DISABLE_SOME_FLOATING_POINT_FALSE}"; then - as_fn_error "conditional \"DISABLE_SOME_FLOATING_POINT\" was never defined. + as_fn_error $? "conditional \"DISABLE_SOME_FLOATING_POINT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_CXX_TRUE}" && test -z "${BUILD_CXX_FALSE}"; then - as_fn_error "conditional \"BUILD_CXX\" was never defined. + as_fn_error $? "conditional \"BUILD_CXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then - as_fn_error "conditional \"HAVE_GTK\" was never defined. + as_fn_error $? "conditional \"HAVE_GTK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -34691,19 +35132,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -34899,7 +35340,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -34952,8 +35393,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cairo $as_me 1.9.14, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by cairo $as_me 1.10.0, which was +generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -35018,11 +35459,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cairo config.status 1.9.14 -configured by $0, generated by GNU Autoconf 2.65, +cairo config.status 1.10.0 +configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -35078,7 +35519,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -35087,7 +35528,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -35141,186 +35582,203 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in AS \ +DLLTOOL \ +OBJDUMP \ +SHELL \ +ECHO \ +SED \ GREP \ EGREP \ FGREP \ @@ -35343,8 +35801,6 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_wl \ lt_prog_compiler_pic \ @@ -35374,6 +35830,7 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib \ @@ -35384,6 +35841,7 @@ predeps \ postdeps \ compiler_lib_search_path \ LD_CXX \ +reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ lt_prog_compiler_wl_CXX \ @@ -35409,9 +35867,9 @@ postdep_objects_CXX \ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -35438,6 +35896,7 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ old_archive_from_expsyms_cmds_CXX \ @@ -35447,9 +35906,9 @@ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ prelink_cmds_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -35457,12 +35916,6 @@ prelink_cmds_CXX; do esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -35499,386 +35952,478 @@ CAIRO_MAKEFILE_win32_features_h_WIN32='$CAIRO_MAKEFILE_win32_features_h_WIN32' xlib_BASE='$xlib_BASE' xlib_REQUIRES='$xlib_REQUIRES' xlib_NONPKGCONFIG_LIBS='$xlib_NONPKGCONFIG_LIBS' + xlib_NONPKGCONFIG_EXTRA_LIBS='$xlib_NONPKGCONFIG_EXTRA_LIBS' xlib_NONPKGCONFIG_CFLAGS='$xlib_NONPKGCONFIG_CFLAGS' SED='$SED' xlib_BASE='$xlib_BASE' xlib_REQUIRES='$xlib_REQUIRES' xlib_NONPKGCONFIG_LIBS='$xlib_NONPKGCONFIG_LIBS' + xlib_NONPKGCONFIG_EXTRA_LIBS='$xlib_NONPKGCONFIG_EXTRA_LIBS' xlib_NONPKGCONFIG_CFLAGS='$xlib_NONPKGCONFIG_CFLAGS' SED='$SED' xlib_xrender_BASE='$xlib_xrender_BASE' xlib_xrender_REQUIRES='$xlib_xrender_REQUIRES' xlib_xrender_NONPKGCONFIG_LIBS='$xlib_xrender_NONPKGCONFIG_LIBS' + xlib_xrender_NONPKGCONFIG_EXTRA_LIBS='$xlib_xrender_NONPKGCONFIG_EXTRA_LIBS' xlib_xrender_NONPKGCONFIG_CFLAGS='$xlib_xrender_NONPKGCONFIG_CFLAGS' SED='$SED' xlib_xrender_BASE='$xlib_xrender_BASE' xlib_xrender_REQUIRES='$xlib_xrender_REQUIRES' xlib_xrender_NONPKGCONFIG_LIBS='$xlib_xrender_NONPKGCONFIG_LIBS' + xlib_xrender_NONPKGCONFIG_EXTRA_LIBS='$xlib_xrender_NONPKGCONFIG_EXTRA_LIBS' xlib_xrender_NONPKGCONFIG_CFLAGS='$xlib_xrender_NONPKGCONFIG_CFLAGS' SED='$SED' xcb_BASE='$xcb_BASE' xcb_REQUIRES='$xcb_REQUIRES' xcb_NONPKGCONFIG_LIBS='$xcb_NONPKGCONFIG_LIBS' + xcb_NONPKGCONFIG_EXTRA_LIBS='$xcb_NONPKGCONFIG_EXTRA_LIBS' xcb_NONPKGCONFIG_CFLAGS='$xcb_NONPKGCONFIG_CFLAGS' SED='$SED' xcb_BASE='$xcb_BASE' xcb_REQUIRES='$xcb_REQUIRES' xcb_NONPKGCONFIG_LIBS='$xcb_NONPKGCONFIG_LIBS' + xcb_NONPKGCONFIG_EXTRA_LIBS='$xcb_NONPKGCONFIG_EXTRA_LIBS' xcb_NONPKGCONFIG_CFLAGS='$xcb_NONPKGCONFIG_CFLAGS' SED='$SED' xlib_xcb_BASE='$xlib_xcb_BASE' xlib_xcb_REQUIRES='$xlib_xcb_REQUIRES' xlib_xcb_NONPKGCONFIG_LIBS='$xlib_xcb_NONPKGCONFIG_LIBS' + xlib_xcb_NONPKGCONFIG_EXTRA_LIBS='$xlib_xcb_NONPKGCONFIG_EXTRA_LIBS' xlib_xcb_NONPKGCONFIG_CFLAGS='$xlib_xcb_NONPKGCONFIG_CFLAGS' SED='$SED' xlib_xcb_BASE='$xlib_xcb_BASE' xlib_xcb_REQUIRES='$xlib_xcb_REQUIRES' xlib_xcb_NONPKGCONFIG_LIBS='$xlib_xcb_NONPKGCONFIG_LIBS' + xlib_xcb_NONPKGCONFIG_EXTRA_LIBS='$xlib_xcb_NONPKGCONFIG_EXTRA_LIBS' xlib_xcb_NONPKGCONFIG_CFLAGS='$xlib_xcb_NONPKGCONFIG_CFLAGS' SED='$SED' xcb_shm_BASE='$xcb_shm_BASE' xcb_shm_REQUIRES='$xcb_shm_REQUIRES' xcb_shm_NONPKGCONFIG_LIBS='$xcb_shm_NONPKGCONFIG_LIBS' + xcb_shm_NONPKGCONFIG_EXTRA_LIBS='$xcb_shm_NONPKGCONFIG_EXTRA_LIBS' xcb_shm_NONPKGCONFIG_CFLAGS='$xcb_shm_NONPKGCONFIG_CFLAGS' SED='$SED' xcb_shm_BASE='$xcb_shm_BASE' xcb_shm_REQUIRES='$xcb_shm_REQUIRES' xcb_shm_NONPKGCONFIG_LIBS='$xcb_shm_NONPKGCONFIG_LIBS' + xcb_shm_NONPKGCONFIG_EXTRA_LIBS='$xcb_shm_NONPKGCONFIG_EXTRA_LIBS' xcb_shm_NONPKGCONFIG_CFLAGS='$xcb_shm_NONPKGCONFIG_CFLAGS' SED='$SED' qt_BASE='$qt_BASE' qt_REQUIRES='$qt_REQUIRES' qt_NONPKGCONFIG_LIBS='$qt_NONPKGCONFIG_LIBS' + qt_NONPKGCONFIG_EXTRA_LIBS='$qt_NONPKGCONFIG_EXTRA_LIBS' qt_NONPKGCONFIG_CFLAGS='$qt_NONPKGCONFIG_CFLAGS' SED='$SED' qt_BASE='$qt_BASE' qt_REQUIRES='$qt_REQUIRES' qt_NONPKGCONFIG_LIBS='$qt_NONPKGCONFIG_LIBS' + qt_NONPKGCONFIG_EXTRA_LIBS='$qt_NONPKGCONFIG_EXTRA_LIBS' qt_NONPKGCONFIG_CFLAGS='$qt_NONPKGCONFIG_CFLAGS' SED='$SED' quartz_BASE='$quartz_BASE' quartz_REQUIRES='$quartz_REQUIRES' quartz_NONPKGCONFIG_LIBS='$quartz_NONPKGCONFIG_LIBS' + quartz_NONPKGCONFIG_EXTRA_LIBS='$quartz_NONPKGCONFIG_EXTRA_LIBS' quartz_NONPKGCONFIG_CFLAGS='$quartz_NONPKGCONFIG_CFLAGS' SED='$SED' quartz_BASE='$quartz_BASE' quartz_REQUIRES='$quartz_REQUIRES' quartz_NONPKGCONFIG_LIBS='$quartz_NONPKGCONFIG_LIBS' + quartz_NONPKGCONFIG_EXTRA_LIBS='$quartz_NONPKGCONFIG_EXTRA_LIBS' quartz_NONPKGCONFIG_CFLAGS='$quartz_NONPKGCONFIG_CFLAGS' SED='$SED' quartz_font_BASE='$quartz_font_BASE' quartz_font_REQUIRES='$quartz_font_REQUIRES' quartz_font_NONPKGCONFIG_LIBS='$quartz_font_NONPKGCONFIG_LIBS' + quartz_font_NONPKGCONFIG_EXTRA_LIBS='$quartz_font_NONPKGCONFIG_EXTRA_LIBS' quartz_font_NONPKGCONFIG_CFLAGS='$quartz_font_NONPKGCONFIG_CFLAGS' SED='$SED' quartz_font_BASE='$quartz_font_BASE' quartz_font_REQUIRES='$quartz_font_REQUIRES' quartz_font_NONPKGCONFIG_LIBS='$quartz_font_NONPKGCONFIG_LIBS' + quartz_font_NONPKGCONFIG_EXTRA_LIBS='$quartz_font_NONPKGCONFIG_EXTRA_LIBS' quartz_font_NONPKGCONFIG_CFLAGS='$quartz_font_NONPKGCONFIG_CFLAGS' SED='$SED' quartz_image_BASE='$quartz_image_BASE' quartz_image_REQUIRES='$quartz_image_REQUIRES' quartz_image_NONPKGCONFIG_LIBS='$quartz_image_NONPKGCONFIG_LIBS' + quartz_image_NONPKGCONFIG_EXTRA_LIBS='$quartz_image_NONPKGCONFIG_EXTRA_LIBS' quartz_image_NONPKGCONFIG_CFLAGS='$quartz_image_NONPKGCONFIG_CFLAGS' SED='$SED' quartz_image_BASE='$quartz_image_BASE' quartz_image_REQUIRES='$quartz_image_REQUIRES' quartz_image_NONPKGCONFIG_LIBS='$quartz_image_NONPKGCONFIG_LIBS' + quartz_image_NONPKGCONFIG_EXTRA_LIBS='$quartz_image_NONPKGCONFIG_EXTRA_LIBS' quartz_image_NONPKGCONFIG_CFLAGS='$quartz_image_NONPKGCONFIG_CFLAGS' SED='$SED' win32_BASE='$win32_BASE' win32_REQUIRES='$win32_REQUIRES' win32_NONPKGCONFIG_LIBS='$win32_NONPKGCONFIG_LIBS' + win32_NONPKGCONFIG_EXTRA_LIBS='$win32_NONPKGCONFIG_EXTRA_LIBS' win32_NONPKGCONFIG_CFLAGS='$win32_NONPKGCONFIG_CFLAGS' SED='$SED' win32_BASE='$win32_BASE' win32_REQUIRES='$win32_REQUIRES' win32_NONPKGCONFIG_LIBS='$win32_NONPKGCONFIG_LIBS' + win32_NONPKGCONFIG_EXTRA_LIBS='$win32_NONPKGCONFIG_EXTRA_LIBS' win32_NONPKGCONFIG_CFLAGS='$win32_NONPKGCONFIG_CFLAGS' SED='$SED' win32_font_BASE='$win32_font_BASE' win32_font_REQUIRES='$win32_font_REQUIRES' win32_font_NONPKGCONFIG_LIBS='$win32_font_NONPKGCONFIG_LIBS' + win32_font_NONPKGCONFIG_EXTRA_LIBS='$win32_font_NONPKGCONFIG_EXTRA_LIBS' win32_font_NONPKGCONFIG_CFLAGS='$win32_font_NONPKGCONFIG_CFLAGS' SED='$SED' win32_font_BASE='$win32_font_BASE' win32_font_REQUIRES='$win32_font_REQUIRES' win32_font_NONPKGCONFIG_LIBS='$win32_font_NONPKGCONFIG_LIBS' + win32_font_NONPKGCONFIG_EXTRA_LIBS='$win32_font_NONPKGCONFIG_EXTRA_LIBS' win32_font_NONPKGCONFIG_CFLAGS='$win32_font_NONPKGCONFIG_CFLAGS' SED='$SED' skia_BASE='$skia_BASE' skia_REQUIRES='$skia_REQUIRES' skia_NONPKGCONFIG_LIBS='$skia_NONPKGCONFIG_LIBS' + skia_NONPKGCONFIG_EXTRA_LIBS='$skia_NONPKGCONFIG_EXTRA_LIBS' skia_NONPKGCONFIG_CFLAGS='$skia_NONPKGCONFIG_CFLAGS' SED='$SED' skia_BASE='$skia_BASE' skia_REQUIRES='$skia_REQUIRES' skia_NONPKGCONFIG_LIBS='$skia_NONPKGCONFIG_LIBS' + skia_NONPKGCONFIG_EXTRA_LIBS='$skia_NONPKGCONFIG_EXTRA_LIBS' skia_NONPKGCONFIG_CFLAGS='$skia_NONPKGCONFIG_CFLAGS' SED='$SED' os2_BASE='$os2_BASE' os2_REQUIRES='$os2_REQUIRES' os2_NONPKGCONFIG_LIBS='$os2_NONPKGCONFIG_LIBS' + os2_NONPKGCONFIG_EXTRA_LIBS='$os2_NONPKGCONFIG_EXTRA_LIBS' os2_NONPKGCONFIG_CFLAGS='$os2_NONPKGCONFIG_CFLAGS' SED='$SED' os2_BASE='$os2_BASE' os2_REQUIRES='$os2_REQUIRES' os2_NONPKGCONFIG_LIBS='$os2_NONPKGCONFIG_LIBS' + os2_NONPKGCONFIG_EXTRA_LIBS='$os2_NONPKGCONFIG_EXTRA_LIBS' os2_NONPKGCONFIG_CFLAGS='$os2_NONPKGCONFIG_CFLAGS' SED='$SED' beos_BASE='$beos_BASE' beos_REQUIRES='$beos_REQUIRES' beos_NONPKGCONFIG_LIBS='$beos_NONPKGCONFIG_LIBS' + beos_NONPKGCONFIG_EXTRA_LIBS='$beos_NONPKGCONFIG_EXTRA_LIBS' beos_NONPKGCONFIG_CFLAGS='$beos_NONPKGCONFIG_CFLAGS' SED='$SED' beos_BASE='$beos_BASE' beos_REQUIRES='$beos_REQUIRES' beos_NONPKGCONFIG_LIBS='$beos_NONPKGCONFIG_LIBS' + beos_NONPKGCONFIG_EXTRA_LIBS='$beos_NONPKGCONFIG_EXTRA_LIBS' beos_NONPKGCONFIG_CFLAGS='$beos_NONPKGCONFIG_CFLAGS' SED='$SED' drm_BASE='$drm_BASE' drm_REQUIRES='$drm_REQUIRES' drm_NONPKGCONFIG_LIBS='$drm_NONPKGCONFIG_LIBS' + drm_NONPKGCONFIG_EXTRA_LIBS='$drm_NONPKGCONFIG_EXTRA_LIBS' drm_NONPKGCONFIG_CFLAGS='$drm_NONPKGCONFIG_CFLAGS' SED='$SED' drm_BASE='$drm_BASE' drm_REQUIRES='$drm_REQUIRES' drm_NONPKGCONFIG_LIBS='$drm_NONPKGCONFIG_LIBS' + drm_NONPKGCONFIG_EXTRA_LIBS='$drm_NONPKGCONFIG_EXTRA_LIBS' drm_NONPKGCONFIG_CFLAGS='$drm_NONPKGCONFIG_CFLAGS' SED='$SED' drm_xr_BASE='$drm_xr_BASE' drm_xr_REQUIRES='$drm_xr_REQUIRES' drm_xr_NONPKGCONFIG_LIBS='$drm_xr_NONPKGCONFIG_LIBS' + drm_xr_NONPKGCONFIG_EXTRA_LIBS='$drm_xr_NONPKGCONFIG_EXTRA_LIBS' drm_xr_NONPKGCONFIG_CFLAGS='$drm_xr_NONPKGCONFIG_CFLAGS' SED='$SED' drm_xr_BASE='$drm_xr_BASE' drm_xr_REQUIRES='$drm_xr_REQUIRES' drm_xr_NONPKGCONFIG_LIBS='$drm_xr_NONPKGCONFIG_LIBS' + drm_xr_NONPKGCONFIG_EXTRA_LIBS='$drm_xr_NONPKGCONFIG_EXTRA_LIBS' drm_xr_NONPKGCONFIG_CFLAGS='$drm_xr_NONPKGCONFIG_CFLAGS' SED='$SED' gallium_BASE='$gallium_BASE' gallium_REQUIRES='$gallium_REQUIRES' gallium_NONPKGCONFIG_LIBS='$gallium_NONPKGCONFIG_LIBS' + gallium_NONPKGCONFIG_EXTRA_LIBS='$gallium_NONPKGCONFIG_EXTRA_LIBS' gallium_NONPKGCONFIG_CFLAGS='$gallium_NONPKGCONFIG_CFLAGS' SED='$SED' gallium_BASE='$gallium_BASE' gallium_REQUIRES='$gallium_REQUIRES' gallium_NONPKGCONFIG_LIBS='$gallium_NONPKGCONFIG_LIBS' + gallium_NONPKGCONFIG_EXTRA_LIBS='$gallium_NONPKGCONFIG_EXTRA_LIBS' gallium_NONPKGCONFIG_CFLAGS='$gallium_NONPKGCONFIG_CFLAGS' SED='$SED' xcb_drm_BASE='$xcb_drm_BASE' xcb_drm_REQUIRES='$xcb_drm_REQUIRES' xcb_drm_NONPKGCONFIG_LIBS='$xcb_drm_NONPKGCONFIG_LIBS' + xcb_drm_NONPKGCONFIG_EXTRA_LIBS='$xcb_drm_NONPKGCONFIG_EXTRA_LIBS' xcb_drm_NONPKGCONFIG_CFLAGS='$xcb_drm_NONPKGCONFIG_CFLAGS' SED='$SED' xcb_drm_BASE='$xcb_drm_BASE' xcb_drm_REQUIRES='$xcb_drm_REQUIRES' xcb_drm_NONPKGCONFIG_LIBS='$xcb_drm_NONPKGCONFIG_LIBS' + xcb_drm_NONPKGCONFIG_EXTRA_LIBS='$xcb_drm_NONPKGCONFIG_EXTRA_LIBS' xcb_drm_NONPKGCONFIG_CFLAGS='$xcb_drm_NONPKGCONFIG_CFLAGS' SED='$SED' png_BASE='$png_BASE' png_REQUIRES='$png_REQUIRES' png_NONPKGCONFIG_LIBS='$png_NONPKGCONFIG_LIBS' + png_NONPKGCONFIG_EXTRA_LIBS='$png_NONPKGCONFIG_EXTRA_LIBS' png_NONPKGCONFIG_CFLAGS='$png_NONPKGCONFIG_CFLAGS' SED='$SED' png_BASE='$png_BASE' png_REQUIRES='$png_REQUIRES' png_NONPKGCONFIG_LIBS='$png_NONPKGCONFIG_LIBS' + png_NONPKGCONFIG_EXTRA_LIBS='$png_NONPKGCONFIG_EXTRA_LIBS' png_NONPKGCONFIG_CFLAGS='$png_NONPKGCONFIG_CFLAGS' SED='$SED' gl_BASE='$gl_BASE' gl_REQUIRES='$gl_REQUIRES' gl_NONPKGCONFIG_LIBS='$gl_NONPKGCONFIG_LIBS' + gl_NONPKGCONFIG_EXTRA_LIBS='$gl_NONPKGCONFIG_EXTRA_LIBS' gl_NONPKGCONFIG_CFLAGS='$gl_NONPKGCONFIG_CFLAGS' SED='$SED' gl_BASE='$gl_BASE' gl_REQUIRES='$gl_REQUIRES' gl_NONPKGCONFIG_LIBS='$gl_NONPKGCONFIG_LIBS' + gl_NONPKGCONFIG_EXTRA_LIBS='$gl_NONPKGCONFIG_EXTRA_LIBS' gl_NONPKGCONFIG_CFLAGS='$gl_NONPKGCONFIG_CFLAGS' SED='$SED' directfb_BASE='$directfb_BASE' directfb_REQUIRES='$directfb_REQUIRES' directfb_NONPKGCONFIG_LIBS='$directfb_NONPKGCONFIG_LIBS' + directfb_NONPKGCONFIG_EXTRA_LIBS='$directfb_NONPKGCONFIG_EXTRA_LIBS' directfb_NONPKGCONFIG_CFLAGS='$directfb_NONPKGCONFIG_CFLAGS' SED='$SED' directfb_BASE='$directfb_BASE' directfb_REQUIRES='$directfb_REQUIRES' directfb_NONPKGCONFIG_LIBS='$directfb_NONPKGCONFIG_LIBS' + directfb_NONPKGCONFIG_EXTRA_LIBS='$directfb_NONPKGCONFIG_EXTRA_LIBS' directfb_NONPKGCONFIG_CFLAGS='$directfb_NONPKGCONFIG_CFLAGS' SED='$SED' vg_BASE='$vg_BASE' vg_REQUIRES='$vg_REQUIRES' vg_NONPKGCONFIG_LIBS='$vg_NONPKGCONFIG_LIBS' + vg_NONPKGCONFIG_EXTRA_LIBS='$vg_NONPKGCONFIG_EXTRA_LIBS' vg_NONPKGCONFIG_CFLAGS='$vg_NONPKGCONFIG_CFLAGS' SED='$SED' vg_BASE='$vg_BASE' vg_REQUIRES='$vg_REQUIRES' vg_NONPKGCONFIG_LIBS='$vg_NONPKGCONFIG_LIBS' + vg_NONPKGCONFIG_EXTRA_LIBS='$vg_NONPKGCONFIG_EXTRA_LIBS' vg_NONPKGCONFIG_CFLAGS='$vg_NONPKGCONFIG_CFLAGS' SED='$SED' egl_BASE='$egl_BASE' egl_REQUIRES='$egl_REQUIRES' egl_NONPKGCONFIG_LIBS='$egl_NONPKGCONFIG_LIBS' + egl_NONPKGCONFIG_EXTRA_LIBS='$egl_NONPKGCONFIG_EXTRA_LIBS' egl_NONPKGCONFIG_CFLAGS='$egl_NONPKGCONFIG_CFLAGS' SED='$SED' egl_BASE='$egl_BASE' egl_REQUIRES='$egl_REQUIRES' egl_NONPKGCONFIG_LIBS='$egl_NONPKGCONFIG_LIBS' + egl_NONPKGCONFIG_EXTRA_LIBS='$egl_NONPKGCONFIG_EXTRA_LIBS' egl_NONPKGCONFIG_CFLAGS='$egl_NONPKGCONFIG_CFLAGS' SED='$SED' glx_BASE='$glx_BASE' glx_REQUIRES='$glx_REQUIRES' glx_NONPKGCONFIG_LIBS='$glx_NONPKGCONFIG_LIBS' + glx_NONPKGCONFIG_EXTRA_LIBS='$glx_NONPKGCONFIG_EXTRA_LIBS' glx_NONPKGCONFIG_CFLAGS='$glx_NONPKGCONFIG_CFLAGS' SED='$SED' glx_BASE='$glx_BASE' glx_REQUIRES='$glx_REQUIRES' glx_NONPKGCONFIG_LIBS='$glx_NONPKGCONFIG_LIBS' + glx_NONPKGCONFIG_EXTRA_LIBS='$glx_NONPKGCONFIG_EXTRA_LIBS' glx_NONPKGCONFIG_CFLAGS='$glx_NONPKGCONFIG_CFLAGS' SED='$SED' wgl_BASE='$wgl_BASE' wgl_REQUIRES='$wgl_REQUIRES' wgl_NONPKGCONFIG_LIBS='$wgl_NONPKGCONFIG_LIBS' + wgl_NONPKGCONFIG_EXTRA_LIBS='$wgl_NONPKGCONFIG_EXTRA_LIBS' wgl_NONPKGCONFIG_CFLAGS='$wgl_NONPKGCONFIG_CFLAGS' SED='$SED' wgl_BASE='$wgl_BASE' wgl_REQUIRES='$wgl_REQUIRES' wgl_NONPKGCONFIG_LIBS='$wgl_NONPKGCONFIG_LIBS' + wgl_NONPKGCONFIG_EXTRA_LIBS='$wgl_NONPKGCONFIG_EXTRA_LIBS' wgl_NONPKGCONFIG_CFLAGS='$wgl_NONPKGCONFIG_CFLAGS' SED='$SED' script_BASE='$script_BASE' script_REQUIRES='$script_REQUIRES' script_NONPKGCONFIG_LIBS='$script_NONPKGCONFIG_LIBS' + script_NONPKGCONFIG_EXTRA_LIBS='$script_NONPKGCONFIG_EXTRA_LIBS' script_NONPKGCONFIG_CFLAGS='$script_NONPKGCONFIG_CFLAGS' SED='$SED' script_BASE='$script_BASE' script_REQUIRES='$script_REQUIRES' script_NONPKGCONFIG_LIBS='$script_NONPKGCONFIG_LIBS' + script_NONPKGCONFIG_EXTRA_LIBS='$script_NONPKGCONFIG_EXTRA_LIBS' script_NONPKGCONFIG_CFLAGS='$script_NONPKGCONFIG_CFLAGS' SED='$SED' ft_BASE='$ft_BASE' ft_REQUIRES='$ft_REQUIRES' ft_NONPKGCONFIG_LIBS='$ft_NONPKGCONFIG_LIBS' + ft_NONPKGCONFIG_EXTRA_LIBS='$ft_NONPKGCONFIG_EXTRA_LIBS' ft_NONPKGCONFIG_CFLAGS='$ft_NONPKGCONFIG_CFLAGS' SED='$SED' ft_BASE='$ft_BASE' ft_REQUIRES='$ft_REQUIRES' ft_NONPKGCONFIG_LIBS='$ft_NONPKGCONFIG_LIBS' + ft_NONPKGCONFIG_EXTRA_LIBS='$ft_NONPKGCONFIG_EXTRA_LIBS' ft_NONPKGCONFIG_CFLAGS='$ft_NONPKGCONFIG_CFLAGS' SED='$SED' fc_BASE='$fc_BASE' fc_REQUIRES='$fc_REQUIRES' fc_NONPKGCONFIG_LIBS='$fc_NONPKGCONFIG_LIBS' + fc_NONPKGCONFIG_EXTRA_LIBS='$fc_NONPKGCONFIG_EXTRA_LIBS' fc_NONPKGCONFIG_CFLAGS='$fc_NONPKGCONFIG_CFLAGS' SED='$SED' fc_BASE='$fc_BASE' fc_REQUIRES='$fc_REQUIRES' fc_NONPKGCONFIG_LIBS='$fc_NONPKGCONFIG_LIBS' + fc_NONPKGCONFIG_EXTRA_LIBS='$fc_NONPKGCONFIG_EXTRA_LIBS' fc_NONPKGCONFIG_CFLAGS='$fc_NONPKGCONFIG_CFLAGS' SED='$SED' ps_BASE='$ps_BASE' ps_REQUIRES='$ps_REQUIRES' ps_NONPKGCONFIG_LIBS='$ps_NONPKGCONFIG_LIBS' + ps_NONPKGCONFIG_EXTRA_LIBS='$ps_NONPKGCONFIG_EXTRA_LIBS' ps_NONPKGCONFIG_CFLAGS='$ps_NONPKGCONFIG_CFLAGS' SED='$SED' ps_BASE='$ps_BASE' ps_REQUIRES='$ps_REQUIRES' ps_NONPKGCONFIG_LIBS='$ps_NONPKGCONFIG_LIBS' + ps_NONPKGCONFIG_EXTRA_LIBS='$ps_NONPKGCONFIG_EXTRA_LIBS' ps_NONPKGCONFIG_CFLAGS='$ps_NONPKGCONFIG_CFLAGS' SED='$SED' pdf_BASE='$pdf_BASE' pdf_REQUIRES='$pdf_REQUIRES' pdf_NONPKGCONFIG_LIBS='$pdf_NONPKGCONFIG_LIBS' + pdf_NONPKGCONFIG_EXTRA_LIBS='$pdf_NONPKGCONFIG_EXTRA_LIBS' pdf_NONPKGCONFIG_CFLAGS='$pdf_NONPKGCONFIG_CFLAGS' SED='$SED' pdf_BASE='$pdf_BASE' pdf_REQUIRES='$pdf_REQUIRES' pdf_NONPKGCONFIG_LIBS='$pdf_NONPKGCONFIG_LIBS' + pdf_NONPKGCONFIG_EXTRA_LIBS='$pdf_NONPKGCONFIG_EXTRA_LIBS' pdf_NONPKGCONFIG_CFLAGS='$pdf_NONPKGCONFIG_CFLAGS' SED='$SED' svg_BASE='$svg_BASE' svg_REQUIRES='$svg_REQUIRES' svg_NONPKGCONFIG_LIBS='$svg_NONPKGCONFIG_LIBS' + svg_NONPKGCONFIG_EXTRA_LIBS='$svg_NONPKGCONFIG_EXTRA_LIBS' svg_NONPKGCONFIG_CFLAGS='$svg_NONPKGCONFIG_CFLAGS' SED='$SED' svg_BASE='$svg_BASE' svg_REQUIRES='$svg_REQUIRES' svg_NONPKGCONFIG_LIBS='$svg_NONPKGCONFIG_LIBS' + svg_NONPKGCONFIG_EXTRA_LIBS='$svg_NONPKGCONFIG_EXTRA_LIBS' svg_NONPKGCONFIG_CFLAGS='$svg_NONPKGCONFIG_CFLAGS' SED='$SED' + tee_BASE='$tee_BASE' + tee_REQUIRES='$tee_REQUIRES' + tee_NONPKGCONFIG_LIBS='$tee_NONPKGCONFIG_LIBS' + tee_NONPKGCONFIG_EXTRA_LIBS='$tee_NONPKGCONFIG_EXTRA_LIBS' + tee_NONPKGCONFIG_CFLAGS='$tee_NONPKGCONFIG_CFLAGS' + + SED='$SED' + tee_BASE='$tee_BASE' + tee_REQUIRES='$tee_REQUIRES' + tee_NONPKGCONFIG_LIBS='$tee_NONPKGCONFIG_LIBS' + tee_NONPKGCONFIG_EXTRA_LIBS='$tee_NONPKGCONFIG_EXTRA_LIBS' + tee_NONPKGCONFIG_CFLAGS='$tee_NONPKGCONFIG_CFLAGS' + + SED='$SED' xml_BASE='$xml_BASE' xml_REQUIRES='$xml_REQUIRES' xml_NONPKGCONFIG_LIBS='$xml_NONPKGCONFIG_LIBS' + xml_NONPKGCONFIG_EXTRA_LIBS='$xml_NONPKGCONFIG_EXTRA_LIBS' xml_NONPKGCONFIG_CFLAGS='$xml_NONPKGCONFIG_CFLAGS' SED='$SED' xml_BASE='$xml_BASE' xml_REQUIRES='$xml_REQUIRES' xml_NONPKGCONFIG_LIBS='$xml_NONPKGCONFIG_LIBS' + xml_NONPKGCONFIG_EXTRA_LIBS='$xml_NONPKGCONFIG_EXTRA_LIBS' xml_NONPKGCONFIG_CFLAGS='$xml_NONPKGCONFIG_CFLAGS' + SED='$SED' + gobject_BASE='$gobject_BASE' + gobject_REQUIRES='$gobject_REQUIRES' + gobject_NONPKGCONFIG_LIBS='$gobject_NONPKGCONFIG_LIBS' + gobject_NONPKGCONFIG_EXTRA_LIBS='$gobject_NONPKGCONFIG_EXTRA_LIBS' + gobject_NONPKGCONFIG_CFLAGS='$gobject_NONPKGCONFIG_CFLAGS' + + SED='$SED' + gobject_BASE='$gobject_BASE' + gobject_REQUIRES='$gobject_REQUIRES' + gobject_NONPKGCONFIG_LIBS='$gobject_NONPKGCONFIG_LIBS' + gobject_NONPKGCONFIG_EXTRA_LIBS='$gobject_NONPKGCONFIG_EXTRA_LIBS' + gobject_NONPKGCONFIG_CFLAGS='$gobject_NONPKGCONFIG_CFLAGS' + _ACEOF @@ -35963,8 +36508,12 @@ do "cairo-pdf-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES cairo-pdf-uninstalled.pc:src/cairo-features-uninstalled.pc.in" ;; "src/cairo-svg.pc") CONFIG_FILES="$CONFIG_FILES src/cairo-svg.pc:src/cairo-features.pc.in" ;; "cairo-svg-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES cairo-svg-uninstalled.pc:src/cairo-features-uninstalled.pc.in" ;; + "src/cairo-tee.pc") CONFIG_FILES="$CONFIG_FILES src/cairo-tee.pc:src/cairo-features.pc.in" ;; + "cairo-tee-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES cairo-tee-uninstalled.pc:src/cairo-features-uninstalled.pc.in" ;; "src/cairo-xml.pc") CONFIG_FILES="$CONFIG_FILES src/cairo-xml.pc:src/cairo-features.pc.in" ;; "cairo-xml-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES cairo-xml-uninstalled.pc:src/cairo-features-uninstalled.pc.in" ;; + "src/cairo-gobject.pc") CONFIG_FILES="$CONFIG_FILES src/cairo-gobject.pc:src/cairo-features.pc.in" ;; + "cairo-gobject-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES cairo-gobject-uninstalled.pc:src/cairo-features-uninstalled.pc.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "boilerplate/Makefile") CONFIG_FILES="$CONFIG_FILES boilerplate/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; @@ -35973,6 +36522,7 @@ do "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; "util/cairo-fdr/Makefile") CONFIG_FILES="$CONFIG_FILES util/cairo-fdr/Makefile" ;; + "util/cairo-gobject/Makefile") CONFIG_FILES="$CONFIG_FILES util/cairo-gobject/Makefile" ;; "util/cairo-script/Makefile") CONFIG_FILES="$CONFIG_FILES util/cairo-script/Makefile" ;; "util/cairo-script/examples/Makefile") CONFIG_FILES="$CONFIG_FILES util/cairo-script/examples/Makefile" ;; "util/cairo-sphinx/Makefile") CONFIG_FILES="$CONFIG_FILES util/cairo-sphinx/Makefile" ;; @@ -35981,7 +36531,7 @@ do "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/public/Makefile") CONFIG_FILES="$CONFIG_FILES doc/public/Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -36019,7 +36569,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -36036,7 +36586,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -36050,18 +36600,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -36150,20 +36700,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -36191,7 +36749,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -36276,7 +36834,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -36289,7 +36847,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -36317,7 +36875,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -36344,7 +36902,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -36481,22 +37039,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -36507,19 +37065,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -36680,7 +37238,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -36713,13 +37272,13 @@ available_tags="CXX " # ### BEGIN LIBTOOL CONFIG # Assembler program. -AS=$AS +AS=$lt_AS # DLL creation program. -DLLTOOL=$DLLTOOL +DLLTOOL=$lt_DLLTOOL # Object dumper program. -OBJDUMP=$OBJDUMP +OBJDUMP=$lt_OBJDUMP # Which release of libtool.m4 was used? macro_version=$macro_version @@ -36737,6 +37296,12 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + # The host system. host_alias=$host_alias host=$host @@ -36786,10 +37351,6 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -36808,6 +37369,9 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -36829,12 +37393,6 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name # The name of the directory that contains temporary libtool files. objdir=$objdir -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO - # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -36897,6 +37455,9 @@ library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -36936,6 +37497,10 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -37209,7 +37774,7 @@ _LT_EOF func_dirname () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else @@ -37220,7 +37785,7 @@ func_dirname () # func_basename file func_basename () { - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED "$basename"` } @@ -37233,10 +37798,8 @@ func_basename () func_stripname () { case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } @@ -37247,20 +37810,20 @@ my_sed_long_arg='1s/^-[^=]*=//' # func_opt_split func_opt_split () { - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` } # func_lo2o object func_lo2o () { - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` } # func_xform libobj-or-source func_xform () { - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` } # func_arith arithmetic-term... @@ -37321,6 +37884,10 @@ _LT_EOF # The linker used to build libraries. LD=$lt_LD_CXX +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds_CXX @@ -37475,7 +38042,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} { echo "$CAIRO_MAKEFILE___WIN32" } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37483,7 +38050,7 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "$srcdir/src/Makefile.am.features":C) @@ -37494,7 +38061,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} { echo "$CAIRO_MAKEFILE_cairo_AMAKE" } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37502,7 +38069,7 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "$srcdir/src/Makefile.win32.features":C) @@ -37513,7 +38080,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} { echo "$CAIRO_MAKEFILE_cairo_WIN32" } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37521,7 +38088,7 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "$srcdir/boilerplate/Makefile.am.features":C) @@ -37532,7 +38099,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} { echo "$CAIRO_MAKEFILE_cairo_boilerplate_AMAKE" } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37540,7 +38107,7 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "$srcdir/boilerplate/Makefile.win32.features":C) @@ -37551,7 +38118,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} { echo "$CAIRO_MAKEFILE_cairo_boilerplate_WIN32" } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37559,7 +38126,7 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "src/cairo-features.h":C) @@ -37583,7 +38150,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} echo '#endif' } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37591,7 +38158,7 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "src/cairo-supported-features.h":C) @@ -37613,7 +38180,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} echo '#endif' } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37621,7 +38188,7 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "$srcdir/build/Makefile.win32.features-h":C) @@ -37632,7 +38199,7 @@ $as_echo "$as_me: creating $_config_file" >&6;} { echo "$CAIRO_MAKEFILE_win32_features_h_WIN32" } >> "$_tmp_file" || - as_fn_error "failed to write to $_tmp_file" "$LINENO" 5 + as_fn_error $? "failed to write to $_tmp_file" "$LINENO" 5 if cmp -s "$_tmp_file" "$_config_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: $_config_file is unchanged" >&5 @@ -37640,264 +38207,280 @@ $as_echo "$as_me: $_config_file is unchanged" >&6;} rm -f "$_tmp_file" else mv "$_tmp_file" "$_config_file" || - as_fn_error "failed to update $_config_file" "$LINENO" 5 + as_fn_error $? "failed to update $_config_file" "$LINENO" 5 fi ;; "src/cairo-xlib.pc":F) mv "src/cairo-xlib.pc" "src/cairo-xlib.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xlib%g; s%@FEATURE_NAME@%Xlib surface backend%g; s%@FEATURE_BASE@%$xlib_BASE%g; s%@FEATURE_REQUIRES@%$xlib_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xlib.pc.tmp" > "src/cairo-xlib.pc" && rm -f "src/cairo-xlib.pc.tmp" || - as_fn_error "failed to update src/cairo-xlib.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xlib%g; s%@FEATURE_NAME@%Xlib surface backend%g; s%@FEATURE_BASE@%$xlib_BASE%g; s%@FEATURE_REQUIRES@%$xlib_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xlib_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xlib.pc.tmp" > "src/cairo-xlib.pc" && rm -f "src/cairo-xlib.pc.tmp" || + as_fn_error $? "failed to update src/cairo-xlib.pc" "$LINENO" 5 ;; "cairo-xlib-uninstalled.pc":F) mv "cairo-xlib-uninstalled.pc" "cairo-xlib-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xlib%g; s%@FEATURE_NAME@%Xlib surface backend%g; s%@FEATURE_BASE@%$xlib_BASE%g; s%@FEATURE_REQUIRES@%$xlib_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_NONPKGCONFIG_CFLAGS%g; " < "cairo-xlib-uninstalled.pc.tmp" > "cairo-xlib-uninstalled.pc" && rm -f "cairo-xlib-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-xlib-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xlib%g; s%@FEATURE_NAME@%Xlib surface backend%g; s%@FEATURE_BASE@%$xlib_BASE%g; s%@FEATURE_REQUIRES@%$xlib_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xlib_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_NONPKGCONFIG_CFLAGS%g; " < "cairo-xlib-uninstalled.pc.tmp" > "cairo-xlib-uninstalled.pc" && rm -f "cairo-xlib-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-xlib-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-xlib-xrender.pc":F) mv "src/cairo-xlib-xrender.pc" "src/cairo-xlib-xrender.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xlib-xrender%g; s%@FEATURE_NAME@%Xlib Xrender surface backend%g; s%@FEATURE_BASE@%$xlib_xrender_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xrender_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xrender_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xrender_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xlib-xrender.pc.tmp" > "src/cairo-xlib-xrender.pc" && rm -f "src/cairo-xlib-xrender.pc.tmp" || - as_fn_error "failed to update src/cairo-xlib-xrender.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xlib-xrender%g; s%@FEATURE_NAME@%Xlib Xrender surface backend%g; s%@FEATURE_BASE@%$xlib_xrender_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xrender_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xrender_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xlib_xrender_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xrender_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xlib-xrender.pc.tmp" > "src/cairo-xlib-xrender.pc" && rm -f "src/cairo-xlib-xrender.pc.tmp" || + as_fn_error $? "failed to update src/cairo-xlib-xrender.pc" "$LINENO" 5 ;; "cairo-xlib-xrender-uninstalled.pc":F) mv "cairo-xlib-xrender-uninstalled.pc" "cairo-xlib-xrender-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xlib-xrender%g; s%@FEATURE_NAME@%Xlib Xrender surface backend%g; s%@FEATURE_BASE@%$xlib_xrender_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xrender_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xrender_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xrender_NONPKGCONFIG_CFLAGS%g; " < "cairo-xlib-xrender-uninstalled.pc.tmp" > "cairo-xlib-xrender-uninstalled.pc" && rm -f "cairo-xlib-xrender-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-xlib-xrender-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xlib-xrender%g; s%@FEATURE_NAME@%Xlib Xrender surface backend%g; s%@FEATURE_BASE@%$xlib_xrender_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xrender_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xrender_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xlib_xrender_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xrender_NONPKGCONFIG_CFLAGS%g; " < "cairo-xlib-xrender-uninstalled.pc.tmp" > "cairo-xlib-xrender-uninstalled.pc" && rm -f "cairo-xlib-xrender-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-xlib-xrender-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-xcb.pc":F) mv "src/cairo-xcb.pc" "src/cairo-xcb.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xcb%g; s%@FEATURE_NAME@%XCB surface backend%g; s%@FEATURE_BASE@%$xcb_BASE%g; s%@FEATURE_REQUIRES@%$xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xcb.pc.tmp" > "src/cairo-xcb.pc" && rm -f "src/cairo-xcb.pc.tmp" || - as_fn_error "failed to update src/cairo-xcb.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xcb%g; s%@FEATURE_NAME@%XCB surface backend%g; s%@FEATURE_BASE@%$xcb_BASE%g; s%@FEATURE_REQUIRES@%$xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xcb_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xcb.pc.tmp" > "src/cairo-xcb.pc" && rm -f "src/cairo-xcb.pc.tmp" || + as_fn_error $? "failed to update src/cairo-xcb.pc" "$LINENO" 5 ;; "cairo-xcb-uninstalled.pc":F) mv "cairo-xcb-uninstalled.pc" "cairo-xcb-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xcb%g; s%@FEATURE_NAME@%XCB surface backend%g; s%@FEATURE_BASE@%$xcb_BASE%g; s%@FEATURE_REQUIRES@%$xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_NONPKGCONFIG_CFLAGS%g; " < "cairo-xcb-uninstalled.pc.tmp" > "cairo-xcb-uninstalled.pc" && rm -f "cairo-xcb-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-xcb-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xcb%g; s%@FEATURE_NAME@%XCB surface backend%g; s%@FEATURE_BASE@%$xcb_BASE%g; s%@FEATURE_REQUIRES@%$xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xcb_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_NONPKGCONFIG_CFLAGS%g; " < "cairo-xcb-uninstalled.pc.tmp" > "cairo-xcb-uninstalled.pc" && rm -f "cairo-xcb-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-xcb-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-xlib-xcb.pc":F) mv "src/cairo-xlib-xcb.pc" "src/cairo-xlib-xcb.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xlib-xcb%g; s%@FEATURE_NAME@%Xlib/XCB functions%g; s%@FEATURE_BASE@%$xlib_xcb_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xcb_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xlib-xcb.pc.tmp" > "src/cairo-xlib-xcb.pc" && rm -f "src/cairo-xlib-xcb.pc.tmp" || - as_fn_error "failed to update src/cairo-xlib-xcb.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xlib-xcb%g; s%@FEATURE_NAME@%Xlib/XCB functions%g; s%@FEATURE_BASE@%$xlib_xcb_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xlib_xcb_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xcb_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xlib-xcb.pc.tmp" > "src/cairo-xlib-xcb.pc" && rm -f "src/cairo-xlib-xcb.pc.tmp" || + as_fn_error $? "failed to update src/cairo-xlib-xcb.pc" "$LINENO" 5 ;; "cairo-xlib-xcb-uninstalled.pc":F) mv "cairo-xlib-xcb-uninstalled.pc" "cairo-xlib-xcb-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xlib-xcb%g; s%@FEATURE_NAME@%Xlib/XCB functions%g; s%@FEATURE_BASE@%$xlib_xcb_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xcb_NONPKGCONFIG_CFLAGS%g; " < "cairo-xlib-xcb-uninstalled.pc.tmp" > "cairo-xlib-xcb-uninstalled.pc" && rm -f "cairo-xlib-xcb-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-xlib-xcb-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xlib-xcb%g; s%@FEATURE_NAME@%Xlib/XCB functions%g; s%@FEATURE_BASE@%$xlib_xcb_BASE%g; s%@FEATURE_REQUIRES@%$xlib_xcb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xlib_xcb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xlib_xcb_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xlib_xcb_NONPKGCONFIG_CFLAGS%g; " < "cairo-xlib-xcb-uninstalled.pc.tmp" > "cairo-xlib-xcb-uninstalled.pc" && rm -f "cairo-xlib-xcb-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-xlib-xcb-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-xcb-shm.pc":F) mv "src/cairo-xcb-shm.pc" "src/cairo-xcb-shm.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xcb-shm%g; s%@FEATURE_NAME@%XCB/SHM functions%g; s%@FEATURE_BASE@%$xcb_shm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_shm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_shm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_shm_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xcb-shm.pc.tmp" > "src/cairo-xcb-shm.pc" && rm -f "src/cairo-xcb-shm.pc.tmp" || - as_fn_error "failed to update src/cairo-xcb-shm.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xcb-shm%g; s%@FEATURE_NAME@%XCB/SHM functions%g; s%@FEATURE_BASE@%$xcb_shm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_shm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_shm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xcb_shm_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_shm_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xcb-shm.pc.tmp" > "src/cairo-xcb-shm.pc" && rm -f "src/cairo-xcb-shm.pc.tmp" || + as_fn_error $? "failed to update src/cairo-xcb-shm.pc" "$LINENO" 5 ;; "cairo-xcb-shm-uninstalled.pc":F) mv "cairo-xcb-shm-uninstalled.pc" "cairo-xcb-shm-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xcb-shm%g; s%@FEATURE_NAME@%XCB/SHM functions%g; s%@FEATURE_BASE@%$xcb_shm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_shm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_shm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_shm_NONPKGCONFIG_CFLAGS%g; " < "cairo-xcb-shm-uninstalled.pc.tmp" > "cairo-xcb-shm-uninstalled.pc" && rm -f "cairo-xcb-shm-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-xcb-shm-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xcb-shm%g; s%@FEATURE_NAME@%XCB/SHM functions%g; s%@FEATURE_BASE@%$xcb_shm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_shm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_shm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xcb_shm_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_shm_NONPKGCONFIG_CFLAGS%g; " < "cairo-xcb-shm-uninstalled.pc.tmp" > "cairo-xcb-shm-uninstalled.pc" && rm -f "cairo-xcb-shm-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-xcb-shm-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-qt.pc":F) mv "src/cairo-qt.pc" "src/cairo-qt.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-qt%g; s%@FEATURE_NAME@%Qt surface backend%g; s%@FEATURE_BASE@%$qt_BASE%g; s%@FEATURE_REQUIRES@%$qt_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$qt_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$qt_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-qt.pc.tmp" > "src/cairo-qt.pc" && rm -f "src/cairo-qt.pc.tmp" || - as_fn_error "failed to update src/cairo-qt.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-qt%g; s%@FEATURE_NAME@%Qt surface backend%g; s%@FEATURE_BASE@%$qt_BASE%g; s%@FEATURE_REQUIRES@%$qt_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$qt_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$qt_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$qt_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-qt.pc.tmp" > "src/cairo-qt.pc" && rm -f "src/cairo-qt.pc.tmp" || + as_fn_error $? "failed to update src/cairo-qt.pc" "$LINENO" 5 ;; "cairo-qt-uninstalled.pc":F) mv "cairo-qt-uninstalled.pc" "cairo-qt-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-qt%g; s%@FEATURE_NAME@%Qt surface backend%g; s%@FEATURE_BASE@%$qt_BASE%g; s%@FEATURE_REQUIRES@%$qt_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$qt_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$qt_NONPKGCONFIG_CFLAGS%g; " < "cairo-qt-uninstalled.pc.tmp" > "cairo-qt-uninstalled.pc" && rm -f "cairo-qt-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-qt-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-qt%g; s%@FEATURE_NAME@%Qt surface backend%g; s%@FEATURE_BASE@%$qt_BASE%g; s%@FEATURE_REQUIRES@%$qt_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$qt_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$qt_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$qt_NONPKGCONFIG_CFLAGS%g; " < "cairo-qt-uninstalled.pc.tmp" > "cairo-qt-uninstalled.pc" && rm -f "cairo-qt-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-qt-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-quartz.pc":F) mv "src/cairo-quartz.pc" "src/cairo-quartz.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-quartz%g; s%@FEATURE_NAME@%Quartz surface backend%g; s%@FEATURE_BASE@%$quartz_BASE%g; s%@FEATURE_REQUIRES@%$quartz_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-quartz.pc.tmp" > "src/cairo-quartz.pc" && rm -f "src/cairo-quartz.pc.tmp" || - as_fn_error "failed to update src/cairo-quartz.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-quartz%g; s%@FEATURE_NAME@%Quartz surface backend%g; s%@FEATURE_BASE@%$quartz_BASE%g; s%@FEATURE_REQUIRES@%$quartz_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$quartz_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-quartz.pc.tmp" > "src/cairo-quartz.pc" && rm -f "src/cairo-quartz.pc.tmp" || + as_fn_error $? "failed to update src/cairo-quartz.pc" "$LINENO" 5 ;; "cairo-quartz-uninstalled.pc":F) mv "cairo-quartz-uninstalled.pc" "cairo-quartz-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-quartz%g; s%@FEATURE_NAME@%Quartz surface backend%g; s%@FEATURE_BASE@%$quartz_BASE%g; s%@FEATURE_REQUIRES@%$quartz_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_NONPKGCONFIG_CFLAGS%g; " < "cairo-quartz-uninstalled.pc.tmp" > "cairo-quartz-uninstalled.pc" && rm -f "cairo-quartz-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-quartz-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-quartz%g; s%@FEATURE_NAME@%Quartz surface backend%g; s%@FEATURE_BASE@%$quartz_BASE%g; s%@FEATURE_REQUIRES@%$quartz_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$quartz_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_NONPKGCONFIG_CFLAGS%g; " < "cairo-quartz-uninstalled.pc.tmp" > "cairo-quartz-uninstalled.pc" && rm -f "cairo-quartz-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-quartz-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-quartz-font.pc":F) mv "src/cairo-quartz-font.pc" "src/cairo-quartz-font.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-quartz-font%g; s%@FEATURE_NAME@%Quartz font backend%g; s%@FEATURE_BASE@%$quartz_font_BASE%g; s%@FEATURE_REQUIRES@%$quartz_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_font_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-quartz-font.pc.tmp" > "src/cairo-quartz-font.pc" && rm -f "src/cairo-quartz-font.pc.tmp" || - as_fn_error "failed to update src/cairo-quartz-font.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-quartz-font%g; s%@FEATURE_NAME@%Quartz font backend%g; s%@FEATURE_BASE@%$quartz_font_BASE%g; s%@FEATURE_REQUIRES@%$quartz_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$quartz_font_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_font_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-quartz-font.pc.tmp" > "src/cairo-quartz-font.pc" && rm -f "src/cairo-quartz-font.pc.tmp" || + as_fn_error $? "failed to update src/cairo-quartz-font.pc" "$LINENO" 5 ;; "cairo-quartz-font-uninstalled.pc":F) mv "cairo-quartz-font-uninstalled.pc" "cairo-quartz-font-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-quartz-font%g; s%@FEATURE_NAME@%Quartz font backend%g; s%@FEATURE_BASE@%$quartz_font_BASE%g; s%@FEATURE_REQUIRES@%$quartz_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_font_NONPKGCONFIG_CFLAGS%g; " < "cairo-quartz-font-uninstalled.pc.tmp" > "cairo-quartz-font-uninstalled.pc" && rm -f "cairo-quartz-font-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-quartz-font-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-quartz-font%g; s%@FEATURE_NAME@%Quartz font backend%g; s%@FEATURE_BASE@%$quartz_font_BASE%g; s%@FEATURE_REQUIRES@%$quartz_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$quartz_font_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_font_NONPKGCONFIG_CFLAGS%g; " < "cairo-quartz-font-uninstalled.pc.tmp" > "cairo-quartz-font-uninstalled.pc" && rm -f "cairo-quartz-font-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-quartz-font-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-quartz-image.pc":F) mv "src/cairo-quartz-image.pc" "src/cairo-quartz-image.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-quartz-image%g; s%@FEATURE_NAME@%Quartz Image surface backend%g; s%@FEATURE_BASE@%$quartz_image_BASE%g; s%@FEATURE_REQUIRES@%$quartz_image_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_image_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_image_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-quartz-image.pc.tmp" > "src/cairo-quartz-image.pc" && rm -f "src/cairo-quartz-image.pc.tmp" || - as_fn_error "failed to update src/cairo-quartz-image.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-quartz-image%g; s%@FEATURE_NAME@%Quartz Image surface backend%g; s%@FEATURE_BASE@%$quartz_image_BASE%g; s%@FEATURE_REQUIRES@%$quartz_image_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_image_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$quartz_image_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_image_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-quartz-image.pc.tmp" > "src/cairo-quartz-image.pc" && rm -f "src/cairo-quartz-image.pc.tmp" || + as_fn_error $? "failed to update src/cairo-quartz-image.pc" "$LINENO" 5 ;; "cairo-quartz-image-uninstalled.pc":F) mv "cairo-quartz-image-uninstalled.pc" "cairo-quartz-image-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-quartz-image%g; s%@FEATURE_NAME@%Quartz Image surface backend%g; s%@FEATURE_BASE@%$quartz_image_BASE%g; s%@FEATURE_REQUIRES@%$quartz_image_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_image_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_image_NONPKGCONFIG_CFLAGS%g; " < "cairo-quartz-image-uninstalled.pc.tmp" > "cairo-quartz-image-uninstalled.pc" && rm -f "cairo-quartz-image-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-quartz-image-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-quartz-image%g; s%@FEATURE_NAME@%Quartz Image surface backend%g; s%@FEATURE_BASE@%$quartz_image_BASE%g; s%@FEATURE_REQUIRES@%$quartz_image_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$quartz_image_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$quartz_image_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$quartz_image_NONPKGCONFIG_CFLAGS%g; " < "cairo-quartz-image-uninstalled.pc.tmp" > "cairo-quartz-image-uninstalled.pc" && rm -f "cairo-quartz-image-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-quartz-image-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-win32.pc":F) mv "src/cairo-win32.pc" "src/cairo-win32.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-win32%g; s%@FEATURE_NAME@%Microsoft Windows surface backend%g; s%@FEATURE_BASE@%$win32_BASE%g; s%@FEATURE_REQUIRES@%$win32_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-win32.pc.tmp" > "src/cairo-win32.pc" && rm -f "src/cairo-win32.pc.tmp" || - as_fn_error "failed to update src/cairo-win32.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-win32%g; s%@FEATURE_NAME@%Microsoft Windows surface backend%g; s%@FEATURE_BASE@%$win32_BASE%g; s%@FEATURE_REQUIRES@%$win32_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$win32_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-win32.pc.tmp" > "src/cairo-win32.pc" && rm -f "src/cairo-win32.pc.tmp" || + as_fn_error $? "failed to update src/cairo-win32.pc" "$LINENO" 5 ;; "cairo-win32-uninstalled.pc":F) mv "cairo-win32-uninstalled.pc" "cairo-win32-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-win32%g; s%@FEATURE_NAME@%Microsoft Windows surface backend%g; s%@FEATURE_BASE@%$win32_BASE%g; s%@FEATURE_REQUIRES@%$win32_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_NONPKGCONFIG_CFLAGS%g; " < "cairo-win32-uninstalled.pc.tmp" > "cairo-win32-uninstalled.pc" && rm -f "cairo-win32-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-win32-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-win32%g; s%@FEATURE_NAME@%Microsoft Windows surface backend%g; s%@FEATURE_BASE@%$win32_BASE%g; s%@FEATURE_REQUIRES@%$win32_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$win32_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_NONPKGCONFIG_CFLAGS%g; " < "cairo-win32-uninstalled.pc.tmp" > "cairo-win32-uninstalled.pc" && rm -f "cairo-win32-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-win32-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-win32-font.pc":F) mv "src/cairo-win32-font.pc" "src/cairo-win32-font.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-win32-font%g; s%@FEATURE_NAME@%Microsoft Windows font backend%g; s%@FEATURE_BASE@%$win32_font_BASE%g; s%@FEATURE_REQUIRES@%$win32_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_font_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-win32-font.pc.tmp" > "src/cairo-win32-font.pc" && rm -f "src/cairo-win32-font.pc.tmp" || - as_fn_error "failed to update src/cairo-win32-font.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-win32-font%g; s%@FEATURE_NAME@%Microsoft Windows font backend%g; s%@FEATURE_BASE@%$win32_font_BASE%g; s%@FEATURE_REQUIRES@%$win32_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$win32_font_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_font_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-win32-font.pc.tmp" > "src/cairo-win32-font.pc" && rm -f "src/cairo-win32-font.pc.tmp" || + as_fn_error $? "failed to update src/cairo-win32-font.pc" "$LINENO" 5 ;; "cairo-win32-font-uninstalled.pc":F) mv "cairo-win32-font-uninstalled.pc" "cairo-win32-font-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-win32-font%g; s%@FEATURE_NAME@%Microsoft Windows font backend%g; s%@FEATURE_BASE@%$win32_font_BASE%g; s%@FEATURE_REQUIRES@%$win32_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_font_NONPKGCONFIG_CFLAGS%g; " < "cairo-win32-font-uninstalled.pc.tmp" > "cairo-win32-font-uninstalled.pc" && rm -f "cairo-win32-font-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-win32-font-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-win32-font%g; s%@FEATURE_NAME@%Microsoft Windows font backend%g; s%@FEATURE_BASE@%$win32_font_BASE%g; s%@FEATURE_REQUIRES@%$win32_font_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$win32_font_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$win32_font_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$win32_font_NONPKGCONFIG_CFLAGS%g; " < "cairo-win32-font-uninstalled.pc.tmp" > "cairo-win32-font-uninstalled.pc" && rm -f "cairo-win32-font-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-win32-font-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-skia.pc":F) mv "src/cairo-skia.pc" "src/cairo-skia.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-skia%g; s%@FEATURE_NAME@%Skia surface backend%g; s%@FEATURE_BASE@%$skia_BASE%g; s%@FEATURE_REQUIRES@%$skia_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$skia_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$skia_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-skia.pc.tmp" > "src/cairo-skia.pc" && rm -f "src/cairo-skia.pc.tmp" || - as_fn_error "failed to update src/cairo-skia.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-skia%g; s%@FEATURE_NAME@%Skia surface backend%g; s%@FEATURE_BASE@%$skia_BASE%g; s%@FEATURE_REQUIRES@%$skia_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$skia_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$skia_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$skia_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-skia.pc.tmp" > "src/cairo-skia.pc" && rm -f "src/cairo-skia.pc.tmp" || + as_fn_error $? "failed to update src/cairo-skia.pc" "$LINENO" 5 ;; "cairo-skia-uninstalled.pc":F) mv "cairo-skia-uninstalled.pc" "cairo-skia-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-skia%g; s%@FEATURE_NAME@%Skia surface backend%g; s%@FEATURE_BASE@%$skia_BASE%g; s%@FEATURE_REQUIRES@%$skia_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$skia_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$skia_NONPKGCONFIG_CFLAGS%g; " < "cairo-skia-uninstalled.pc.tmp" > "cairo-skia-uninstalled.pc" && rm -f "cairo-skia-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-skia-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-skia%g; s%@FEATURE_NAME@%Skia surface backend%g; s%@FEATURE_BASE@%$skia_BASE%g; s%@FEATURE_REQUIRES@%$skia_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$skia_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$skia_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$skia_NONPKGCONFIG_CFLAGS%g; " < "cairo-skia-uninstalled.pc.tmp" > "cairo-skia-uninstalled.pc" && rm -f "cairo-skia-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-skia-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-os2.pc":F) mv "src/cairo-os2.pc" "src/cairo-os2.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-os2%g; s%@FEATURE_NAME@%OS/2 surface backend%g; s%@FEATURE_BASE@%$os2_BASE%g; s%@FEATURE_REQUIRES@%$os2_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$os2_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$os2_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-os2.pc.tmp" > "src/cairo-os2.pc" && rm -f "src/cairo-os2.pc.tmp" || - as_fn_error "failed to update src/cairo-os2.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-os2%g; s%@FEATURE_NAME@%OS/2 surface backend%g; s%@FEATURE_BASE@%$os2_BASE%g; s%@FEATURE_REQUIRES@%$os2_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$os2_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$os2_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$os2_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-os2.pc.tmp" > "src/cairo-os2.pc" && rm -f "src/cairo-os2.pc.tmp" || + as_fn_error $? "failed to update src/cairo-os2.pc" "$LINENO" 5 ;; "cairo-os2-uninstalled.pc":F) mv "cairo-os2-uninstalled.pc" "cairo-os2-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-os2%g; s%@FEATURE_NAME@%OS/2 surface backend%g; s%@FEATURE_BASE@%$os2_BASE%g; s%@FEATURE_REQUIRES@%$os2_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$os2_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$os2_NONPKGCONFIG_CFLAGS%g; " < "cairo-os2-uninstalled.pc.tmp" > "cairo-os2-uninstalled.pc" && rm -f "cairo-os2-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-os2-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-os2%g; s%@FEATURE_NAME@%OS/2 surface backend%g; s%@FEATURE_BASE@%$os2_BASE%g; s%@FEATURE_REQUIRES@%$os2_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$os2_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$os2_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$os2_NONPKGCONFIG_CFLAGS%g; " < "cairo-os2-uninstalled.pc.tmp" > "cairo-os2-uninstalled.pc" && rm -f "cairo-os2-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-os2-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-beos.pc":F) mv "src/cairo-beos.pc" "src/cairo-beos.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-beos%g; s%@FEATURE_NAME@%BeOS/Zeta surface backend%g; s%@FEATURE_BASE@%$beos_BASE%g; s%@FEATURE_REQUIRES@%$beos_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$beos_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$beos_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-beos.pc.tmp" > "src/cairo-beos.pc" && rm -f "src/cairo-beos.pc.tmp" || - as_fn_error "failed to update src/cairo-beos.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-beos%g; s%@FEATURE_NAME@%BeOS/Zeta surface backend%g; s%@FEATURE_BASE@%$beos_BASE%g; s%@FEATURE_REQUIRES@%$beos_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$beos_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$beos_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$beos_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-beos.pc.tmp" > "src/cairo-beos.pc" && rm -f "src/cairo-beos.pc.tmp" || + as_fn_error $? "failed to update src/cairo-beos.pc" "$LINENO" 5 ;; "cairo-beos-uninstalled.pc":F) mv "cairo-beos-uninstalled.pc" "cairo-beos-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-beos%g; s%@FEATURE_NAME@%BeOS/Zeta surface backend%g; s%@FEATURE_BASE@%$beos_BASE%g; s%@FEATURE_REQUIRES@%$beos_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$beos_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$beos_NONPKGCONFIG_CFLAGS%g; " < "cairo-beos-uninstalled.pc.tmp" > "cairo-beos-uninstalled.pc" && rm -f "cairo-beos-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-beos-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-beos%g; s%@FEATURE_NAME@%BeOS/Zeta surface backend%g; s%@FEATURE_BASE@%$beos_BASE%g; s%@FEATURE_REQUIRES@%$beos_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$beos_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$beos_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$beos_NONPKGCONFIG_CFLAGS%g; " < "cairo-beos-uninstalled.pc.tmp" > "cairo-beos-uninstalled.pc" && rm -f "cairo-beos-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-beos-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-drm.pc":F) mv "src/cairo-drm.pc" "src/cairo-drm.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-drm%g; s%@FEATURE_NAME@%DRM surface backend%g; s%@FEATURE_BASE@%$drm_BASE%g; s%@FEATURE_REQUIRES@%$drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-drm.pc.tmp" > "src/cairo-drm.pc" && rm -f "src/cairo-drm.pc.tmp" || - as_fn_error "failed to update src/cairo-drm.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-drm%g; s%@FEATURE_NAME@%DRM surface backend%g; s%@FEATURE_BASE@%$drm_BASE%g; s%@FEATURE_REQUIRES@%$drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$drm_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-drm.pc.tmp" > "src/cairo-drm.pc" && rm -f "src/cairo-drm.pc.tmp" || + as_fn_error $? "failed to update src/cairo-drm.pc" "$LINENO" 5 ;; "cairo-drm-uninstalled.pc":F) mv "cairo-drm-uninstalled.pc" "cairo-drm-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-drm%g; s%@FEATURE_NAME@%DRM surface backend%g; s%@FEATURE_BASE@%$drm_BASE%g; s%@FEATURE_REQUIRES@%$drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_NONPKGCONFIG_CFLAGS%g; " < "cairo-drm-uninstalled.pc.tmp" > "cairo-drm-uninstalled.pc" && rm -f "cairo-drm-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-drm-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-drm%g; s%@FEATURE_NAME@%DRM surface backend%g; s%@FEATURE_BASE@%$drm_BASE%g; s%@FEATURE_REQUIRES@%$drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$drm_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_NONPKGCONFIG_CFLAGS%g; " < "cairo-drm-uninstalled.pc.tmp" > "cairo-drm-uninstalled.pc" && rm -f "cairo-drm-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-drm-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-drm-xr.pc":F) mv "src/cairo-drm-xr.pc" "src/cairo-drm-xr.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-drm-xr%g; s%@FEATURE_NAME@%DRM Xr (DDX) functions%g; s%@FEATURE_BASE@%$drm_xr_BASE%g; s%@FEATURE_REQUIRES@%$drm_xr_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_xr_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_xr_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-drm-xr.pc.tmp" > "src/cairo-drm-xr.pc" && rm -f "src/cairo-drm-xr.pc.tmp" || - as_fn_error "failed to update src/cairo-drm-xr.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-drm-xr%g; s%@FEATURE_NAME@%DRM Xr (DDX) functions%g; s%@FEATURE_BASE@%$drm_xr_BASE%g; s%@FEATURE_REQUIRES@%$drm_xr_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_xr_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$drm_xr_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_xr_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-drm-xr.pc.tmp" > "src/cairo-drm-xr.pc" && rm -f "src/cairo-drm-xr.pc.tmp" || + as_fn_error $? "failed to update src/cairo-drm-xr.pc" "$LINENO" 5 ;; "cairo-drm-xr-uninstalled.pc":F) mv "cairo-drm-xr-uninstalled.pc" "cairo-drm-xr-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-drm-xr%g; s%@FEATURE_NAME@%DRM Xr (DDX) functions%g; s%@FEATURE_BASE@%$drm_xr_BASE%g; s%@FEATURE_REQUIRES@%$drm_xr_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_xr_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_xr_NONPKGCONFIG_CFLAGS%g; " < "cairo-drm-xr-uninstalled.pc.tmp" > "cairo-drm-xr-uninstalled.pc" && rm -f "cairo-drm-xr-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-drm-xr-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-drm-xr%g; s%@FEATURE_NAME@%DRM Xr (DDX) functions%g; s%@FEATURE_BASE@%$drm_xr_BASE%g; s%@FEATURE_REQUIRES@%$drm_xr_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$drm_xr_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$drm_xr_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$drm_xr_NONPKGCONFIG_CFLAGS%g; " < "cairo-drm-xr-uninstalled.pc.tmp" > "cairo-drm-xr-uninstalled.pc" && rm -f "cairo-drm-xr-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-drm-xr-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-gallium.pc":F) mv "src/cairo-gallium.pc" "src/cairo-gallium.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-gallium%g; s%@FEATURE_NAME@%Gallium3D surface backend%g; s%@FEATURE_BASE@%$gallium_BASE%g; s%@FEATURE_REQUIRES@%$gallium_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gallium_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gallium_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-gallium.pc.tmp" > "src/cairo-gallium.pc" && rm -f "src/cairo-gallium.pc.tmp" || - as_fn_error "failed to update src/cairo-gallium.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-gallium%g; s%@FEATURE_NAME@%Gallium3D surface backend%g; s%@FEATURE_BASE@%$gallium_BASE%g; s%@FEATURE_REQUIRES@%$gallium_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gallium_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$gallium_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gallium_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-gallium.pc.tmp" > "src/cairo-gallium.pc" && rm -f "src/cairo-gallium.pc.tmp" || + as_fn_error $? "failed to update src/cairo-gallium.pc" "$LINENO" 5 ;; "cairo-gallium-uninstalled.pc":F) mv "cairo-gallium-uninstalled.pc" "cairo-gallium-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-gallium%g; s%@FEATURE_NAME@%Gallium3D surface backend%g; s%@FEATURE_BASE@%$gallium_BASE%g; s%@FEATURE_REQUIRES@%$gallium_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gallium_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gallium_NONPKGCONFIG_CFLAGS%g; " < "cairo-gallium-uninstalled.pc.tmp" > "cairo-gallium-uninstalled.pc" && rm -f "cairo-gallium-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-gallium-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-gallium%g; s%@FEATURE_NAME@%Gallium3D surface backend%g; s%@FEATURE_BASE@%$gallium_BASE%g; s%@FEATURE_REQUIRES@%$gallium_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gallium_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$gallium_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gallium_NONPKGCONFIG_CFLAGS%g; " < "cairo-gallium-uninstalled.pc.tmp" > "cairo-gallium-uninstalled.pc" && rm -f "cairo-gallium-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-gallium-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-xcb-drm.pc":F) mv "src/cairo-xcb-drm.pc" "src/cairo-xcb-drm.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xcb-drm%g; s%@FEATURE_NAME@%XCB/DRM functions%g; s%@FEATURE_BASE@%$xcb_drm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_drm_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xcb-drm.pc.tmp" > "src/cairo-xcb-drm.pc" && rm -f "src/cairo-xcb-drm.pc.tmp" || - as_fn_error "failed to update src/cairo-xcb-drm.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xcb-drm%g; s%@FEATURE_NAME@%XCB/DRM functions%g; s%@FEATURE_BASE@%$xcb_drm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xcb_drm_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_drm_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xcb-drm.pc.tmp" > "src/cairo-xcb-drm.pc" && rm -f "src/cairo-xcb-drm.pc.tmp" || + as_fn_error $? "failed to update src/cairo-xcb-drm.pc" "$LINENO" 5 ;; "cairo-xcb-drm-uninstalled.pc":F) mv "cairo-xcb-drm-uninstalled.pc" "cairo-xcb-drm-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xcb-drm%g; s%@FEATURE_NAME@%XCB/DRM functions%g; s%@FEATURE_BASE@%$xcb_drm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_drm_NONPKGCONFIG_CFLAGS%g; " < "cairo-xcb-drm-uninstalled.pc.tmp" > "cairo-xcb-drm-uninstalled.pc" && rm -f "cairo-xcb-drm-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-xcb-drm-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xcb-drm%g; s%@FEATURE_NAME@%XCB/DRM functions%g; s%@FEATURE_BASE@%$xcb_drm_BASE%g; s%@FEATURE_REQUIRES@%$xcb_drm_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xcb_drm_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xcb_drm_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xcb_drm_NONPKGCONFIG_CFLAGS%g; " < "cairo-xcb-drm-uninstalled.pc.tmp" > "cairo-xcb-drm-uninstalled.pc" && rm -f "cairo-xcb-drm-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-xcb-drm-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-png.pc":F) mv "src/cairo-png.pc" "src/cairo-png.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-png%g; s%@FEATURE_NAME@%PNG functions%g; s%@FEATURE_BASE@%$png_BASE%g; s%@FEATURE_REQUIRES@%$png_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$png_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$png_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-png.pc.tmp" > "src/cairo-png.pc" && rm -f "src/cairo-png.pc.tmp" || - as_fn_error "failed to update src/cairo-png.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-png%g; s%@FEATURE_NAME@%PNG functions%g; s%@FEATURE_BASE@%$png_BASE%g; s%@FEATURE_REQUIRES@%$png_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$png_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$png_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$png_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-png.pc.tmp" > "src/cairo-png.pc" && rm -f "src/cairo-png.pc.tmp" || + as_fn_error $? "failed to update src/cairo-png.pc" "$LINENO" 5 ;; "cairo-png-uninstalled.pc":F) mv "cairo-png-uninstalled.pc" "cairo-png-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-png%g; s%@FEATURE_NAME@%PNG functions%g; s%@FEATURE_BASE@%$png_BASE%g; s%@FEATURE_REQUIRES@%$png_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$png_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$png_NONPKGCONFIG_CFLAGS%g; " < "cairo-png-uninstalled.pc.tmp" > "cairo-png-uninstalled.pc" && rm -f "cairo-png-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-png-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-png%g; s%@FEATURE_NAME@%PNG functions%g; s%@FEATURE_BASE@%$png_BASE%g; s%@FEATURE_REQUIRES@%$png_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$png_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$png_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$png_NONPKGCONFIG_CFLAGS%g; " < "cairo-png-uninstalled.pc.tmp" > "cairo-png-uninstalled.pc" && rm -f "cairo-png-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-png-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-gl.pc":F) mv "src/cairo-gl.pc" "src/cairo-gl.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-gl%g; s%@FEATURE_NAME@%OpenGL surface backend%g; s%@FEATURE_BASE@%$gl_BASE%g; s%@FEATURE_REQUIRES@%$gl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gl_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-gl.pc.tmp" > "src/cairo-gl.pc" && rm -f "src/cairo-gl.pc.tmp" || - as_fn_error "failed to update src/cairo-gl.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-gl%g; s%@FEATURE_NAME@%OpenGL surface backend%g; s%@FEATURE_BASE@%$gl_BASE%g; s%@FEATURE_REQUIRES@%$gl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$gl_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gl_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-gl.pc.tmp" > "src/cairo-gl.pc" && rm -f "src/cairo-gl.pc.tmp" || + as_fn_error $? "failed to update src/cairo-gl.pc" "$LINENO" 5 ;; "cairo-gl-uninstalled.pc":F) mv "cairo-gl-uninstalled.pc" "cairo-gl-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-gl%g; s%@FEATURE_NAME@%OpenGL surface backend%g; s%@FEATURE_BASE@%$gl_BASE%g; s%@FEATURE_REQUIRES@%$gl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gl_NONPKGCONFIG_CFLAGS%g; " < "cairo-gl-uninstalled.pc.tmp" > "cairo-gl-uninstalled.pc" && rm -f "cairo-gl-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-gl-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-gl%g; s%@FEATURE_NAME@%OpenGL surface backend%g; s%@FEATURE_BASE@%$gl_BASE%g; s%@FEATURE_REQUIRES@%$gl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$gl_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gl_NONPKGCONFIG_CFLAGS%g; " < "cairo-gl-uninstalled.pc.tmp" > "cairo-gl-uninstalled.pc" && rm -f "cairo-gl-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-gl-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-directfb.pc":F) mv "src/cairo-directfb.pc" "src/cairo-directfb.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-directfb%g; s%@FEATURE_NAME@%directfb surface backend%g; s%@FEATURE_BASE@%$directfb_BASE%g; s%@FEATURE_REQUIRES@%$directfb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$directfb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$directfb_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-directfb.pc.tmp" > "src/cairo-directfb.pc" && rm -f "src/cairo-directfb.pc.tmp" || - as_fn_error "failed to update src/cairo-directfb.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-directfb%g; s%@FEATURE_NAME@%directfb surface backend%g; s%@FEATURE_BASE@%$directfb_BASE%g; s%@FEATURE_REQUIRES@%$directfb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$directfb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$directfb_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$directfb_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-directfb.pc.tmp" > "src/cairo-directfb.pc" && rm -f "src/cairo-directfb.pc.tmp" || + as_fn_error $? "failed to update src/cairo-directfb.pc" "$LINENO" 5 ;; "cairo-directfb-uninstalled.pc":F) mv "cairo-directfb-uninstalled.pc" "cairo-directfb-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-directfb%g; s%@FEATURE_NAME@%directfb surface backend%g; s%@FEATURE_BASE@%$directfb_BASE%g; s%@FEATURE_REQUIRES@%$directfb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$directfb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$directfb_NONPKGCONFIG_CFLAGS%g; " < "cairo-directfb-uninstalled.pc.tmp" > "cairo-directfb-uninstalled.pc" && rm -f "cairo-directfb-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-directfb-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-directfb%g; s%@FEATURE_NAME@%directfb surface backend%g; s%@FEATURE_BASE@%$directfb_BASE%g; s%@FEATURE_REQUIRES@%$directfb_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$directfb_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$directfb_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$directfb_NONPKGCONFIG_CFLAGS%g; " < "cairo-directfb-uninstalled.pc.tmp" > "cairo-directfb-uninstalled.pc" && rm -f "cairo-directfb-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-directfb-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-vg.pc":F) mv "src/cairo-vg.pc" "src/cairo-vg.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-vg%g; s%@FEATURE_NAME@%OpenVG surface backend%g; s%@FEATURE_BASE@%$vg_BASE%g; s%@FEATURE_REQUIRES@%$vg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$vg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$vg_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-vg.pc.tmp" > "src/cairo-vg.pc" && rm -f "src/cairo-vg.pc.tmp" || - as_fn_error "failed to update src/cairo-vg.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-vg%g; s%@FEATURE_NAME@%OpenVG surface backend%g; s%@FEATURE_BASE@%$vg_BASE%g; s%@FEATURE_REQUIRES@%$vg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$vg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$vg_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$vg_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-vg.pc.tmp" > "src/cairo-vg.pc" && rm -f "src/cairo-vg.pc.tmp" || + as_fn_error $? "failed to update src/cairo-vg.pc" "$LINENO" 5 ;; "cairo-vg-uninstalled.pc":F) mv "cairo-vg-uninstalled.pc" "cairo-vg-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-vg%g; s%@FEATURE_NAME@%OpenVG surface backend%g; s%@FEATURE_BASE@%$vg_BASE%g; s%@FEATURE_REQUIRES@%$vg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$vg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$vg_NONPKGCONFIG_CFLAGS%g; " < "cairo-vg-uninstalled.pc.tmp" > "cairo-vg-uninstalled.pc" && rm -f "cairo-vg-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-vg-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-vg%g; s%@FEATURE_NAME@%OpenVG surface backend%g; s%@FEATURE_BASE@%$vg_BASE%g; s%@FEATURE_REQUIRES@%$vg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$vg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$vg_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$vg_NONPKGCONFIG_CFLAGS%g; " < "cairo-vg-uninstalled.pc.tmp" > "cairo-vg-uninstalled.pc" && rm -f "cairo-vg-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-vg-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-egl.pc":F) mv "src/cairo-egl.pc" "src/cairo-egl.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-egl%g; s%@FEATURE_NAME@%EGL functions%g; s%@FEATURE_BASE@%$egl_BASE%g; s%@FEATURE_REQUIRES@%$egl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$egl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$egl_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-egl.pc.tmp" > "src/cairo-egl.pc" && rm -f "src/cairo-egl.pc.tmp" || - as_fn_error "failed to update src/cairo-egl.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-egl%g; s%@FEATURE_NAME@%EGL functions%g; s%@FEATURE_BASE@%$egl_BASE%g; s%@FEATURE_REQUIRES@%$egl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$egl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$egl_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$egl_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-egl.pc.tmp" > "src/cairo-egl.pc" && rm -f "src/cairo-egl.pc.tmp" || + as_fn_error $? "failed to update src/cairo-egl.pc" "$LINENO" 5 ;; "cairo-egl-uninstalled.pc":F) mv "cairo-egl-uninstalled.pc" "cairo-egl-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-egl%g; s%@FEATURE_NAME@%EGL functions%g; s%@FEATURE_BASE@%$egl_BASE%g; s%@FEATURE_REQUIRES@%$egl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$egl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$egl_NONPKGCONFIG_CFLAGS%g; " < "cairo-egl-uninstalled.pc.tmp" > "cairo-egl-uninstalled.pc" && rm -f "cairo-egl-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-egl-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-egl%g; s%@FEATURE_NAME@%EGL functions%g; s%@FEATURE_BASE@%$egl_BASE%g; s%@FEATURE_REQUIRES@%$egl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$egl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$egl_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$egl_NONPKGCONFIG_CFLAGS%g; " < "cairo-egl-uninstalled.pc.tmp" > "cairo-egl-uninstalled.pc" && rm -f "cairo-egl-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-egl-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-glx.pc":F) mv "src/cairo-glx.pc" "src/cairo-glx.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-glx%g; s%@FEATURE_NAME@%GLX functions%g; s%@FEATURE_BASE@%$glx_BASE%g; s%@FEATURE_REQUIRES@%$glx_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$glx_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$glx_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-glx.pc.tmp" > "src/cairo-glx.pc" && rm -f "src/cairo-glx.pc.tmp" || - as_fn_error "failed to update src/cairo-glx.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-glx%g; s%@FEATURE_NAME@%GLX functions%g; s%@FEATURE_BASE@%$glx_BASE%g; s%@FEATURE_REQUIRES@%$glx_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$glx_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$glx_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$glx_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-glx.pc.tmp" > "src/cairo-glx.pc" && rm -f "src/cairo-glx.pc.tmp" || + as_fn_error $? "failed to update src/cairo-glx.pc" "$LINENO" 5 ;; "cairo-glx-uninstalled.pc":F) mv "cairo-glx-uninstalled.pc" "cairo-glx-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-glx%g; s%@FEATURE_NAME@%GLX functions%g; s%@FEATURE_BASE@%$glx_BASE%g; s%@FEATURE_REQUIRES@%$glx_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$glx_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$glx_NONPKGCONFIG_CFLAGS%g; " < "cairo-glx-uninstalled.pc.tmp" > "cairo-glx-uninstalled.pc" && rm -f "cairo-glx-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-glx-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-glx%g; s%@FEATURE_NAME@%GLX functions%g; s%@FEATURE_BASE@%$glx_BASE%g; s%@FEATURE_REQUIRES@%$glx_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$glx_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$glx_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$glx_NONPKGCONFIG_CFLAGS%g; " < "cairo-glx-uninstalled.pc.tmp" > "cairo-glx-uninstalled.pc" && rm -f "cairo-glx-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-glx-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-wgl.pc":F) mv "src/cairo-wgl.pc" "src/cairo-wgl.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-wgl%g; s%@FEATURE_NAME@%WGL functions%g; s%@FEATURE_BASE@%$wgl_BASE%g; s%@FEATURE_REQUIRES@%$wgl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$wgl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$wgl_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-wgl.pc.tmp" > "src/cairo-wgl.pc" && rm -f "src/cairo-wgl.pc.tmp" || - as_fn_error "failed to update src/cairo-wgl.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-wgl%g; s%@FEATURE_NAME@%WGL functions%g; s%@FEATURE_BASE@%$wgl_BASE%g; s%@FEATURE_REQUIRES@%$wgl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$wgl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$wgl_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$wgl_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-wgl.pc.tmp" > "src/cairo-wgl.pc" && rm -f "src/cairo-wgl.pc.tmp" || + as_fn_error $? "failed to update src/cairo-wgl.pc" "$LINENO" 5 ;; "cairo-wgl-uninstalled.pc":F) mv "cairo-wgl-uninstalled.pc" "cairo-wgl-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-wgl%g; s%@FEATURE_NAME@%WGL functions%g; s%@FEATURE_BASE@%$wgl_BASE%g; s%@FEATURE_REQUIRES@%$wgl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$wgl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$wgl_NONPKGCONFIG_CFLAGS%g; " < "cairo-wgl-uninstalled.pc.tmp" > "cairo-wgl-uninstalled.pc" && rm -f "cairo-wgl-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-wgl-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-wgl%g; s%@FEATURE_NAME@%WGL functions%g; s%@FEATURE_BASE@%$wgl_BASE%g; s%@FEATURE_REQUIRES@%$wgl_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$wgl_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$wgl_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$wgl_NONPKGCONFIG_CFLAGS%g; " < "cairo-wgl-uninstalled.pc.tmp" > "cairo-wgl-uninstalled.pc" && rm -f "cairo-wgl-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-wgl-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-script.pc":F) mv "src/cairo-script.pc" "src/cairo-script.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-script%g; s%@FEATURE_NAME@%script surface backend%g; s%@FEATURE_BASE@%$script_BASE%g; s%@FEATURE_REQUIRES@%$script_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$script_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$script_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-script.pc.tmp" > "src/cairo-script.pc" && rm -f "src/cairo-script.pc.tmp" || - as_fn_error "failed to update src/cairo-script.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-script%g; s%@FEATURE_NAME@%script surface backend%g; s%@FEATURE_BASE@%$script_BASE%g; s%@FEATURE_REQUIRES@%$script_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$script_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$script_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$script_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-script.pc.tmp" > "src/cairo-script.pc" && rm -f "src/cairo-script.pc.tmp" || + as_fn_error $? "failed to update src/cairo-script.pc" "$LINENO" 5 ;; "cairo-script-uninstalled.pc":F) mv "cairo-script-uninstalled.pc" "cairo-script-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-script%g; s%@FEATURE_NAME@%script surface backend%g; s%@FEATURE_BASE@%$script_BASE%g; s%@FEATURE_REQUIRES@%$script_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$script_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$script_NONPKGCONFIG_CFLAGS%g; " < "cairo-script-uninstalled.pc.tmp" > "cairo-script-uninstalled.pc" && rm -f "cairo-script-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-script-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-script%g; s%@FEATURE_NAME@%script surface backend%g; s%@FEATURE_BASE@%$script_BASE%g; s%@FEATURE_REQUIRES@%$script_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$script_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$script_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$script_NONPKGCONFIG_CFLAGS%g; " < "cairo-script-uninstalled.pc.tmp" > "cairo-script-uninstalled.pc" && rm -f "cairo-script-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-script-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-ft.pc":F) mv "src/cairo-ft.pc" "src/cairo-ft.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-ft%g; s%@FEATURE_NAME@%FreeType font backend%g; s%@FEATURE_BASE@%$ft_BASE%g; s%@FEATURE_REQUIRES@%$ft_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ft_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ft_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-ft.pc.tmp" > "src/cairo-ft.pc" && rm -f "src/cairo-ft.pc.tmp" || - as_fn_error "failed to update src/cairo-ft.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-ft%g; s%@FEATURE_NAME@%FreeType font backend%g; s%@FEATURE_BASE@%$ft_BASE%g; s%@FEATURE_REQUIRES@%$ft_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ft_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$ft_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ft_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-ft.pc.tmp" > "src/cairo-ft.pc" && rm -f "src/cairo-ft.pc.tmp" || + as_fn_error $? "failed to update src/cairo-ft.pc" "$LINENO" 5 ;; "cairo-ft-uninstalled.pc":F) mv "cairo-ft-uninstalled.pc" "cairo-ft-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-ft%g; s%@FEATURE_NAME@%FreeType font backend%g; s%@FEATURE_BASE@%$ft_BASE%g; s%@FEATURE_REQUIRES@%$ft_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ft_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ft_NONPKGCONFIG_CFLAGS%g; " < "cairo-ft-uninstalled.pc.tmp" > "cairo-ft-uninstalled.pc" && rm -f "cairo-ft-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-ft-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-ft%g; s%@FEATURE_NAME@%FreeType font backend%g; s%@FEATURE_BASE@%$ft_BASE%g; s%@FEATURE_REQUIRES@%$ft_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ft_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$ft_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ft_NONPKGCONFIG_CFLAGS%g; " < "cairo-ft-uninstalled.pc.tmp" > "cairo-ft-uninstalled.pc" && rm -f "cairo-ft-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-ft-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-fc.pc":F) mv "src/cairo-fc.pc" "src/cairo-fc.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-fc%g; s%@FEATURE_NAME@%Fontconfig font backend%g; s%@FEATURE_BASE@%$fc_BASE%g; s%@FEATURE_REQUIRES@%$fc_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$fc_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$fc_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-fc.pc.tmp" > "src/cairo-fc.pc" && rm -f "src/cairo-fc.pc.tmp" || - as_fn_error "failed to update src/cairo-fc.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-fc%g; s%@FEATURE_NAME@%Fontconfig font backend%g; s%@FEATURE_BASE@%$fc_BASE%g; s%@FEATURE_REQUIRES@%$fc_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$fc_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$fc_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$fc_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-fc.pc.tmp" > "src/cairo-fc.pc" && rm -f "src/cairo-fc.pc.tmp" || + as_fn_error $? "failed to update src/cairo-fc.pc" "$LINENO" 5 ;; "cairo-fc-uninstalled.pc":F) mv "cairo-fc-uninstalled.pc" "cairo-fc-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-fc%g; s%@FEATURE_NAME@%Fontconfig font backend%g; s%@FEATURE_BASE@%$fc_BASE%g; s%@FEATURE_REQUIRES@%$fc_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$fc_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$fc_NONPKGCONFIG_CFLAGS%g; " < "cairo-fc-uninstalled.pc.tmp" > "cairo-fc-uninstalled.pc" && rm -f "cairo-fc-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-fc-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-fc%g; s%@FEATURE_NAME@%Fontconfig font backend%g; s%@FEATURE_BASE@%$fc_BASE%g; s%@FEATURE_REQUIRES@%$fc_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$fc_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$fc_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$fc_NONPKGCONFIG_CFLAGS%g; " < "cairo-fc-uninstalled.pc.tmp" > "cairo-fc-uninstalled.pc" && rm -f "cairo-fc-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-fc-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-ps.pc":F) mv "src/cairo-ps.pc" "src/cairo-ps.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-ps%g; s%@FEATURE_NAME@%PostScript surface backend%g; s%@FEATURE_BASE@%$ps_BASE%g; s%@FEATURE_REQUIRES@%$ps_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ps_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ps_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-ps.pc.tmp" > "src/cairo-ps.pc" && rm -f "src/cairo-ps.pc.tmp" || - as_fn_error "failed to update src/cairo-ps.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-ps%g; s%@FEATURE_NAME@%PostScript surface backend%g; s%@FEATURE_BASE@%$ps_BASE%g; s%@FEATURE_REQUIRES@%$ps_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ps_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$ps_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ps_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-ps.pc.tmp" > "src/cairo-ps.pc" && rm -f "src/cairo-ps.pc.tmp" || + as_fn_error $? "failed to update src/cairo-ps.pc" "$LINENO" 5 ;; "cairo-ps-uninstalled.pc":F) mv "cairo-ps-uninstalled.pc" "cairo-ps-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-ps%g; s%@FEATURE_NAME@%PostScript surface backend%g; s%@FEATURE_BASE@%$ps_BASE%g; s%@FEATURE_REQUIRES@%$ps_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ps_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ps_NONPKGCONFIG_CFLAGS%g; " < "cairo-ps-uninstalled.pc.tmp" > "cairo-ps-uninstalled.pc" && rm -f "cairo-ps-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-ps-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-ps%g; s%@FEATURE_NAME@%PostScript surface backend%g; s%@FEATURE_BASE@%$ps_BASE%g; s%@FEATURE_REQUIRES@%$ps_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$ps_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$ps_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$ps_NONPKGCONFIG_CFLAGS%g; " < "cairo-ps-uninstalled.pc.tmp" > "cairo-ps-uninstalled.pc" && rm -f "cairo-ps-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-ps-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-pdf.pc":F) mv "src/cairo-pdf.pc" "src/cairo-pdf.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-pdf%g; s%@FEATURE_NAME@%PDF surface backend%g; s%@FEATURE_BASE@%$pdf_BASE%g; s%@FEATURE_REQUIRES@%$pdf_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$pdf_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$pdf_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-pdf.pc.tmp" > "src/cairo-pdf.pc" && rm -f "src/cairo-pdf.pc.tmp" || - as_fn_error "failed to update src/cairo-pdf.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-pdf%g; s%@FEATURE_NAME@%PDF surface backend%g; s%@FEATURE_BASE@%$pdf_BASE%g; s%@FEATURE_REQUIRES@%$pdf_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$pdf_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$pdf_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$pdf_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-pdf.pc.tmp" > "src/cairo-pdf.pc" && rm -f "src/cairo-pdf.pc.tmp" || + as_fn_error $? "failed to update src/cairo-pdf.pc" "$LINENO" 5 ;; "cairo-pdf-uninstalled.pc":F) mv "cairo-pdf-uninstalled.pc" "cairo-pdf-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-pdf%g; s%@FEATURE_NAME@%PDF surface backend%g; s%@FEATURE_BASE@%$pdf_BASE%g; s%@FEATURE_REQUIRES@%$pdf_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$pdf_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$pdf_NONPKGCONFIG_CFLAGS%g; " < "cairo-pdf-uninstalled.pc.tmp" > "cairo-pdf-uninstalled.pc" && rm -f "cairo-pdf-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-pdf-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-pdf%g; s%@FEATURE_NAME@%PDF surface backend%g; s%@FEATURE_BASE@%$pdf_BASE%g; s%@FEATURE_REQUIRES@%$pdf_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$pdf_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$pdf_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$pdf_NONPKGCONFIG_CFLAGS%g; " < "cairo-pdf-uninstalled.pc.tmp" > "cairo-pdf-uninstalled.pc" && rm -f "cairo-pdf-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-pdf-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-svg.pc":F) mv "src/cairo-svg.pc" "src/cairo-svg.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-svg%g; s%@FEATURE_NAME@%SVG surface backend%g; s%@FEATURE_BASE@%$svg_BASE%g; s%@FEATURE_REQUIRES@%$svg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$svg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$svg_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-svg.pc.tmp" > "src/cairo-svg.pc" && rm -f "src/cairo-svg.pc.tmp" || - as_fn_error "failed to update src/cairo-svg.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-svg%g; s%@FEATURE_NAME@%SVG surface backend%g; s%@FEATURE_BASE@%$svg_BASE%g; s%@FEATURE_REQUIRES@%$svg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$svg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$svg_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$svg_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-svg.pc.tmp" > "src/cairo-svg.pc" && rm -f "src/cairo-svg.pc.tmp" || + as_fn_error $? "failed to update src/cairo-svg.pc" "$LINENO" 5 ;; "cairo-svg-uninstalled.pc":F) mv "cairo-svg-uninstalled.pc" "cairo-svg-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-svg%g; s%@FEATURE_NAME@%SVG surface backend%g; s%@FEATURE_BASE@%$svg_BASE%g; s%@FEATURE_REQUIRES@%$svg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$svg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$svg_NONPKGCONFIG_CFLAGS%g; " < "cairo-svg-uninstalled.pc.tmp" > "cairo-svg-uninstalled.pc" && rm -f "cairo-svg-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-svg-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-svg%g; s%@FEATURE_NAME@%SVG surface backend%g; s%@FEATURE_BASE@%$svg_BASE%g; s%@FEATURE_REQUIRES@%$svg_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$svg_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$svg_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$svg_NONPKGCONFIG_CFLAGS%g; " < "cairo-svg-uninstalled.pc.tmp" > "cairo-svg-uninstalled.pc" && rm -f "cairo-svg-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-svg-uninstalled.pc" "$LINENO" 5 + ;; + "src/cairo-tee.pc":F) mv "src/cairo-tee.pc" "src/cairo-tee.pc.tmp" && + $SED " s%@FEATURE_PC@%cairo-tee%g; s%@FEATURE_NAME@%tee surface backend%g; s%@FEATURE_BASE@%$tee_BASE%g; s%@FEATURE_REQUIRES@%$tee_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$tee_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$tee_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$tee_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-tee.pc.tmp" > "src/cairo-tee.pc" && rm -f "src/cairo-tee.pc.tmp" || + as_fn_error $? "failed to update src/cairo-tee.pc" "$LINENO" 5 + ;; + "cairo-tee-uninstalled.pc":F) mv "cairo-tee-uninstalled.pc" "cairo-tee-uninstalled.pc.tmp" && + $SED " s%@FEATURE_PC@%cairo-tee%g; s%@FEATURE_NAME@%tee surface backend%g; s%@FEATURE_BASE@%$tee_BASE%g; s%@FEATURE_REQUIRES@%$tee_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$tee_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$tee_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$tee_NONPKGCONFIG_CFLAGS%g; " < "cairo-tee-uninstalled.pc.tmp" > "cairo-tee-uninstalled.pc" && rm -f "cairo-tee-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-tee-uninstalled.pc" "$LINENO" 5 ;; "src/cairo-xml.pc":F) mv "src/cairo-xml.pc" "src/cairo-xml.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xml%g; s%@FEATURE_NAME@%xml surface backend%g; s%@FEATURE_BASE@%$xml_BASE%g; s%@FEATURE_REQUIRES@%$xml_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xml_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xml_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xml.pc.tmp" > "src/cairo-xml.pc" && rm -f "src/cairo-xml.pc.tmp" || - as_fn_error "failed to update src/cairo-xml.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xml%g; s%@FEATURE_NAME@%xml surface backend%g; s%@FEATURE_BASE@%$xml_BASE%g; s%@FEATURE_REQUIRES@%$xml_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xml_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xml_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xml_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-xml.pc.tmp" > "src/cairo-xml.pc" && rm -f "src/cairo-xml.pc.tmp" || + as_fn_error $? "failed to update src/cairo-xml.pc" "$LINENO" 5 ;; "cairo-xml-uninstalled.pc":F) mv "cairo-xml-uninstalled.pc" "cairo-xml-uninstalled.pc.tmp" && - $SED " s%@FEATURE_PC@%cairo-xml%g; s%@FEATURE_NAME@%xml surface backend%g; s%@FEATURE_BASE@%$xml_BASE%g; s%@FEATURE_REQUIRES@%$xml_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xml_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xml_NONPKGCONFIG_CFLAGS%g; " < "cairo-xml-uninstalled.pc.tmp" > "cairo-xml-uninstalled.pc" && rm -f "cairo-xml-uninstalled.pc.tmp" || - as_fn_error "failed to update cairo-xml-uninstalled.pc" "$LINENO" 5 + $SED " s%@FEATURE_PC@%cairo-xml%g; s%@FEATURE_NAME@%xml surface backend%g; s%@FEATURE_BASE@%$xml_BASE%g; s%@FEATURE_REQUIRES@%$xml_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$xml_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$xml_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$xml_NONPKGCONFIG_CFLAGS%g; " < "cairo-xml-uninstalled.pc.tmp" > "cairo-xml-uninstalled.pc" && rm -f "cairo-xml-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-xml-uninstalled.pc" "$LINENO" 5 + ;; + "src/cairo-gobject.pc":F) mv "src/cairo-gobject.pc" "src/cairo-gobject.pc.tmp" && + $SED " s%@FEATURE_PC@%cairo-gobject%g; s%@FEATURE_NAME@%gobject functions%g; s%@FEATURE_BASE@%$gobject_BASE%g; s%@FEATURE_REQUIRES@%$gobject_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gobject_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$gobject_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gobject_NONPKGCONFIG_CFLAGS%g; " < "src/cairo-gobject.pc.tmp" > "src/cairo-gobject.pc" && rm -f "src/cairo-gobject.pc.tmp" || + as_fn_error $? "failed to update src/cairo-gobject.pc" "$LINENO" 5 + ;; + "cairo-gobject-uninstalled.pc":F) mv "cairo-gobject-uninstalled.pc" "cairo-gobject-uninstalled.pc.tmp" && + $SED " s%@FEATURE_PC@%cairo-gobject%g; s%@FEATURE_NAME@%gobject functions%g; s%@FEATURE_BASE@%$gobject_BASE%g; s%@FEATURE_REQUIRES@%$gobject_REQUIRES%g; s%@FEATURE_NONPKGCONFIG_LIBS@%$gobject_NONPKGCONFIG_LIBS%g; s%@FEATURE_NONPKGCONFIG_EXTRA_LIBS@%$gobject_NONPKGCONFIG_EXTRA_LIBS%g; s%@FEATURE_NONPKGCONFIG_CFLAGS@%$gobject_NONPKGCONFIG_CFLAGS%g; " < "cairo-gobject-uninstalled.pc.tmp" > "cairo-gobject-uninstalled.pc" && rm -f "cairo-gobject-uninstalled.pc.tmp" || + as_fn_error $? "failed to update cairo-gobject-uninstalled.pc" "$LINENO" 5 ;; esac @@ -37909,7 +38492,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -37930,7 +38513,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index cb66294..7fa57cd 100644 --- a/configure.ac +++ b/configure.ac @@ -279,7 +279,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [ AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config]) if test "x$png_REQUIRES" = x; then # libpng13 is GnuWin32's libpng-1.2.8 :-( - for l in libpng12 libpng13 libpng10 libpng; do + for l in libpng libpng14 libpng12 libpng13 libpng10; do if $PKG_CONFIG --exists $l ; then png_REQUIRES=$l use_png=yes @@ -614,7 +614,7 @@ CAIRO_ENABLE(test_surfaces, test surfaces, no) dnl =========================================================================== CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [ - pixman_REQUIRES="pixman-1 >= 0.17.5" + pixman_REQUIRES="pixman-1 >= 0.18.4" PKG_CHECK_MODULES(pixman, $pixman_REQUIRES, , [AC_MSG_RESULT(no) use_image="no (requires $pixman_REQUIRES http://cairographics.org/releases/)"]) image_REQUIRES=$pixman_REQUIRES @@ -625,8 +625,8 @@ CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [ dnl =========================================================================== CAIRO_ENABLE_SURFACE_BACKEND(recording, recording, always) -CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, always) -CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, yes, [ +CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no) +CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [ use_xml=$have_libz xml_NONPKGCONFIG_LIBS=-lz ]) @@ -652,6 +652,20 @@ AC_SUBST(real_pthread_LIBS) dnl =========================================================================== +dnl Build gobject integration library + +CAIRO_ENABLE_FUNCTIONS(gobject, gobject, auto, [ + gobject_REQUIRES="gobject-2.0 glib-2.0" + PKG_CHECK_MODULES(GOBJECT, $gobject_REQUIRES, , [AC_MSG_RESULT(no) + use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)"]) + gobject_NONPKGCONFIG_EXTRA_LIBS="-L\${libdir} -lcairo-gobject" +]) +dnl I'm too lazy to fix the caching properly +if test "x$use_gobject" = "xyes"; then + PKG_CHECK_MODULES(GOBJECT, $gobject_REQUIRES) +fi + +dnl =========================================================================== dnl Default to quick testing during development, but force a full test before dnl release @@ -791,6 +805,7 @@ test/pdiff/Makefile perf/Makefile util/Makefile util/cairo-fdr/Makefile +util/cairo-gobject/Makefile util/cairo-script/Makefile util/cairo-script/examples/Makefile util/cairo-sphinx/Makefile diff --git a/depcomp b/depcomp deleted file mode 100755 index 04701da..0000000 --- a/depcomp +++ /dev/null @@ -1,530 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2005-07-09.11 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - stat=$? - - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/doc/Makefile.in b/doc/Makefile.in index 5a77cbc..c591dfc 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -172,6 +172,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -285,7 +287,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ diff --git a/doc/public/Makefile.in b/doc/public/Makefile.in index c3e0862..3f46fb1 100644 --- a/doc/public/Makefile.in +++ b/doc/public/Makefile.in @@ -268,24 +268,34 @@ check_PROGRAMS = @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_158 = $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_159 = $(cairo_test_surfaces_cxx_sources) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_160 = $(cairo_test_surfaces_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_161 = $(cairo_xml_headers) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_162 = $(cairo_xml_private) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_163 = $(cairo_xml_cxx_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_164 = $(cairo_xml_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_165 = cairo-xml.pc -@CAIRO_HAS_PTHREAD_TRUE@am__append_166 = $(cairo_pthread_private) $(cairo_pthread_headers) -@CAIRO_HAS_PTHREAD_TRUE@am__append_167 = $(cairo_pthread_cxx_sources) -@CAIRO_HAS_PTHREAD_TRUE@am__append_168 = $(cairo_pthread_sources) -@CAIRO_HAS_TRACE_TRUE@am__append_169 = $(cairo_trace_private) $(cairo_trace_headers) -@CAIRO_HAS_TRACE_TRUE@am__append_170 = $(cairo_trace_cxx_sources) -@CAIRO_HAS_TRACE_TRUE@am__append_171 = $(cairo_trace_sources) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_172 = $(cairo_interpreter_private) $(cairo_interpreter_headers) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_173 = $(cairo_interpreter_cxx_sources) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_174 = $(cairo_interpreter_sources) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_175 = $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_176 = $(cairo_symbol_lookup_cxx_sources) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_177 = $(cairo_symbol_lookup_sources) -@ENABLE_GTK_DOC_TRUE@am__append_178 = check-doc-coverage.sh +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_161 = $(cairo_tee_headers) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_162 = $(cairo_tee_private) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_163 = $(cairo_tee_cxx_sources) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_164 = $(cairo_tee_sources) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_165 = cairo-tee.pc +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_166 = $(cairo_xml_headers) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_167 = $(cairo_xml_private) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_168 = $(cairo_xml_cxx_sources) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_169 = $(cairo_xml_sources) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_170 = cairo-xml.pc +@CAIRO_HAS_PTHREAD_TRUE@am__append_171 = $(cairo_pthread_private) $(cairo_pthread_headers) +@CAIRO_HAS_PTHREAD_TRUE@am__append_172 = $(cairo_pthread_cxx_sources) +@CAIRO_HAS_PTHREAD_TRUE@am__append_173 = $(cairo_pthread_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_174 = $(cairo_gobject_headers) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_175 = $(cairo_gobject_private) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_176 = $(cairo_gobject_cxx_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_177 = $(cairo_gobject_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_178 = cairo-gobject.pc +@CAIRO_HAS_TRACE_TRUE@am__append_179 = $(cairo_trace_private) $(cairo_trace_headers) +@CAIRO_HAS_TRACE_TRUE@am__append_180 = $(cairo_trace_cxx_sources) +@CAIRO_HAS_TRACE_TRUE@am__append_181 = $(cairo_trace_sources) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_182 = $(cairo_interpreter_private) $(cairo_interpreter_headers) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_183 = $(cairo_interpreter_cxx_sources) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_184 = $(cairo_interpreter_sources) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_185 = $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_186 = $(cairo_symbol_lookup_cxx_sources) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_187 = $(cairo_symbol_lookup_sources) +@ENABLE_GTK_DOC_TRUE@am__append_188 = check-doc-coverage.sh subdir = doc/public ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ @@ -380,6 +390,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -493,7 +505,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ @@ -545,7 +556,7 @@ EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ check-doc-coverage.sh check-doc-syntax.sh EXTRA_LTLIBRARIES = MAINTAINERCLEANFILES = Makefile.in -TESTS = $(am__append_178) check-doc-syntax.sh +TESTS = $(am__append_188) check-doc-syntax.sh cairo_headers = cairo.h cairo-deprecated.h cairo_private = cairoint.h cairo-analysis-surface-private.h \ cairo-arc-private.h cairo-atomic-private.h \ @@ -554,26 +565,26 @@ cairo_private = cairoint.h cairo-analysis-surface-private.h \ cairo-compiler-private.h cairo-composite-rectangles-private.h \ cairo-device-private.h cairo-error-private.h \ cairo-fixed-private.h cairo-fixed-type-private.h \ - cairo-freelist-private.h cairo-freed-pool-private.h \ - cairo-fontconfig-private.h cairo-gstate-private.h \ - cairo-hash-private.h cairo-image-info-private.h \ - cairo-list-private.h cairo-malloc-private.h \ - cairo-recording-surface-private.h cairo-mutex-impl-private.h \ - cairo-mutex-list-private.h cairo-mutex-private.h \ - cairo-mutex-type-private.h cairo-output-stream-private.h \ - cairo-paginated-private.h cairo-paginated-surface-private.h \ - cairo-path-fixed-private.h cairo-path-private.h \ - cairo-private.h cairo-reference-count-private.h \ - cairo-region-private.h cairo-rtree-private.h \ - cairo-scaled-font-private.h cairo-slope-private.h \ - cairo-spans-private.h cairo-surface-fallback-private.h \ - cairo-surface-private.h cairo-surface-clipper-private.h \ - cairo-surface-offset-private.h \ + cairo-freelist-private.h cairo-freelist-type-private.h \ + cairo-freed-pool-private.h cairo-fontconfig-private.h \ + cairo-gstate-private.h cairo-hash-private.h \ + cairo-image-info-private.h cairo-list-private.h \ + cairo-malloc-private.h cairo-recording-surface-private.h \ + cairo-mutex-impl-private.h cairo-mutex-list-private.h \ + cairo-mutex-private.h cairo-mutex-type-private.h \ + cairo-output-stream-private.h cairo-paginated-private.h \ + cairo-paginated-surface-private.h cairo-path-fixed-private.h \ + cairo-path-private.h cairo-private.h \ + cairo-reference-count-private.h cairo-region-private.h \ + cairo-rtree-private.h cairo-scaled-font-private.h \ + cairo-slope-private.h cairo-spans-private.h \ + cairo-surface-fallback-private.h cairo-surface-private.h \ + cairo-surface-clipper-private.h cairo-surface-offset-private.h \ cairo-surface-subsurface-private.h \ cairo-surface-snapshot-private.h \ - cairo-surface-wrapper-private.h cairo-tee-surface-private.h \ - cairo-types-private.h cairo-user-font-private.h \ - cairo-wideint-private.h cairo-wideint-type-private.h $(NULL) \ + cairo-surface-wrapper-private.h cairo-types-private.h \ + cairo-user-font-private.h cairo-wideint-private.h \ + cairo-wideint-type-private.h $(NULL) \ $(_cairo_font_subset_private) $(_cairo_pdf_operators_private) cairo_sources = cairo-analysis-surface.c cairo-arc.c cairo-array.c \ cairo-atomic.c cairo-base64-stream.c cairo-base85-stream.c \ @@ -599,7 +610,7 @@ cairo_sources = cairo-analysis-surface.c cairo-arc.c cairo-array.c \ cairo-surface-fallback.c cairo-surface-clipper.c \ cairo-surface-offset.c cairo-surface-snapshot.c \ cairo-surface-subsurface.c cairo-surface-wrapper.c \ - cairo-system.c cairo-tee-surface.c cairo-tor-scan-converter.c \ + cairo-system.c cairo-tor-scan-converter.c \ cairo-toy-font-face.c cairo-traps.c cairo-unicode.c \ cairo-user-font.c cairo-version.c cairo-wideint.c $(NULL) \ $(_cairo_font_subset_sources) $(_cairo_pdf_operators_sources) \ @@ -756,6 +767,9 @@ cairo_drm_xr_sources = \ cairo_script_headers = cairo-script.h cairo_script_sources = cairo-script-surface.c +cairo_tee_headers = cairo-tee.h +cairo_tee_private = cairo-tee-surface-private.h +cairo_tee_sources = cairo-tee-surface.c cairo_xml_headers = cairo-xml.h cairo_xml_sources = cairo-xml-surface.c cairo_vg_headers = cairo-vg.h @@ -768,8 +782,7 @@ supported_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \ $(cairo_wgl_headers) $(cairo_ft_headers) $(cairo_fc_headers) \ $(cairo_ps_headers) $(cairo_pdf_headers) $(cairo_svg_headers) \ $(cairo_image_headers) $(cairo_recording_headers) \ - $(cairo_tee_headers) $(cairo_xml_headers) \ - $(cairo_user_headers) + $(cairo_user_headers) $(cairo_gobject_headers) unsupported_cairo_headers = $(cairo_xcb_headers) \ $(cairo_xlib_xcb_headers) $(cairo_qt_headers) \ $(cairo_quartz_image_headers) $(cairo_skia_headers) \ @@ -777,7 +790,8 @@ unsupported_cairo_headers = $(cairo_xcb_headers) \ $(cairo_drm_headers) $(cairo_drm_xr_headers) \ $(cairo_gallium_headers) $(cairo_xcb_drm_headers) \ $(cairo_gl_headers) $(cairo_directfb_headers) \ - $(cairo_vg_headers) $(cairo_script_headers) + $(cairo_vg_headers) $(cairo_script_headers) \ + $(cairo_tee_headers) $(cairo_xml_headers) all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \ $(cairo_xlib_xrender_headers) $(cairo_xcb_headers) \ $(cairo_xlib_xcb_headers) $(cairo_xcb_shm_headers) \ @@ -795,7 +809,7 @@ all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \ $(cairo_pdf_headers) $(cairo_svg_headers) \ $(cairo_image_headers) $(cairo_recording_headers) \ $(cairo_tee_headers) $(cairo_xml_headers) \ - $(cairo_user_headers) + $(cairo_user_headers) $(cairo_gobject_headers) all_cairo_private = $(cairo_private) $(cairo_xlib_private) \ $(cairo_xlib_xrender_private) $(cairo_xcb_private) \ $(cairo_xlib_xcb_private) $(cairo_xcb_shm_private) \ @@ -815,10 +829,10 @@ all_cairo_private = $(cairo_private) $(cairo_xlib_private) \ $(cairo_image_private) $(cairo_recording_private) \ $(cairo_tee_private) $(cairo_xml_private) \ $(cairo_user_private) $(cairo_pthread_private) \ - $(cairo_pthread_headers) $(cairo_trace_private) \ - $(cairo_trace_headers) $(cairo_interpreter_private) \ - $(cairo_interpreter_headers) $(cairo_symbol_lookup_private) \ - $(cairo_symbol_lookup_headers) + $(cairo_pthread_headers) $(cairo_gobject_private) \ + $(cairo_trace_private) $(cairo_trace_headers) \ + $(cairo_interpreter_private) $(cairo_interpreter_headers) \ + $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers) all_cairo_cxx_sources = $(cairo_cxx_sources) $(cairo_xlib_cxx_sources) \ $(cairo_xlib_xrender_cxx_sources) $(cairo_xcb_cxx_sources) \ $(cairo_xlib_xcb_cxx_sources) $(cairo_xcb_shm_cxx_sources) \ @@ -839,7 +853,8 @@ all_cairo_cxx_sources = $(cairo_cxx_sources) $(cairo_xlib_cxx_sources) \ $(cairo_image_cxx_sources) $(cairo_recording_cxx_sources) \ $(cairo_tee_cxx_sources) $(cairo_xml_cxx_sources) \ $(cairo_user_cxx_sources) $(cairo_pthread_cxx_sources) \ - $(cairo_trace_cxx_sources) $(cairo_interpreter_cxx_sources) \ + $(cairo_gobject_cxx_sources) $(cairo_trace_cxx_sources) \ + $(cairo_interpreter_cxx_sources) \ $(cairo_symbol_lookup_cxx_sources) all_cairo_sources = $(cairo_sources) $(cairo_xlib_sources) \ $(cairo_xlib_xrender_sources) $(cairo_xcb_sources) \ @@ -859,8 +874,9 @@ all_cairo_sources = $(cairo_sources) $(cairo_xlib_sources) \ $(cairo_test_surfaces_sources) $(cairo_image_sources) \ $(cairo_recording_sources) $(cairo_tee_sources) \ $(cairo_xml_sources) $(cairo_user_sources) \ - $(cairo_pthread_sources) $(cairo_trace_sources) \ - $(cairo_interpreter_sources) $(cairo_symbol_lookup_sources) + $(cairo_pthread_sources) $(cairo_gobject_sources) \ + $(cairo_trace_sources) $(cairo_interpreter_sources) \ + $(cairo_symbol_lookup_sources) enabled_cairo_headers = $(cairo_headers) $(am__append_3) \ $(am__append_8) $(am__append_13) $(am__append_18) \ $(am__append_23) $(am__append_28) $(am__append_33) \ @@ -873,7 +889,8 @@ enabled_cairo_headers = $(cairo_headers) $(am__append_3) \ $(am__append_128) $(am__append_133) $(am__append_138) \ $(am__append_143) $(am__append_148) $(am__append_153) \ $(cairo_image_headers) $(cairo_recording_headers) \ - $(cairo_tee_headers) $(am__append_161) $(cairo_user_headers) + $(am__append_161) $(am__append_166) $(cairo_user_headers) \ + $(am__append_174) enabled_cairo_private = $(cairo_private) $(am__append_4) \ $(am__append_9) $(am__append_14) $(am__append_19) \ $(am__append_24) $(am__append_29) $(am__append_34) \ @@ -886,9 +903,9 @@ enabled_cairo_private = $(cairo_private) $(am__append_4) \ $(am__append_129) $(am__append_134) $(am__append_139) \ $(am__append_144) $(am__append_149) $(am__append_154) \ $(am__append_158) $(cairo_image_private) \ - $(cairo_recording_private) $(cairo_tee_private) \ - $(am__append_162) $(cairo_user_private) $(am__append_166) \ - $(am__append_169) $(am__append_172) $(am__append_175) + $(cairo_recording_private) $(am__append_162) $(am__append_167) \ + $(cairo_user_private) $(am__append_171) $(am__append_175) \ + $(am__append_179) $(am__append_182) $(am__append_185) enabled_cairo_cxx_sources = $(cairo_cxx_sources) $(am__append_5) \ $(am__append_10) $(am__append_15) $(am__append_20) \ $(am__append_25) $(am__append_30) $(am__append_35) \ @@ -901,9 +918,10 @@ enabled_cairo_cxx_sources = $(cairo_cxx_sources) $(am__append_5) \ $(am__append_130) $(am__append_135) $(am__append_140) \ $(am__append_145) $(am__append_150) $(am__append_155) \ $(am__append_159) $(cairo_image_cxx_sources) \ - $(cairo_recording_cxx_sources) $(cairo_tee_cxx_sources) \ - $(am__append_163) $(cairo_user_cxx_sources) $(am__append_167) \ - $(am__append_170) $(am__append_173) $(am__append_176) + $(cairo_recording_cxx_sources) $(am__append_163) \ + $(am__append_168) $(cairo_user_cxx_sources) $(am__append_172) \ + $(am__append_176) $(am__append_180) $(am__append_183) \ + $(am__append_186) enabled_cairo_sources = $(cairo_sources) $(am__append_6) \ $(am__append_11) $(am__append_16) $(am__append_21) \ $(am__append_26) $(am__append_31) $(am__append_36) \ @@ -916,9 +934,9 @@ enabled_cairo_sources = $(cairo_sources) $(am__append_6) \ $(am__append_131) $(am__append_136) $(am__append_141) \ $(am__append_146) $(am__append_151) $(am__append_156) \ $(am__append_160) $(cairo_image_sources) \ - $(cairo_recording_sources) $(cairo_tee_sources) \ - $(am__append_164) $(cairo_user_sources) $(am__append_168) \ - $(am__append_171) $(am__append_174) $(am__append_177) + $(cairo_recording_sources) $(am__append_164) $(am__append_169) \ + $(cairo_user_sources) $(am__append_173) $(am__append_177) \ + $(am__append_181) $(am__append_184) $(am__append_187) all_cairo_pkgconf = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \ cairo-xcb.pc cairo-xlib-xcb.pc cairo-xcb-shm.pc cairo-qt.pc \ cairo-quartz.pc cairo-quartz-font.pc cairo-quartz-image.pc \ @@ -927,7 +945,8 @@ all_cairo_pkgconf = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \ cairo-xcb-drm.pc cairo-png.pc cairo-gl.pc cairo-directfb.pc \ cairo-vg.pc cairo-egl.pc cairo-glx.pc cairo-wgl.pc \ cairo-script.pc cairo-ft.pc cairo-fc.pc cairo-ps.pc \ - cairo-pdf.pc cairo-svg.pc cairo-xml.pc + cairo-pdf.pc cairo-svg.pc cairo-tee.pc cairo-xml.pc \ + cairo-gobject.pc enabled_cairo_pkgconf = cairo.pc $(am__append_7) $(am__append_12) \ $(am__append_17) $(am__append_22) $(am__append_27) \ $(am__append_32) $(am__append_37) $(am__append_42) \ @@ -938,7 +957,8 @@ enabled_cairo_pkgconf = cairo.pc $(am__append_7) $(am__append_12) \ $(am__append_107) $(am__append_112) $(am__append_117) \ $(am__append_122) $(am__append_127) $(am__append_132) \ $(am__append_137) $(am__append_142) $(am__append_147) \ - $(am__append_152) $(am__append_157) $(am__append_165) + $(am__append_152) $(am__append_157) $(am__append_165) \ + $(am__append_170) $(am__append_178) # The name of the module. DOC_MODULE = cairo diff --git a/doc/public/check-doc-coverage.sh b/doc/public/check-doc-coverage.sh index 1cf051b..581f324 100755 --- a/doc/public/check-doc-coverage.sh +++ b/doc/public/check-doc-coverage.sh @@ -23,7 +23,7 @@ stat=0 if test -f "$DOC_MODULE-undeclared.txt"; then undeclared=`cat "$DOC_MODULE-undeclared.txt"` if test -n "$undeclared"; then - echo Undeclared documentation symbols: 1>&2 + echo "*** ERROR: Undeclared documentation symbols:" 1>&2 cat "$DOC_MODULE-undeclared.txt" 1>&2 stat=1 fi @@ -31,7 +31,7 @@ fi >&2 if test -f "$DOC_MODULE-unused.txt"; then unused=`cat "$DOC_MODULE-unused.txt"` if test -n "$unused"; then - echo Unused documentated symbols: 1>&2 + echo "*** ERROR: Unused documentated symbols:" 1>&2 cat "$DOC_MODULE-unused.txt" 1>&2 stat=1 fi @@ -41,10 +41,14 @@ if test -f "$DOC_MODULE-undocumented.txt"; then grep '^0 not documented' "$DOC_MODULE-undocumented.txt" >/dev/null; then : else - echo Incomplete or undocumented symbols: 1>&2 + echo "*** ERROR: Incomplete or undocumented symbols:" 1>&2 cat "$DOC_MODULE-undocumented.txt" 1>&2 stat=1 fi fi >&2 -exit $stat +if test $stat != 0; then + echo "*** IGNORING ERROR ***" +fi +#exit $stat +exit 0 diff --git a/doc/public/html/cairo-Error-handling.html b/doc/public/html/cairo-Error-handling.html index b0a80ec..10d1a35 100644 --- a/doc/public/html/cairo-Error-handling.html +++ b/doc/public/html/cairo-Error-handling.html @@ -155,7 +155,7 @@ to get a human-readable representation of an error message. <tr> <td><p><a name="CAIRO-STATUS-NULL-POINTER:CAPS"></a><span class="term"><code class="literal">CAIRO_STATUS_NULL_POINTER</code></span></p></td> <td> -<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> pointer +<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> pointer </td> </tr> <tr> diff --git a/doc/public/html/cairo-FreeType-Fonts.html b/doc/public/html/cairo-FreeType-Fonts.html index 3e9c6a7..4f37859 100644 --- a/doc/public/html/cairo-FreeType-Fonts.html +++ b/doc/public/html/cairo-FreeType-Fonts.html @@ -103,18 +103,35 @@ the FreeType face object to the <a class="link" href="cairo-cairo-font-face-t.ht </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -static const cairo_user_data_key_t key; +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="keyword">const</span><span class="normal"> </span><span class="usertype">cairo_user_data_key_t</span><span class="normal"> key</span><span class="symbol">;</span> + +<span class="normal">font_face </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-ft-face">cairo_ft_font_face_create_for_ft_face</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">ft_face</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">);</span> +<span class="normal">status </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html#cairo-font-face-set-user-data">cairo_font_face_set_user_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">font_face</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">key</span><span class="symbol">,</span> +<span class="normal"> ft_face</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/cairo/cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a></span><span class="symbol">)</span><span class="normal"> FT_Done_Face</span><span class="symbol">);</span> +<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status</span><span class="symbol">)</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html#cairo-font-face-destroy">cairo_font_face_destroy</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">font_face</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function">FT_Done_Face</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">ft_face</span><span class="symbol">);</span> +<span class="normal"> </span><span class="keyword">return</span><span class="normal"> ERROR</span><span class="symbol">;</span> +<span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> -font_face = cairo_ft_font_face_create_for_ft_face (ft_face, 0); -status = cairo_font_face_set_user_data (font_face, &key, - ft_face, (cairo_destroy_func_t) FT_Done_Face); -if (status) { - cairo_font_face_destroy (font_face); - FT_Done_Face (ft_face); - return ERROR; -} -</pre></div> <p> </p> <div class="variablelist"><table border="0"> @@ -274,7 +291,7 @@ might result in a call into the freetype library). <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The <span class="type">FT_Face</span> object for <em class="parameter"><code>font</code></em>, scaled appropriately, -or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>scaled_font</code></em> is in an error state (see +or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>scaled_font</code></em> is in an error state (see <a class="link" href="cairo-cairo-scaled-font-t.html#cairo-scaled-font-status" title="cairo_scaled_font_status ()"><code class="function">cairo_scaled_font_status()</code></a>) or there is insufficient memory. </td> </tr> diff --git a/doc/public/html/cairo-Image-Surfaces.html b/doc/public/html/cairo-Image-Surfaces.html index a5268ed..5120a97 100644 --- a/doc/public/html/cairo-Image-Surfaces.html +++ b/doc/public/html/cairo-Image-Surfaces.html @@ -140,9 +140,9 @@ New entries may be added in future versions. </tr> <tr> <td><p><a name="CAIRO-FORMAT-RGB16-565:CAPS"></a><span class="term"><code class="literal">CAIRO_FORMAT_RGB16_565</code></span></p></td> -<td>This format value is deprecated. It has - never been properly implemented in cairo and should not be used - by applications. (since 1.2) +<td>each pixel is a 16-bit quantity + with red in the upper 5 bits, then green in the middle + 6 bits, and blue in the lower 5 bits. </td> </tr> </tbody> @@ -160,17 +160,33 @@ within cairo. Typical usage will be of the form: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -int stride; -unsigned char *data; -<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface; +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="type">int</span><span class="normal"> stride</span><span class="symbol">;</span> +<span class="type">unsigned</span><span class="normal"> </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">data</span><span class="symbol">;</span> +<span class="symbol"><</span><span class="usertype">a</span><span class="normal"> class</span><span class="symbol">=</span><span class="string">"link"</span><span class="normal"> href</span><span class="symbol">=</span><span class="string">"cairo-cairo-surface-t.html#cairo-surface-t"</span><span class="normal"> title</span><span class="symbol">=</span><span class="string">"cairo_surface_t"</span><span class="symbol">></span><span class="usertype">cairo_surface_t</a></span><span class="normal"> </span><span class="symbol">*</span><span class="normal">surface</span><span class="symbol">;</span> + +<span class="normal">stride </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#cairo-format-stride-for-width">cairo_format_stride_for_width</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">format</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">);</span> +<span class="normal">data </span><span class="symbol">=</span><span class="normal"> </span><span class="function">malloc</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stride </span><span class="symbol">*</span><span class="normal"> height</span><span class="symbol">);</span> +<span class="normal">surface </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#cairo-image-surface-create-for-data">cairo_image_surface_create_for_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">,</span><span class="normal"> format</span><span class="symbol">,</span> +<span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">,</span> +<span class="normal"> stride</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> -stride = cairo_format_stride_for_width (format, width); -data = malloc (stride * height); -surface = cairo_image_surface_create_for_data (data, format, - width, height, - stride); -</pre></div> <p> </p> <div class="variablelist"><table border="0"> @@ -340,7 +356,7 @@ inspection or modification. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> a pointer to the image data of this surface or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td> a pointer to the image data of this surface or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>surface</code></em> is not an image surface, or if <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-finish" title="cairo_surface_finish ()"><code class="function">cairo_surface_finish()</code></a> has been called. diff --git a/doc/public/html/cairo-PDF-Surfaces.html b/doc/public/html/cairo-PDF-Surfaces.html index 9e7d9b3..c0aa92b 100644 --- a/doc/public/html/cairo-PDF-Surfaces.html +++ b/doc/public/html/cairo-PDF-Surfaces.html @@ -90,7 +90,7 @@ to <em class="parameter"><code>filename</code></em>. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> -<td>a filename for the PDF output (must be writable), <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> may be +<td>a filename for the PDF output (must be writable), <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> may be used to specify no output. This will generate a PDF surface that may be queried and used as a source, without generating a temporary file. @@ -138,7 +138,7 @@ incrementally to the stream represented by <em class="parameter"><code>write_fun <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate a no-op <em class="parameter"><code>write_func</code></em>. With a no-op <em class="parameter"><code>write_func</code></em>, the surface may be queried or used as a source without generating any temporary files. @@ -271,7 +271,7 @@ Used to retrieve the list of supported versions. See <pre class="programlisting">const <span class="returnvalue">char</span> * cairo_pdf_version_to_string (<em class="parameter"><code><a class="link" href="cairo-PDF-Surfaces.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t"><span class="type">cairo_pdf_version_t</span></a> version</code></em>);</pre> <p> Get the string representation of the given <em class="parameter"><code>version</code></em> id. This function -will return <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-PDF-Surfaces.html#cairo-pdf-get-versions" title="cairo_pdf_get_versions ()"><code class="function">cairo_pdf_get_versions()</code></a> +will return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-PDF-Surfaces.html#cairo-pdf-get-versions" title="cairo_pdf_get_versions ()"><code class="function">cairo_pdf_get_versions()</code></a> for a way to get the list of valid version ids. </p> <div class="variablelist"><table border="0"> diff --git a/doc/public/html/cairo-Paths.html b/doc/public/html/cairo-Paths.html index 9ecf952..d2bcd26 100644 --- a/doc/public/html/cairo-Paths.html +++ b/doc/public/html/cairo-Paths.html @@ -201,34 +201,67 @@ Here is sample code for iterating through a <a class="link" href="cairo-Paths.ht </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> - int i; - cairo_path_t *path; - cairo_path_data_t *data; - - path = cairo_copy_path (cr); - - for (i=0; i < path->num_data; i += path->data[i].header.length) { - data = &path->data[i]; - switch (data->header.type) { - case CAIRO_PATH_MOVE_TO: - do_move_to_things (data[1].point.x, data[1].point.y); - break; - case CAIRO_PATH_LINE_TO: - do_line_to_things (data[1].point.x, data[1].point.y); - break; - case CAIRO_PATH_CURVE_TO: - do_curve_to_things (data[1].point.x, data[1].point.y, - data[2].point.x, data[2].point.y, - data[3].point.x, data[3].point.y); - break; - case CAIRO_PATH_CLOSE_PATH: - do_close_path_things (); - break; - } - } - cairo_path_destroy (path); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="type">int</span><span class="normal"> i</span><span class="symbol">;</span> +<span class="usertype">cairo_path_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">path</span><span class="symbol">;</span> +<span class="usertype">cairo_path_data_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">data</span><span class="symbol">;</span> +<span class="normal"> </span> +<span class="normal">path </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-copy-path">cairo_copy_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="normal"> </span> +<span class="keyword">for</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">i</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> i </span><span class="symbol"><</span><span class="normal"> path</span><span class="symbol">-></span><span class="normal">num_data</span><span class="symbol">;</span><span class="normal"> i </span><span class="symbol">+=</span><span class="normal"> path</span><span class="symbol">-></span><span class="normal">data</span><span class="symbol">[</span><span class="normal">i</span><span class="symbol">].</span><span class="normal">header</span><span class="symbol">.</span><span class="normal">length</span><span class="symbol">)</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> data </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">path</span><span class="symbol">-></span><span class="normal">data</span><span class="symbol">[</span><span class="normal">i</span><span class="symbol">];</span> +<span class="normal"> </span><span class="keyword">switch</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">-></span><span class="normal">header</span><span class="symbol">.</span><span class="normal">type</span><span class="symbol">)</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> </span><span class="keyword">case</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#CAIRO-PATH-MOVE-TO:CAPS">CAIRO_PATH_MOVE_TO</a></span><span class="symbol">:</span> +<span class="normal"> </span><span class="function">do_move_to_things</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">[</span><span class="number">1</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> data</span><span class="symbol">[</span><span class="number">1</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">);</span> +<span class="normal"> </span><span class="keyword">break</span><span class="symbol">;</span> +<span class="normal"> </span><span class="keyword">case</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#CAIRO-PATH-LINE-TO:CAPS">CAIRO_PATH_LINE_TO</a></span><span class="symbol">:</span> +<span class="normal"> </span><span class="function">do_line_to_things</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">[</span><span class="number">1</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> data</span><span class="symbol">[</span><span class="number">1</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">);</span> +<span class="normal"> </span><span class="keyword">break</span><span class="symbol">;</span> +<span class="normal"> </span><span class="keyword">case</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#CAIRO-PATH-CURVE-TO:CAPS">CAIRO_PATH_CURVE_TO</a></span><span class="symbol">:</span> +<span class="normal"> </span><span class="function">do_curve_to_things</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">[</span><span class="number">1</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> data</span><span class="symbol">[</span><span class="number">1</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">,</span> +<span class="normal"> data</span><span class="symbol">[</span><span class="number">2</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> data</span><span class="symbol">[</span><span class="number">2</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">,</span> +<span class="normal"> data</span><span class="symbol">[</span><span class="number">3</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> data</span><span class="symbol">[</span><span class="number">3</span><span class="symbol">].</span><span class="normal">point</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">);</span> +<span class="normal"> </span><span class="keyword">break</span><span class="symbol">;</span> +<span class="normal"> </span><span class="keyword">case</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#CAIRO-PATH-CLOSE-PATH:CAPS">CAIRO_PATH_CLOSE_PATH</a></span><span class="symbol">:</span> +<span class="normal"> </span><span class="function">do_close_path_things</span><span class="normal"> </span><span class="symbol">();</span> +<span class="normal"> </span><span class="keyword">break</span><span class="symbol">;</span> +<span class="normal"> </span><span class="cbracket">}</span> +<span class="cbracket">}</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-path-destroy">cairo_path_destroy</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">path</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <p> @@ -293,7 +326,7 @@ over the returned data structure. </p> <p> This function will always return a valid pointer, but the result -will have no data (<code class="literal">data==<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></code> and +will have no data (<code class="literal">data==<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></code> and <code class="literal">num_data==0</code>), if either of the following conditions hold: </p> @@ -346,7 +379,7 @@ series of <a class="link" href="cairo-Paths.html#CAIRO-PATH-LINE-TO:CAPS"><code </p> <p> This function will always return a valid pointer, but the result -will have no data (<code class="literal">data==<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></code> and +will have no data (<code class="literal">data==<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></code> and <code class="literal">num_data==0</code>), if either of the following conditions hold: </p> @@ -648,13 +681,25 @@ in the box given by <em class="parameter"><code>x</code></em>, <em class="parame </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -cairo_save (cr); -cairo_translate (cr, x + width / 2., y + height / 2.); -cairo_scale (cr, width / 2., height / 2.); -cairo_arc (cr, 0., 0., 1., 0., 2 * M_PI); -cairo_restore (cr); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-save">cairo_save</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Transformations.html#cairo-translate">cairo_translate</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> width </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</span><span class="symbol">.,</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> height </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</span><span class="symbol">.);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Transformations.html#cairo-scale">cairo_scale</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> width </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</span><span class="symbol">.,</span><span class="normal"> height </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</span><span class="symbol">.);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-arc">cairo_arc</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">.,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.,</span><span class="normal"> </span><span class="number">2</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> M_PI</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-restore">cairo_restore</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <div class="variablelist"><table border="0"> @@ -893,13 +938,25 @@ path at position (<em class="parameter"><code>x</code></em>, <em class="paramete <p> This function is logically equivalent to: </p> -<div class="informalexample"><pre class="programlisting"> -cairo_move_to (cr, x, y); -cairo_rel_line_to (cr, width, 0); -cairo_rel_line_to (cr, 0, height); -cairo_rel_line_to (cr, -width, 0); -cairo_close_path (cr); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-move-to">cairo_move_to</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-rel-line-to">cairo_rel_line_to</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-rel-line-to">cairo_rel_line_to</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-rel-line-to">cairo_rel_line_to</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="normal">width</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-close-path">cairo_close_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <div class="variablelist"><table border="0"> @@ -1003,7 +1060,7 @@ serious text-using applications. See <a class="link" href="cairo-Paths.html#cair </tr> <tr> <td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td> -<td>a NUL-terminated string of text encoded in UTF-8, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a NUL-terminated string of text encoded in UTF-8, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> </tbody> diff --git a/doc/public/html/cairo-PostScript-Surfaces.html b/doc/public/html/cairo-PostScript-Surfaces.html index 55d38aa..18ff361 100644 --- a/doc/public/html/cairo-PostScript-Surfaces.html +++ b/doc/public/html/cairo-PostScript-Surfaces.html @@ -103,7 +103,7 @@ vary. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface- <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> -<td>a filename for the PS output (must be writable), <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> may be +<td>a filename for the PS output (must be writable), <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> may be used to specify no output. This will generate a PS surface that may be queried and used as a source, without generating a temporary file. @@ -157,7 +157,7 @@ output can vary. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo- <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate a no-op <em class="parameter"><code>write_func</code></em>. With a no-op <em class="parameter"><code>write_func</code></em>, the surface may be queried or used as a source without generating any temporary files. @@ -288,7 +288,7 @@ Used to retrieve the list of supported levels. See <pre class="programlisting">const <span class="returnvalue">char</span> * cairo_ps_level_to_string (<em class="parameter"><code><a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-level-t" title="enum cairo_ps_level_t"><span class="type">cairo_ps_level_t</span></a> level</code></em>);</pre> <p> Get the string representation of the given <em class="parameter"><code>level</code></em> id. This function -will return <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>level</code></em> id isn't valid. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-get-levels" title="cairo_ps_get_levels ()"><code class="function">cairo_ps_get_levels()</code></a> +will return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>level</code></em> id isn't valid. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-get-levels" title="cairo_ps_get_levels ()"><code class="function">cairo_ps_get_levels()</code></a> for a way to get the list of valid level ids. </p> <div class="variablelist"><table border="0"> @@ -315,7 +315,7 @@ for a way to get the list of valid level ids. <pre class="programlisting"><span class="returnvalue">void</span> cairo_ps_surface_set_eps (<em class="parameter"><code><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a> *surface</code></em>, <em class="parameter"><code><a class="link" href="cairo-Types.html#cairo-bool-t" title="cairo_bool_t"><span class="type">cairo_bool_t</span></a> eps</code></em>);</pre> <p> -If <em class="parameter"><code>eps</code></em> is <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, the PostScript surface will output Encapsulated +If <em class="parameter"><code>eps</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, the PostScript surface will output Encapsulated PostScript. </p> <p> @@ -336,7 +336,7 @@ than one page. <tr> <td><p><span class="term"><em class="parameter"><code>eps</code></em> :</span></p></td> <td> -<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to output EPS format PostScript +<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to output EPS format PostScript </td> </tr> </tbody> @@ -360,7 +360,7 @@ Check whether the PostScript surface will output Encapsulated PostScript. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the surface will output Encapsulated PostScript. +<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the surface will output Encapsulated PostScript. </td> </tr> @@ -545,26 +545,51 @@ Here is an example sequence showing how this function might be used: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface = cairo_ps_surface_create (filename, width, height); -... -cairo_ps_surface_dsc_comment (surface, "%%Title: My excellent document"); -cairo_ps_surface_dsc_comment (surface, "%%Copyright: Copyright (C) 2006 Cairo Lover") -... -cairo_ps_surface_dsc_begin_setup (surface); -cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *MediaColor White"); -... -cairo_ps_surface_dsc_begin_page_setup (surface); -cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *PageSize A3"); -cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *InputSlot LargeCapacity"); -cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *MediaType Glossy"); -cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *MediaColor Blue"); -... draw to first page here .. -cairo_show_page (cr); -... -cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *PageSize A5"); -... -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="symbol"><</span><span class="usertype">a</span><span class="normal"> class</span><span class="symbol">=</span><span class="string">"link"</span><span class="normal"> href</span><span class="symbol">=</span><span class="string">"cairo-cairo-surface-t.html#cairo-surface-t"</span><span class="normal"> title</span><span class="symbol">=</span><span class="string">"cairo_surface_t"</span><span class="symbol">></span><span class="usertype">cairo_surface_t</a></span><span class="normal"> </span><span class="symbol">*</span><span class="normal">surface </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-create">cairo_ps_surface_create</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">filename</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">);</span> +<span class="symbol">...</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%Title: My excellent document"</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%Copyright: Copyright (C) 2006 Cairo Lover"</span><span class="symbol">)</span> +<span class="symbol">...</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-setup">cairo_ps_surface_dsc_begin_setup</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%IncludeFeature: *MediaColor White"</span><span class="symbol">);</span> +<span class="symbol">...</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-page-setup">cairo_ps_surface_dsc_begin_page_setup</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%IncludeFeature: *PageSize A3"</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%IncludeFeature: *InputSlot LargeCapacity"</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%IncludeFeature: *MediaType Glossy"</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%IncludeFeature: *MediaColor Blue"</span><span class="symbol">);</span> +<span class="symbol">...</span><span class="normal"> draw to first </span><span class="usertype">page</span><span class="normal"> here </span><span class="symbol">..</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-show-page">cairo_show_page</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="symbol">...</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"%%IncludeFeature: *PageSize A5"</span><span class="symbol">);</span> +<span class="symbol">...</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <div class="variablelist"><table border="0"> diff --git a/doc/public/html/cairo-Quartz-(CGFont)-Fonts.html b/doc/public/html/cairo-Quartz-(CGFont)-Fonts.html index c8f0b80..3d2fc0b 100644 --- a/doc/public/html/cairo-Quartz-(CGFont)-Fonts.html +++ b/doc/public/html/cairo-Quartz-(CGFont)-Fonts.html @@ -56,7 +56,8 @@ implementation of the font backend methods. <a name="cairo-Quartz-(CGFont)-Fonts.details"></a><h2>Details</h2> <div class="refsect2" title="CAIRO_HAS_QUARTZ_FONT"> <a name="CAIRO-HAS-QUARTZ-FONT:CAPS"></a><h3>CAIRO_HAS_QUARTZ_FONT</h3> -<pre class="programlisting">#define CAIRO_HAS_QUARTZ_FONT</pre> +<pre class="programlisting">#define CAIRO_HAS_QUARTZ_FONT 1 +</pre> <p> Defined if the Quartz font backend is available. This macro can be used to conditionally compile backend-specific code. diff --git a/doc/public/html/cairo-Quartz-Surfaces.html b/doc/public/html/cairo-Quartz-Surfaces.html index 7c91850..747e903 100644 --- a/doc/public/html/cairo-Quartz-Surfaces.html +++ b/doc/public/html/cairo-Quartz-Surfaces.html @@ -59,7 +59,8 @@ Apple OS X Quartz rendering system. <a name="cairo-Quartz-Surfaces.details"></a><h2>Details</h2> <div class="refsect2" title="CAIRO_HAS_QUARTZ_SURFACE"> <a name="CAIRO-HAS-QUARTZ-SURFACE:CAPS"></a><h3>CAIRO_HAS_QUARTZ_SURFACE</h3> -<pre class="programlisting">#define CAIRO_HAS_QUARTZ_SURFACE</pre> +<pre class="programlisting">#define CAIRO_HAS_QUARTZ_SURFACE 1 +</pre> <p> Defined if the Quartz surface backend is available. This macro can be used to conditionally compile backend-specific code. @@ -123,10 +124,19 @@ using a translate and a scale; for example: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -CGContextTranslateCTM (cgContext, 0.0, height); -CGContextScaleCTM (cgContext, 1.0, -1.0); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function">CGContextTranslateCTM</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cgContext</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">);</span> +<span class="function">CGContextScaleCTM</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cgContext</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">1.0</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <p> diff --git a/doc/public/html/cairo-Regions.html b/doc/public/html/cairo-Regions.html index 29c26f1..21195dd 100644 --- a/doc/public/html/cairo-Regions.html +++ b/doc/public/html/cairo-Regions.html @@ -394,7 +394,7 @@ Checks whether <em class="parameter"><code>region</code></em> is empty. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>region</code></em> is empty, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it isn't. +<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>region</code></em> is empty, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it isn't. </td> </tr> @@ -431,7 +431,7 @@ Checks whether (<em class="parameter"><code>x</code></em>, <em class="parameter" </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if (<em class="parameter"><code>x</code></em>, <em class="parameter"><code>y</code></em>) is contained in <em class="parameter"><code>region</code></em>, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not. +<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if (<em class="parameter"><code>x</code></em>, <em class="parameter"><code>y</code></em>) is contained in <em class="parameter"><code>region</code></em>, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not. </td> </tr> @@ -514,26 +514,26 @@ in <em class="parameter"><code>region</code></em> <pre class="programlisting"><a class="link" href="cairo-Types.html#cairo-bool-t" title="cairo_bool_t"><span class="returnvalue">cairo_bool_t</span></a> cairo_region_equal (<em class="parameter"><code>const <a class="link" href="cairo-Regions.html#cairo-region-t" title="cairo_region_t"><span class="type">cairo_region_t</span></a> *a</code></em>, <em class="parameter"><code>const <a class="link" href="cairo-Regions.html#cairo-region-t" title="cairo_region_t"><span class="type">cairo_region_t</span></a> *b</code></em>);</pre> <p> -Compares whether region_a is equivalent to region_b. <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> as an argument -is equal to itself, but not to any non-<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> region. +Compares whether region_a is equivalent to region_b. <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> as an argument +is equal to itself, but not to any non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> region. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-Regions.html#cairo-region-t" title="cairo_region_t"><span class="type">cairo_region_t</span></a> or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a <a class="link" href="cairo-Regions.html#cairo-region-t" title="cairo_region_t"><span class="type">cairo_region_t</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-Regions.html#cairo-region-t" title="cairo_region_t"><span class="type">cairo_region_t</span></a> or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a <a class="link" href="cairo-Regions.html#cairo-region-t" title="cairo_region_t"><span class="type">cairo_region_t</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if both regions contained the same coverage, -<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not or any region is in an error status. +<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if both regions contained the same coverage, +<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not or any region is in an error status. </td> </tr> diff --git a/doc/public/html/cairo-SVG-Surfaces.html b/doc/public/html/cairo-SVG-Surfaces.html index d416cc2..95313c9 100644 --- a/doc/public/html/cairo-SVG-Surfaces.html +++ b/doc/public/html/cairo-SVG-Surfaces.html @@ -106,7 +106,7 @@ Base64-encoded and emitted. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> -<td>a filename for the SVG output (must be writable), <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> may be +<td>a filename for the SVG output (must be writable), <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> may be used to specify no output. This will generate a SVG surface that may be queried and used as a source, without generating a temporary file. @@ -154,7 +154,7 @@ incrementally to the stream represented by <em class="parameter"><code>write_fun <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate a no-op <em class="parameter"><code>write_func</code></em>. With a no-op <em class="parameter"><code>write_func</code></em>, the surface may be queried or used as a source without generating any temporary files. @@ -284,7 +284,7 @@ Used to retrieve the list of supported versions. See <pre class="programlisting">const <span class="returnvalue">char</span> * cairo_svg_version_to_string (<em class="parameter"><code><a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t" title="enum cairo_svg_version_t"><span class="type">cairo_svg_version_t</span></a> version</code></em>);</pre> <p> Get the string representation of the given <em class="parameter"><code>version</code></em> id. This function -will return <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-get-versions" title="cairo_svg_get_versions ()"><code class="function">cairo_svg_get_versions()</code></a> +will return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-get-versions" title="cairo_svg_get_versions ()"><code class="function">cairo_svg_get_versions()</code></a> for a way to get the list of valid version ids. </p> <div class="variablelist"><table border="0"> diff --git a/doc/public/html/cairo-Types.html b/doc/public/html/cairo-Types.html index 5a0a2bb..d654e5d 100644 --- a/doc/public/html/cairo-Types.html +++ b/doc/public/html/cairo-Types.html @@ -63,11 +63,21 @@ value as a boolean condition. </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> - if (cairo_in_stroke (cr, x, y)) { - /* do something */ - } -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-in-stroke">cairo_in_stroke</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">))</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> </span><span class="comment">/* do something */</span> +<span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> </div> diff --git a/doc/public/html/cairo-User-Fonts.html b/doc/public/html/cairo-User-Fonts.html index 7fe81f3..372c9b3 100644 --- a/doc/public/html/cairo-User-Fonts.html +++ b/doc/public/html/cairo-User-Fonts.html @@ -271,7 +271,7 @@ Arabic and Indic. </p> <p> The <em class="parameter"><code>num_glyphs</code></em> argument is preset to the number of glyph entries available -in the <em class="parameter"><code>glyphs</code></em> buffer. If the <em class="parameter"><code>glyphs</code></em> buffer is <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the value of +in the <em class="parameter"><code>glyphs</code></em> buffer. If the <em class="parameter"><code>glyphs</code></em> buffer is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the value of <em class="parameter"><code>num_glyphs</code></em> will be zero. If the provided glyph array is too short for the conversion (or for convenience), a new glyph array may be allocated using <a class="link" href="cairo-text.html#cairo-glyph-allocate" title="cairo_glyph_allocate ()"><code class="function">cairo_glyph_allocate()</code></a> and placed in <em class="parameter"><code>glyphs</code></em>. Upon return, @@ -282,10 +282,10 @@ The callback should populate the glyph indices and positions (in font space) assuming that the text is to be shown at the origin. </p> <p> -If <em class="parameter"><code>clusters</code></em> is not <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> are also -non-<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, and cluster mapping should be computed. The semantics of how +If <em class="parameter"><code>clusters</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> are also +non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, and cluster mapping should be computed. The semantics of how cluster array allocation works is similar to the glyph array. That is, -if <em class="parameter"><code>clusters</code></em> initially points to a non-<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value, that array may be used +if <em class="parameter"><code>clusters</code></em> initially points to a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value, that array may be used as a cluster buffer, and <em class="parameter"><code>num_clusters</code></em> points to the number of cluster entries available there. If the provided cluster array is too short for the conversion (or for convenience), a new cluster array may be allocated @@ -339,7 +339,7 @@ glyph value for other purposes. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>clusters</code></em> :</span></p></td> -<td>pointer to array of cluster mapping information to fill, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>pointer to array of cluster mapping information to fill, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -487,7 +487,7 @@ is created from it. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>init_func</code></em> :</span></p></td> -<td>The init callback, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>The init callback, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> </tbody> @@ -513,7 +513,7 @@ Gets the scaled-font initialization function of a user-font. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The init callback of <em class="parameter"><code>font_face</code></em> -or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error has occurred. +or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error has occurred. </td> </tr> @@ -539,7 +539,7 @@ is created from it. </p> <p> The render_glyph callback is the only mandatory callback of a user-font. -If the callback is <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> and a glyph is tried to be rendered using +If the callback is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> and a glyph is tried to be rendered using <em class="parameter"><code>font_face</code></em>, a <a class="link" href="cairo-Error-handling.html#CAIRO-STATUS-USER-FONT-ERROR:CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_ERROR</code></a> will occur. </p> <div class="variablelist"><table border="0"> @@ -552,7 +552,7 @@ If the callback is <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.ht </tr> <tr> <td><p><span class="term"><em class="parameter"><code>render_glyph_func</code></em> :</span></p></td> -<td>The render_glyph callback, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>The render_glyph callback, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> </tbody> @@ -578,7 +578,7 @@ Gets the glyph rendering function of a user-font. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The render_glyph callback of <em class="parameter"><code>font_face</code></em> -or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error has occurred. +or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error has occurred. </td> </tr> @@ -612,7 +612,7 @@ is created from it. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>unicode_to_glyph_func</code></em> :</span></p></td> -<td>The unicode_to_glyph callback, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>The unicode_to_glyph callback, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> </tbody> @@ -638,7 +638,7 @@ Gets the unicode-to-glyph conversion function of a user-font. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The unicode_to_glyph callback of <em class="parameter"><code>font_face</code></em> -or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error occurred. +or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error occurred. </td> </tr> @@ -672,7 +672,7 @@ is created from it. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>text_to_glyphs_func</code></em> :</span></p></td> -<td>The text_to_glyphs callback, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>The text_to_glyphs callback, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> </tbody> @@ -698,7 +698,7 @@ Gets the text-to-glyphs conversion function of a user-font. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The text_to_glyphs callback of <em class="parameter"><code>font_face</code></em> -or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error occurred. +or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set or an error occurred. </td> </tr> diff --git a/doc/public/html/cairo-Version-Information.html b/doc/public/html/cairo-Version-Information.html index a4c7116..2e51677 100644 --- a/doc/public/html/cairo-Version-Information.html +++ b/doc/public/html/cairo-Version-Information.html @@ -62,38 +62,71 @@ or as a "snapshot" tar file as opposed to a "release" tar file). </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> - _____ Major. Always 1, until we invent a new scheme. -/ ___ Minor. Even/Odd = Release/Snapshot (tar files) or Branch/Head (git) -| / _ Micro. Even/Odd = Tar-file/git -| | / -1.0.0 -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="normal">_____ Major</span><span class="symbol">.</span><span class="normal"> Always </span><span class="number">1</span><span class="symbol">,</span><span class="normal"> until we invent a </span><span class="usertype">new</span><span class="normal"> scheme</span><span class="symbol">.</span> +<span class="symbol">/</span><span class="normal"> ___ Minor</span><span class="symbol">.</span><span class="normal"> Even</span><span class="symbol">/</span><span class="normal">Odd </span><span class="symbol">=</span><span class="normal"> Release</span><span class="symbol">/</span><span class="function">Snapshot</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">tar</span><span class="normal"> files</span><span class="symbol">)</span><span class="normal"> </span><span class="usertype">or</span><span class="normal"> Branch</span><span class="symbol">/</span><span class="function">Head</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">git</span><span class="symbol">)</span> +<span class="symbol">|</span><span class="normal"> </span><span class="symbol">/</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-I18N.html#gettext-macro">_</a> Micro</span><span class="symbol">.</span><span class="normal"> Even</span><span class="symbol">/</span><span class="normal">Odd </span><span class="symbol">=</span><span class="normal"> Tar</span><span class="symbol">-</span><span class="normal">file</span><span class="symbol">/</span><span class="normal">git</span> +<span class="symbol">|</span><span class="normal"> </span><span class="symbol">|</span><span class="normal"> </span><span class="symbol">/</span> +<span class="number">1.0</span><span class="symbol">.</span><span class="number">0</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <p> Here are a few examples of versions that one might see. </p> -<div class="informalexample"><pre class="programlisting"> -Releases --------- -1.0.0 - A major release -1.0.2 - A subsequent maintenance release -1.2.0 - Another major release +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="normal">Releases</span> +<span class="symbol">--------</span> +<span class="number">1.0</span><span class="symbol">.</span><span class="number">0</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> A major release</span> +<span class="number">1.0</span><span class="symbol">.</span><span class="number">2</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> A subsequent maintenance release</span> +<span class="number">1.2</span><span class="symbol">.</span><span class="number">0</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> Another major release</span> -Snapshots ---------- -1.1.2 - A snapshot (working toward the 1.2.0 release) +<span class="normal">Snapshots</span> +<span class="symbol">---------</span> +<span class="number">1.1</span><span class="symbol">.</span><span class="number">2</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> </span><span class="usertype">A</span><span class="normal"> </span><span class="function">snapshot</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">working toward the </span><span class="number">1.2</span><span class="symbol">.</span><span class="number">0</span><span class="normal"> release</span><span class="symbol">)</span> + +<span class="normal">In</span><span class="symbol">-</span><span class="usertype">progress</span><span class="normal"> </span><span class="function">development</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">eg</span><span class="symbol">.</span><span class="normal"> </span><span class="usertype">from</span><span class="normal"> git</span><span class="symbol">)</span> +<span class="symbol">--------------------------------------</span> +<span class="number">1.0</span><span class="symbol">.</span><span class="number">1</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> Development on a </span><span class="usertype">maintenance</span><span class="normal"> </span><span class="function">branch</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">toward </span><span class="number">1.0</span><span class="symbol">.</span><span class="number">2</span><span class="normal"> release</span><span class="symbol">)</span> +<span class="number">1.1</span><span class="symbol">.</span><span class="number">1</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> Development </span><span class="usertype">on</span><span class="normal"> </span><span class="function">head</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">toward </span><span class="number">1.1</span><span class="symbol">.</span><span class="number">2</span><span class="normal"> snapshot and </span><span class="number">1.2</span><span class="symbol">.</span><span class="number">0</span><span class="normal"> release</span><span class="symbol">)</span></pre></td> + </tr> + </tbody> + </table> +</div> -In-progress development (eg. from git) --------------------------------------- -1.0.1 - Development on a maintenance branch (toward 1.0.2 release) -1.1.1 - Development on head (toward 1.1.2 snapshot and 1.2.0 release) -</pre></div> <p> </p> <div class="refsect2" title="Compatibility"> -<a name="id3080893"></a><h3>Compatibility</h3> +<a name="id3076756"></a><h3>Compatibility</h3> <p> The API/ABI compatibility guarantees for various versions are as follows. First, let's assume some cairo-using application code that is @@ -121,7 +154,7 @@ rather the many states between snapshots and releases. </div> <hr> <div class="refsect2" title="Examining the version"> -<a name="id3080931"></a><h3>Examining the version</h3> +<a name="id3076795"></a><h3>Examining the version</h3> <p> Cairo provides the ability to examine the version at either compile-time or run-time and in both a human-readable form as well as @@ -130,17 +163,33 @@ macro <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-ENCODE: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -Compile-time ------------- -CAIRO_VERSION_STRING Human-readable -CAIRO_VERSION Encoded, suitable for comparison +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="normal">Compile</span><span class="symbol">-</span><span class="normal">time</span> +<span class="symbol">------------</span> +<span class="usertype">CAIRO_VERSION_STRING</span><span class="normal"> Human</span><span class="symbol">-</span><span class="normal">readable</span> +<span class="usertype">CAIRO_VERSION</span><span class="normal"> Encoded</span><span class="symbol">,</span><span class="normal"> suitable </span><span class="keyword">for</span><span class="normal"> comparison</span> + +<span class="normal">Run</span><span class="symbol">-</span><span class="normal">time</span> +<span class="symbol">--------</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#cairo-version-string">cairo_version_string</a></span><span class="symbol">()</span><span class="normal"> Human</span><span class="symbol">-</span><span class="normal">readable</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#cairo-version">cairo_version</a></span><span class="symbol">()</span><span class="normal"> Encoded</span><span class="symbol">,</span><span class="normal"> suitable </span><span class="keyword">for</span><span class="normal"> comparison</span></pre></td> + </tr> + </tbody> + </table> +</div> -Run-time --------- -cairo_version_string() Human-readable -cairo_version() Encoded, suitable for comparison -</pre></div> <p> </p> <p> @@ -149,14 +198,27 @@ to 1.0.0 could be achieved at compile-time or run-time as follows: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -##if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 0, 0) -printf ("Compiling with suitable cairo version: %s\n", %CAIRO_VERSION_STRING); -##endif +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="preproc">#</span><span class="normal">#</span><span class="usertype">if</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#CAIRO-VERSION:CAPS">CAIRO_VERSION</a> </span><span class="symbol">>=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS">CAIRO_VERSION_ENCODE</a></span><span class="symbol">(</span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">)</span> +<span class="function">printf</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Compiling with suitable cairo version: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">%</span><span class="normal"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#CAIRO-VERSION-STRING:CAPS">CAIRO_VERSION_STRING</a></span><span class="symbol">);</span> +<span class="preproc">#</span><span class="normal">#endif</span> + +<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#cairo-version">cairo_version</a></span><span class="symbol">()</span><span class="normal"> </span><span class="symbol">>=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS">CAIRO_VERSION_ENCODE</a></span><span class="symbol">(</span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">))</span> +<span class="normal"> </span><span class="function">printf</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Running with suitable cairo version: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#cairo-version-string">cairo_version_string</a></span><span class="normal"> </span><span class="symbol">());</span></pre></td> + </tr> + </tbody> + </table> +</div> -if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 0, 0)) - printf ("Running with suitable cairo version: %s\n", cairo_version_string ()); -</pre></div> <p> </p> </div> @@ -292,9 +354,17 @@ or equal to version X.Y.Z could be performed as follows: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -if (cairo_version() >= CAIRO_VERSION_ENCODE(X,Y,Z)) {...} -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#cairo-version">cairo_version</a></span><span class="symbol">()</span><span class="normal"> </span><span class="symbol">>=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS">CAIRO_VERSION_ENCODE</a></span><span class="symbol">(</span><span class="normal">X</span><span class="symbol">,</span><span class="normal">Y</span><span class="symbol">,</span><span class="normal">Z</span><span class="symbol">))</span><span class="normal"> </span><span class="cbracket">{</span><span class="symbol">...</span><span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <p> diff --git a/doc/public/html/cairo-Win32-Fonts.html b/doc/public/html/cairo-Win32-Fonts.html index eccd205..89b3a2b 100644 --- a/doc/public/html/cairo-Win32-Fonts.html +++ b/doc/public/html/cairo-Win32-Fonts.html @@ -69,7 +69,8 @@ Microsoft Windows systems. <a name="cairo-Win32-Fonts.details"></a><h2>Details</h2> <div class="refsect2" title="CAIRO_HAS_WIN32_FONT"> <a name="CAIRO-HAS-WIN32-FONT:CAPS"></a><h3>CAIRO_HAS_WIN32_FONT</h3> -<pre class="programlisting">#define CAIRO_HAS_WIN32_FONT</pre> +<pre class="programlisting">#define CAIRO_HAS_WIN32_FONT 1 +</pre> <p> Defined if the Microsoft Windows font backend is available. This macro can be used to conditionally compile backend-specific code. @@ -157,7 +158,7 @@ and can be used with functions such as <a class="link" href="cairo-Win32-Fonts.h <tr> <td><p><span class="term"><em class="parameter"><code>logfont</code></em> :</span></p></td> <td>A <span class="type">LOGFONTW</span> structure specifying the font to use. - If <em class="parameter"><code>font</code></em> is <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> then the lfHeight, lfWidth, lfOrientation and lfEscapement + If <em class="parameter"><code>font</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> then the lfHeight, lfWidth, lfOrientation and lfEscapement fields of this structure are ignored. Otherwise lfWidth, lfOrientation and lfEscapement must be zero. </td> diff --git a/doc/public/html/cairo-Win32-Surfaces.html b/doc/public/html/cairo-Win32-Surfaces.html index c4b767e..280e35c 100644 --- a/doc/public/html/cairo-Win32-Surfaces.html +++ b/doc/public/html/cairo-Win32-Surfaces.html @@ -71,7 +71,8 @@ The surface returned by the other win32 constructors is of surface type <a name="cairo-Win32-Surfaces.details"></a><h2>Details</h2> <div class="refsect2" title="CAIRO_HAS_WIN32_SURFACE"> <a name="CAIRO-HAS-WIN32-SURFACE:CAPS"></a><h3>CAIRO_HAS_WIN32_SURFACE</h3> -<pre class="programlisting">#define CAIRO_HAS_WIN32_SURFACE</pre> +<pre class="programlisting">#define CAIRO_HAS_WIN32_SURFACE 1 +</pre> <p> Defined if the Microsoft Windows surface backend is available. This macro can be used to conditionally compile backend-specific code. @@ -228,8 +229,8 @@ associated methods must be used for correct output. <a name="cairo-win32-surface-get-dc"></a><h3>cairo_win32_surface_get_dc ()</h3> <pre class="programlisting"><span class="returnvalue">HDC</span> cairo_win32_surface_get_dc (<em class="parameter"><code><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a> *surface</code></em>);</pre> <p> -Returns the HDC associated with this surface, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none. -Also returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the surface is not a win32 surface. +Returns the HDC associated with this surface, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none. +Also returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the surface is not a win32 surface. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -241,7 +242,7 @@ Also returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NUL </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> HDC or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no HDC available. +<td> HDC or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no HDC available. </td> </tr> @@ -256,7 +257,7 @@ Also returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NUL <p> Returns a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a> image surface that refers to the same bits as the DIB of the Win32 surface. If the passed-in win32 surface -is not a DIB surface, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned. +is not a DIB surface, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -269,7 +270,7 @@ is not a DIB surface, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a> (owned by the win32 <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a>), -or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the win32 surface is not a DIB. +or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the win32 surface is not a DIB. </td> </tr> diff --git a/doc/public/html/cairo-XLib-Surfaces.html b/doc/public/html/cairo-XLib-Surfaces.html index 40b573e..56dae38 100644 --- a/doc/public/html/cairo-XLib-Surfaces.html +++ b/doc/public/html/cairo-XLib-Surfaces.html @@ -373,7 +373,7 @@ constructor. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> the Visual or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if there is no appropriate Visual for +<td> the Visual or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if there is no appropriate Visual for <em class="parameter"><code>surface</code></em>. </td> diff --git a/doc/public/html/cairo-cairo-device-t.html b/doc/public/html/cairo-cairo-device-t.html index 0085804..cd79a7a 100644 --- a/doc/public/html/cairo-cairo-device-t.html +++ b/doc/public/html/cairo-cairo-device-t.html @@ -85,28 +85,67 @@ be used by applications. Putting this all together, a function that works with devices should look something like this: </p> -<div class="informalexample"><pre class="programlisting"> -void -my_device_modifying_function (cairo_device_t *device) -{ - cairo_status_t status; +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="type">void</span> +<span class="function">my_device_modifying_function</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">cairo_device_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">device</span><span class="symbol">)</span> +<span class="cbracket">{</span> +<span class="normal"> </span><span class="usertype">cairo_status_t</span><span class="normal"> status</span><span class="symbol">;</span> - // Ensure the device is properly reset - cairo_device_flush (device); - // Try to acquire the device - status = cairo_device_acquire (device); - if (status != CAIRO_STATUS_SUCCESS) { - printf ("Failed to acquire the device: %s\n", cairo_status_to_string (status)); - return; - } +<span class="normal"> </span><span class="comment">// Ensure the device is properly reset</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-device-t.html#cairo-device-flush">cairo_device_flush</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">device</span><span class="symbol">);</span> +<span class="normal"> </span><span class="comment">// Try to acquire the device</span> +<span class="normal"> status </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-device-t.html#cairo-device-acquire">cairo_device_acquire</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">device</span><span class="symbol">);</span> +<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status </span><span class="symbol">!=</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Error-handling.html#CAIRO-STATUS-SUCCESS:CAPS">CAIRO_STATUS_SUCCESS</a></span><span class="symbol">)</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> </span><span class="function">printf</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Failed to acquire the device: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Error-handling.html#cairo-status-to-string">cairo_status_to_string</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status</span><span class="symbol">));</span> +<span class="normal"> </span><span class="keyword">return</span><span class="symbol">;</span> +<span class="normal"> </span><span class="cbracket">}</span> - // Do the custom operations on the device here. - // But do not call any Cairo functions that might acquire devices. - - // Release the device when done. - cairo_device_release (device); -} -</pre></div> +<span class="normal"> </span><span class="comment">// Do the custom operations on the device here.</span> +<span class="normal"> </span><span class="comment">// But do not call any Cairo functions that might acquire devices.</span> +<span class="normal"> </span> +<span class="normal"> </span><span class="comment">// Release the device when done.</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-device-t.html#cairo-device-release">cairo_device_release</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">device</span><span class="symbol">);</span> +<span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> + +<p> +</p> +<p> +</p> +<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"> +<h3 class="title">Note</h3> +<p>Please refer to the documentation of each backend for +additional usage requirements, guarantees provided, and +interactions with existing surface API of the device functions for +surfaces of that type. +</p> +</div> <p> </p> </div> @@ -271,28 +310,12 @@ This function may acquire devices. <div class="refsect2" title="enum cairo_device_type_t"> <a name="cairo-device-type-t"></a><h3>enum cairo_device_type_t</h3> <pre class="programlisting">typedef enum _cairo_device_type { - CAIRO_DEVICE_TYPE_IMAGE, - CAIRO_DEVICE_TYPE_PDF, - CAIRO_DEVICE_TYPE_PS, - CAIRO_DEVICE_TYPE_XLIB, - CAIRO_DEVICE_TYPE_XCB, - CAIRO_DEVICE_TYPE_GLITZ, - CAIRO_DEVICE_TYPE_QUARTZ, - CAIRO_DEVICE_TYPE_WIN32, - CAIRO_DEVICE_TYPE_BEOS, - CAIRO_DEVICE_TYPE_DIRECTFB, - CAIRO_DEVICE_TYPE_SVG, - CAIRO_DEVICE_TYPE_OS2, - CAIRO_DEVICE_TYPE_WIN32_PRINTING, - CAIRO_DEVICE_TYPE_QUARTZ_IMAGE, - CAIRO_DEVICE_TYPE_SCRIPT, - CAIRO_DEVICE_TYPE_QT, - CAIRO_DEVICE_TYPE_RECORDING, - CAIRO_DEVICE_TYPE_VG, - CAIRO_DEVICE_TYPE_GL, CAIRO_DEVICE_TYPE_DRM, + CAIRO_DEVICE_TYPE_GL, + CAIRO_DEVICE_TYPE_SCRIPT, + CAIRO_DEVICE_TYPE_XCB, + CAIRO_DEVICE_TYPE_XLIB, CAIRO_DEVICE_TYPE_XML, - CAIRO_DEVICE_TYPE_SKIA } cairo_device_type_t; </pre> <p> @@ -320,73 +343,13 @@ New entries may be added in future versions. <col align="left" valign="top"> <tbody> <tr> -<td><p><a name="CAIRO-DEVICE-TYPE-IMAGE:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_IMAGE</code></span></p></td> -<td>The surface is of type image -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-PDF:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_PDF</code></span></p></td> -<td>The surface is of type pdf -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-PS:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_PS</code></span></p></td> -<td>The surface is of type ps -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-XLIB:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_XLIB</code></span></p></td> -<td>The surface is of type xlib -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-XCB:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_XCB</code></span></p></td> -<td>The surface is of type xcb -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-GLITZ:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_GLITZ</code></span></p></td> -<td>The surface is of type glitz -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-QUARTZ:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_QUARTZ</code></span></p></td> -<td>The surface is of type quartz -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-WIN32:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_WIN32</code></span></p></td> -<td>The surface is of type win32 -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-BEOS:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_BEOS</code></span></p></td> -<td>The surface is of type beos -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-DIRECTFB:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_DIRECTFB</code></span></p></td> -<td>The surface is of type directfb -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-SVG:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_SVG</code></span></p></td> -<td>The surface is of type svg -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-OS2:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_OS2</code></span></p></td> -<td>The surface is of type os2 -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-WIN32-PRINTING:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_WIN32_PRINTING</code></span></p></td> -<td>The surface is a win32 printing surface +<td><p><a name="CAIRO-DEVICE-TYPE-DRM:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_DRM</code></span></p></td> +<td>The surface is of type Direct Render Manager </td> </tr> <tr> -<td><p><a name="CAIRO-DEVICE-TYPE-QUARTZ-IMAGE:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_QUARTZ_IMAGE</code></span></p></td> -<td>The surface is of type quartz_image +<td><p><a name="CAIRO-DEVICE-TYPE-GL:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_GL</code></span></p></td> +<td>The surface is of type OpenGL </td> </tr> <tr> @@ -395,38 +358,19 @@ New entries may be added in future versions. </td> </tr> <tr> -<td><p><a name="CAIRO-DEVICE-TYPE-QT:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_QT</code></span></p></td> -<td>The surface is of type Qt -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-RECORDING:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_RECORDING</code></span></p></td> -<td>The surface is of type recording -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-VG:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_VG</code></span></p></td> -<td>The surface is a OpenVG surface -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-GL:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_GL</code></span></p></td> -<td>The surface is of type OpenGL +<td><p><a name="CAIRO-DEVICE-TYPE-XCB:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_XCB</code></span></p></td> +<td>The surface is of type xcb </td> </tr> <tr> -<td><p><a name="CAIRO-DEVICE-TYPE-DRM:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_DRM</code></span></p></td> -<td>The surface is of type Direct Render Manager +<td><p><a name="CAIRO-DEVICE-TYPE-XLIB:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_XLIB</code></span></p></td> +<td>The surface is of type xlib </td> </tr> <tr> <td><p><a name="CAIRO-DEVICE-TYPE-XML:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_XML</code></span></p></td> <td>The surface is of type XML -</td> -</tr> -<tr> -<td><p><a name="CAIRO-DEVICE-TYPE-SKIA:CAPS"></a><span class="term"><code class="literal">CAIRO_DEVICE_TYPE_SKIA</code></span></p></td> -<td>The surface is of type Skia + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-create-for-rectangle" title="cairo_surface_create_for_rectangle ()"><code class="function">cairo_surface_create_for_rectangle()</code></a> </td> </tr> </tbody> @@ -494,7 +438,7 @@ object is a nil object, 0 will be returned. <em class="parameter"><code><a class="link" href="cairo-Types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()"><span class="type">cairo_destroy_func_t</span></a> destroy</code></em>);</pre> <p> Attach user data to <em class="parameter"><code>device</code></em>. To remove user data from a surface, -call this function with the key that was used to set it and <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +call this function with the key that was used to set it and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. </p> <div class="variablelist"><table border="0"> @@ -541,7 +485,7 @@ slot could not be allocated for the user data. <p> Return user data previously attached to <em class="parameter"><code>device</code></em> using the specified key. If no user data has been attached with the given -key this function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +key this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -559,7 +503,7 @@ attached to </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> the user data previously attached or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +<td> the user data previously attached or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </td> </tr> diff --git a/doc/public/html/cairo-cairo-font-face-t.html b/doc/public/html/cairo-cairo-font-face-t.html index b7fc25f..3a8d19e 100644 --- a/doc/public/html/cairo-cairo-font-face-t.html +++ b/doc/public/html/cairo-cairo-font-face-t.html @@ -109,7 +109,7 @@ The number of references to a <a class="link" href="cairo-cairo-font-face-t.html <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, (may be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in which case this +<td>a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, (may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in which case this function does nothing). </td> </tr> @@ -302,7 +302,7 @@ object is a nil object, 0 will be returned. <em class="parameter"><code><a class="link" href="cairo-Types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()"><span class="type">cairo_destroy_func_t</span></a> destroy</code></em>);</pre> <p> Attach user data to <em class="parameter"><code>font_face</code></em>. To remove user data from a font face, -call this function with the key that was used to set it and <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +call this function with the key that was used to set it and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. </p> <div class="variablelist"><table border="0"> @@ -347,7 +347,7 @@ slot could not be allocated for the user data. <p> Return user data previously attached to <em class="parameter"><code>font_face</code></em> using the specified key. If no user data has been attached with the given key this -function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -365,7 +365,7 @@ attached to </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> the user data previously attached or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +<td> the user data previously attached or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </td> </tr> </tbody> diff --git a/doc/public/html/cairo-cairo-font-options-t.html b/doc/public/html/cairo-cairo-font-options-t.html index bdd1b11..3565366 100644 --- a/doc/public/html/cairo-cairo-font-options-t.html +++ b/doc/public/html/cairo-cairo-font-options-t.html @@ -270,8 +270,8 @@ Compares two font options objects for equality. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if all fields of the two font options objects match. -Note that this function will return <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if either object is in +<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if all fields of the two font options objects match. +Note that this function will return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if either object is in error. </td> </tr> diff --git a/doc/public/html/cairo-cairo-pattern-t.html b/doc/public/html/cairo-cairo-pattern-t.html index 6083fe4..fb97831 100644 --- a/doc/public/html/cairo-cairo-pattern-t.html +++ b/doc/public/html/cairo-cairo-pattern-t.html @@ -310,7 +310,7 @@ pattern. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>count</code></em> :</span></p></td> -<td>return value for the number of color stops, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the number of color stops, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -355,27 +355,27 @@ returned by <a class="link" href="cairo-cairo-pattern-t.html#cairo-pattern-get-c </tr> <tr> <td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td> -<td>return value for the offset of the stop, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the offset of the stop, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> -<td>return value for red component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for red component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> -<td>return value for green component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for green component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> -<td>return value for blue component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for blue component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> -<td>return value for alpha component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for alpha component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -508,22 +508,22 @@ Gets the solid color for a solid color pattern. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> -<td>return value for red component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for red component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> -<td>return value for green component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for green component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> -<td>return value for blue component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for blue component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> -<td>return value for alpha component of color, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for alpha component of color, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -588,7 +588,7 @@ Gets the surface of a surface pattern. The reference returned in </tr> <tr> <td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> -<td>return value for surface of pattern, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for surface of pattern, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -681,22 +681,22 @@ Gets the gradient endpoints for a linear gradient. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td> -<td>return value for the x coordinate of the first point, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the x coordinate of the first point, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td> -<td>return value for the y coordinate of the first point, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the y coordinate of the first point, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> -<td>return value for the x coordinate of the second point, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the x coordinate of the second point, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> -<td>return value for the y coordinate of the second point, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the y coordinate of the second point, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -804,32 +804,32 @@ specified as a center coordinate and a radius. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td> -<td>return value for the x coordinate of the center of the first circle, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the x coordinate of the center of the first circle, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td> -<td>return value for the y coordinate of the center of the first circle, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the y coordinate of the center of the first circle, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>r0</code></em> :</span></p></td> -<td>return value for the radius of the first circle, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the radius of the first circle, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> -<td>return value for the x coordinate of the center of the second circle, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the x coordinate of the center of the second circle, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> -<td>return value for the y coordinate of the center of the second circle, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the y coordinate of the center of the second circle, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>r1</code></em> :</span></p></td> -<td>return value for the radius of the second circle, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the radius of the second circle, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -1101,10 +1101,19 @@ creates implicitly. For example: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -cairo_set_source_surface (cr, image, x, y); -cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-source-surface">cairo_set_source_surface</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> image</span><span class="symbol">,</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html#cairo-pattern-set-filter">cairo_pattern_set_filter</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-get-source">cairo_get_source</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">),</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html#CAIRO-FILTER-NEAREST:CAPS">CAIRO_FILTER_NEAREST</a></span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <div class="variablelist"><table border="0"> @@ -1175,10 +1184,19 @@ it does by default the correct code to use is: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -cairo_matrix_init_scale (&matrix, 0.5, 0.5); -cairo_pattern_set_matrix (pattern, &matrix); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html#cairo-matrix-init-scale">cairo_matrix_init_scale</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.5</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.5</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html#cairo-pattern-set-matrix">cairo_pattern_set_matrix</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pattern</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">matrix</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <p> @@ -1353,7 +1371,7 @@ object is a nil object, 0 will be returned. <em class="parameter"><code><a class="link" href="cairo-Types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()"><span class="type">cairo_destroy_func_t</span></a> destroy</code></em>);</pre> <p> Attach user data to <em class="parameter"><code>pattern</code></em>. To remove user data from a surface, -call this function with the key that was used to set it and <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +call this function with the key that was used to set it and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. </p> <div class="variablelist"><table border="0"> @@ -1400,7 +1418,7 @@ slot could not be allocated for the user data. <p> Return user data previously attached to <em class="parameter"><code>pattern</code></em> using the specified key. If no user data has been attached with the given -key this function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +key this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -1418,7 +1436,7 @@ attached to </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> the user data previously attached or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +<td> the user data previously attached or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </td> </tr> diff --git a/doc/public/html/cairo-cairo-scaled-font-t.html b/doc/public/html/cairo-cairo-scaled-font-t.html index 51308d7..54f1919 100644 --- a/doc/public/html/cairo-cairo-scaled-font-t.html +++ b/doc/public/html/cairo-cairo-scaled-font-t.html @@ -183,7 +183,7 @@ The number of references to a <a class="link" href="cairo-cairo-scaled-font-t.ht <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-cairo-scaled-font-t.html#cairo-scaled-font-t" title="cairo_scaled_font_t"><span class="type">cairo_scaled_font_t</span></a>, (may be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in which case +<td>a <a class="link" href="cairo-cairo-scaled-font-t.html#cairo-scaled-font-t" title="cairo_scaled_font_t"><span class="type">cairo_scaled_font_t</span></a>, (may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in which case this function does nothing) </td> </tr> @@ -515,7 +515,7 @@ Converts UTF-8 text to an array of glyphs, optionally with cluster mapping, that can be used to render later using <em class="parameter"><code>scaled_font</code></em>. </p> <p> -If <em class="parameter"><code>glyphs</code></em> initially points to a non-<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value, that array is used +If <em class="parameter"><code>glyphs</code></em> initially points to a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value, that array is used as a glyph buffer, and <em class="parameter"><code>num_glyphs</code></em> should point to the number of glyph entries available there. If the provided glyph array is too short for the conversion, a new glyph array is allocated using <a class="link" href="cairo-text.html#cairo-glyph-allocate" title="cairo_glyph_allocate ()"><code class="function">cairo_glyph_allocate()</code></a> @@ -526,11 +526,11 @@ array using <a class="link" href="cairo-text.html#cairo-glyph-free" title="cairo array was large enough. </p> <p> -If <em class="parameter"><code>clusters</code></em> is not <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> should not be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, +If <em class="parameter"><code>clusters</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> should not be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, and cluster mapping will be computed. The semantics of how cluster array allocation works is similar to the glyph array. That is, -if <em class="parameter"><code>clusters</code></em> initially points to a non-<a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value, that array is used +if <em class="parameter"><code>clusters</code></em> initially points to a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value, that array is used as a cluster buffer, and <em class="parameter"><code>num_clusters</code></em> should point to the number of cluster entries available there. If the provided cluster array is too short for the conversion, a new cluster array is allocated using <a class="link" href="cairo-text.html#cairo-text-cluster-allocate" title="cairo_text_cluster_allocate ()"><code class="function">cairo_text_cluster_allocate()</code></a> @@ -541,92 +541,179 @@ array using <a class="link" href="cairo-text.html#cairo-text-cluster-free" title array was large enough. </p> <p> -In the simplest case, <em class="parameter"><code>glyphs</code></em> and <em class="parameter"><code>clusters</code></em> can point to <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> initially +In the simplest case, <em class="parameter"><code>glyphs</code></em> and <em class="parameter"><code>clusters</code></em> can point to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> initially and a suitable array will be allocated. In code: </p> -<div class="informalexample"><pre class="programlisting"> -cairo_status_t status; +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="usertype">cairo_status_t</span><span class="normal"> status</span><span class="symbol">;</span> -cairo_glyph_t *glyphs = NULL; -int num_glyphs; -cairo_text_cluster_t *clusters = NULL; -int num_clusters; -cairo_text_cluster_flags_t cluster_flags; +<span class="usertype">cairo_glyph_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">glyphs </span><span class="symbol">=</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">;</span> +<span class="type">int</span><span class="normal"> num_glyphs</span><span class="symbol">;</span> +<span class="usertype">cairo_text_cluster_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">clusters </span><span class="symbol">=</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">;</span> +<span class="type">int</span><span class="normal"> num_clusters</span><span class="symbol">;</span> +<span class="usertype">cairo_text_cluster_flags_t</span><span class="normal"> cluster_flags</span><span class="symbol">;</span> -status = cairo_scaled_font_text_to_glyphs (scaled_font, - x, y, - utf8, utf8_len, - &glyphs, &num_glyphs, - &clusters, &num_clusters, &cluster_flags); +<span class="normal">status </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-text-to-glyphs">cairo_scaled_font_text_to_glyphs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">scaled_font</span><span class="symbol">,</span> +<span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">,</span> +<span class="normal"> utf8</span><span class="symbol">,</span><span class="normal"> utf8_len</span><span class="symbol">,</span> +<span class="normal"> </span><span class="symbol">&</span><span class="normal">glyphs</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">num_glyphs</span><span class="symbol">,</span> +<span class="normal"> </span><span class="symbol">&</span><span class="normal">clusters</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">num_clusters</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">cluster_flags</span><span class="symbol">);</span> -if (status == CAIRO_STATUS_SUCCESS) { - cairo_show_text_glyphs (cr, - utf8, utf8_len, - glyphs, num_glyphs, - clusters, num_clusters, cluster_flags); +<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status </span><span class="symbol">==</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Error-handling.html#CAIRO-STATUS-SUCCESS:CAPS">CAIRO_STATUS_SUCCESS</a></span><span class="symbol">)</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-show-text-glyphs">cairo_show_text_glyphs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span> +<span class="normal"> utf8</span><span class="symbol">,</span><span class="normal"> utf8_len</span><span class="symbol">,</span> +<span class="normal"> glyphs</span><span class="symbol">,</span><span class="normal"> num_glyphs</span><span class="symbol">,</span> +<span class="normal"> clusters</span><span class="symbol">,</span><span class="normal"> num_clusters</span><span class="symbol">,</span><span class="normal"> cluster_flags</span><span class="symbol">);</span> + +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-glyph-free">cairo_glyph_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">glyphs</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-text-cluster-free">cairo_text_cluster_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">clusters</span><span class="symbol">);</span> +<span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> - cairo_glyph_free (glyphs); - cairo_text_cluster_free (clusters); -} -</pre></div> <p> </p> <p> If no cluster mapping is needed: </p> -<div class="informalexample"><pre class="programlisting"> -cairo_status_t status; +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="usertype">cairo_status_t</span><span class="normal"> status</span><span class="symbol">;</span> + +<span class="usertype">cairo_glyph_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">glyphs </span><span class="symbol">=</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">;</span> +<span class="type">int</span><span class="normal"> num_glyphs</span><span class="symbol">;</span> -cairo_glyph_t *glyphs = NULL; -int num_glyphs; +<span class="normal">status </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-text-to-glyphs">cairo_scaled_font_text_to_glyphs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">scaled_font</span><span class="symbol">,</span> +<span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">,</span> +<span class="normal"> utf8</span><span class="symbol">,</span><span class="normal"> utf8_len</span><span class="symbol">,</span> +<span class="normal"> </span><span class="symbol">&</span><span class="normal">glyphs</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">num_glyphs</span><span class="symbol">,</span> +<span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">,</span> +<span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span> -status = cairo_scaled_font_text_to_glyphs (scaled_font, - x, y, - utf8, utf8_len, - &glyphs, &num_glyphs, - NULL, NULL, - NULL); +<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status </span><span class="symbol">==</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Error-handling.html#CAIRO-STATUS-SUCCESS:CAPS">CAIRO_STATUS_SUCCESS</a></span><span class="symbol">)</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-show-glyphs">cairo_show_glyphs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> glyphs</span><span class="symbol">,</span><span class="normal"> num_glyphs</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-glyph-free">cairo_glyph_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">glyphs</span><span class="symbol">);</span> +<span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> -if (status == CAIRO_STATUS_SUCCESS) { - cairo_show_glyphs (cr, glyphs, num_glyphs); - cairo_glyph_free (glyphs); -} -</pre></div> <p> </p> <p> If stack-based glyph and cluster arrays are to be used for small arrays: </p> -<div class="informalexample"><pre class="programlisting"> -cairo_status_t status; +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="usertype">cairo_status_t</span><span class="normal"> status</span><span class="symbol">;</span> + +<span class="usertype">cairo_glyph_t</span><span class="normal"> stack_glyphs</span><span class="symbol">[</span><span class="number">40</span><span class="symbol">];</span> +<span class="usertype">cairo_glyph_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">glyphs </span><span class="symbol">=</span><span class="normal"> stack_glyphs</span><span class="symbol">;</span> +<span class="type">int</span><span class="normal"> num_glyphs </span><span class="symbol">=</span><span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stack_glyphs</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">/</span><span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stack_glyphs</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">]);</span> +<span class="usertype">cairo_text_cluster_t</span><span class="normal"> stack_clusters</span><span class="symbol">[</span><span class="number">40</span><span class="symbol">];</span> +<span class="usertype">cairo_text_cluster_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">clusters </span><span class="symbol">=</span><span class="normal"> stack_clusters</span><span class="symbol">;</span> +<span class="type">int</span><span class="normal"> num_clusters </span><span class="symbol">=</span><span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stack_clusters</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">/</span><span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stack_clusters</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">]);</span> +<span class="usertype">cairo_text_cluster_flags_t</span><span class="normal"> cluster_flags</span><span class="symbol">;</span> -cairo_glyph_t stack_glyphs[40]; -cairo_glyph_t *glyphs = stack_glyphs; -int num_glyphs = sizeof (stack_glyphs) / sizeof (stack_glyphs[0]); -cairo_text_cluster_t stack_clusters[40]; -cairo_text_cluster_t *clusters = stack_clusters; -int num_clusters = sizeof (stack_clusters) / sizeof (stack_clusters[0]); -cairo_text_cluster_flags_t cluster_flags; +<span class="normal">status </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-text-to-glyphs">cairo_scaled_font_text_to_glyphs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">scaled_font</span><span class="symbol">,</span> +<span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">,</span> +<span class="normal"> utf8</span><span class="symbol">,</span><span class="normal"> utf8_len</span><span class="symbol">,</span> +<span class="normal"> </span><span class="symbol">&</span><span class="normal">glyphs</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">num_glyphs</span><span class="symbol">,</span> +<span class="normal"> </span><span class="symbol">&</span><span class="normal">clusters</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">num_clusters</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">cluster_flags</span><span class="symbol">);</span> -status = cairo_scaled_font_text_to_glyphs (scaled_font, - x, y, - utf8, utf8_len, - &glyphs, &num_glyphs, - &clusters, &num_clusters, &cluster_flags); +<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status </span><span class="symbol">==</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Error-handling.html#CAIRO-STATUS-SUCCESS:CAPS">CAIRO_STATUS_SUCCESS</a></span><span class="symbol">)</span><span class="normal"> </span><span class="cbracket">{</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-show-text-glyphs">cairo_show_text_glyphs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span> +<span class="normal"> utf8</span><span class="symbol">,</span><span class="normal"> utf8_len</span><span class="symbol">,</span> +<span class="normal"> glyphs</span><span class="symbol">,</span><span class="normal"> num_glyphs</span><span class="symbol">,</span> +<span class="normal"> clusters</span><span class="symbol">,</span><span class="normal"> num_clusters</span><span class="symbol">,</span><span class="normal"> cluster_flags</span><span class="symbol">);</span> -if (status == CAIRO_STATUS_SUCCESS) { - cairo_show_text_glyphs (cr, - utf8, utf8_len, - glyphs, num_glyphs, - clusters, num_clusters, cluster_flags); +<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">glyphs </span><span class="symbol">!=</span><span class="normal"> stack_glyphs</span><span class="symbol">)</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-glyph-free">cairo_glyph_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">glyphs</span><span class="symbol">);</span> +<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">clusters </span><span class="symbol">!=</span><span class="normal"> stack_clusters</span><span class="symbol">)</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-text.html#cairo-text-cluster-free">cairo_text_cluster_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">clusters</span><span class="symbol">);</span> +<span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> - if (glyphs != stack_glyphs) - cairo_glyph_free (glyphs); - if (clusters != stack_clusters) - cairo_text_cluster_free (clusters); -} -</pre></div> <p> </p> <p> @@ -678,18 +765,18 @@ same <em class="parameter"><code>scaled_font</code></em> is used for the operati </tr> <tr> <td><p><span class="term"><em class="parameter"><code>clusters</code></em> :</span></p></td> -<td>pointer to array of cluster mapping information to fill, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>pointer to array of cluster mapping information to fill, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>num_clusters</code></em> :</span></p></td> -<td>pointer to number of clusters, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>pointer to number of clusters, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>cluster_flags</code></em> :</span></p></td> <td>pointer to location to store cluster flags corresponding to the - output <em class="parameter"><code>clusters</code></em>, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> + output <em class="parameter"><code>clusters</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -903,7 +990,7 @@ object is a nil object, 0 will be returned. <em class="parameter"><code><a class="link" href="cairo-Types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()"><span class="type">cairo_destroy_func_t</span></a> destroy</code></em>);</pre> <p> Attach user data to <em class="parameter"><code>scaled_font</code></em>. To remove user data from a surface, -call this function with the key that was used to set it and <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +call this function with the key that was used to set it and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. </p> <div class="variablelist"><table border="0"> @@ -950,7 +1037,7 @@ slot could not be allocated for the user data. <p> Return user data previously attached to <em class="parameter"><code>scaled_font</code></em> using the specified key. If no user data has been attached with the given -key this function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +key this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -968,7 +1055,7 @@ attached to </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> the user data previously attached or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +<td> the user data previously attached or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </td> </tr> diff --git a/doc/public/html/cairo-cairo-surface-t.html b/doc/public/html/cairo-cairo-surface-t.html index b8f753f..4231110 100644 --- a/doc/public/html/cairo-cairo-surface-t.html +++ b/doc/public/html/cairo-cairo-surface-t.html @@ -124,28 +124,54 @@ functions. If you do this, keep in mind that it is mandatory that you call you must use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-mark-dirty" title="cairo_surface_mark_dirty ()"><code class="function">cairo_surface_mark_dirty()</code></a> after modifying it. </p> <div class="example"> -<a name="id3063632"></a><p class="title"><b>Example 1. Directly modifying an image surface</b></p> -<div class="example-contents"><pre class="programlisting"> -void -modify_image_surface (cairo_surface_t *surface) -{ - unsigned char *data; - int width, height, stride; +<a name="id3054006"></a><p class="title"><b>Example 1. Directly modifying an image surface</b></p> +<div class="example-contents"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="type">void</span> +<span class="function">modify_image_surface</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">cairo_surface_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">surface</span><span class="symbol">)</span> +<span class="cbracket">{</span> +<span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">data</span><span class="symbol">;</span> +<span class="normal"> </span><span class="type">int</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">,</span><span class="normal"> stride</span><span class="symbol">;</span> - // flush to ensure all writing to the image was done - cairo_surface_flush (surface); +<span class="normal"> </span><span class="comment">// flush to ensure all writing to the image was done</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html#cairo-surface-flush">cairo_surface_flush</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> - // modify the image - data = cairo_image_surface_get_data (surface); - width = cairo_image_surface_get_width (surface); - height = cairo_image_surface_get_height (surface); - stride = cairo_image_surface_get_stride (surface); - modify_image_data (data, width, height, stride); +<span class="normal"> </span><span class="comment">// modify the image</span> +<span class="normal"> data </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#cairo-image-surface-get-data">cairo_image_surface_get_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="normal"> width </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#cairo-image-surface-get-width">cairo_image_surface_get_width</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="normal"> height </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#cairo-image-surface-get-height">cairo_image_surface_get_height</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="normal"> stride </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#cairo-image-surface-get-stride">cairo_image_surface_get_stride</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function">modify_image_data</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">,</span><span class="normal"> stride</span><span class="symbol">);</span> + +<span class="normal"> </span><span class="comment">// mark the image dirty so Cairo clears its caches.</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html#cairo-surface-mark-dirty">cairo_surface_mark_dirty</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="cbracket">}</span></pre></td> + </tr> + </tbody> + </table> +</div> - // mark the image dirty so Cairo clears its caches. - cairo_surface_mark_dirty (surface); -} -</pre></div> </div> <p><br class="example-break"> Note that for other surface types it might be necessary to acquire the @@ -347,6 +373,17 @@ for passing constrained child surfaces to library routines that draw directly onto the parent surface, i.e. with no further backend allocations, double buffering or copies. </p> +<p> +</p> +<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"> +<h3 class="title">Note</h3> +<p>The semantics of subsurfaces have not been finalized yet +unless the rectangle is in full device units, is contained within +the extents of the target surface, and the target or subsurface's +device transforms are not changed.</p> +</div> +<p> +</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -384,10 +421,12 @@ with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if <em class="parameter"><code>other</code></em> is already in an error state or any other error occurs. + </td> </tr> </tbody> </table></div> +<p class="since">Since 1.10</p> </div> <hr> <div class="refsect2" title="cairo_surface_reference ()"> @@ -532,7 +571,7 @@ See <a class="link" href="cairo-cairo-device-t.html#cairo-device-t" title="cairo </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> The device for <em class="parameter"><code>surface</code></em> or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the surface does +<td> The device for <em class="parameter"><code>surface</code></em> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the surface does not have an associated device. </td> @@ -857,7 +896,8 @@ resolution if never set. CAIRO_SURFACE_TYPE_DRM, CAIRO_SURFACE_TYPE_TEE, CAIRO_SURFACE_TYPE_XML, - CAIRO_SURFACE_TYPE_SKIA + CAIRO_SURFACE_TYPE_SKIA, + CAIRO_SURFACE_TYPE_SUBSURFACE } cairo_surface_type_t; </pre> <p> @@ -1005,6 +1045,12 @@ New entries may be added in future versions. <td>The surface is of type Skia, since 1.10 </td> </tr> +<tr> +<td><p><a name="CAIRO-SURFACE-TYPE-SUBSURFACE:CAPS"></a><span class="term"><code class="literal">CAIRO_SURFACE_TYPE_SUBSURFACE</code></span></p></td> +<td>The surface is a subsurface created with + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-create-for-rectangle" title="cairo_surface_create_for_rectangle ()"><code class="function">cairo_surface_create_for_rectangle()</code></a>, since 1.10 +</td> +</tr> </tbody> </table></div> <p class="since">Since 1.2</p> @@ -1070,7 +1116,7 @@ object is a nil object, 0 will be returned. <em class="parameter"><code><a class="link" href="cairo-Types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()"><span class="type">cairo_destroy_func_t</span></a> destroy</code></em>);</pre> <p> Attach user data to <em class="parameter"><code>surface</code></em>. To remove user data from a surface, -call this function with the key that was used to set it and <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +call this function with the key that was used to set it and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. </p> <div class="variablelist"><table border="0"> @@ -1115,7 +1161,7 @@ slot could not be allocated for the user data. <p> Return user data previously attached to <em class="parameter"><code>surface</code></em> using the specified key. If no user data has been attached with the given key this -function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -1133,7 +1179,7 @@ attached to </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> the user data previously attached or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +<td> the user data previously attached or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </td> </tr> </tbody> @@ -1196,7 +1242,7 @@ whether it actually uses the provided text and cluster data to a <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a> call. </p> <p> -Note: Even if this function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, a +Note: Even if this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, a <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a> operation targeted at <em class="parameter"><code>surface</code></em> will still succeed. It just will act like a <a class="link" href="cairo-text.html#cairo-show-glyphs" title="cairo_show_glyphs ()"><code class="function">cairo_show_glyphs()</code></a> operation. Users can use this @@ -1213,8 +1259,8 @@ target surface does not use it. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>surface</code></em> supports - <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a>, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise +<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>surface</code></em> supports + <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a>, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise </td> </tr> @@ -1234,7 +1280,7 @@ target surface does not use it. <p> Attach an image in the format <em class="parameter"><code>mime_type</code></em> to <em class="parameter"><code>surface</code></em>. To remove the data from a surface, call this function with same mime type -and <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. +and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. </p> <p> The attached image (or filename) data can later be used by backends @@ -1308,7 +1354,7 @@ slot could not be allocated for the user data. <p> Return mime data previously attached to <em class="parameter"><code>surface</code></em> using the specified mime type. If no data has been attached with the given -mime type, <em class="parameter"><code>data</code></em> is set <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +mime type, <em class="parameter"><code>data</code></em> is set <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff --git a/doc/public/html/cairo-cairo-t.html b/doc/public/html/cairo-cairo-t.html index 154f9ef..426fbd5 100644 --- a/doc/public/html/cairo-cairo-t.html +++ b/doc/public/html/cairo-cairo-t.html @@ -223,7 +223,7 @@ maintain a separate reference to it. <td> a newly allocated <a class="link" href="cairo-cairo-t.html#cairo-t" title="cairo_t"><span class="type">cairo_t</span></a> with a reference count of 1. The initial reference count should be released with <a class="link" href="cairo-cairo-t.html#cairo-destroy" title="cairo_destroy ()"><code class="function">cairo_destroy()</code></a> when you are done using the <a class="link" href="cairo-cairo-t.html#cairo-t" title="cairo_t"><span class="type">cairo_t</span></a>. - This function never returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If memory cannot be + This function never returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If memory cannot be allocated, a special <a class="link" href="cairo-cairo-t.html#cairo-t" title="cairo_t"><span class="type">cairo_t</span></a> object will be returned on which <a class="link" href="cairo-cairo-t.html#cairo-status" title="cairo_status ()"><code class="function">cairo_status()</code></a> returns <a class="link" href="cairo-Error-handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. You can use this object normally, but no drawing will @@ -420,15 +420,29 @@ under the stroke: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -cairo_push_group (cr); -cairo_set_source (cr, fill_pattern); -cairo_fill_preserve (cr); -cairo_set_source (cr, stroke_pattern); -cairo_stroke (cr); -cairo_pop_group_to_source (cr); -cairo_paint_with_alpha (cr, alpha); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3 +4 +5 +6 +7</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-push-group">cairo_push_group</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-source">cairo_set_source</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> fill_pattern</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-fill-preserve">cairo_fill_preserve</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-source">cairo_set_source</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> stroke_pattern</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-stroke">cairo_stroke</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-pop-group-to-source">cairo_pop_group_to_source</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-paint-with-alpha">cairo_paint_with_alpha</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> alpha</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <div class="variablelist"><table border="0"> @@ -529,11 +543,21 @@ operations: </p> <p> </p> -<div class="informalexample"><pre class="programlisting"> -<a class="link" href="cairo-cairo-pattern-t.html#cairo-pattern-t" title="cairo_pattern_t">cairo_pattern_t</a> *group = cairo_pop_group (cr); -cairo_set_source (cr, group); -cairo_pattern_destroy (group); -</pre></div> +<div class="informalexample"> + <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> + <tbody> + <tr> + <td class="listing_lines" align="right"><pre>1 +2 +3</pre></td> + <td class="listing_code"><pre class="programlisting"><span class="symbol"><</span><span class="usertype">a</span><span class="normal"> class</span><span class="symbol">=</span><span class="string">"link"</span><span class="normal"> href</span><span class="symbol">=</span><span class="string">"cairo-cairo-pattern-t.html#cairo-pattern-t"</span><span class="normal"> title</span><span class="symbol">=</span><span class="string">"cairo_pattern_t"</span><span class="symbol">></span><span class="usertype">cairo_pattern_t</a></span><span class="normal"> </span><span class="symbol">*</span><span class="normal">group </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-pop-group">cairo_pop_group</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-source">cairo_set_source</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> group</span><span class="symbol">);</span> +<span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html#cairo-pattern-destroy">cairo_pattern_destroy</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">group</span><span class="symbol">);</span></pre></td> + </tr> + </tbody> + </table> +</div> + <p> </p> <p> @@ -1004,7 +1028,7 @@ See also <a class="link" href="cairo-cairo-t.html#cairo-set-dash" title="cairo_s <em class="parameter"><code><span class="type">double</span> *dashes</code></em>, <em class="parameter"><code><span class="type">double</span> *offset</code></em>);</pre> <p> -Gets the current dash array. If not <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, <em class="parameter"><code>dashes</code></em> should be big +Gets the current dash array. If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, <em class="parameter"><code>dashes</code></em> should be big enough to hold at least the number of values returned by <a class="link" href="cairo-cairo-t.html#cairo-get-dash-count" title="cairo_get_dash_count ()"><code class="function">cairo_get_dash_count()</code></a>. </p> @@ -1018,12 +1042,12 @@ enough to hold at least the number of values returned by </tr> <tr> <td><p><span class="term"><em class="parameter"><code>dashes</code></em> :</span></p></td> -<td>return value for the dash array, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the dash array, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td> -<td>return value for the current dash offset, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>return value for the current dash offset, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> </tbody> @@ -2096,7 +2120,7 @@ be dereferenced. <pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-rectangle-list-t" title="cairo_rectangle_list_t"><span class="returnvalue">cairo_rectangle_list_t</span></a> * cairo_copy_clip_rectangle_list (<em class="parameter"><code><a class="link" href="cairo-cairo-t.html#cairo-t" title="cairo_t"><span class="type">cairo_t</span></a> *cr</code></em>);</pre> <p> Gets the current clip region as a list of rectangles in user coordinates. -Never returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +Never returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <p> The status in the list may be <a class="link" href="cairo-Error-handling.html#CAIRO-STATUS-CLIP-NOT-REPRESENTABLE:CAPS"><code class="literal">CAIRO_STATUS_CLIP_NOT_REPRESENTABLE</code></a> to @@ -2633,7 +2657,7 @@ object is a nil object, 0 will be returned. <em class="parameter"><code><a class="link" href="cairo-Types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()"><span class="type">cairo_destroy_func_t</span></a> destroy</code></em>);</pre> <p> Attach user data to <em class="parameter"><code>cr</code></em>. To remove user data from a surface, -call this function with the key that was used to set it and <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +call this function with the key that was used to set it and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for <em class="parameter"><code>data</code></em>. </p> <div class="variablelist"><table border="0"> @@ -2680,7 +2704,7 @@ slot could not be allocated for the user data. <p> Return user data previously attached to <em class="parameter"><code>cr</code></em> using the specified key. If no user data has been attached with the given key this -function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -2698,7 +2722,7 @@ attached to </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> the user data previously attached or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. +<td> the user data previously attached or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </td> </tr> diff --git a/doc/public/html/cairo-text.html b/doc/public/html/cairo-text.html index 9e88dc9..5753858 100644 --- a/doc/public/html/cairo-text.html +++ b/doc/public/html/cairo-text.html @@ -541,7 +541,7 @@ destroyed if there are no other references to it. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> -<td>a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to restore to the default font +<td>a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to restore to the default font </td> </tr> </tbody> @@ -568,7 +568,7 @@ Gets the current font face for a <a class="link" href="cairo-cairo-t.html#cairo- cairo. To keep a reference to it, you must call <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-reference" title="cairo_font_face_reference ()"><code class="function">cairo_font_face_reference()</code></a>. -This function never returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If memory cannot be allocated, a +This function never returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If memory cannot be allocated, a special "nil" <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a> object will be returned on which <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-status" title="cairo_font_face_status ()"><code class="function">cairo_font_face_status()</code></a> returns <a class="link" href="cairo-Error-handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using this nil object will cause its error state to propagate to other @@ -630,7 +630,7 @@ Gets the current scaled font for a <a class="link" href="cairo-cairo-t.html#cair cairo. To keep a reference to it, you must call <a class="link" href="cairo-cairo-scaled-font-t.html#cairo-scaled-font-reference" title="cairo_scaled_font_reference ()"><code class="function">cairo_scaled_font_reference()</code></a>. -This function never returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If memory cannot be allocated, a +This function never returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If memory cannot be allocated, a special "nil" <a class="link" href="cairo-cairo-scaled-font-t.html#cairo-scaled-font-t" title="cairo_scaled_font_t"><span class="type">cairo_scaled_font_t</span></a> object will be returned on which <a class="link" href="cairo-cairo-scaled-font-t.html#cairo-scaled-font-status" title="cairo_scaled_font_status ()"><code class="function">cairo_scaled_font_status()</code></a> returns <a class="link" href="cairo-Error-handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using this nil object will cause its error state to propagate to other @@ -685,7 +685,7 @@ serious text-using applications. See <a class="link" href="cairo-text.html#cairo </tr> <tr> <td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td> -<td>a NUL-terminated string of text encoded in UTF-8, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a NUL-terminated string of text encoded in UTF-8, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> </tbody> @@ -862,7 +862,7 @@ affect the x_advance and y_advance values. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td> -<td>a NUL-terminated string of text encoded in UTF-8, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>a NUL-terminated string of text encoded in UTF-8, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr> <tr> @@ -1058,8 +1058,8 @@ For all other uses, user can use their own allocation method for glyphs. </p> <p> -This function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>num_glyphs</code></em> is not positive, -or if out of memory. That means, the <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> return value +This function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>num_glyphs</code></em> is not positive, +or if out of memory. That means, the <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> return value signals out-of-memory only if <em class="parameter"><code>num_glyphs</code></em> was positive. </p> <div class="variablelist"><table border="0"> @@ -1097,7 +1097,7 @@ for glyphs. <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></p></td> -<td>array of glyphs to free, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>array of glyphs to free, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr></tbody> </table></div> @@ -1116,8 +1116,8 @@ For all other uses, user can use their own allocation method for text clusters. </p> <p> -This function returns <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>num_clusters</code></em> is not positive, -or if out of memory. That means, the <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> return value +This function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>num_clusters</code></em> is not positive, +or if out of memory. That means, the <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> return value signals out-of-memory only if <em class="parameter"><code>num_clusters</code></em> was positive. </p> <div class="variablelist"><table border="0"> @@ -1155,7 +1155,7 @@ for text clusters. <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>clusters</code></em> :</span></p></td> -<td>array of text clusters to free, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> +<td>array of text clusters to free, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> </td> </tr></tbody> </table></div> diff --git a/doc/public/html/cairo.devhelp b/doc/public/html/cairo.devhelp index 34f6cc1..fc3b6cd 100644 --- a/doc/public/html/cairo.devhelp +++ b/doc/public/html/cairo.devhelp @@ -454,8 +454,8 @@ <function name="enum cairo_status_t" link="cairo-Error-handling.html#cairo-status-t"/> <function name="cairo_status_to_string ()" link="cairo-Error-handling.html#cairo-status-to-string"/> <function name="cairo_debug_reset_static_data ()" link="cairo-Error-handling.html#cairo-debug-reset-static-data"/> - <function name="Compatibility" link="cairo-Version-Information.html#id3080893"/> - <function name="Examining the version" link="cairo-Version-Information.html#id3080931"/> + <function name="Compatibility" link="cairo-Version-Information.html#id3076756"/> + <function name="Examining the version" link="cairo-Version-Information.html#id3076795"/> <function name="CAIRO_VERSION" link="cairo-Version-Information.html#CAIRO-VERSION:CAPS"/> <function name="CAIRO_VERSION_MAJOR" link="cairo-Version-Information.html#CAIRO-VERSION-MAJOR:CAPS"/> <function name="CAIRO_VERSION_MINOR" link="cairo-Version-Information.html#CAIRO-VERSION-MINOR:CAPS"/> diff --git a/doc/public/html/cairo.devhelp2 b/doc/public/html/cairo.devhelp2 index c63bd91..5047e51 100644 --- a/doc/public/html/cairo.devhelp2 +++ b/doc/public/html/cairo.devhelp2 @@ -345,7 +345,7 @@ <keyword type="typedef" name="cairo_surface_t" link="cairo-cairo-surface-t.html#cairo-surface-t"/> <keyword type="enum" name="enum cairo_content_t" link="cairo-cairo-surface-t.html#cairo-content-t"/> <keyword type="function" name="cairo_surface_create_similar ()" link="cairo-cairo-surface-t.html#cairo-surface-create-similar"/> - <keyword type="function" name="cairo_surface_create_for_rectangle ()" link="cairo-cairo-surface-t.html#cairo-surface-create-for-rectangle"/> + <keyword type="function" name="cairo_surface_create_for_rectangle ()" link="cairo-cairo-surface-t.html#cairo-surface-create-for-rectangle" since="1.10"/> <keyword type="function" name="cairo_surface_reference ()" link="cairo-cairo-surface-t.html#cairo-surface-reference"/> <keyword type="function" name="cairo_surface_destroy ()" link="cairo-cairo-surface-t.html#cairo-surface-destroy"/> <keyword type="function" name="cairo_surface_status ()" link="cairo-cairo-surface-t.html#cairo-surface-status"/> @@ -454,8 +454,8 @@ <keyword type="enum" name="enum cairo_status_t" link="cairo-Error-handling.html#cairo-status-t"/> <keyword type="function" name="cairo_status_to_string ()" link="cairo-Error-handling.html#cairo-status-to-string"/> <keyword type="function" name="cairo_debug_reset_static_data ()" link="cairo-Error-handling.html#cairo-debug-reset-static-data"/> - <keyword type="" name="Compatibility" link="cairo-Version-Information.html#id3080893"/> - <keyword type="" name="Examining the version" link="cairo-Version-Information.html#id3080931"/> + <keyword type="" name="Compatibility" link="cairo-Version-Information.html#id3076756"/> + <keyword type="" name="Examining the version" link="cairo-Version-Information.html#id3076795"/> <keyword type="macro" name="CAIRO_VERSION" link="cairo-Version-Information.html#CAIRO-VERSION:CAPS"/> <keyword type="macro" name="CAIRO_VERSION_MAJOR" link="cairo-Version-Information.html#CAIRO-VERSION-MAJOR:CAPS"/> <keyword type="macro" name="CAIRO_VERSION_MINOR" link="cairo-Version-Information.html#CAIRO-VERSION-MINOR:CAPS"/> @@ -555,28 +555,12 @@ <keyword type="constant" name="CAIRO_HINT_METRICS_DEFAULT" link="cairo-cairo-font-options-t.html#CAIRO-HINT-METRICS-DEFAULT:CAPS"/> <keyword type="constant" name="CAIRO_HINT_METRICS_OFF" link="cairo-cairo-font-options-t.html#CAIRO-HINT-METRICS-OFF:CAPS"/> <keyword type="constant" name="CAIRO_HINT_METRICS_ON" link="cairo-cairo-font-options-t.html#CAIRO-HINT-METRICS-ON:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_IMAGE" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-IMAGE:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_PDF" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-PDF:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_PS" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-PS:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_XLIB" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XLIB:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_XCB" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XCB:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_GLITZ" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-GLITZ:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_QUARTZ" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-QUARTZ:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_WIN32" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-WIN32:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_BEOS" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-BEOS:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_DIRECTFB" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-DIRECTFB:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_SVG" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SVG:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_OS2" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-OS2:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_WIN32_PRINTING" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-WIN32-PRINTING:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_QUARTZ_IMAGE" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-QUARTZ-IMAGE:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_SCRIPT" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SCRIPT:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_QT" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-QT:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_RECORDING" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-RECORDING:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_VG" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-VG:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_GL" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-GL:CAPS"/> <keyword type="constant" name="CAIRO_DEVICE_TYPE_DRM" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-DRM:CAPS"/> + <keyword type="constant" name="CAIRO_DEVICE_TYPE_GL" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-GL:CAPS"/> + <keyword type="constant" name="CAIRO_DEVICE_TYPE_SCRIPT" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SCRIPT:CAPS"/> + <keyword type="constant" name="CAIRO_DEVICE_TYPE_XCB" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XCB:CAPS"/> + <keyword type="constant" name="CAIRO_DEVICE_TYPE_XLIB" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XLIB:CAPS"/> <keyword type="constant" name="CAIRO_DEVICE_TYPE_XML" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XML:CAPS"/> - <keyword type="constant" name="CAIRO_DEVICE_TYPE_SKIA" link="cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SKIA:CAPS"/> <keyword type="constant" name="CAIRO_CONTENT_COLOR" link="cairo-cairo-surface-t.html#CAIRO-CONTENT-COLOR:CAPS"/> <keyword type="constant" name="CAIRO_CONTENT_ALPHA" link="cairo-cairo-surface-t.html#CAIRO-CONTENT-ALPHA:CAPS"/> <keyword type="constant" name="CAIRO_CONTENT_COLOR_ALPHA" link="cairo-cairo-surface-t.html#CAIRO-CONTENT-COLOR-ALPHA:CAPS"/> @@ -603,6 +587,7 @@ <keyword type="constant" name="CAIRO_SURFACE_TYPE_TEE" link="cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-TEE:CAPS"/> <keyword type="constant" name="CAIRO_SURFACE_TYPE_XML" link="cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-XML:CAPS"/> <keyword type="constant" name="CAIRO_SURFACE_TYPE_SKIA" link="cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-SKIA:CAPS"/> + <keyword type="constant" name="CAIRO_SURFACE_TYPE_SUBSURFACE" link="cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-SUBSURFACE:CAPS"/> <keyword type="constant" name="CAIRO_FORMAT_INVALID" link="cairo-Image-Surfaces.html#CAIRO-FORMAT-INVALID:CAPS"/> <keyword type="constant" name="CAIRO_FORMAT_ARGB32" link="cairo-Image-Surfaces.html#CAIRO-FORMAT-ARGB32:CAPS"/> <keyword type="constant" name="CAIRO_FORMAT_RGB24" link="cairo-Image-Surfaces.html#CAIRO-FORMAT-RGB24:CAPS"/> diff --git a/doc/public/html/index-1.10.html b/doc/public/html/index-1.10.html index 45d3b52..2234e2b 100644 --- a/doc/public/html/index-1.10.html +++ b/doc/public/html/index-1.10.html @@ -128,6 +128,8 @@ <div class="indexdiv"> <h3>S</h3> <dl> +<dt>cairo_surface_create_for_rectangle, <a class="indexterm" href="cairo-cairo-surface-t.html#cairo-surface-create-for-rectangle">cairo_surface_create_for_rectangle ()</a> +</dt> <dt>cairo_surface_get_device, <a class="indexterm" href="cairo-cairo-surface-t.html#cairo-surface-get-device">cairo_surface_get_device ()</a> </dt> <dt>cairo_surface_get_mime_data, <a class="indexterm" href="cairo-cairo-surface-t.html#cairo-surface-get-mime-data">cairo_surface_get_mime_data ()</a> diff --git a/doc/public/html/index.html b/doc/public/html/index.html index 2181a68..ba85107 100644 --- a/doc/public/html/index.html +++ b/doc/public/html/index.html @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Cairo: A Vector Graphics Library</p></th></tr></table></div> -<div><p class="releaseinfo">for Cairo 1.9.14 +<div><p class="releaseinfo">for Cairo 1.10.0 </p></div> </div> <hr> diff --git a/doc/public/html/index.sgml b/doc/public/html/index.sgml index 71927bf..a77567d 100644 --- a/doc/public/html/index.sgml +++ b/doc/public/html/index.sgml @@ -425,28 +425,12 @@ <ANCHOR id="cairo-device-finish" href="cairo/cairo-cairo-device-t.html#cairo-device-finish"> <ANCHOR id="cairo-device-flush" href="cairo/cairo-cairo-device-t.html#cairo-device-flush"> <ANCHOR id="cairo-device-type-t" href="cairo/cairo-cairo-device-t.html#cairo-device-type-t"> -<ANCHOR id="CAIRO-DEVICE-TYPE-IMAGE:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-IMAGE:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-PDF:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-PDF:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-PS:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-PS:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-XLIB:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XLIB:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-XCB:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XCB:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-GLITZ:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-GLITZ:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-QUARTZ:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-QUARTZ:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-WIN32:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-WIN32:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-BEOS:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-BEOS:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-DIRECTFB:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-DIRECTFB:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-SVG:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SVG:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-OS2:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-OS2:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-WIN32-PRINTING:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-WIN32-PRINTING:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-QUARTZ-IMAGE:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-QUARTZ-IMAGE:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-SCRIPT:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SCRIPT:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-QT:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-QT:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-RECORDING:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-RECORDING:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-VG:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-VG:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-GL:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-GL:CAPS"> <ANCHOR id="CAIRO-DEVICE-TYPE-DRM:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-DRM:CAPS"> +<ANCHOR id="CAIRO-DEVICE-TYPE-GL:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-GL:CAPS"> +<ANCHOR id="CAIRO-DEVICE-TYPE-SCRIPT:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SCRIPT:CAPS"> +<ANCHOR id="CAIRO-DEVICE-TYPE-XCB:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XCB:CAPS"> +<ANCHOR id="CAIRO-DEVICE-TYPE-XLIB:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XLIB:CAPS"> <ANCHOR id="CAIRO-DEVICE-TYPE-XML:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-XML:CAPS"> -<ANCHOR id="CAIRO-DEVICE-TYPE-SKIA:CAPS" href="cairo/cairo-cairo-device-t.html#CAIRO-DEVICE-TYPE-SKIA:CAPS"> <ANCHOR id="cairo-device-get-type" href="cairo/cairo-cairo-device-t.html#cairo-device-get-type"> <ANCHOR id="cairo-device-get-reference-count" href="cairo/cairo-cairo-device-t.html#cairo-device-get-reference-count"> <ANCHOR id="cairo-device-set-user-data" href="cairo/cairo-cairo-device-t.html#cairo-device-set-user-data"> @@ -507,6 +491,7 @@ <ANCHOR id="CAIRO-SURFACE-TYPE-TEE:CAPS" href="cairo/cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-TEE:CAPS"> <ANCHOR id="CAIRO-SURFACE-TYPE-XML:CAPS" href="cairo/cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-XML:CAPS"> <ANCHOR id="CAIRO-SURFACE-TYPE-SKIA:CAPS" href="cairo/cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-SKIA:CAPS"> +<ANCHOR id="CAIRO-SURFACE-TYPE-SUBSURFACE:CAPS" href="cairo/cairo-cairo-surface-t.html#CAIRO-SURFACE-TYPE-SUBSURFACE:CAPS"> <ANCHOR id="cairo-surface-get-type" href="cairo/cairo-cairo-surface-t.html#cairo-surface-get-type"> <ANCHOR id="cairo-surface-get-reference-count" href="cairo/cairo-cairo-surface-t.html#cairo-surface-get-reference-count"> <ANCHOR id="cairo-surface-set-user-data" href="cairo/cairo-cairo-surface-t.html#cairo-surface-set-user-data"> diff --git a/doc/public/tmpl/cairo-device.sgml b/doc/public/tmpl/cairo-device.sgml index 6540e90..77acead 100644 --- a/doc/public/tmpl/cairo-device.sgml +++ b/doc/public/tmpl/cairo-device.sgml @@ -9,13 +9,11 @@ cairo-device </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> @@ -75,28 +73,12 @@ cairo-device </para> -@CAIRO_DEVICE_TYPE_IMAGE: -@CAIRO_DEVICE_TYPE_PDF: -@CAIRO_DEVICE_TYPE_PS: -@CAIRO_DEVICE_TYPE_XLIB: -@CAIRO_DEVICE_TYPE_XCB: -@CAIRO_DEVICE_TYPE_GLITZ: -@CAIRO_DEVICE_TYPE_QUARTZ: -@CAIRO_DEVICE_TYPE_WIN32: -@CAIRO_DEVICE_TYPE_BEOS: -@CAIRO_DEVICE_TYPE_DIRECTFB: -@CAIRO_DEVICE_TYPE_SVG: -@CAIRO_DEVICE_TYPE_OS2: -@CAIRO_DEVICE_TYPE_WIN32_PRINTING: -@CAIRO_DEVICE_TYPE_QUARTZ_IMAGE: -@CAIRO_DEVICE_TYPE_SCRIPT: -@CAIRO_DEVICE_TYPE_QT: -@CAIRO_DEVICE_TYPE_RECORDING: -@CAIRO_DEVICE_TYPE_VG: -@CAIRO_DEVICE_TYPE_GL: @CAIRO_DEVICE_TYPE_DRM: +@CAIRO_DEVICE_TYPE_GL: +@CAIRO_DEVICE_TYPE_SCRIPT: +@CAIRO_DEVICE_TYPE_XCB: +@CAIRO_DEVICE_TYPE_XLIB: @CAIRO_DEVICE_TYPE_XML: -@CAIRO_DEVICE_TYPE_SKIA: <!-- ##### FUNCTION cairo_device_get_type ##### --> <para> diff --git a/doc/public/tmpl/cairo-font-face.sgml b/doc/public/tmpl/cairo-font-face.sgml index f7fba4d..6901694 100644 --- a/doc/public/tmpl/cairo-font-face.sgml +++ b/doc/public/tmpl/cairo-font-face.sgml @@ -9,13 +9,11 @@ cairo-font-face </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-font-options.sgml b/doc/public/tmpl/cairo-font-options.sgml index fa9165f..ebdf795 100644 --- a/doc/public/tmpl/cairo-font-options.sgml +++ b/doc/public/tmpl/cairo-font-options.sgml @@ -9,13 +9,11 @@ cairo-font-options </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml index 5be3ba1..a2ab8d0 100644 --- a/doc/public/tmpl/cairo-ft.sgml +++ b/doc/public/tmpl/cairo-ft.sgml @@ -9,13 +9,11 @@ cairo-ft </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-image.sgml b/doc/public/tmpl/cairo-image.sgml index c540ae6..70c43c4 100644 --- a/doc/public/tmpl/cairo-image.sgml +++ b/doc/public/tmpl/cairo-image.sgml @@ -9,13 +9,11 @@ cairo-image </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-matrix.sgml b/doc/public/tmpl/cairo-matrix.sgml index 292501e..138f5d9 100644 --- a/doc/public/tmpl/cairo-matrix.sgml +++ b/doc/public/tmpl/cairo-matrix.sgml @@ -9,13 +9,11 @@ cairo-matrix </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-paths.sgml b/doc/public/tmpl/cairo-paths.sgml index 9342041..737254b 100644 --- a/doc/public/tmpl/cairo-paths.sgml +++ b/doc/public/tmpl/cairo-paths.sgml @@ -9,13 +9,11 @@ cairo-paths </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml index 5a5bf53..1c16d40 100644 --- a/doc/public/tmpl/cairo-pattern.sgml +++ b/doc/public/tmpl/cairo-pattern.sgml @@ -9,13 +9,11 @@ cairo-pattern </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml index f665728..b8484f2 100644 --- a/doc/public/tmpl/cairo-pdf.sgml +++ b/doc/public/tmpl/cairo-pdf.sgml @@ -9,13 +9,11 @@ cairo-pdf </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-png.sgml b/doc/public/tmpl/cairo-png.sgml index 56abbbb..67caf1e 100644 --- a/doc/public/tmpl/cairo-png.sgml +++ b/doc/public/tmpl/cairo-png.sgml @@ -9,13 +9,11 @@ cairo-png </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-ps.sgml b/doc/public/tmpl/cairo-ps.sgml index 7f9170d..b40bd91 100644 --- a/doc/public/tmpl/cairo-ps.sgml +++ b/doc/public/tmpl/cairo-ps.sgml @@ -9,13 +9,11 @@ cairo-ps </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-quartz-fonts.sgml b/doc/public/tmpl/cairo-quartz-fonts.sgml index 09f4117..2ea30fa 100644 --- a/doc/public/tmpl/cairo-quartz-fonts.sgml +++ b/doc/public/tmpl/cairo-quartz-fonts.sgml @@ -9,13 +9,11 @@ cairo-quartz-fonts </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-quartz.sgml b/doc/public/tmpl/cairo-quartz.sgml index 41b334a..64cbdde 100644 --- a/doc/public/tmpl/cairo-quartz.sgml +++ b/doc/public/tmpl/cairo-quartz.sgml @@ -9,13 +9,11 @@ cairo-quartz </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-region.sgml b/doc/public/tmpl/cairo-region.sgml index f8c4d8b..c166ba9 100644 --- a/doc/public/tmpl/cairo-region.sgml +++ b/doc/public/tmpl/cairo-region.sgml @@ -9,13 +9,11 @@ cairo-region </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-scaled-font.sgml b/doc/public/tmpl/cairo-scaled-font.sgml index 308e3c4..b9905a8 100644 --- a/doc/public/tmpl/cairo-scaled-font.sgml +++ b/doc/public/tmpl/cairo-scaled-font.sgml @@ -9,13 +9,11 @@ cairo-scaled-font </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml index 05acd83..76e869b 100644 --- a/doc/public/tmpl/cairo-status.sgml +++ b/doc/public/tmpl/cairo-status.sgml @@ -9,13 +9,11 @@ cairo-status </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml index a1ff184..0444481 100644 --- a/doc/public/tmpl/cairo-surface.sgml +++ b/doc/public/tmpl/cairo-surface.sgml @@ -9,13 +9,11 @@ cairo-surface </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> @@ -247,6 +245,7 @@ cairo-surface @CAIRO_SURFACE_TYPE_TEE: @CAIRO_SURFACE_TYPE_XML: @CAIRO_SURFACE_TYPE_SKIA: +@CAIRO_SURFACE_TYPE_SUBSURFACE: <!-- ##### FUNCTION cairo_surface_get_type ##### --> <para> diff --git a/doc/public/tmpl/cairo-svg.sgml b/doc/public/tmpl/cairo-svg.sgml index 4da487f..47eeabb 100644 --- a/doc/public/tmpl/cairo-svg.sgml +++ b/doc/public/tmpl/cairo-svg.sgml @@ -9,13 +9,11 @@ cairo-svg </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-text.sgml b/doc/public/tmpl/cairo-text.sgml index 25e9d8b..c7bbac9 100644 --- a/doc/public/tmpl/cairo-text.sgml +++ b/doc/public/tmpl/cairo-text.sgml @@ -9,13 +9,11 @@ cairo-text </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-transforms.sgml b/doc/public/tmpl/cairo-transforms.sgml index 8a02988..771f745 100644 --- a/doc/public/tmpl/cairo-transforms.sgml +++ b/doc/public/tmpl/cairo-transforms.sgml @@ -9,13 +9,11 @@ cairo-transforms </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-types.sgml b/doc/public/tmpl/cairo-types.sgml index c852ce7..a93305a 100644 --- a/doc/public/tmpl/cairo-types.sgml +++ b/doc/public/tmpl/cairo-types.sgml @@ -9,13 +9,11 @@ cairo-types </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-unused.sgml b/doc/public/tmpl/cairo-unused.sgml index 0bcdad8..e69de29 100644 --- a/doc/public/tmpl/cairo-unused.sgml +++ b/doc/public/tmpl/cairo-unused.sgml @@ -1,142 +0,0 @@ -<!-- ##### SECTION ./tmpl/cairo-atsui.sgml:Long_Description ##### --> -<para> -The ATSUI font backend is primarily used to render text on Apple OS X systems. -</para> - - -<!-- ##### SECTION ./tmpl/cairo-atsui.sgml:See_Also ##### --> -<para> -<itemizedlist> -<listitem>#cairo_font_face_t</listitem> -</itemizedlist> -</para> - - -<!-- ##### SECTION ./tmpl/cairo-atsui.sgml:Short_Description ##### --> -Font support for ATSUI on OS X - - -<!-- ##### SECTION ./tmpl/cairo-atsui.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/cairo-atsui.sgml:Title ##### --> -ATSUI Fonts - - -<!-- ##### SECTION ./tmpl/cairo-beos.sgml:Long_Description ##### --> -<para> -The BeOS surface is used to render cairo graphics to -BeOS views and bitmaps. -</para> - - -<!-- ##### SECTION ./tmpl/cairo-beos.sgml:See_Also ##### --> -<para> -<itemizedlist> -<listitem>#cairo_surface_t</listitem> -</itemizedlist> -</para> - - -<!-- ##### SECTION ./tmpl/cairo-beos.sgml:Short_Description ##### --> -BeOS surface support - - -<!-- ##### SECTION ./tmpl/cairo-beos.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/cairo-beos.sgml:Title ##### --> -BeOS Surfaces - - -<!-- ##### SECTION ./tmpl/cairo-glitz.sgml:Long_Description ##### --> -<para> -The Glitz surface is used to render cairo graphics targeting the -OpenGL hardware using the Glitz library. -</para> - - -<!-- ##### SECTION ./tmpl/cairo-glitz.sgml:See_Also ##### --> -<para> -<itemizedlist> -<listitem>#cairo_surface_t</listitem> -</itemizedlist> -</para> - - -<!-- ##### SECTION ./tmpl/cairo-glitz.sgml:Short_Description ##### --> -OpenGL accelerated rendering using the Glitz library - - -<!-- ##### SECTION ./tmpl/cairo-glitz.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/cairo-glitz.sgml:Title ##### --> -Glitz Surfaces - - -<!-- ##### SECTION ./tmpl/cairo-xcb-xrender.sgml:Long_Description ##### --> -<para> -The XCB surface is used to render cairo graphics to X Window System -windows and pixmaps using the XCB library and its X Render extension. -</para> -<para> -Note that the XCB surface automatically takes advantage of the X Render -extension if it is available. -</para> - - -<!-- ##### SECTION ./tmpl/cairo-xcb-xrender.sgml:See_Also ##### --> -<para> -<itemizedlist> -<listitem>#cairo_surface_t</listitem> -</itemizedlist> -</para> - - -<!-- ##### SECTION ./tmpl/cairo-xcb-xrender.sgml:Short_Description ##### --> -X Window System rendering using the XCB library and the X Render extension - - -<!-- ##### SECTION ./tmpl/cairo-xcb-xrender.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/cairo-xcb-xrender.sgml:Title ##### --> -XCB Surfaces - - -<!-- ##### SECTION ./tmpl/cairo-xcb.sgml:Long_Description ##### --> -<para> -The XCB surface is used to render cairo graphics to X Window System -windows and pixmaps using the XCB library. -</para> -<para> -Note that the XCB surface automatically takes advantage of the X render -extension if it is available. -</para> - - -<!-- ##### SECTION ./tmpl/cairo-xcb.sgml:See_Also ##### --> -<para> -<itemizedlist> -<listitem>#cairo_surface_t</listitem> -</itemizedlist> -</para> - - -<!-- ##### SECTION ./tmpl/cairo-xcb.sgml:Short_Description ##### --> -X Window System rendering using the XCB library - - -<!-- ##### SECTION ./tmpl/cairo-xcb.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/cairo-xcb.sgml:Title ##### --> -XCB Surfaces - - diff --git a/doc/public/tmpl/cairo-user-fonts.sgml b/doc/public/tmpl/cairo-user-fonts.sgml index 142a181..8e9c7bd 100644 --- a/doc/public/tmpl/cairo-user-fonts.sgml +++ b/doc/public/tmpl/cairo-user-fonts.sgml @@ -9,13 +9,11 @@ cairo-user-fonts </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-version.sgml b/doc/public/tmpl/cairo-version.sgml index c88c649..13770ee 100644 --- a/doc/public/tmpl/cairo-version.sgml +++ b/doc/public/tmpl/cairo-version.sgml @@ -9,13 +9,11 @@ cairo-version </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-win32-fonts.sgml b/doc/public/tmpl/cairo-win32-fonts.sgml index 819d077..ee6ee19 100644 --- a/doc/public/tmpl/cairo-win32-fonts.sgml +++ b/doc/public/tmpl/cairo-win32-fonts.sgml @@ -9,13 +9,11 @@ cairo-win32-fonts </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-win32.sgml b/doc/public/tmpl/cairo-win32.sgml index c188484..18cd3c1 100644 --- a/doc/public/tmpl/cairo-win32.sgml +++ b/doc/public/tmpl/cairo-win32.sgml @@ -9,13 +9,11 @@ cairo-win32 </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-xlib-xrender.sgml b/doc/public/tmpl/cairo-xlib-xrender.sgml index f1a5a65..3285957 100644 --- a/doc/public/tmpl/cairo-xlib-xrender.sgml +++ b/doc/public/tmpl/cairo-xlib-xrender.sgml @@ -9,13 +9,11 @@ cairo-xlib-xrender </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml index 419dfab..bb368ec 100644 --- a/doc/public/tmpl/cairo-xlib.sgml +++ b/doc/public/tmpl/cairo-xlib.sgml @@ -9,13 +9,11 @@ cairo-xlib </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml index 3752fe2..b06653e 100644 --- a/doc/public/tmpl/cairo.sgml +++ b/doc/public/tmpl/cairo.sgml @@ -9,13 +9,11 @@ cairo </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/doc/public/version.xml b/doc/public/version.xml index e5f8fef..81c871d 100644 --- a/doc/public/version.xml +++ b/doc/public/version.xml @@ -1 +1 @@ -1.9.14 +1.10.0 diff --git a/doc/public/xml/api-index-1.10.xml b/doc/public/xml/api-index-1.10.xml index 3c6d4a5..86edc91 100644 --- a/doc/public/xml/api-index-1.10.xml +++ b/doc/public/xml/api-index-1.10.xml @@ -55,6 +55,7 @@ <indexentry><primaryie linkends="cairo-region-xor-rectangle"><link linkend="cairo-region-xor-rectangle">cairo_region_xor_rectangle</link>, function in <link linkend="cairo-Regions">Regions</link></primaryie></indexentry> </indexdiv> <indexdiv><title>S</title> +<indexentry><primaryie linkends="cairo-surface-create-for-rectangle"><link linkend="cairo-surface-create-for-rectangle">cairo_surface_create_for_rectangle</link>, function in <link linkend="cairo-cairo-surface-t">cairo_surface_t</link></primaryie></indexentry> <indexentry><primaryie linkends="cairo-surface-get-device"><link linkend="cairo-surface-get-device">cairo_surface_get_device</link>, function in <link linkend="cairo-cairo-surface-t">cairo_surface_t</link></primaryie></indexentry> <indexentry><primaryie linkends="cairo-surface-get-mime-data"><link linkend="cairo-surface-get-mime-data">cairo_surface_get_mime_data</link>, function in <link linkend="cairo-cairo-surface-t">cairo_surface_t</link></primaryie></indexentry> <indexentry><primaryie linkends="cairo-surface-set-mime-data"><link linkend="cairo-surface-set-mime-data">cairo_surface_set_mime_data</link>, function in <link linkend="cairo-cairo-surface-t">cairo_surface_t</link></primaryie></indexentry> diff --git a/doc/public/xml/cairo-device.xml b/doc/public/xml/cairo-device.xml index 8ee950b..0400492 100644 --- a/doc/public/xml/cairo-device.xml +++ b/doc/public/xml/cairo-device.xml @@ -90,6 +90,13 @@ my_device_modifying_function (cairo_device_t *device) } </programlisting></informalexample> </para> +<para> +<note><para>Please refer to the documentation of each backend for +additional usage requirements, guarantees provided, and +interactions with existing surface API of the device functions for +surfaces of that type. +</para></note> +</para> </refsect1> <refsect1 id="cairo-cairo-device-t.details" role="details"> <title role="details.title">Details</title> @@ -211,28 +218,12 @@ This function may acquire devices. <title>enum cairo_device_type_t</title> <indexterm zone="cairo-device-type-t" role="1.10"><primary sortas="device_type_t">cairo_device_type_t</primary></indexterm> <programlisting>typedef enum _cairo_device_type { - CAIRO_DEVICE_TYPE_IMAGE, - CAIRO_DEVICE_TYPE_PDF, - CAIRO_DEVICE_TYPE_PS, - CAIRO_DEVICE_TYPE_XLIB, - CAIRO_DEVICE_TYPE_XCB, - CAIRO_DEVICE_TYPE_GLITZ, - CAIRO_DEVICE_TYPE_QUARTZ, - CAIRO_DEVICE_TYPE_WIN32, - CAIRO_DEVICE_TYPE_BEOS, - CAIRO_DEVICE_TYPE_DIRECTFB, - CAIRO_DEVICE_TYPE_SVG, - CAIRO_DEVICE_TYPE_OS2, - CAIRO_DEVICE_TYPE_WIN32_PRINTING, - CAIRO_DEVICE_TYPE_QUARTZ_IMAGE, - CAIRO_DEVICE_TYPE_SCRIPT, - CAIRO_DEVICE_TYPE_QT, - CAIRO_DEVICE_TYPE_RECORDING, - CAIRO_DEVICE_TYPE_VG, - CAIRO_DEVICE_TYPE_GL, CAIRO_DEVICE_TYPE_DRM, + CAIRO_DEVICE_TYPE_GL, + CAIRO_DEVICE_TYPE_SCRIPT, + CAIRO_DEVICE_TYPE_XCB, + CAIRO_DEVICE_TYPE_XLIB, CAIRO_DEVICE_TYPE_XML, - CAIRO_DEVICE_TYPE_SKIA } cairo_device_type_t; </programlisting> <para> @@ -256,74 +247,14 @@ the wrong type is undefined. <para> New entries may be added in future versions. </para><variablelist role="enum"> -<varlistentry id="CAIRO-DEVICE-TYPE-IMAGE:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_IMAGE</literal></term> -<listitem><simpara>The surface is of type image -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-PDF:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_PDF</literal></term> -<listitem><simpara>The surface is of type pdf -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-PS:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_PS</literal></term> -<listitem><simpara>The surface is of type ps -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-XLIB:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_XLIB</literal></term> -<listitem><simpara>The surface is of type xlib -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-XCB:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_XCB</literal></term> -<listitem><simpara>The surface is of type xcb -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-GLITZ:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_GLITZ</literal></term> -<listitem><simpara>The surface is of type glitz -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-QUARTZ:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_QUARTZ</literal></term> -<listitem><simpara>The surface is of type quartz -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-WIN32:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_WIN32</literal></term> -<listitem><simpara>The surface is of type win32 -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-BEOS:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_BEOS</literal></term> -<listitem><simpara>The surface is of type beos -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-DIRECTFB:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_DIRECTFB</literal></term> -<listitem><simpara>The surface is of type directfb -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-SVG:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_SVG</literal></term> -<listitem><simpara>The surface is of type svg -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-OS2:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_OS2</literal></term> -<listitem><simpara>The surface is of type os2 -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-WIN32-PRINTING:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_WIN32_PRINTING</literal></term> -<listitem><simpara>The surface is a win32 printing surface +<varlistentry id="CAIRO-DEVICE-TYPE-DRM:CAPS" role="constant"> +<term><literal>CAIRO_DEVICE_TYPE_DRM</literal></term> +<listitem><simpara>The surface is of type Direct Render Manager </simpara></listitem> </varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-QUARTZ-IMAGE:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_QUARTZ_IMAGE</literal></term> -<listitem><simpara>The surface is of type quartz_image +<varlistentry id="CAIRO-DEVICE-TYPE-GL:CAPS" role="constant"> +<term><literal>CAIRO_DEVICE_TYPE_GL</literal></term> +<listitem><simpara>The surface is of type OpenGL </simpara></listitem> </varlistentry> <varlistentry id="CAIRO-DEVICE-TYPE-SCRIPT:CAPS" role="constant"> @@ -331,39 +262,20 @@ New entries may be added in future versions. <listitem><simpara>The surface is of type script </simpara></listitem> </varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-QT:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_QT</literal></term> -<listitem><simpara>The surface is of type Qt -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-RECORDING:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_RECORDING</literal></term> -<listitem><simpara>The surface is of type recording -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-VG:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_VG</literal></term> -<listitem><simpara>The surface is a OpenVG surface -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-GL:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_GL</literal></term> -<listitem><simpara>The surface is of type OpenGL +<varlistentry id="CAIRO-DEVICE-TYPE-XCB:CAPS" role="constant"> +<term><literal>CAIRO_DEVICE_TYPE_XCB</literal></term> +<listitem><simpara>The surface is of type xcb </simpara></listitem> </varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-DRM:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_DRM</literal></term> -<listitem><simpara>The surface is of type Direct Render Manager +<varlistentry id="CAIRO-DEVICE-TYPE-XLIB:CAPS" role="constant"> +<term><literal>CAIRO_DEVICE_TYPE_XLIB</literal></term> +<listitem><simpara>The surface is of type xlib </simpara></listitem> </varlistentry> <varlistentry id="CAIRO-DEVICE-TYPE-XML:CAPS" role="constant"> <term><literal>CAIRO_DEVICE_TYPE_XML</literal></term> <listitem><simpara>The surface is of type XML -</simpara></listitem> -</varlistentry> -<varlistentry id="CAIRO-DEVICE-TYPE-SKIA:CAPS" role="constant"> -<term><literal>CAIRO_DEVICE_TYPE_SKIA</literal></term> -<listitem><simpara>The surface is of type Skia + <link linkend="cairo-surface-create-for-rectangle"><function>cairo_surface_create_for_rectangle()</function></link> </simpara></listitem> </varlistentry> </variablelist><para role="since">Since 1.10</para></refsect2> diff --git a/doc/public/xml/cairo-image.xml b/doc/public/xml/cairo-image.xml index eb44d88..9c46882 100644 --- a/doc/public/xml/cairo-image.xml +++ b/doc/public/xml/cairo-image.xml @@ -120,9 +120,9 @@ New entries may be added in future versions. </varlistentry> <varlistentry id="CAIRO-FORMAT-RGB16-565:CAPS" role="constant"> <term><literal>CAIRO_FORMAT_RGB16_565</literal></term> -<listitem><simpara>This format value is deprecated. It has - never been properly implemented in cairo and should not be used - by applications. (since 1.2) +<listitem><simpara>each pixel is a 16-bit quantity + with red in the upper 5 bits, then green in the middle + 6 bits, and blue in the lower 5 bits. </simpara></listitem> </varlistentry> </variablelist></refsect2> diff --git a/doc/public/xml/cairo-quartz-fonts.xml b/doc/public/xml/cairo-quartz-fonts.xml index 5477cca..2bcf23f 100644 --- a/doc/public/xml/cairo-quartz-fonts.xml +++ b/doc/public/xml/cairo-quartz-fonts.xml @@ -40,7 +40,8 @@ implementation of the font backend methods. <refsect2 id="CAIRO-HAS-QUARTZ-FONT:CAPS" role="macro"> <title>CAIRO_HAS_QUARTZ_FONT</title> <indexterm zone="CAIRO-HAS-QUARTZ-FONT:CAPS"><primary sortas="HAS_QUARTZ_FONT">CAIRO_HAS_QUARTZ_FONT</primary></indexterm> -<programlisting>#define CAIRO_HAS_QUARTZ_FONT</programlisting> +<programlisting>#define CAIRO_HAS_QUARTZ_FONT 1 +</programlisting> <para> Defined if the Quartz font backend is available. This macro can be used to conditionally compile backend-specific code. diff --git a/doc/public/xml/cairo-quartz.xml b/doc/public/xml/cairo-quartz.xml index ab1fc6b..aa4c87a 100644 --- a/doc/public/xml/cairo-quartz.xml +++ b/doc/public/xml/cairo-quartz.xml @@ -43,7 +43,8 @@ Apple OS X Quartz rendering system. <refsect2 id="CAIRO-HAS-QUARTZ-SURFACE:CAPS" role="macro"> <title>CAIRO_HAS_QUARTZ_SURFACE</title> <indexterm zone="CAIRO-HAS-QUARTZ-SURFACE:CAPS"><primary sortas="HAS_QUARTZ_SURFACE">CAIRO_HAS_QUARTZ_SURFACE</primary></indexterm> -<programlisting>#define CAIRO_HAS_QUARTZ_SURFACE</programlisting> +<programlisting>#define CAIRO_HAS_QUARTZ_SURFACE 1 +</programlisting> <para> Defined if the Quartz surface backend is available. This macro can be used to conditionally compile backend-specific code. diff --git a/doc/public/xml/cairo-surface.xml b/doc/public/xml/cairo-surface.xml index 16b7aa8..d4c8be4 100644 --- a/doc/public/xml/cairo-surface.xml +++ b/doc/public/xml/cairo-surface.xml @@ -286,9 +286,9 @@ pointer to a "nil" surface if <parameter>other</parameter> is already in an erro or any other error occurs. </simpara></listitem></varlistentry> </variablelist></refsect2> -<refsect2 id="cairo-surface-create-for-rectangle" role="function"> +<refsect2 id="cairo-surface-create-for-rectangle" role="function" condition="since:1.10"> <title>cairo_surface_create_for_rectangle ()</title> -<indexterm zone="cairo-surface-create-for-rectangle"><primary sortas="surface_create_for_rectangle">cairo_surface_create_for_rectangle</primary></indexterm> +<indexterm zone="cairo-surface-create-for-rectangle" role="1.10"><primary sortas="surface_create_for_rectangle">cairo_surface_create_for_rectangle</primary></indexterm> <programlisting><link linkend="cairo-surface-t"><returnvalue>cairo_surface_t</returnvalue></link> * cairo_surface_create_for_rectangle (<parameter><link linkend="cairo-surface-t"><type>cairo_surface_t</type></link> *target</parameter>, <parameter><link linkend="double"><type>double</type></link> x</parameter>, <parameter><link linkend="double"><type>double</type></link> y</parameter>, @@ -302,6 +302,12 @@ its bounds is drawn onto the target surface, making this a useful method for passing constrained child surfaces to library routines that draw directly onto the parent surface, i.e. with no further backend allocations, double buffering or copies. +</para> +<para> +<note><para>The semantics of subsurfaces have not been finalized yet +unless the rectangle is in full device units, is contained within +the extents of the target surface, and the target or subsurface's +device transforms are not changed.</para></note> </para><variablelist role="params"> <varlistentry><term><parameter>target</parameter> :</term> <listitem><simpara>an existing surface for which the sub-surface will point to @@ -325,8 +331,9 @@ with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if <parameter>other</parameter> is already in an error state or any other error occurs. + </simpara></listitem></varlistentry> -</variablelist></refsect2> +</variablelist><para role="since">Since 1.10</para></refsect2> <refsect2 id="cairo-surface-reference" role="function"> <title>cairo_surface_reference ()</title> <indexterm zone="cairo-surface-reference"><primary sortas="surface_reference">cairo_surface_reference</primary></indexterm> @@ -662,7 +669,8 @@ resolution if never set. CAIRO_SURFACE_TYPE_DRM, CAIRO_SURFACE_TYPE_TEE, CAIRO_SURFACE_TYPE_XML, - CAIRO_SURFACE_TYPE_SKIA + CAIRO_SURFACE_TYPE_SKIA, + CAIRO_SURFACE_TYPE_SUBSURFACE } cairo_surface_type_t; </programlisting> <para> @@ -807,6 +815,12 @@ New entries may be added in future versions. <listitem><simpara>The surface is of type Skia, since 1.10 </simpara></listitem> </varlistentry> +<varlistentry id="CAIRO-SURFACE-TYPE-SUBSURFACE:CAPS" role="constant"> +<term><literal>CAIRO_SURFACE_TYPE_SUBSURFACE</literal></term> +<listitem><simpara>The surface is a subsurface created with + <link linkend="cairo-surface-create-for-rectangle"><function>cairo_surface_create_for_rectangle()</function></link>, since 1.10 +</simpara></listitem> +</varlistentry> </variablelist><para role="since">Since 1.2</para></refsect2> <refsect2 id="cairo-surface-get-type" role="function" condition="since:1.2"> <title>cairo_surface_get_type ()</title> diff --git a/doc/public/xml/cairo-win32-fonts.xml b/doc/public/xml/cairo-win32-fonts.xml index c75595d..3076a3c 100644 --- a/doc/public/xml/cairo-win32-fonts.xml +++ b/doc/public/xml/cairo-win32-fonts.xml @@ -53,7 +53,8 @@ Microsoft Windows systems. <refsect2 id="CAIRO-HAS-WIN32-FONT:CAPS" role="macro"> <title>CAIRO_HAS_WIN32_FONT</title> <indexterm zone="CAIRO-HAS-WIN32-FONT:CAPS"><primary sortas="HAS_WIN32_FONT">CAIRO_HAS_WIN32_FONT</primary></indexterm> -<programlisting>#define CAIRO_HAS_WIN32_FONT</programlisting> +<programlisting>#define CAIRO_HAS_WIN32_FONT 1 +</programlisting> <para> Defined if the Microsoft Windows font backend is available. This macro can be used to conditionally compile backend-specific code. diff --git a/doc/public/xml/cairo-win32.xml b/doc/public/xml/cairo-win32.xml index 2933eec..636f51e 100644 --- a/doc/public/xml/cairo-win32.xml +++ b/doc/public/xml/cairo-win32.xml @@ -55,7 +55,8 @@ The surface returned by the other win32 constructors is of surface type <refsect2 id="CAIRO-HAS-WIN32-SURFACE:CAPS" role="macro"> <title>CAIRO_HAS_WIN32_SURFACE</title> <indexterm zone="CAIRO-HAS-WIN32-SURFACE:CAPS"><primary sortas="HAS_WIN32_SURFACE">CAIRO_HAS_WIN32_SURFACE</primary></indexterm> -<programlisting>#define CAIRO_HAS_WIN32_SURFACE</programlisting> +<programlisting>#define CAIRO_HAS_WIN32_SURFACE 1 +</programlisting> <para> Defined if the Microsoft Windows surface backend is available. This macro can be used to conditionally compile backend-specific code. diff --git a/missing b/missing deleted file mode 100755 index 894e786..0000000 --- a/missing +++ /dev/null @@ -1,360 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2005-06-08.21 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to <bug-automake@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/perf/Makefile.in b/perf/Makefile.in index d58add8..98bfe5d 100644 --- a/perf/Makefile.in +++ b/perf/Makefile.in @@ -258,6 +258,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -371,7 +373,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ diff --git a/perf/README b/perf/README index 0fc5281..b142e59 100644 --- a/perf/README +++ b/perf/README @@ -22,19 +22,19 @@ feel as to whether cairo is faster for everyday use. Running the micro-benchmarks ---------------------------- The micro-benchmarks are compiled into a single executable called -cairo-perf, which is what "make perf" executes. Some +cairo-perf-micro, which is what "make perf" executes. Some examples of running it: # Report on all tests with default number of iterations: - ./cairo-perf + ./cairo-perf-micro # Report on 100 iterations of all gradient tests: - ./cairo-perf -i 100 gradient + ./cairo-perf-micro -i 100 gradient # Generate raw results for 10 iterations into cairo.perf - ./cairo-perf -r -i 10 > cairo.perf + ./cairo-perf-micro -r -i 10 > cairo.perf # Append 10 more iterations of the paint test - ./cairo-perf -r -i 10 paint >> cairo.perf + ./cairo-perf-micro -r -i 10 paint >> cairo.perf Raw results aren't useful for reading directly, but are quite useful when using cairo-perf-diff to compare separate runs (see more @@ -47,7 +47,7 @@ The macro-benchmarks are run by a single program called cairo-perf-trace, which is also executed by "make perf". cairo-perf-trace loops over the series of traces stored beneath cairo-traces/. cairo-perf-trace produces the same output and takes the -same arguments as cairo-perf. Some examples of running it: +same arguments as cairo-perf-micro. Some examples of running it: # Report on all tests with default number of iterations: ./cairo-perf-trace diff --git a/perf/cairo-perf-micro.c b/perf/cairo-perf-micro.c index a12911f..750bac3 100644 --- a/perf/cairo-perf-micro.c +++ b/perf/cairo-perf-micro.c @@ -128,18 +128,17 @@ static unsigned cairo_perf_calibrate (cairo_perf_t *perf, cairo_perf_func_t perf_func) { - cairo_perf_ticks_t calibration0, calibration; + cairo_perf_ticks_t calibration, calibration_max; unsigned loops, min_loops; min_loops = 1; - calibration0 = perf_func (perf->cr, perf->size, perf->size, min_loops); - if (perf->fast_and_sloppy) { - calibration = calibration0; - } else { - calibration = 0.01 * cairo_perf_ticks_per_second (); - while (calibration0 < calibration) { - min_loops *= 10; - calibration0 = perf_func (perf->cr, perf->size, perf->size, min_loops); + calibration = perf_func (perf->cr, perf->size, perf->size, min_loops); + + if (!perf->fast_and_sloppy) { + calibration_max = perf->ms_per_iteration * 0.0001 / 4 * cairo_perf_ticks_per_second (); + while (calibration < calibration_max) { + min_loops *= 2; + calibration = perf_func (perf->cr, perf->size, perf->size, min_loops); } } diff --git a/src/Makefile.am.features b/src/Makefile.am.features index 0cb461b..b778cb6 100644 --- a/src/Makefile.am.features +++ b/src/Makefile.am.features @@ -542,17 +542,23 @@ enabled_cairo_private += $(cairo_recording_private) enabled_cairo_cxx_sources += $(cairo_recording_cxx_sources) enabled_cairo_sources += $(cairo_recording_sources) -supported_cairo_headers += $(cairo_tee_headers) +unsupported_cairo_headers += $(cairo_tee_headers) all_cairo_headers += $(cairo_tee_headers) all_cairo_private += $(cairo_tee_private) all_cairo_cxx_sources += $(cairo_tee_cxx_sources) all_cairo_sources += $(cairo_tee_sources) +if CAIRO_HAS_TEE_SURFACE enabled_cairo_headers += $(cairo_tee_headers) enabled_cairo_private += $(cairo_tee_private) enabled_cairo_cxx_sources += $(cairo_tee_cxx_sources) enabled_cairo_sources += $(cairo_tee_sources) +endif +all_cairo_pkgconf += cairo-tee.pc +if CAIRO_HAS_TEE_SURFACE +enabled_cairo_pkgconf += cairo-tee.pc +endif -supported_cairo_headers += $(cairo_xml_headers) +unsupported_cairo_headers += $(cairo_xml_headers) all_cairo_headers += $(cairo_xml_headers) all_cairo_private += $(cairo_xml_private) all_cairo_cxx_sources += $(cairo_xml_cxx_sources) @@ -587,6 +593,22 @@ enabled_cairo_cxx_sources += $(cairo_pthread_cxx_sources) enabled_cairo_sources += $(cairo_pthread_sources) endif +supported_cairo_headers += $(cairo_gobject_headers) +all_cairo_headers += $(cairo_gobject_headers) +all_cairo_private += $(cairo_gobject_private) +all_cairo_cxx_sources += $(cairo_gobject_cxx_sources) +all_cairo_sources += $(cairo_gobject_sources) +if CAIRO_HAS_GOBJECT_FUNCTIONS +enabled_cairo_headers += $(cairo_gobject_headers) +enabled_cairo_private += $(cairo_gobject_private) +enabled_cairo_cxx_sources += $(cairo_gobject_cxx_sources) +enabled_cairo_sources += $(cairo_gobject_sources) +endif +all_cairo_pkgconf += cairo-gobject.pc +if CAIRO_HAS_GOBJECT_FUNCTIONS +enabled_cairo_pkgconf += cairo-gobject.pc +endif + all_cairo_private += $(cairo_trace_private) $(cairo_trace_headers) all_cairo_cxx_sources += $(cairo_trace_cxx_sources) all_cairo_sources += $(cairo_trace_sources) diff --git a/src/Makefile.in b/src/Makefile.in index ab3ffb1..19e7cbb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -98,7 +98,7 @@ DIST_COMMON = README $(am__cairoinclude_HEADERS_DIST) \ $(top_srcdir)/build/Makefile.am.common \ $(top_srcdir)/src/Makefile.sources EXTRA_PROGRAMS = -TESTS = $(am__EXEEXT_1) $(am__append_178) +TESTS = $(am__EXEEXT_1) $(am__append_188) check_PROGRAMS = check-link$(EXEEXT) @BUILD_XCB_SHM_TRUE@am__append_1 = \ @BUILD_XCB_SHM_TRUE@ cairo-xcb-shm.c \ @@ -264,24 +264,34 @@ check_PROGRAMS = check-link$(EXEEXT) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_158 = $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_159 = $(cairo_test_surfaces_cxx_sources) @CAIRO_HAS_TEST_SURFACES_TRUE@am__append_160 = $(cairo_test_surfaces_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_161 = $(cairo_xml_headers) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_162 = $(cairo_xml_private) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_163 = $(cairo_xml_cxx_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_164 = $(cairo_xml_sources) -@CAIRO_HAS_XML_SURFACE_TRUE@am__append_165 = cairo-xml.pc -@CAIRO_HAS_PTHREAD_TRUE@am__append_166 = $(cairo_pthread_private) $(cairo_pthread_headers) -@CAIRO_HAS_PTHREAD_TRUE@am__append_167 = $(cairo_pthread_cxx_sources) -@CAIRO_HAS_PTHREAD_TRUE@am__append_168 = $(cairo_pthread_sources) -@CAIRO_HAS_TRACE_TRUE@am__append_169 = $(cairo_trace_private) $(cairo_trace_headers) -@CAIRO_HAS_TRACE_TRUE@am__append_170 = $(cairo_trace_cxx_sources) -@CAIRO_HAS_TRACE_TRUE@am__append_171 = $(cairo_trace_sources) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_172 = $(cairo_interpreter_private) $(cairo_interpreter_headers) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_173 = $(cairo_interpreter_cxx_sources) -@CAIRO_HAS_INTERPRETER_TRUE@am__append_174 = $(cairo_interpreter_sources) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_175 = $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_176 = $(cairo_symbol_lookup_cxx_sources) -@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_177 = $(cairo_symbol_lookup_sources) -@CROSS_COMPILING_FALSE@am__append_178 = check-link$(EXEEXT) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_161 = $(cairo_tee_headers) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_162 = $(cairo_tee_private) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_163 = $(cairo_tee_cxx_sources) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_164 = $(cairo_tee_sources) +@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_165 = cairo-tee.pc +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_166 = $(cairo_xml_headers) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_167 = $(cairo_xml_private) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_168 = $(cairo_xml_cxx_sources) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_169 = $(cairo_xml_sources) +@CAIRO_HAS_XML_SURFACE_TRUE@am__append_170 = cairo-xml.pc +@CAIRO_HAS_PTHREAD_TRUE@am__append_171 = $(cairo_pthread_private) $(cairo_pthread_headers) +@CAIRO_HAS_PTHREAD_TRUE@am__append_172 = $(cairo_pthread_cxx_sources) +@CAIRO_HAS_PTHREAD_TRUE@am__append_173 = $(cairo_pthread_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_174 = $(cairo_gobject_headers) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_175 = $(cairo_gobject_private) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_176 = $(cairo_gobject_cxx_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_177 = $(cairo_gobject_sources) +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_178 = cairo-gobject.pc +@CAIRO_HAS_TRACE_TRUE@am__append_179 = $(cairo_trace_private) $(cairo_trace_headers) +@CAIRO_HAS_TRACE_TRUE@am__append_180 = $(cairo_trace_cxx_sources) +@CAIRO_HAS_TRACE_TRUE@am__append_181 = $(cairo_trace_sources) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_182 = $(cairo_interpreter_private) $(cairo_interpreter_headers) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_183 = $(cairo_interpreter_cxx_sources) +@CAIRO_HAS_INTERPRETER_TRUE@am__append_184 = $(cairo_interpreter_sources) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_185 = $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_186 = $(cairo_symbol_lookup_cxx_sources) +@CAIRO_HAS_SYMBOL_LOOKUP_TRUE@am__append_187 = $(cairo_symbol_lookup_sources) +@CROSS_COMPILING_FALSE@am__append_188 = check-link$(EXEEXT) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ @@ -318,7 +328,8 @@ CONFIG_CLEAN_FILES = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \ cairo-xcb-drm.pc cairo-png.pc cairo-gl.pc cairo-directfb.pc \ cairo-vg.pc cairo-egl.pc cairo-glx.pc cairo-wgl.pc \ cairo-script.pc cairo-ft.pc cairo-fc.pc cairo-ps.pc \ - cairo-pdf.pc cairo-svg.pc cairo-xml.pc + cairo-pdf.pc cairo-svg.pc cairo-tee.pc cairo-xml.pc \ + cairo-gobject.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -351,14 +362,15 @@ am__libcairo_la_SOURCES_DIST = cairo.h cairo-deprecated.h cairo-xlib.h \ cairo-quartz-image.h cairo-win32.h cairo-skia.h cairo-os2.h \ cairo-beos.h cairo-drm.h cairo-drm-xr.h cairo-gl.h \ cairo-directfb.h cairo-vg.h cairo-script.h cairo-ft.h \ - cairo-ps.h cairo-pdf.h cairo-svg.h cairo-xml.h cairoint.h \ - cairo-analysis-surface-private.h cairo-arc-private.h \ - cairo-atomic-private.h cairo-boxes-private.h \ - cairo-cache-private.h cairo-clip-private.h \ - cairo-combsort-private.h cairo-compiler-private.h \ - cairo-composite-rectangles-private.h cairo-device-private.h \ - cairo-error-private.h cairo-fixed-private.h \ - cairo-fixed-type-private.h cairo-freelist-private.h \ + cairo-ps.h cairo-pdf.h cairo-svg.h cairo-tee.h cairo-xml.h \ + cairoint.h cairo-analysis-surface-private.h \ + cairo-arc-private.h cairo-atomic-private.h \ + cairo-boxes-private.h cairo-cache-private.h \ + cairo-clip-private.h cairo-combsort-private.h \ + cairo-compiler-private.h cairo-composite-rectangles-private.h \ + cairo-device-private.h cairo-error-private.h \ + cairo-fixed-private.h cairo-fixed-type-private.h \ + cairo-freelist-private.h cairo-freelist-type-private.h \ cairo-freed-pool-private.h cairo-fontconfig-private.h \ cairo-gstate-private.h cairo-hash-private.h \ cairo-image-info-private.h cairo-list-private.h \ @@ -375,9 +387,9 @@ am__libcairo_la_SOURCES_DIST = cairo.h cairo-deprecated.h cairo-xlib.h \ cairo-surface-clipper-private.h cairo-surface-offset-private.h \ cairo-surface-subsurface-private.h \ cairo-surface-snapshot-private.h \ - cairo-surface-wrapper-private.h cairo-tee-surface-private.h \ - cairo-types-private.h cairo-user-font-private.h \ - cairo-wideint-private.h cairo-wideint-type-private.h \ + cairo-surface-wrapper-private.h cairo-types-private.h \ + cairo-user-font-private.h cairo-wideint-private.h \ + cairo-wideint-type-private.h \ cairo-scaled-font-subsets-private.h \ cairo-truetype-subset-private.h cairo-type1-private.h \ cairo-type3-glyph-surface-private.h \ @@ -397,10 +409,10 @@ am__libcairo_la_SOURCES_DIST = cairo.h cairo-deprecated.h cairo-xlib.h \ cairo-pdf-surface-private.h cairo-svg-surface-private.h \ test-fallback-surface.h test-fallback16-surface.h \ test-null-surface.h test-paginated-surface.h \ - test-wrapping-surface.h cairo-analysis-surface.c cairo-arc.c \ - cairo-array.c cairo-atomic.c cairo-base64-stream.c \ - cairo-base85-stream.c cairo-bentley-ottmann.c \ - cairo-bentley-ottmann-rectangular.c \ + test-wrapping-surface.h cairo-tee-surface-private.h \ + cairo-analysis-surface.c cairo-arc.c cairo-array.c \ + cairo-atomic.c cairo-base64-stream.c cairo-base85-stream.c \ + cairo-bentley-ottmann.c cairo-bentley-ottmann-rectangular.c \ cairo-bentley-ottmann-rectilinear.c \ cairo-botor-scan-converter.c cairo-boxes.c cairo.c \ cairo-cache.c cairo-clip.c cairo-color.c \ @@ -422,7 +434,7 @@ am__libcairo_la_SOURCES_DIST = cairo.h cairo-deprecated.h cairo-xlib.h \ cairo-surface-fallback.c cairo-surface-clipper.c \ cairo-surface-offset.c cairo-surface-snapshot.c \ cairo-surface-subsurface.c cairo-surface-wrapper.c \ - cairo-system.c cairo-tee-surface.c cairo-tor-scan-converter.c \ + cairo-system.c cairo-tor-scan-converter.c \ cairo-toy-font-face.c cairo-traps.c cairo-unicode.c \ cairo-user-font.c cairo-version.c cairo-wideint.c \ cairo-cff-subset.c cairo-scaled-font-subsets.c \ @@ -458,7 +470,8 @@ am__libcairo_la_SOURCES_DIST = cairo.h cairo-deprecated.h cairo-xlib.h \ cairo-pdf-surface.c cairo-svg-surface.c \ test-fallback-surface.c test-fallback16-surface.c \ test-null-surface.c test-paginated-surface.c \ - test-wrapping-surface.c cairo-xml-surface.c cairo-version.h + test-wrapping-surface.c cairo-tee-surface.c \ + cairo-xml-surface.c cairo-version.h am__objects_1 = @CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_2 = $(am__objects_1) @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__objects_3 = $(am__objects_1) @@ -480,8 +493,9 @@ am__objects_1 = @CAIRO_HAS_PS_SURFACE_TRUE@am__objects_19 = $(am__objects_1) @CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_20 = $(am__objects_1) @CAIRO_HAS_SVG_SURFACE_TRUE@am__objects_21 = $(am__objects_1) -@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_22 = $(am__objects_1) -am__objects_23 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ +@CAIRO_HAS_TEE_SURFACE_TRUE@am__objects_22 = $(am__objects_1) +@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_23 = $(am__objects_1) +am__objects_24 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_1) $(am__objects_1) \ $(am__objects_5) $(am__objects_6) $(am__objects_1) \ $(am__objects_7) $(am__objects_8) $(am__objects_1) \ @@ -491,10 +505,11 @@ am__objects_23 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_15) $(am__objects_16) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_17) \ $(am__objects_18) $(am__objects_1) $(am__objects_19) \ - $(am__objects_20) $(am__objects_21) $(am__objects_22) -am__objects_24 = $(am__objects_1) $(am__objects_1) -@CAIRO_HAS_TEST_SURFACES_TRUE@am__objects_25 = $(am__objects_1) -am__objects_26 = $(am__objects_24) $(am__objects_2) $(am__objects_1) \ + $(am__objects_20) $(am__objects_21) $(am__objects_22) \ + $(am__objects_23) $(am__objects_1) +am__objects_25 = $(am__objects_1) $(am__objects_1) +@CAIRO_HAS_TEST_SURFACES_TRUE@am__objects_26 = $(am__objects_1) +am__objects_27 = $(am__objects_25) $(am__objects_2) $(am__objects_1) \ $(am__objects_4) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_6) $(am__objects_1) \ $(am__objects_1) $(am__objects_8) $(am__objects_1) \ @@ -504,18 +519,19 @@ am__objects_26 = $(am__objects_24) $(am__objects_2) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_18) $(am__objects_1) $(am__objects_19) \ - $(am__objects_20) $(am__objects_21) $(am__objects_25) \ + $(am__objects_20) $(am__objects_21) $(am__objects_26) \ + $(am__objects_22) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_1) -am__objects_27 = cairo-cff-subset.lo cairo-scaled-font-subsets.lo \ + $(am__objects_1) +am__objects_28 = cairo-cff-subset.lo cairo-scaled-font-subsets.lo \ cairo-truetype-subset.lo cairo-type1-fallback.lo \ cairo-type1-subset.lo cairo-type3-glyph-surface.lo -am__objects_28 = cairo-pdf-operators.lo -am__objects_29 = cairo-deflate-stream.lo -@CAIRO_HAS_PDF_SURFACE_FALSE@@CAIRO_HAS_SCRIPT_SURFACE_FALSE@@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_30 = $(am__objects_29) -@CAIRO_HAS_PDF_SURFACE_FALSE@@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_30 = $(am__objects_29) -@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_30 = $(am__objects_29) -am__objects_31 = cairo-analysis-surface.lo cairo-arc.lo cairo-array.lo \ +am__objects_29 = cairo-pdf-operators.lo +am__objects_30 = cairo-deflate-stream.lo +@CAIRO_HAS_PDF_SURFACE_FALSE@@CAIRO_HAS_SCRIPT_SURFACE_FALSE@@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_31 = $(am__objects_30) +@CAIRO_HAS_PDF_SURFACE_FALSE@@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_31 = $(am__objects_30) +@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_31 = $(am__objects_30) +am__objects_32 = cairo-analysis-surface.lo cairo-arc.lo cairo-array.lo \ cairo-atomic.lo cairo-base64-stream.lo cairo-base85-stream.lo \ cairo-bentley-ottmann.lo cairo-bentley-ottmann-rectangular.lo \ cairo-bentley-ottmann-rectilinear.lo \ @@ -539,40 +555,40 @@ am__objects_31 = cairo-analysis-surface.lo cairo-arc.lo cairo-array.lo \ cairo-surface.lo cairo-surface-fallback.lo \ cairo-surface-clipper.lo cairo-surface-offset.lo \ cairo-surface-snapshot.lo cairo-surface-subsurface.lo \ - cairo-surface-wrapper.lo cairo-system.lo cairo-tee-surface.lo \ + cairo-surface-wrapper.lo cairo-system.lo \ cairo-tor-scan-converter.lo cairo-toy-font-face.lo \ cairo-traps.lo cairo-unicode.lo cairo-user-font.lo \ - cairo-version.lo cairo-wideint.lo $(am__objects_27) \ - $(am__objects_28) $(am__objects_30) -@BUILD_XLIB_XCB_FALSE@am__objects_32 = cairo-xlib-display.lo \ + cairo-version.lo cairo-wideint.lo $(am__objects_28) \ + $(am__objects_29) $(am__objects_31) +@BUILD_XLIB_XCB_FALSE@am__objects_33 = cairo-xlib-display.lo \ @BUILD_XLIB_XCB_FALSE@ cairo-xlib-screen.lo \ @BUILD_XLIB_XCB_FALSE@ cairo-xlib-surface.lo \ @BUILD_XLIB_XCB_FALSE@ cairo-xlib-visual.lo -@BUILD_XLIB_XCB_TRUE@am__objects_32 = cairo-xlib-xcb-surface.lo -@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_33 = $(am__objects_32) -@BUILD_XCB_SHM_TRUE@am__objects_34 = cairo-xcb-shm.lo \ +@BUILD_XLIB_XCB_TRUE@am__objects_33 = cairo-xlib-xcb-surface.lo +@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_34 = $(am__objects_33) +@BUILD_XCB_SHM_TRUE@am__objects_35 = cairo-xcb-shm.lo \ @BUILD_XCB_SHM_TRUE@ cairo-xcb-connection-shm.lo -am__objects_35 = cairo-xcb-connection.lo cairo-xcb-connection-core.lo \ +am__objects_36 = cairo-xcb-connection.lo cairo-xcb-connection-core.lo \ cairo-xcb-connection-render.lo cairo-xcb-screen.lo \ cairo-xcb-surface.lo cairo-xcb-surface-cairo.lo \ cairo-xcb-surface-core.lo cairo-xcb-surface-render.lo \ - $(am__objects_34) -@CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_36 = $(am__objects_35) -am__objects_37 = cairo-quartz-surface.lo -@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__objects_38 = $(am__objects_37) -am__objects_39 = cairo-quartz-font.lo -@CAIRO_HAS_QUARTZ_FONT_TRUE@am__objects_40 = $(am__objects_39) -am__objects_41 = cairo-quartz-image-surface.lo -@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__objects_42 = \ -@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@ $(am__objects_41) -am__objects_43 = cairo-win32-surface.lo \ + $(am__objects_35) +@CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_37 = $(am__objects_36) +am__objects_38 = cairo-quartz-surface.lo +@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__objects_39 = $(am__objects_38) +am__objects_40 = cairo-quartz-font.lo +@CAIRO_HAS_QUARTZ_FONT_TRUE@am__objects_41 = $(am__objects_40) +am__objects_42 = cairo-quartz-image-surface.lo +@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__objects_43 = \ +@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@ $(am__objects_42) +am__objects_44 = cairo-win32-surface.lo \ cairo-win32-printing-surface.lo -@CAIRO_HAS_WIN32_SURFACE_TRUE@am__objects_44 = $(am__objects_43) -am__objects_45 = cairo-win32-font.lo -@CAIRO_HAS_WIN32_FONT_TRUE@am__objects_46 = $(am__objects_45) -am__objects_47 = cairo-os2-surface.lo -@CAIRO_HAS_OS2_SURFACE_TRUE@am__objects_48 = $(am__objects_47) -am__objects_49 = cairo-drm.lo cairo-drm-bo.lo cairo-drm-surface.lo \ +@CAIRO_HAS_WIN32_SURFACE_TRUE@am__objects_45 = $(am__objects_44) +am__objects_46 = cairo-win32-font.lo +@CAIRO_HAS_WIN32_FONT_TRUE@am__objects_47 = $(am__objects_46) +am__objects_48 = cairo-os2-surface.lo +@CAIRO_HAS_OS2_SURFACE_TRUE@am__objects_49 = $(am__objects_48) +am__objects_50 = cairo-drm.lo cairo-drm-bo.lo cairo-drm-surface.lo \ cairo-drm-intel.lo cairo-drm-intel-debug.lo \ cairo-drm-intel-surface.lo cairo-drm-i915-surface.lo \ cairo-drm-i915-glyphs.lo cairo-drm-i915-shader.lo \ @@ -581,59 +597,62 @@ am__objects_49 = cairo-drm.lo cairo-drm-bo.lo cairo-drm-surface.lo \ cairo-drm-i965-spans.lo cairo-drm-intel-brw-eu.lo \ cairo-drm-intel-brw-eu-emit.lo cairo-drm-intel-brw-eu-util.lo \ cairo-drm-radeon.lo cairo-drm-radeon-surface.lo -@CAIRO_HAS_DRM_SURFACE_TRUE@am__objects_50 = $(am__objects_49) -am__objects_51 = cairo-drm-xr.lo -@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__objects_52 = $(am__objects_51) -am__objects_53 = cairo-drm-gallium-surface.lo -@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__objects_54 = $(am__objects_53) -am__objects_55 = cairo-png.lo -@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__objects_56 = $(am__objects_55) -@BUILD_PRIVATE_GLEW_TRUE@am__objects_57 = glew.lo -am__objects_58 = cairo-gl-composite.lo cairo-gl-device.lo \ +@CAIRO_HAS_DRM_SURFACE_TRUE@am__objects_51 = $(am__objects_50) +am__objects_52 = cairo-drm-xr.lo +@CAIRO_HAS_DRM_XR_FUNCTIONS_TRUE@am__objects_53 = $(am__objects_52) +am__objects_54 = cairo-drm-gallium-surface.lo +@CAIRO_HAS_GALLIUM_SURFACE_TRUE@am__objects_55 = $(am__objects_54) +am__objects_56 = cairo-png.lo +@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__objects_57 = $(am__objects_56) +@BUILD_PRIVATE_GLEW_TRUE@am__objects_58 = glew.lo +am__objects_59 = cairo-gl-composite.lo cairo-gl-device.lo \ cairo-gl-glyphs.lo cairo-gl-gradient.lo cairo-gl-shaders.lo \ - cairo-gl-surface.lo $(am__objects_57) -@CAIRO_HAS_GL_SURFACE_TRUE@am__objects_59 = $(am__objects_58) -am__objects_60 = cairo-directfb-surface.lo -@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__objects_61 = $(am__objects_60) -am__objects_62 = cairo-vg-surface.lo -@CAIRO_HAS_VG_SURFACE_TRUE@am__objects_63 = $(am__objects_62) -am__objects_64 = cairo-egl-context.lo -@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__objects_65 = $(am__objects_64) -am__objects_66 = cairo-glx-context.lo -@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__objects_67 = $(am__objects_66) -am__objects_68 = cairo-wgl-context.lo -@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__objects_69 = $(am__objects_68) -am__objects_70 = cairo-script-surface.lo -@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_71 = $(am__objects_70) -am__objects_72 = cairo-ft-font.lo -@CAIRO_HAS_FT_FONT_TRUE@am__objects_73 = $(am__objects_72) -am__objects_74 = cairo-ps-surface.lo -@CAIRO_HAS_PS_SURFACE_TRUE@am__objects_75 = $(am__objects_74) -am__objects_76 = cairo-pdf-surface.lo -@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_77 = $(am__objects_76) -am__objects_78 = cairo-svg-surface.lo -@CAIRO_HAS_SVG_SURFACE_TRUE@am__objects_79 = $(am__objects_78) -am__objects_80 = test-fallback-surface.lo test-fallback16-surface.lo \ + cairo-gl-surface.lo $(am__objects_58) +@CAIRO_HAS_GL_SURFACE_TRUE@am__objects_60 = $(am__objects_59) +am__objects_61 = cairo-directfb-surface.lo +@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__objects_62 = $(am__objects_61) +am__objects_63 = cairo-vg-surface.lo +@CAIRO_HAS_VG_SURFACE_TRUE@am__objects_64 = $(am__objects_63) +am__objects_65 = cairo-egl-context.lo +@CAIRO_HAS_EGL_FUNCTIONS_TRUE@am__objects_66 = $(am__objects_65) +am__objects_67 = cairo-glx-context.lo +@CAIRO_HAS_GLX_FUNCTIONS_TRUE@am__objects_68 = $(am__objects_67) +am__objects_69 = cairo-wgl-context.lo +@CAIRO_HAS_WGL_FUNCTIONS_TRUE@am__objects_70 = $(am__objects_69) +am__objects_71 = cairo-script-surface.lo +@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__objects_72 = $(am__objects_71) +am__objects_73 = cairo-ft-font.lo +@CAIRO_HAS_FT_FONT_TRUE@am__objects_74 = $(am__objects_73) +am__objects_75 = cairo-ps-surface.lo +@CAIRO_HAS_PS_SURFACE_TRUE@am__objects_76 = $(am__objects_75) +am__objects_77 = cairo-pdf-surface.lo +@CAIRO_HAS_PDF_SURFACE_TRUE@am__objects_78 = $(am__objects_77) +am__objects_79 = cairo-svg-surface.lo +@CAIRO_HAS_SVG_SURFACE_TRUE@am__objects_80 = $(am__objects_79) +am__objects_81 = test-fallback-surface.lo test-fallback16-surface.lo \ test-null-surface.lo test-paginated-surface.lo \ test-wrapping-surface.lo -@CAIRO_HAS_TEST_SURFACES_TRUE@am__objects_81 = $(am__objects_80) -am__objects_82 = cairo-xml-surface.lo -@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_83 = $(am__objects_82) -am__objects_84 = $(am__objects_31) $(am__objects_33) $(am__objects_1) \ - $(am__objects_36) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_38) $(am__objects_40) \ - $(am__objects_42) $(am__objects_44) $(am__objects_46) \ - $(am__objects_1) $(am__objects_48) $(am__objects_1) \ - $(am__objects_50) $(am__objects_52) $(am__objects_54) \ - $(am__objects_1) $(am__objects_56) $(am__objects_59) \ - $(am__objects_61) $(am__objects_63) $(am__objects_65) \ - $(am__objects_67) $(am__objects_69) $(am__objects_71) \ - $(am__objects_73) $(am__objects_1) $(am__objects_75) \ - $(am__objects_77) $(am__objects_79) $(am__objects_81) \ - $(am__objects_83) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_1) -am_libcairo_la_OBJECTS = $(am__objects_23) $(am__objects_26) \ - $(am__objects_84) +@CAIRO_HAS_TEST_SURFACES_TRUE@am__objects_82 = $(am__objects_81) +am__objects_83 = cairo-tee-surface.lo +@CAIRO_HAS_TEE_SURFACE_TRUE@am__objects_84 = $(am__objects_83) +am__objects_85 = cairo-xml-surface.lo +@CAIRO_HAS_XML_SURFACE_TRUE@am__objects_86 = $(am__objects_85) +am__objects_87 = $(am__objects_32) $(am__objects_34) $(am__objects_1) \ + $(am__objects_37) $(am__objects_1) $(am__objects_1) \ + $(am__objects_1) $(am__objects_39) $(am__objects_41) \ + $(am__objects_43) $(am__objects_45) $(am__objects_47) \ + $(am__objects_1) $(am__objects_49) $(am__objects_1) \ + $(am__objects_51) $(am__objects_53) $(am__objects_55) \ + $(am__objects_1) $(am__objects_57) $(am__objects_60) \ + $(am__objects_62) $(am__objects_64) $(am__objects_66) \ + $(am__objects_68) $(am__objects_70) $(am__objects_72) \ + $(am__objects_74) $(am__objects_1) $(am__objects_76) \ + $(am__objects_78) $(am__objects_80) $(am__objects_82) \ + $(am__objects_84) $(am__objects_86) $(am__objects_1) \ + $(am__objects_1) $(am__objects_1) $(am__objects_1) \ + $(am__objects_1) +am_libcairo_la_OBJECTS = $(am__objects_24) $(am__objects_27) \ + $(am__objects_87) nodist_libcairo_la_OBJECTS = libcairo_la_OBJECTS = $(am_libcairo_la_OBJECTS) \ $(nodist_libcairo_la_OBJECTS) @@ -648,14 +667,15 @@ am__libcairo_cxx_la_SOURCES_DIST = cairo.h cairo-deprecated.h \ cairo-quartz.h cairo-quartz-image.h cairo-win32.h cairo-skia.h \ cairo-os2.h cairo-beos.h cairo-drm.h cairo-drm-xr.h cairo-gl.h \ cairo-directfb.h cairo-vg.h cairo-script.h cairo-ft.h \ - cairo-ps.h cairo-pdf.h cairo-svg.h cairo-xml.h cairoint.h \ - cairo-analysis-surface-private.h cairo-arc-private.h \ - cairo-atomic-private.h cairo-boxes-private.h \ - cairo-cache-private.h cairo-clip-private.h \ - cairo-combsort-private.h cairo-compiler-private.h \ - cairo-composite-rectangles-private.h cairo-device-private.h \ - cairo-error-private.h cairo-fixed-private.h \ - cairo-fixed-type-private.h cairo-freelist-private.h \ + cairo-ps.h cairo-pdf.h cairo-svg.h cairo-tee.h cairo-xml.h \ + cairoint.h cairo-analysis-surface-private.h \ + cairo-arc-private.h cairo-atomic-private.h \ + cairo-boxes-private.h cairo-cache-private.h \ + cairo-clip-private.h cairo-combsort-private.h \ + cairo-compiler-private.h cairo-composite-rectangles-private.h \ + cairo-device-private.h cairo-error-private.h \ + cairo-fixed-private.h cairo-fixed-type-private.h \ + cairo-freelist-private.h cairo-freelist-type-private.h \ cairo-freed-pool-private.h cairo-fontconfig-private.h \ cairo-gstate-private.h cairo-hash-private.h \ cairo-image-info-private.h cairo-list-private.h \ @@ -672,9 +692,9 @@ am__libcairo_cxx_la_SOURCES_DIST = cairo.h cairo-deprecated.h \ cairo-surface-clipper-private.h cairo-surface-offset-private.h \ cairo-surface-subsurface-private.h \ cairo-surface-snapshot-private.h \ - cairo-surface-wrapper-private.h cairo-tee-surface-private.h \ - cairo-types-private.h cairo-user-font-private.h \ - cairo-wideint-private.h cairo-wideint-type-private.h \ + cairo-surface-wrapper-private.h cairo-types-private.h \ + cairo-user-font-private.h cairo-wideint-private.h \ + cairo-wideint-type-private.h \ cairo-scaled-font-subsets-private.h \ cairo-truetype-subset-private.h cairo-type1-private.h \ cairo-type3-glyph-surface-private.h \ @@ -694,19 +714,20 @@ am__libcairo_cxx_la_SOURCES_DIST = cairo.h cairo-deprecated.h \ cairo-pdf-surface-private.h cairo-svg-surface-private.h \ test-fallback-surface.h test-fallback16-surface.h \ test-null-surface.h test-paginated-surface.h \ - test-wrapping-surface.h cairo-qt-surface.cpp \ - cairo-skia-surface.cpp cairo-beos-surface.cpp -am__objects_85 = cairo-qt-surface.lo -@CAIRO_HAS_QT_SURFACE_TRUE@am__objects_86 = $(am__objects_85) -am__objects_87 = cairo-skia-surface.lo -@CAIRO_HAS_SKIA_SURFACE_TRUE@am__objects_88 = $(am__objects_87) -am__objects_89 = cairo-beos-surface.lo -@CAIRO_HAS_BEOS_SURFACE_TRUE@am__objects_90 = $(am__objects_89) -am__objects_91 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_1) $(am__objects_86) \ + test-wrapping-surface.h cairo-tee-surface-private.h \ + cairo-qt-surface.cpp cairo-skia-surface.cpp \ + cairo-beos-surface.cpp +am__objects_88 = cairo-qt-surface.lo +@CAIRO_HAS_QT_SURFACE_TRUE@am__objects_89 = $(am__objects_88) +am__objects_90 = cairo-skia-surface.lo +@CAIRO_HAS_SKIA_SURFACE_TRUE@am__objects_91 = $(am__objects_90) +am__objects_92 = cairo-beos-surface.lo +@CAIRO_HAS_BEOS_SURFACE_TRUE@am__objects_93 = $(am__objects_92) +am__objects_94 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \ + $(am__objects_1) $(am__objects_1) $(am__objects_89) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) $(am__objects_1) $(am__objects_88) \ - $(am__objects_1) $(am__objects_90) $(am__objects_1) \ + $(am__objects_1) $(am__objects_1) $(am__objects_91) \ + $(am__objects_1) $(am__objects_93) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ @@ -714,9 +735,9 @@ am__objects_91 = $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ $(am__objects_1) $(am__objects_1) $(am__objects_1) \ - $(am__objects_1) -am_libcairo_cxx_la_OBJECTS = $(am__objects_23) $(am__objects_26) \ - $(am__objects_91) + $(am__objects_1) $(am__objects_1) $(am__objects_1) +am_libcairo_cxx_la_OBJECTS = $(am__objects_24) $(am__objects_27) \ + $(am__objects_94) libcairo_cxx_la_OBJECTS = $(am_libcairo_cxx_la_OBJECTS) libcairo_cxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ @@ -778,7 +799,7 @@ am__cairoinclude_HEADERS_DIST = cairo.h cairo-deprecated.h \ cairo-quartz.h cairo-quartz-image.h cairo-win32.h cairo-skia.h \ cairo-os2.h cairo-beos.h cairo-drm.h cairo-drm-xr.h cairo-gl.h \ cairo-directfb.h cairo-vg.h cairo-script.h cairo-ft.h \ - cairo-ps.h cairo-pdf.h cairo-svg.h cairo-xml.h \ + cairo-ps.h cairo-pdf.h cairo-svg.h cairo-tee.h cairo-xml.h \ $(top_srcdir)/cairo-version.h HEADERS = $(cairoinclude_HEADERS) $(nodist_cairoinclude_HEADERS) ETAGS = etags @@ -841,6 +862,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -954,7 +977,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ @@ -1014,26 +1036,26 @@ cairo_private = cairoint.h cairo-analysis-surface-private.h \ cairo-compiler-private.h cairo-composite-rectangles-private.h \ cairo-device-private.h cairo-error-private.h \ cairo-fixed-private.h cairo-fixed-type-private.h \ - cairo-freelist-private.h cairo-freed-pool-private.h \ - cairo-fontconfig-private.h cairo-gstate-private.h \ - cairo-hash-private.h cairo-image-info-private.h \ - cairo-list-private.h cairo-malloc-private.h \ - cairo-recording-surface-private.h cairo-mutex-impl-private.h \ - cairo-mutex-list-private.h cairo-mutex-private.h \ - cairo-mutex-type-private.h cairo-output-stream-private.h \ - cairo-paginated-private.h cairo-paginated-surface-private.h \ - cairo-path-fixed-private.h cairo-path-private.h \ - cairo-private.h cairo-reference-count-private.h \ - cairo-region-private.h cairo-rtree-private.h \ - cairo-scaled-font-private.h cairo-slope-private.h \ - cairo-spans-private.h cairo-surface-fallback-private.h \ - cairo-surface-private.h cairo-surface-clipper-private.h \ - cairo-surface-offset-private.h \ + cairo-freelist-private.h cairo-freelist-type-private.h \ + cairo-freed-pool-private.h cairo-fontconfig-private.h \ + cairo-gstate-private.h cairo-hash-private.h \ + cairo-image-info-private.h cairo-list-private.h \ + cairo-malloc-private.h cairo-recording-surface-private.h \ + cairo-mutex-impl-private.h cairo-mutex-list-private.h \ + cairo-mutex-private.h cairo-mutex-type-private.h \ + cairo-output-stream-private.h cairo-paginated-private.h \ + cairo-paginated-surface-private.h cairo-path-fixed-private.h \ + cairo-path-private.h cairo-private.h \ + cairo-reference-count-private.h cairo-region-private.h \ + cairo-rtree-private.h cairo-scaled-font-private.h \ + cairo-slope-private.h cairo-spans-private.h \ + cairo-surface-fallback-private.h cairo-surface-private.h \ + cairo-surface-clipper-private.h cairo-surface-offset-private.h \ cairo-surface-subsurface-private.h \ cairo-surface-snapshot-private.h \ - cairo-surface-wrapper-private.h cairo-tee-surface-private.h \ - cairo-types-private.h cairo-user-font-private.h \ - cairo-wideint-private.h cairo-wideint-type-private.h $(NULL) \ + cairo-surface-wrapper-private.h cairo-types-private.h \ + cairo-user-font-private.h cairo-wideint-private.h \ + cairo-wideint-type-private.h $(NULL) \ $(_cairo_font_subset_private) $(_cairo_pdf_operators_private) cairo_sources = cairo-analysis-surface.c cairo-arc.c cairo-array.c \ cairo-atomic.c cairo-base64-stream.c cairo-base85-stream.c \ @@ -1059,7 +1081,7 @@ cairo_sources = cairo-analysis-surface.c cairo-arc.c cairo-array.c \ cairo-surface-fallback.c cairo-surface-clipper.c \ cairo-surface-offset.c cairo-surface-snapshot.c \ cairo-surface-subsurface.c cairo-surface-wrapper.c \ - cairo-system.c cairo-tee-surface.c cairo-tor-scan-converter.c \ + cairo-system.c cairo-tor-scan-converter.c \ cairo-toy-font-face.c cairo-traps.c cairo-unicode.c \ cairo-user-font.c cairo-version.c cairo-wideint.c $(NULL) \ $(_cairo_font_subset_sources) $(_cairo_pdf_operators_sources) \ @@ -1216,6 +1238,9 @@ cairo_drm_xr_sources = \ cairo_script_headers = cairo-script.h cairo_script_sources = cairo-script-surface.c +cairo_tee_headers = cairo-tee.h +cairo_tee_private = cairo-tee-surface-private.h +cairo_tee_sources = cairo-tee-surface.c cairo_xml_headers = cairo-xml.h cairo_xml_sources = cairo-xml-surface.c cairo_vg_headers = cairo-vg.h @@ -1228,8 +1253,7 @@ supported_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \ $(cairo_wgl_headers) $(cairo_ft_headers) $(cairo_fc_headers) \ $(cairo_ps_headers) $(cairo_pdf_headers) $(cairo_svg_headers) \ $(cairo_image_headers) $(cairo_recording_headers) \ - $(cairo_tee_headers) $(cairo_xml_headers) \ - $(cairo_user_headers) + $(cairo_user_headers) $(cairo_gobject_headers) unsupported_cairo_headers = $(cairo_xcb_headers) \ $(cairo_xlib_xcb_headers) $(cairo_qt_headers) \ $(cairo_quartz_image_headers) $(cairo_skia_headers) \ @@ -1237,7 +1261,8 @@ unsupported_cairo_headers = $(cairo_xcb_headers) \ $(cairo_drm_headers) $(cairo_drm_xr_headers) \ $(cairo_gallium_headers) $(cairo_xcb_drm_headers) \ $(cairo_gl_headers) $(cairo_directfb_headers) \ - $(cairo_vg_headers) $(cairo_script_headers) + $(cairo_vg_headers) $(cairo_script_headers) \ + $(cairo_tee_headers) $(cairo_xml_headers) all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \ $(cairo_xlib_xrender_headers) $(cairo_xcb_headers) \ $(cairo_xlib_xcb_headers) $(cairo_xcb_shm_headers) \ @@ -1255,7 +1280,7 @@ all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \ $(cairo_pdf_headers) $(cairo_svg_headers) \ $(cairo_image_headers) $(cairo_recording_headers) \ $(cairo_tee_headers) $(cairo_xml_headers) \ - $(cairo_user_headers) + $(cairo_user_headers) $(cairo_gobject_headers) all_cairo_private = $(cairo_private) $(cairo_xlib_private) \ $(cairo_xlib_xrender_private) $(cairo_xcb_private) \ $(cairo_xlib_xcb_private) $(cairo_xcb_shm_private) \ @@ -1275,10 +1300,10 @@ all_cairo_private = $(cairo_private) $(cairo_xlib_private) \ $(cairo_image_private) $(cairo_recording_private) \ $(cairo_tee_private) $(cairo_xml_private) \ $(cairo_user_private) $(cairo_pthread_private) \ - $(cairo_pthread_headers) $(cairo_trace_private) \ - $(cairo_trace_headers) $(cairo_interpreter_private) \ - $(cairo_interpreter_headers) $(cairo_symbol_lookup_private) \ - $(cairo_symbol_lookup_headers) + $(cairo_pthread_headers) $(cairo_gobject_private) \ + $(cairo_trace_private) $(cairo_trace_headers) \ + $(cairo_interpreter_private) $(cairo_interpreter_headers) \ + $(cairo_symbol_lookup_private) $(cairo_symbol_lookup_headers) all_cairo_cxx_sources = $(cairo_cxx_sources) $(cairo_xlib_cxx_sources) \ $(cairo_xlib_xrender_cxx_sources) $(cairo_xcb_cxx_sources) \ $(cairo_xlib_xcb_cxx_sources) $(cairo_xcb_shm_cxx_sources) \ @@ -1299,7 +1324,8 @@ all_cairo_cxx_sources = $(cairo_cxx_sources) $(cairo_xlib_cxx_sources) \ $(cairo_image_cxx_sources) $(cairo_recording_cxx_sources) \ $(cairo_tee_cxx_sources) $(cairo_xml_cxx_sources) \ $(cairo_user_cxx_sources) $(cairo_pthread_cxx_sources) \ - $(cairo_trace_cxx_sources) $(cairo_interpreter_cxx_sources) \ + $(cairo_gobject_cxx_sources) $(cairo_trace_cxx_sources) \ + $(cairo_interpreter_cxx_sources) \ $(cairo_symbol_lookup_cxx_sources) all_cairo_sources = $(cairo_sources) $(cairo_xlib_sources) \ $(cairo_xlib_xrender_sources) $(cairo_xcb_sources) \ @@ -1319,8 +1345,9 @@ all_cairo_sources = $(cairo_sources) $(cairo_xlib_sources) \ $(cairo_test_surfaces_sources) $(cairo_image_sources) \ $(cairo_recording_sources) $(cairo_tee_sources) \ $(cairo_xml_sources) $(cairo_user_sources) \ - $(cairo_pthread_sources) $(cairo_trace_sources) \ - $(cairo_interpreter_sources) $(cairo_symbol_lookup_sources) + $(cairo_pthread_sources) $(cairo_gobject_sources) \ + $(cairo_trace_sources) $(cairo_interpreter_sources) \ + $(cairo_symbol_lookup_sources) enabled_cairo_headers = $(cairo_headers) $(am__append_3) \ $(am__append_8) $(am__append_13) $(am__append_18) \ $(am__append_23) $(am__append_28) $(am__append_33) \ @@ -1333,7 +1360,8 @@ enabled_cairo_headers = $(cairo_headers) $(am__append_3) \ $(am__append_128) $(am__append_133) $(am__append_138) \ $(am__append_143) $(am__append_148) $(am__append_153) \ $(cairo_image_headers) $(cairo_recording_headers) \ - $(cairo_tee_headers) $(am__append_161) $(cairo_user_headers) + $(am__append_161) $(am__append_166) $(cairo_user_headers) \ + $(am__append_174) enabled_cairo_private = $(cairo_private) $(am__append_4) \ $(am__append_9) $(am__append_14) $(am__append_19) \ $(am__append_24) $(am__append_29) $(am__append_34) \ @@ -1346,9 +1374,9 @@ enabled_cairo_private = $(cairo_private) $(am__append_4) \ $(am__append_129) $(am__append_134) $(am__append_139) \ $(am__append_144) $(am__append_149) $(am__append_154) \ $(am__append_158) $(cairo_image_private) \ - $(cairo_recording_private) $(cairo_tee_private) \ - $(am__append_162) $(cairo_user_private) $(am__append_166) \ - $(am__append_169) $(am__append_172) $(am__append_175) + $(cairo_recording_private) $(am__append_162) $(am__append_167) \ + $(cairo_user_private) $(am__append_171) $(am__append_175) \ + $(am__append_179) $(am__append_182) $(am__append_185) enabled_cairo_cxx_sources = $(cairo_cxx_sources) $(am__append_5) \ $(am__append_10) $(am__append_15) $(am__append_20) \ $(am__append_25) $(am__append_30) $(am__append_35) \ @@ -1361,9 +1389,10 @@ enabled_cairo_cxx_sources = $(cairo_cxx_sources) $(am__append_5) \ $(am__append_130) $(am__append_135) $(am__append_140) \ $(am__append_145) $(am__append_150) $(am__append_155) \ $(am__append_159) $(cairo_image_cxx_sources) \ - $(cairo_recording_cxx_sources) $(cairo_tee_cxx_sources) \ - $(am__append_163) $(cairo_user_cxx_sources) $(am__append_167) \ - $(am__append_170) $(am__append_173) $(am__append_176) + $(cairo_recording_cxx_sources) $(am__append_163) \ + $(am__append_168) $(cairo_user_cxx_sources) $(am__append_172) \ + $(am__append_176) $(am__append_180) $(am__append_183) \ + $(am__append_186) enabled_cairo_sources = $(cairo_sources) $(am__append_6) \ $(am__append_11) $(am__append_16) $(am__append_21) \ $(am__append_26) $(am__append_31) $(am__append_36) \ @@ -1376,9 +1405,9 @@ enabled_cairo_sources = $(cairo_sources) $(am__append_6) \ $(am__append_131) $(am__append_136) $(am__append_141) \ $(am__append_146) $(am__append_151) $(am__append_156) \ $(am__append_160) $(cairo_image_sources) \ - $(cairo_recording_sources) $(cairo_tee_sources) \ - $(am__append_164) $(cairo_user_sources) $(am__append_168) \ - $(am__append_171) $(am__append_174) $(am__append_177) + $(cairo_recording_sources) $(am__append_164) $(am__append_169) \ + $(cairo_user_sources) $(am__append_173) $(am__append_177) \ + $(am__append_181) $(am__append_184) $(am__append_187) all_cairo_pkgconf = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \ cairo-xcb.pc cairo-xlib-xcb.pc cairo-xcb-shm.pc cairo-qt.pc \ cairo-quartz.pc cairo-quartz-font.pc cairo-quartz-image.pc \ @@ -1387,7 +1416,8 @@ all_cairo_pkgconf = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \ cairo-xcb-drm.pc cairo-png.pc cairo-gl.pc cairo-directfb.pc \ cairo-vg.pc cairo-egl.pc cairo-glx.pc cairo-wgl.pc \ cairo-script.pc cairo-ft.pc cairo-fc.pc cairo-ps.pc \ - cairo-pdf.pc cairo-svg.pc cairo-xml.pc + cairo-pdf.pc cairo-svg.pc cairo-tee.pc cairo-xml.pc \ + cairo-gobject.pc enabled_cairo_pkgconf = cairo.pc $(am__append_7) $(am__append_12) \ $(am__append_17) $(am__append_22) $(am__append_27) \ $(am__append_32) $(am__append_37) $(am__append_42) \ @@ -1398,7 +1428,8 @@ enabled_cairo_pkgconf = cairo.pc $(am__append_7) $(am__append_12) \ $(am__append_107) $(am__append_112) $(am__append_117) \ $(am__append_122) $(am__append_127) $(am__append_132) \ $(am__append_137) $(am__append_142) $(am__append_147) \ - $(am__append_152) $(am__append_157) $(am__append_165) + $(am__append_152) $(am__append_157) $(am__append_165) \ + $(am__append_170) $(am__append_178) AM_CPPFLAGS = -I$(srcdir) $(CAIRO_CFLAGS) AM_LDFLAGS = $(CAIRO_LDFLAGS) @OS_WIN32_TRUE@export_symbols = -export-symbols cairo.def @@ -1558,8 +1589,12 @@ cairo-pdf.pc: $(top_builddir)/config.status $(srcdir)/cairo-features.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cairo-svg.pc: $(top_builddir)/config.status $(srcdir)/cairo-features.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +cairo-tee.pc: $(top_builddir)/config.status $(srcdir)/cairo-features.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cairo-xml.pc: $(top_builddir)/config.status $(srcdir)/cairo-features.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +cairo-gobject.pc: $(top_builddir)/config.status $(srcdir)/cairo-features.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" diff --git a/src/Makefile.sources b/src/Makefile.sources index e0153cd..c645c02 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -66,6 +66,7 @@ cairo_private = \ cairo-fixed-private.h \ cairo-fixed-type-private.h \ cairo-freelist-private.h \ + cairo-freelist-type-private.h \ cairo-freed-pool-private.h \ cairo-fontconfig-private.h \ cairo-gstate-private.h \ @@ -97,7 +98,6 @@ cairo_private = \ cairo-surface-subsurface-private.h \ cairo-surface-snapshot-private.h \ cairo-surface-wrapper-private.h \ - cairo-tee-surface-private.h \ cairo-types-private.h \ cairo-user-font-private.h \ cairo-wideint-private.h \ @@ -168,7 +168,6 @@ cairo_sources = \ cairo-surface-subsurface.c \ cairo-surface-wrapper.c \ cairo-system.c \ - cairo-tee-surface.c \ cairo-tor-scan-converter.c \ cairo-toy-font-face.c \ cairo-traps.c \ @@ -377,6 +376,10 @@ if CAIRO_HAS_SCRIPT_SURFACE req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources) endif +cairo_tee_headers = cairo-tee.h +cairo_tee_private = cairo-tee-surface-private.h +cairo_tee_sources = cairo-tee-surface.c + cairo_xml_headers = cairo-xml.h cairo_xml_sources = cairo-xml-surface.c if CAIRO_HAS_XML_SURFACE diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features index 8fe6af7..fb47816 100644 --- a/src/Makefile.win32.features +++ b/src/Makefile.win32.features @@ -546,17 +546,23 @@ enabled_cairo_private += $(cairo_recording_private) enabled_cairo_cxx_sources += $(cairo_recording_cxx_sources) enabled_cairo_sources += $(cairo_recording_sources) -supported_cairo_headers += $(cairo_tee_headers) +unsupported_cairo_headers += $(cairo_tee_headers) all_cairo_headers += $(cairo_tee_headers) all_cairo_private += $(cairo_tee_private) all_cairo_cxx_sources += $(cairo_tee_cxx_sources) all_cairo_sources += $(cairo_tee_sources) +ifeq ($(CAIRO_HAS_TEE_SURFACE),1) enabled_cairo_headers += $(cairo_tee_headers) enabled_cairo_private += $(cairo_tee_private) enabled_cairo_cxx_sources += $(cairo_tee_cxx_sources) enabled_cairo_sources += $(cairo_tee_sources) +endif +all_cairo_pkgconf += cairo-tee.pc +ifeq ($(CAIRO_HAS_TEE_SURFACE),1) +enabled_cairo_pkgconf += cairo-tee.pc +endif -supported_cairo_headers += $(cairo_xml_headers) +unsupported_cairo_headers += $(cairo_xml_headers) all_cairo_headers += $(cairo_xml_headers) all_cairo_private += $(cairo_xml_private) all_cairo_cxx_sources += $(cairo_xml_cxx_sources) @@ -591,6 +597,22 @@ enabled_cairo_cxx_sources += $(cairo_pthread_cxx_sources) enabled_cairo_sources += $(cairo_pthread_sources) endif +supported_cairo_headers += $(cairo_gobject_headers) +all_cairo_headers += $(cairo_gobject_headers) +all_cairo_private += $(cairo_gobject_private) +all_cairo_cxx_sources += $(cairo_gobject_cxx_sources) +all_cairo_sources += $(cairo_gobject_sources) +ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1) +enabled_cairo_headers += $(cairo_gobject_headers) +enabled_cairo_private += $(cairo_gobject_private) +enabled_cairo_cxx_sources += $(cairo_gobject_cxx_sources) +enabled_cairo_sources += $(cairo_gobject_sources) +endif +all_cairo_pkgconf += cairo-gobject.pc +ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1) +enabled_cairo_pkgconf += cairo-gobject.pc +endif + all_cairo_private += $(cairo_trace_private) $(cairo_trace_headers) all_cairo_cxx_sources += $(cairo_trace_cxx_sources) all_cairo_sources += $(cairo_trace_sources) diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c index 5d554aa..a615149 100644 --- a/src/cairo-analysis-surface.c +++ b/src/cairo-analysis-surface.c @@ -118,7 +118,7 @@ _analyze_recording_surface_pattern (cairo_analysis_surface_t *surface, surface->has_ctm = ! _cairo_matrix_is_identity (&surface->ctm); source = surface_pattern->surface; - if (source->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source; source = sub->target; } diff --git a/src/cairo-color.c b/src/cairo-color.c index 6bc1705..d20fea4 100644 --- a/src/cairo-color.c +++ b/src/cairo-color.c @@ -185,30 +185,13 @@ cairo_bool_t _cairo_color_stop_equal (const cairo_color_stop_t *color_a, const cairo_color_stop_t *color_b) { - uint16_t a, b; - if (color_a == color_b) return TRUE; - if (color_a->alpha_short != color_b->alpha_short) - return FALSE; - - a = _cairo_color_double_to_short (color_a->red * color_a->alpha); - b = _cairo_color_double_to_short (color_b->red * color_b->alpha); - if (a != b) - return FALSE; - - a = _cairo_color_double_to_short (color_a->green * color_a->alpha); - b = _cairo_color_double_to_short (color_b->green * color_b->alpha); - if (a != b) - return FALSE; - - a = _cairo_color_double_to_short (color_a->blue * color_a->alpha); - b = _cairo_color_double_to_short (color_b->blue * color_b->alpha); - if (a != b) - return FALSE; - - return TRUE; + return color_a->alpha_short == color_b->alpha_short && + color_a->red_short == color_b->red_short && + color_a->green_short == color_b->green_short && + color_a->blue_short == color_b->blue_short; } cairo_content_t diff --git a/src/cairo-device.c b/src/cairo-device.c index dac1b3b..15b0484 100644 --- a/src/cairo-device.c +++ b/src/cairo-device.c @@ -86,6 +86,12 @@ * cairo_device_release (device); * } * </programlisting></informalexample> + * + * <note><para>Please refer to the documentation of each backend for + * additional usage requirements, guarantees provided, and + * interactions with existing surface API of the device functions for + * surfaces of that type. + * </para></note> */ static const cairo_device_t _nil_device = { diff --git a/src/cairo-egl-context.c b/src/cairo-egl-context.c index 607e3bf..a4ec281 100644 --- a/src/cairo-egl-context.c +++ b/src/cairo-egl-context.c @@ -115,6 +115,21 @@ _egl_destroy (void *abstract_ctx) eglDestroySurface (ctx->display, ctx->dummy_surface); } +static cairo_bool_t +_egl_make_current_surfaceless(cairo_egl_context_t *ctx) +{ + const char *extensions; + + extensions = eglQueryString(ctx->display, EGL_EXTENSIONS); + if (!strstr(extensions, "EGL_KHR_surfaceless_opengl")) + return FALSE; + if (!eglMakeCurrent(ctx->display, + EGL_NO_SURFACE, EGL_NO_SURFACE, ctx->context)) + return FALSE; + + return TRUE; +} + cairo_device_t * cairo_egl_device_create (EGLDisplay dpy, EGLContext egl) { @@ -141,30 +156,33 @@ cairo_egl_device_create (EGLDisplay dpy, EGLContext egl) ctx->base.swap_buffers = _egl_swap_buffers; ctx->base.destroy = _egl_destroy; - /* dummy surface, meh. */ - eglGetConfigs (dpy, NULL, 0, &numConfigs); - configs = malloc (sizeof(*configs) *numConfigs); - if (configs == NULL) { - free (ctx); - return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY); - } - eglGetConfigs (dpy, configs, numConfigs, &numConfigs); - ctx->dummy_surface = eglCreatePbufferSurface (dpy, configs[0], attribs); - free (configs); - - if (ctx->dummy_surface == NULL) { - free (ctx); - return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY); - } - - if (!eglMakeCurrent (dpy, ctx->dummy_surface, ctx->dummy_surface, egl)) { - free (ctx); - return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY); + if (!_egl_make_current_surfaceless (ctx)) { + /* Fall back to dummy surface, meh. */ + eglGetConfigs (dpy, NULL, 0, &numConfigs); + configs = malloc (sizeof(*configs) *numConfigs); + if (configs == NULL) { + free (ctx); + return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY); + } + eglGetConfigs (dpy, configs, numConfigs, &numConfigs); + ctx->dummy_surface = eglCreatePbufferSurface (dpy, configs[0], attribs); + free (configs); + + if (ctx->dummy_surface == NULL) { + free (ctx); + return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY); + } + + if (!eglMakeCurrent (dpy, ctx->dummy_surface, ctx->dummy_surface, egl)) { + free (ctx); + return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY); + } } status = _cairo_gl_context_init (&ctx->base); if (unlikely (status)) { - eglDestroySurface (dpy, ctx->dummy_surface); + if (ctx->dummy_surface != EGL_NO_SURFACE) + eglDestroySurface (dpy, ctx->dummy_surface); free (ctx); return _cairo_gl_context_create_in_error (status); } diff --git a/src/cairo-features-uninstalled.pc.in b/src/cairo-features-uninstalled.pc.in index cc05247..b9cd9d3 100644 --- a/src/cairo-features-uninstalled.pc.in +++ b/src/cairo-features-uninstalled.pc.in @@ -3,5 +3,5 @@ Description: @FEATURE_NAME@ for cairo graphics library Version: @VERSION@ Requires: @FEATURE_BASE@ @FEATURE_REQUIRES@ -Libs: @FEATURE_NONPKGCONFIG_LIBS@ +Libs: @FEATURE_NONPKGCONFIG_LIBS@ @FEATURE_NONPKGCONFIG_EXTRA_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/src @FEATURE_NONPKGCONFIG_CFLAGS@ diff --git a/src/cairo-features.pc.in b/src/cairo-features.pc.in index 34908ec..9a4b657 100644 --- a/src/cairo-features.pc.in +++ b/src/cairo-features.pc.in @@ -8,5 +8,5 @@ Description: @FEATURE_NAME@ for cairo graphics library Version: @VERSION@ Requires: @FEATURE_BASE@ @FEATURE_REQUIRES@ -Libs: @FEATURE_NONPKGCONFIG_LIBS@ +Libs: @FEATURE_NONPKGCONFIG_LIBS@ @FEATURE_NONPKGCONFIG_EXTRA_LIBS@ Cflags: -I${includedir}/cairo @FEATURE_NONPKGCONFIG_CFLAGS@ diff --git a/src/cairo-freelist-private.h b/src/cairo-freelist-private.h index 47ed232..703181b 100644 --- a/src/cairo-freelist-private.h +++ b/src/cairo-freelist-private.h @@ -24,6 +24,7 @@ #include "cairo-types-private.h" #include "cairo-compiler-private.h" +#include "cairo-freelist-type-private.h" /* for stand-alone compilation*/ #ifndef VG @@ -34,33 +35,6 @@ #define NULL (void *) 0 #endif -typedef struct _cairo_freelist_node cairo_freelist_node_t; -struct _cairo_freelist_node { - cairo_freelist_node_t *next; -}; - -typedef struct _cairo_freelist { - cairo_freelist_node_t *first_free_node; - unsigned nodesize; -} cairo_freelist_t; - -typedef struct _cairo_freelist_pool cairo_freelist_pool_t; -struct _cairo_freelist_pool { - cairo_freelist_pool_t *next; - unsigned size, rem; - uint8_t *data; -}; - -typedef struct _cairo_freepool { - cairo_freelist_node_t *first_free_node; - cairo_freelist_pool_t *pools; - cairo_freelist_pool_t *freepools; - unsigned nodesize; - cairo_freelist_pool_t embedded_pool; - uint8_t embedded_data[1000]; -} cairo_freepool_t; - - /* Initialise a freelist that will be responsible for allocating * nodes of size nodesize. */ cairo_private void diff --git a/src/cairo-freelist-type-private.h b/src/cairo-freelist-type-private.h new file mode 100644 index 0000000..4dd0564 --- /dev/null +++ b/src/cairo-freelist-type-private.h @@ -0,0 +1,54 @@ +/* + * Copyright © 2010 Joonas Pihlaja + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ +#ifndef CAIRO_FREELIST_TYPE_H +#define CAIRO_FREELIST_TYPE_H + +#include "cairo-types-private.h" +#include "cairo-compiler-private.h" + +typedef struct _cairo_freelist_node cairo_freelist_node_t; +struct _cairo_freelist_node { + cairo_freelist_node_t *next; +}; + +typedef struct _cairo_freelist { + cairo_freelist_node_t *first_free_node; + unsigned nodesize; +} cairo_freelist_t; + +typedef struct _cairo_freelist_pool cairo_freelist_pool_t; +struct _cairo_freelist_pool { + cairo_freelist_pool_t *next; + unsigned size, rem; + uint8_t *data; +}; + +typedef struct _cairo_freepool { + cairo_freelist_node_t *first_free_node; + cairo_freelist_pool_t *pools; + cairo_freelist_pool_t *freepools; + unsigned nodesize; + cairo_freelist_pool_t embedded_pool; + uint8_t embedded_data[1000]; +} cairo_freepool_t; + +#endif /* CAIRO_FREELIST_TYPE_H */ diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 828c553..67eb275 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -1065,17 +1065,10 @@ _fill_xrender_bitmap(FT_Bitmap *target, for (x = 0; x < width; x++, src += 1) { unsigned int pix; -#if 1 - pix = ((unsigned int)src[0] << 16) | - ((unsigned int)src[src_pitch] << 8) | - ((unsigned int)src[src_pitch*2] ) | - 0xFF000000 ; -#else pix = ((unsigned int)src[0] << 16) | ((unsigned int)src[src_pitch] << 8) | ((unsigned int)src[src_pitch*2] ) | ((unsigned int)src[src_pitch] << 24) ; -#endif dst[x] = pix; } } diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c index 8ebcdfe..94c220b 100644 --- a/src/cairo-gl-gradient.c +++ b/src/cairo-gl-gradient.c @@ -192,6 +192,7 @@ _cairo_gl_gradient_create (cairo_gl_context_t *ctx, { unsigned long hash; cairo_gl_gradient_t *gradient; + cairo_status_t status; int tex_width; void *data; @@ -224,10 +225,16 @@ _cairo_gl_gradient_create (cairo_gl_context_t *ctx, glBufferDataARB (GL_PIXEL_UNPACK_BUFFER_ARB, tex_width * sizeof (uint32_t), 0, GL_STREAM_DRAW); data = glMapBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY); - _cairo_gl_gradient_render (ctx, n_stops, stops, data, tex_width); + status = _cairo_gl_gradient_render (ctx, n_stops, stops, data, tex_width); glUnmapBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB); + if (unlikely (status)) { + glBindBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB, 0); + free (gradient); + return status; + } + glGenTextures (1, &gradient->tex); _cairo_gl_context_activate (ctx, CAIRO_GL_TEX_TEMP); glBindTexture (GL_TEXTURE_1D, gradient->tex); diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index 7caf624..b1d09d2 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -874,7 +874,7 @@ _cairo_gstate_copy_pattern (cairo_pattern_t *pattern, { /* First check if the we can replace the original with a much simpler * pattern. For example, gradients that are uniform or just have a single - * stop can be replace with a solid. + * stop can sometimes be replaced with a solid. */ if (_cairo_pattern_is_clear (original)) { diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index 464df32..f88ccb8 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -1410,7 +1410,7 @@ _pixman_image_for_surface (const cairo_surface_pattern_t *pattern, source->stride); if (unlikely (pixman_image == NULL)) return NULL; - } else if (type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + } else if (type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub; cairo_bool_t is_contained = FALSE; diff --git a/src/cairo-os2-private.h b/src/cairo-os2-private.h index fa4c8e8..829dd3c 100644 --- a/src/cairo-os2-private.h +++ b/src/cairo-os2-private.h @@ -61,6 +61,7 @@ typedef struct _cairo_os2_surface /* General flags: */ cairo_bool_t blit_as_changes; + cairo_bool_t use_24bpp; } cairo_os2_surface_t; #endif /* CAIRO_OS2_PRIVATE_H */ diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c index 4ca88b7..b975828 100644 --- a/src/cairo-os2-surface.c +++ b/src/cairo-os2-surface.c @@ -33,6 +33,7 @@ * * Contributor(s): * Peter Weilbacher <mozilla@Weilbacher.org> + * Rich Walsh <dragtext@e-vertise.com> */ #include "cairoint.h" @@ -67,7 +68,7 @@ /* Initialization counter: */ static int cairo_os2_initialization_count = 0; -static void inline +static inline void DisableFPUException (void) { unsigned short usCW; @@ -170,43 +171,35 @@ cairo_os2_fini (void) */ void *_buffer_alloc (size_t a, size_t b, const unsigned int size) { - /* check length like in the _cairo_malloc_abc macro, but we can leave - * away the unsigned casts as our arguments are unsigned already - */ - size_t nbytes = b && - a >= INT32_MAX / b ? 0 : size && - a*b >= INT32_MAX / size ? 0 : a * b * size; - void *buffer = NULL; -#ifdef OS2_USE_PLATFORM_ALLOC - APIRET rc = NO_ERROR; + size_t nbytes; + void *buffer = NULL; - rc = DosAllocMem ((PPVOID)&buffer, - nbytes, -#ifdef OS2_HIGH_MEMORY /* only if compiled with high-memory support, */ - OBJ_ANY | /* we can allocate anywhere! */ -#endif - PAG_READ | PAG_WRITE | PAG_COMMIT); - if (rc != NO_ERROR) { - /* should there for some reason be another error, let's return - * a null surface and free the buffer again, because that's - * how a malloc failure would look like - */ - if (rc != ERROR_NOT_ENOUGH_MEMORY && buffer) { - DosFreeMem (buffer); - } + if (!a || !b || !size || + a >= INT32_MAX / b || a*b >= INT32_MAX / size) { return NULL; } + nbytes = a * b * size; + +#ifdef OS2_USE_PLATFORM_ALLOC + /* Using OBJ_ANY on a machine that isn't configured for hi-mem + * will cause ERROR_INVALID_PARAMETER. If this occurs, or this + * build doesn't have hi-mem enabled, fall back to using lo-mem. + */ +#ifdef OS2_HIGH_MEMORY + if (!DosAllocMem (&buffer, nbytes, + OBJ_ANY | PAG_READ | PAG_WRITE | PAG_COMMIT)) + return buffer; +#endif + if (DosAllocMem (&buffer, nbytes, + PAG_READ | PAG_WRITE | PAG_COMMIT)) + return NULL; #else + /* Clear the malloc'd buffer the way DosAllocMem() does. */ buffer = malloc (nbytes); + if (buffer) { + memset (buffer, 0, nbytes); + } #endif - - /* This does not seem to be needed, malloc'd space is usually - * already zero'd out! - */ - /* - * memset (buffer, 0x00, nbytes); - */ - return buffer; } @@ -304,45 +297,37 @@ _cairo_os2_surface_blit_pixels (cairo_os2_surface_t *surface, PRECTL prcl_begin_paint_rect) { POINTL aptlPoints[4]; - LONG lOldYInversion, rc = GPI_OK; - - /* Enable Y Inversion for the HPS, so the - * GpiDrawBits will work with upside-top image, not with upside-down image! - */ - lOldYInversion = GpiQueryYInversion (hps_begin_paint); - GpiEnableYInversion (hps_begin_paint, surface->bitmap_info.cy-1); - - /* Target coordinates (Noninclusive) */ - aptlPoints[0].x = prcl_begin_paint_rect->xLeft; - aptlPoints[0].y = prcl_begin_paint_rect->yBottom; - - aptlPoints[1].x = prcl_begin_paint_rect->xRight-1; - aptlPoints[1].y = prcl_begin_paint_rect->yTop-1; + LONG lOldYInversion; + LONG rc = GPI_OK; + + /* Check the limits (may not be necessary) */ + if (prcl_begin_paint_rect->xLeft < 0) + prcl_begin_paint_rect->xLeft = 0; + if (prcl_begin_paint_rect->yBottom < 0) + prcl_begin_paint_rect->yBottom = 0; + if (prcl_begin_paint_rect->xRight > (LONG) surface->bitmap_info.cx) + prcl_begin_paint_rect->xRight = (LONG) surface->bitmap_info.cx; + if (prcl_begin_paint_rect->yTop > (LONG) surface->bitmap_info.cy) + prcl_begin_paint_rect->yTop = (LONG) surface->bitmap_info.cy; + + /* Exit if the rectangle is empty */ + if (prcl_begin_paint_rect->xLeft >= prcl_begin_paint_rect->xRight || + prcl_begin_paint_rect->yBottom >= prcl_begin_paint_rect->yTop) + return; - /* Source coordinates (Inclusive) */ - aptlPoints[2].x = prcl_begin_paint_rect->xLeft; - aptlPoints[2].y = prcl_begin_paint_rect->yBottom; + /* Set the Target & Source coordinates */ + *((PRECTL)&aptlPoints[0]) = *prcl_begin_paint_rect; + *((PRECTL)&aptlPoints[2]) = *prcl_begin_paint_rect; - aptlPoints[3].x = prcl_begin_paint_rect->xRight; - aptlPoints[3].y = (prcl_begin_paint_rect->yTop); + /* Make the Target coordinates non-inclusive */ + aptlPoints[1].x -= 1; + aptlPoints[1].y -= 1; - /* Some extra checking for limits - * (Dunno if really needed, but had some crashes sometimes without it, - * while developing the code...) + /* Enable Y Inversion for the HPS, so GpiDrawBits will + * work with upside-top image, not with upside-down image! */ - { - int i; - for (i = 0; i < 4; i++) { - if (aptlPoints[i].x < 0) - aptlPoints[i].x = 0; - if (aptlPoints[i].y < 0) - aptlPoints[i].y = 0; - if (aptlPoints[i].x > (LONG) surface->bitmap_info.cx) - aptlPoints[i].x = (LONG) surface->bitmap_info.cx; - if (aptlPoints[i].y > (LONG) surface->bitmap_info.cy) - aptlPoints[i].y = (LONG) surface->bitmap_info.cy; - } - } + lOldYInversion = GpiQueryYInversion (hps_begin_paint); + GpiEnableYInversion (hps_begin_paint, surface->bitmap_info.cy-1); /* Debug code to draw rectangle limits */ #if 0 @@ -365,63 +350,81 @@ _cairo_os2_surface_blit_pixels (cairo_os2_surface_t *surface, } } #endif - rc = GpiDrawBits (hps_begin_paint, - surface->pixels, - &(surface->bitmap_info), - 4, - aptlPoints, - ROP_SRCCOPY, - BBO_IGNORE); - - if (rc != GPI_OK) { - /* if GpiDrawBits () failed then this is most likely because the + if (!surface->use_24bpp) { + rc = GpiDrawBits (hps_begin_paint, + surface->pixels, + &(surface->bitmap_info), + 4, + aptlPoints, + ROP_SRCCOPY, + BBO_IGNORE); + if (rc != GPI_OK) + surface->use_24bpp = TRUE; + } + + if (surface->use_24bpp) { + /* If GpiDrawBits () failed then this is most likely because the * display driver could not handle a 32bit bitmap. So we need to * - create a buffer that only contains 3 bytes per pixel * - change the bitmap info header to contain 24bit * - pass the new buffer to GpiDrawBits () again * - clean up the new buffer */ - BITMAPINFOHEADER2 bmpheader; - unsigned char *pchPixBuf, *pchPixSource; - void *pBufStart; - ULONG ulPixels; - - /* allocate temporary pixel buffer */ - pchPixBuf = (unsigned char *) _buffer_alloc (surface->bitmap_info.cy, - surface->bitmap_info.cx, - 3); - pchPixSource = surface->pixels; /* start at beginning of pixel buffer */ - pBufStart = pchPixBuf; /* remember beginning of the new pixel buffer */ - - /* copy the first three bytes for each pixel but skip over the fourth */ - for (ulPixels = 0; ulPixels < surface->bitmap_info.cx * surface->bitmap_info.cy; ulPixels++) - { - /* copy BGR from source buffer */ - *pchPixBuf++ = *pchPixSource++; - *pchPixBuf++ = *pchPixSource++; - *pchPixBuf++ = *pchPixSource++; - pchPixSource++; /* jump over alpha channel in source buffer */ - } - - /* jump back to start of the buffer for display and cleanup */ - pchPixBuf = pBufStart; + BITMAPINFO2 bmpinfo; + unsigned char *pchPixBuf; + unsigned char *pchTarget; + ULONG *pulSource; + ULONG ulX; + ULONG ulY; + ULONG ulPad; + + /* Set up the bitmap header, but this time for 24bit depth. */ + bmpinfo = surface->bitmap_info; + bmpinfo.cBitCount = 24; + + /* The start of each row has to be DWORD aligned. Calculate the + * of number aligned bytes per row, the total size of the bitmap, + * and the number of padding bytes at the end of each row. + */ + ulX = (((bmpinfo.cx * bmpinfo.cBitCount) + 31) / 32) * 4; + bmpinfo.cbImage = ulX * bmpinfo.cy; + ulPad = ulX - bmpinfo.cx * 3; + + /* Allocate temporary pixel buffer. If the rows don't need + * padding, it has to be 1 byte larger than the size of the + * bitmap or else the high-order byte from the last source + * row will end up in unallocated memory. + */ + pchPixBuf = (unsigned char *)_buffer_alloc (1, 1, + bmpinfo.cbImage + (ulPad ? 0 : 1)); - /* set up the bitmap header, but this time with 24bit depth only */ - memset (&bmpheader, 0, sizeof (bmpheader)); - bmpheader.cbFix = sizeof (BITMAPINFOHEADER2); - bmpheader.cx = surface->bitmap_info.cx; - bmpheader.cy = surface->bitmap_info.cy; - bmpheader.cPlanes = surface->bitmap_info.cPlanes; - bmpheader.cBitCount = 24; - rc = GpiDrawBits (hps_begin_paint, - pchPixBuf, - (PBITMAPINFO2)&bmpheader, - 4, - aptlPoints, - ROP_SRCCOPY, - BBO_IGNORE); + if (pchPixBuf) { + /* Copy 4 bytes from the source but advance the target ptr only + * 3 bytes, so the high-order alpha byte will be overwritten by + * the next copy. At the end of each row, skip over the padding. + */ + pchTarget = pchPixBuf; + pulSource = (ULONG*)surface->pixels; + for (ulY = bmpinfo.cy; ulY; ulY--) { + for (ulX = bmpinfo.cx; ulX; ulX--) { + *((ULONG*)pchTarget) = *pulSource++; + pchTarget += 3; + } + pchTarget += ulPad; + } - _buffer_free (pchPixBuf); + rc = GpiDrawBits (hps_begin_paint, + pchPixBuf, + &bmpinfo, + 4, + aptlPoints, + ROP_SRCCOPY, + BBO_IGNORE); + if (rc != GPI_OK) + surface->use_24bpp = FALSE; + + _buffer_free (pchPixBuf); + } } /* Restore Y inversion */ @@ -435,7 +438,6 @@ _cairo_os2_surface_get_pixels_from_screen (cairo_os2_surface_t *surface, { HPS hps; HDC hdc; - HAB hab; SIZEL sizlTemp; HBITMAP hbmpTemp; BITMAPINFO2 bmi2Temp; @@ -453,19 +455,10 @@ _cairo_os2_surface_get_pixels_from_screen (cairo_os2_surface_t *surface, * -- Blit dirty pixels from screen to HBITMAP * - Copy HBITMAP lines (pixels) into our buffer * - Free resources - * - * These steps will require an Anchor Block (HAB). However, - * WinQUeryAnchorBlock () documentation says that HAB is not - * used in current OS/2 implementations, OS/2 deduces all information - * it needs from the TID. Anyway, we'd be in trouble if we'd have to - * get a HAB where we only know a HPS... - * So, we'll simply use a fake HAB. */ - hab = (HAB) 1; /* OS/2 doesn't really use HAB... */ - /* Create a memory device context */ - hdc = DevOpenDC (hab, OD_MEMORY,"*",0L, NULL, NULLHANDLE); + hdc = DevOpenDC (0, OD_MEMORY,"*",0L, NULL, NULLHANDLE); if (!hdc) { return; } @@ -473,7 +466,7 @@ _cairo_os2_surface_get_pixels_from_screen (cairo_os2_surface_t *surface, /* Create a memory PS */ sizlTemp.cx = prcl_begin_paint_rect->xRight - prcl_begin_paint_rect->xLeft; sizlTemp.cy = prcl_begin_paint_rect->yTop - prcl_begin_paint_rect->yBottom; - hps = GpiCreatePS (hab, + hps = GpiCreatePS (0, hdc, &sizlTemp, PU_PELS | GPIT_NORMAL | GPIA_ASSOC); @@ -538,7 +531,7 @@ _cairo_os2_surface_get_pixels_from_screen (cairo_os2_surface_t *surface, GpiQueryBitmapBits (hps, sizlTemp.cy - y - 1, /* lScanStart */ 1, /* lScans */ - pchTemp, + (PBYTE)pchTemp, &bmi2Temp); /* Go for next line */ @@ -721,7 +714,15 @@ static cairo_bool_t _cairo_os2_surface_get_extents (void *abstract_surface, cairo_rectangle_int_t *rectangle) { - cairo_os2_surface_t *local_os2_surface = abstract_surface; + cairo_os2_surface_t *local_os2_surface; + + local_os2_surface = (cairo_os2_surface_t *) abstract_surface; + if ((!local_os2_surface) || + (local_os2_surface->base.backend != &cairo_os2_surface_backend)) + { + /* Invalid parameter (wrong surface)! */ + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); + } rectangle->x = 0; rectangle->y = 0; @@ -738,14 +739,15 @@ _cairo_os2_surface_get_extents (void *abstract_surface, * @height: the height of the surface * * Create a Cairo surface which is bound to a given presentation space (HPS). - * The surface will be created to have the given size. - * By default every change to the surface will be made visible immediately by - * blitting it into the window. This can be changed with + * The caller retains ownership of the HPS and must dispose of it after the + * the surface has been destroyed. The surface will be created to have the + * given size. By default every change to the surface will be made visible + * immediately by blitting it into the window. This can be changed with * cairo_os2_surface_set_manual_window_refresh(). - * Note that the surface will contain garbage when created, so the pixels have - * to be initialized by hand first. You can use the Cairo functions to fill it - * with black, or use cairo_surface_mark_dirty() to fill the surface with pixels - * from the window/HPS. + * Note that the surface will contain garbage when created, so the pixels + * have to be initialized by hand first. You can use the Cairo functions to + * fill it with black, or use cairo_surface_mark_dirty() to fill the surface + * with pixels from the window/HPS. * * Return value: the newly created surface * @@ -756,72 +758,48 @@ cairo_os2_surface_create (HPS hps_client_window, int width, int height) { - cairo_os2_surface_t *local_os2_surface; + cairo_os2_surface_t *local_os2_surface = 0; cairo_status_t status; int rc; /* Check the size of the window */ - if ((width <= 0) || - (height <= 0)) - { - /* Invalid window size! */ - return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_SIZE)); + if ((width <= 0) || (height <= 0)) { + status = _cairo_error (CAIRO_STATUS_INVALID_SIZE); + goto error_exit; } + /* Allocate an OS/2 surface structure. */ local_os2_surface = (cairo_os2_surface_t *) malloc (sizeof (cairo_os2_surface_t)); if (!local_os2_surface) { - /* Not enough memory! */ - return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); + goto error_exit; } - /* Initialize the OS/2 specific parts of the surface! */ + memset(local_os2_surface, 0, sizeof(cairo_os2_surface_t)); - /* Create mutex semaphore */ - rc = DosCreateMutexSem (NULL, - &(local_os2_surface->hmtx_use_private_fields), - 0, - FALSE); - if (rc != NO_ERROR) { - /* Could not create mutex semaphore! */ - free (local_os2_surface); - return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); + /* Allocate resources: mutex & event semaphores and the pixel buffer */ + if (DosCreateMutexSem (NULL, + &(local_os2_surface->hmtx_use_private_fields), + 0, + FALSE)) + { + status = _cairo_error (CAIRO_STATUS_DEVICE_ERROR); + goto error_exit; } - /* Save PS handle */ - local_os2_surface->hps_client_window = hps_client_window; - - /* Defaults */ - local_os2_surface->hwnd_client_window = NULLHANDLE; - local_os2_surface->blit_as_changes = TRUE; - local_os2_surface->pixel_array_lend_count = 0; - rc = DosCreateEventSem (NULL, - &(local_os2_surface->hev_pixel_array_came_back), - 0, - FALSE); - - if (rc != NO_ERROR) { - /* Could not create event semaphore! */ - DosCloseMutexSem (local_os2_surface->hmtx_use_private_fields); - free (local_os2_surface); - return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); + if (DosCreateEventSem (NULL, + &(local_os2_surface->hev_pixel_array_came_back), + 0, + FALSE)) + { + status = _cairo_error (CAIRO_STATUS_DEVICE_ERROR); + goto error_exit; } - /* Prepare BITMAPINFO2 structure for our buffer */ - memset (&(local_os2_surface->bitmap_info), 0, sizeof (local_os2_surface->bitmap_info)); - local_os2_surface->bitmap_info.cbFix = sizeof (BITMAPINFOHEADER2); - local_os2_surface->bitmap_info.cx = width; - local_os2_surface->bitmap_info.cy = height; - local_os2_surface->bitmap_info.cPlanes = 1; - local_os2_surface->bitmap_info.cBitCount = 32; - - /* Allocate memory for pixels */ local_os2_surface->pixels = (unsigned char *) _buffer_alloc (height, width, 4); - if (!(local_os2_surface->pixels)) { - /* Not enough memory for the pixels! */ - DosCloseEventSem (local_os2_surface->hev_pixel_array_came_back); - DosCloseMutexSem (local_os2_surface->hmtx_use_private_fields); - free (local_os2_surface); - return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); + if (!local_os2_surface->pixels) { + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); + goto error_exit; } /* Create image surface from pixel array */ @@ -831,23 +809,92 @@ cairo_os2_surface_create (HPS hps_client_window, width, /* Width */ height, /* Height */ width * 4); /* Rowstride */ - status = local_os2_surface->image_surface->base.status; - if (status) { - /* Could not create image surface! */ - _buffer_free (local_os2_surface->pixels); - DosCloseEventSem (local_os2_surface->hev_pixel_array_came_back); - DosCloseMutexSem (local_os2_surface->hmtx_use_private_fields); - free (local_os2_surface); - return _cairo_surface_create_in_error (status); - } + if (status) + goto error_exit; + + /* Set values for OS/2-specific data that aren't zero/NULL/FALSE. + * Note: hps_client_window may be null if this was called by + * cairo_os2_surface_create_for_window(). + */ + local_os2_surface->hps_client_window = hps_client_window; + local_os2_surface->blit_as_changes = TRUE; + + /* Prepare BITMAPINFO2 structure for our buffer */ + local_os2_surface->bitmap_info.cbFix = sizeof (BITMAPINFOHEADER2); + local_os2_surface->bitmap_info.cx = width; + local_os2_surface->bitmap_info.cy = height; + local_os2_surface->bitmap_info.cPlanes = 1; + local_os2_surface->bitmap_info.cBitCount = 32; /* Initialize base surface */ _cairo_surface_init (&local_os2_surface->base, &cairo_os2_surface_backend, - NULL, /* device */ + NULL, /* device */ _cairo_content_from_format (CAIRO_FORMAT_ARGB32)); + /* Successful exit */ + return (cairo_surface_t *)local_os2_surface; + + error_exit: + + /* This point will only be reached if an error occured */ + + if (local_os2_surface) { + if (local_os2_surface->pixels) + _buffer_free (local_os2_surface->pixels); + if (local_os2_surface->hev_pixel_array_came_back) + DosCloseEventSem (local_os2_surface->hev_pixel_array_came_back); + if (local_os2_surface->hmtx_use_private_fields) + DosCloseMutexSem (local_os2_surface->hmtx_use_private_fields); + free (local_os2_surface); + } + + return _cairo_surface_create_in_error (status); +} + +/** + * cairo_os2_surface_create_for_window: + * @hwnd_client_window: the window handle to bind the surface to + * @width: the width of the surface + * @height: the height of the surface + * + * Create a Cairo surface which is bound to a given window; the caller retains + * ownership of the window. This is a convenience function for use with + * windows that will only be updated when cairo_os2_surface_refresh_window() + * is called (usually in response to a WM_PAINT message). It avoids the need + * to create a persistent HPS for every window and assumes that one will be + * supplied by the caller when a cairo function needs one. If it isn't, an + * HPS will be created on-the-fly and released before the function which needs + * it returns. + * + * Return value: the newly created surface + * + * Since: 1.10 + **/ +cairo_surface_t * +cairo_os2_surface_create_for_window (HWND hwnd_client_window, + int width, + int height) +{ + cairo_os2_surface_t *local_os2_surface; + + /* A window handle must be provided. */ + if (!hwnd_client_window) { + return _cairo_surface_create_in_error ( + _cairo_error (CAIRO_STATUS_NO_MEMORY)); + } + + /* Create the surface. */ + local_os2_surface = (cairo_os2_surface_t *) + cairo_os2_surface_create (0, width, height); + + /* If successful, save the hwnd & turn off automatic repainting. */ + if (!local_os2_surface->image_surface->base.status) { + local_os2_surface->hwnd_client_window = hwnd_client_window; + local_os2_surface->blit_as_changes = FALSE; + } + return (cairo_surface_t *)local_os2_surface; } @@ -1016,6 +1063,7 @@ cairo_os2_surface_refresh_window (cairo_surface_t *surface, { cairo_os2_surface_t *local_os2_surface; RECTL rclTemp; + HPS hpsTemp = 0; local_os2_surface = (cairo_os2_surface_t *) surface; if ((!local_os2_surface) || @@ -1025,9 +1073,19 @@ cairo_os2_surface_refresh_window (cairo_surface_t *surface, return; } - /* Manage defaults (NULLs) */ - if (!hps_begin_paint) + /* If an HPS wasn't provided, see if we can get one. */ + if (!hps_begin_paint) { hps_begin_paint = local_os2_surface->hps_client_window; + if (!hps_begin_paint) { + if (local_os2_surface->hwnd_client_window) { + hpsTemp = WinGetPS(local_os2_surface->hwnd_client_window); + hps_begin_paint = hpsTemp; + } + /* No HPS & no way to get one, so exit */ + if (!hps_begin_paint) + return; + } + } if (prcl_begin_paint_rect == NULL) { /* Update the whole window! */ @@ -1048,6 +1106,8 @@ cairo_os2_surface_refresh_window (cairo_surface_t *surface, != NO_ERROR) { /* Could not get mutex! */ + if (hpsTemp) + WinReleasePS(hpsTemp); return; } @@ -1075,6 +1135,9 @@ cairo_os2_surface_refresh_window (cairo_surface_t *surface, } DosReleaseMutexSem (local_os2_surface->hmtx_use_private_fields); + + if (hpsTemp) + WinReleasePS(hpsTemp); } static cairo_status_t @@ -1111,10 +1174,10 @@ _cairo_os2_surface_finish (void *abstract_surface) * @surface: the cairo surface to associate with the window handle * @hwnd_client_window: the window handle of the client window * - * Sets window handle for surface. If Cairo wants to blit into the window - * because it is set to blit as the surface changes (see - * cairo_os2_surface_set_manual_window_refresh()), then there are two ways it - * can choose: + * Sets window handle for surface; the caller retains ownership of the window. + * If Cairo wants to blit into the window because it is set to blit as the + * surface changes (see cairo_os2_surface_set_manual_window_refresh()), then + * there are two ways it can choose: * If it knows the HWND of the surface, then it invalidates that area, so the * application will get a WM_PAINT message and it can call * cairo_os2_surface_refresh_window() to redraw that area. Otherwise cairo itself @@ -1216,6 +1279,74 @@ cairo_os2_surface_get_manual_window_refresh (cairo_surface_t *surface) return !(local_os2_surface->blit_as_changes); } +/** + * cairo_os2_surface_get_hps: + * @surface: the cairo surface to be querued + * @hps: HPS currently associated with the surface (if any) + * + * This API retrieves the HPS associated with the surface. + * + * Return value: %CAIRO_STATUS_SUCCESS if the hps could be retrieved, + * %CAIRO_STATUS_SURFACE_TYPE_MISMATCH if the surface is not an OS/2 surface, + * %CAIRO_STATUS_NULL_POINTER if the hps argument is null + * + * Since: 1.10 + **/ +cairo_status_t +cairo_os2_surface_get_hps (cairo_surface_t *surface, + HPS *hps) +{ + cairo_os2_surface_t *local_os2_surface; + + local_os2_surface = (cairo_os2_surface_t *) surface; + if ((!local_os2_surface) || + (local_os2_surface->base.backend != &cairo_os2_surface_backend)) + { + /* Invalid parameter (wrong surface)! */ + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); + } + if (!hps) + { + return _cairo_error (CAIRO_STATUS_NULL_POINTER); + } + *hps = local_os2_surface->hps_client_window; + + return CAIRO_STATUS_SUCCESS; +} + +/** + * cairo_os2_surface_set_hps: + * @surface: the cairo surface to associate with the HPS + * @hps: new HPS to be associated with the surface (the HPS may be null) + * + * This API replaces the HPS associated with the surface with a new one. + * The caller retains ownership of the HPS and must dispose of it after + * the surface has been destroyed or it has been replaced by another + * call to this function. + * + * Return value: %CAIRO_STATUS_SUCCESS if the hps could be replaced, + * %CAIRO_STATUS_SURFACE_TYPE_MISMATCH if the surface is not an OS/2 surface, + * + * Since: 1.10 + **/ +cairo_status_t +cairo_os2_surface_set_hps (cairo_surface_t *surface, + HPS hps) +{ + cairo_os2_surface_t *local_os2_surface; + + local_os2_surface = (cairo_os2_surface_t *) surface; + if ((!local_os2_surface) || + (local_os2_surface->base.backend != &cairo_os2_surface_backend)) + { + /* Invalid parameter (wrong surface)! */ + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); + } + local_os2_surface->hps_client_window = hps; + + return CAIRO_STATUS_SUCCESS; +} + static cairo_status_t _cairo_os2_surface_mark_dirty_rectangle (void *surface, int x, @@ -1333,5 +1464,11 @@ static const cairo_surface_backend_t cairo_os2_surface_backend = { NULL, /* stroke */ NULL, /* fill */ NULL, /* show_glyphs */ - NULL /* snapshot */ + NULL, /* snapshot */ + NULL, /* is_similar */ + NULL, /* fill_stroke */ + NULL, /* create_solid_pattern_surface */ + NULL, /* can_repaint_solid_pattern_surface */ + NULL, /* has_show_text_glyphs */ + NULL /* show_text_glyphs */ }; diff --git a/src/cairo-os2.h b/src/cairo-os2.h index ae9073c..d23f2de 100644 --- a/src/cairo-os2.h +++ b/src/cairo-os2.h @@ -33,6 +33,7 @@ * * Contributor(s): * Peter Weilbacher <mozilla@Weilbacher.org> + * Rich Walsh <dragtext@e-vertise.com> */ #ifndef _CAIRO_OS2_H_ @@ -65,6 +66,11 @@ cairo_os2_surface_create (HPS hps_client_window, int width, int height); +cairo_public cairo_surface_t * +cairo_os2_surface_create_for_window (HWND hwnd_client_window, + int width, + int height); + cairo_public void cairo_os2_surface_set_hwnd (cairo_surface_t *surface, HWND hwnd_client_window); @@ -87,6 +93,14 @@ cairo_os2_surface_set_manual_window_refresh (cairo_surface_t *surface, cairo_public cairo_bool_t cairo_os2_surface_get_manual_window_refresh (cairo_surface_t *surface); +cairo_public cairo_status_t +cairo_os2_surface_get_hps (cairo_surface_t *surface, + HPS *hps); + +cairo_public cairo_status_t +cairo_os2_surface_set_hps (cairo_surface_t *surface, + HPS hps); + #else /* CAIRO_HAS_OS2_SURFACE */ # error Cairo was not compiled with support for the OS/2 backend #endif /* CAIRO_HAS_OS2_SURFACE */ diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c index d9d40a8..1b79011 100644 --- a/src/cairo-pattern.c +++ b/src/cairo-pattern.c @@ -1759,6 +1759,20 @@ _extents_to_linear_parameter (const cairo_linear_pattern_t *linear, } static cairo_bool_t +_linear_pattern_is_degenerate (const cairo_linear_pattern_t *linear) +{ + return linear->p1.x == linear->p2.x && linear->p1.y == linear->p2.y; +} + +static cairo_bool_t +_radial_pattern_is_degenerate (const cairo_radial_pattern_t *radial) +{ + return radial->r1 == radial->r2 && + (radial->r1 == 0 /* && radial->r2 == 0 */ || + (radial->c1.x == radial->c2.x && radial->c1.y == radial->c2.y)); +} + +static cairo_bool_t _gradient_is_clear (const cairo_gradient_pattern_t *gradient, const cairo_rectangle_int_t *extents) { @@ -1777,7 +1791,7 @@ _gradient_is_clear (const cairo_gradient_pattern_t *gradient, if (gradient->base.extend == CAIRO_EXTEND_NONE) { cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) gradient; /* EXTEND_NONE degenerate linear gradients are clear */ - if (linear->p1.x == linear->p2.x && linear->p1.y == linear->p2.y) + if (_linear_pattern_is_degenerate (linear)) return TRUE; if (extents != NULL) { @@ -1790,8 +1804,7 @@ _gradient_is_clear (const cairo_gradient_pattern_t *gradient, } else { cairo_radial_pattern_t *radial = (cairo_radial_pattern_t *) gradient; /* degenerate radial gradients are clear */ - if (((radial->c1.x == radial->c2.x && radial->c1.y == radial->c2.y) || - radial->r1 == 0) && radial->r1 == radial->r2) + if (_radial_pattern_is_degenerate (radial)) return TRUE; /* TODO: check actual intersection */ } @@ -1803,6 +1816,116 @@ _gradient_is_clear (const cairo_gradient_pattern_t *gradient, return TRUE; } +static void +_gradient_color_average (const cairo_gradient_pattern_t *gradient, + cairo_color_t *color) +{ + double delta0, delta1; + double r, g, b, a; + unsigned int i, start = 1, end; + + assert (gradient->n_stops > 0); + assert (gradient->base.extend != CAIRO_EXTEND_NONE); + + if (gradient->n_stops == 1) { + _cairo_color_init_rgba (color, + gradient->stops[0].color.red, + gradient->stops[0].color.green, + gradient->stops[0].color.blue, + gradient->stops[0].color.alpha); + return; + } + + end = gradient->n_stops - 1; + + switch (gradient->base.extend) { + case CAIRO_EXTEND_REPEAT: + /* + * Sa, Sb and Sy, Sz are the first two and last two stops respectively. + * The weight of the first and last stop can be computed as the area of + * the following triangles (taken with height 1, since the whole [0-1] + * will have total weight 1 this way): b*h/2 + * + * + + + * / |\ / | \ + * / | \ / | \ + * / | \ / | \ + * ~~~~~+---+---+---+~~~~~~~+-------+---+---+~~~~~ + * -1+Sz 0 Sa Sb Sy Sz 1 1+Sa + * + * For the first stop: (Sb-(-1+Sz)/2 = (1+Sb-Sz)/2 + * For the last stop: ((1+Sa)-Sy)/2 = (1+Sa-Sy)/2 + * Halving the result is done after summing up all the areas. + */ + delta0 = 1.0 + gradient->stops[1].offset - gradient->stops[end].offset; + delta1 = 1.0 + gradient->stops[0].offset - gradient->stops[end-1].offset; + break; + + case CAIRO_EXTEND_REFLECT: + /* + * Sa, Sb and Sy, Sz are the first two and last two stops respectively. + * The weight of the first and last stop can be computed as the area of + * the following trapezoids (taken with height 1, since the whole [0-1] + * will have total weight 1 this way): (b+B)*h/2 + * + * +-------+ +---+ + * | |\ / | | + * | | \ / | | + * | | \ / | | + * +-------+---+~~~~~~~+-------+---+ + * 0 Sa Sb Sy Sz 1 + * + * For the first stop: (Sa+Sb)/2 + * For the last stop: ((1-Sz) + (1-Sy))/2 = (2-Sy-Sz)/2 + * Halving the result is done after summing up all the areas. + */ + delta0 = gradient->stops[0].offset + gradient->stops[1].offset; + delta1 = 2.0 - gradient->stops[end-1].offset - gradient->stops[end].offset; + break; + + case CAIRO_EXTEND_PAD: + /* PAD is computed as the average of the first and last stop: + * - take both of them with weight 1 (they will be halved + * after the whole sum has been computed). + * - avoid summing any of the inner stops. + */ + delta0 = delta1 = 1.0; + start = end; + break; + + case CAIRO_EXTEND_NONE: + default: + ASSERT_NOT_REACHED; + _cairo_color_init_rgba (color, 0, 0, 0, 0); + return; + } + + r = delta0 * gradient->stops[0].color.red; + g = delta0 * gradient->stops[0].color.green; + b = delta0 * gradient->stops[0].color.blue; + a = delta0 * gradient->stops[0].color.alpha; + + for (i = start; i < end; ++i) { + /* Inner stops weight is the same as the area of the triangle they influence + * (which goes from the stop before to the stop after), again with height 1 + * since the whole must sum up to 1: b*h/2 + * Halving is done after the whole sum has been computed. + */ + double delta = gradient->stops[i+1].offset - gradient->stops[i-1].offset; + r += delta * gradient->stops[i].color.red; + g += delta * gradient->stops[i].color.green; + b += delta * gradient->stops[i].color.blue; + a += delta * gradient->stops[i].color.alpha; + } + + r += delta1 * gradient->stops[end].color.red; + g += delta1 * gradient->stops[end].color.green; + b += delta1 * gradient->stops[end].color.blue; + a += delta1 * gradient->stops[end].color.alpha; + + _cairo_color_init_rgba (color, r * .5, g * .5, b * .5, a * .5); +} + /** * _cairo_gradient_pattern_is_solid * @@ -1825,10 +1948,15 @@ _cairo_gradient_pattern_is_solid (const cairo_gradient_pattern_t *gradient, assert (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR || gradient->base.type == CAIRO_PATTERN_TYPE_RADIAL); - /* TODO: radial, degenerate linear */ + /* TODO: radial */ if (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR) { + cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) gradient; + if (_linear_pattern_is_degenerate (linear)) { + _gradient_color_average (gradient, color); + return TRUE; + } + if (gradient->base.extend == CAIRO_EXTEND_NONE) { - cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) gradient; double t[2]; /* We already know that the pattern is not clear, thus if some @@ -1944,7 +2072,7 @@ _gradient_is_opaque (const cairo_gradient_pattern_t *gradient, cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) gradient; /* EXTEND_NONE degenerate radial gradients are clear */ - if (linear->p1.x == linear->p2.x && linear->p1.y == linear->p2.y) + if (_linear_pattern_is_degenerate (linear)) return FALSE; if (extents == NULL) diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c index 2da49d9..c60e636 100644 --- a/src/cairo-pdf-surface.c +++ b/src/cairo-pdf-surface.c @@ -1080,7 +1080,7 @@ _get_source_surface_size (cairo_surface_t *source, unsigned long mime_data_length; if (source->type == CAIRO_SURFACE_TYPE_RECORDING) { - if (source->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source; *width = sub->extents.width; @@ -2343,7 +2343,7 @@ _cairo_pdf_surface_emit_surface (cairo_pdf_surface_t *surface, cairo_pdf_source_surface_t *src_surface) { if (src_surface->surface->type == CAIRO_SURFACE_TYPE_RECORDING) { - if (src_surface->surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (src_surface->surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) src_surface->surface; return _cairo_pdf_surface_emit_recording_subsurface (surface, sub->target, diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c index bedc143..c73214e 100644 --- a/src/cairo-ps-surface.c +++ b/src/cairo-ps-surface.c @@ -2620,7 +2620,7 @@ _cairo_ps_surface_acquire_surface (cairo_ps_surface_t *surface, surface->image = NULL; if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) { - if (pattern->surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (pattern->surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) pattern->surface; *width = sub->extents.width; @@ -2710,7 +2710,7 @@ _cairo_ps_surface_emit_surface (cairo_ps_surface_t *surface, if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) { cairo_surface_t *source = pattern->surface; - if (source->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source; status = _cairo_ps_surface_emit_recording_subsurface (surface, sub->target, &sub->extents); } else { diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c index 06fe181..113674f 100644 --- a/src/cairo-quartz-surface.c +++ b/src/cairo-quartz-surface.c @@ -144,6 +144,9 @@ _cairo_quartz_surface_create_internal (CGContextRef cgContext, unsigned int width, unsigned int height); +static cairo_bool_t +_cairo_surface_is_quartz (const cairo_surface_t *surface); + /* Load all extra symbols */ static void quartz_ensure_symbols(void) { @@ -1104,15 +1107,14 @@ _cairo_surface_to_cgimage (cairo_surface_t *target, { cairo_status_t status; quartz_source_image_t *source_img; - cairo_surface_type_t stype = source->backend->type; - if (stype == CAIRO_SURFACE_TYPE_QUARTZ_IMAGE) { + if (source->backend && source->backend->type == CAIRO_SURFACE_TYPE_QUARTZ_IMAGE) { cairo_quartz_image_surface_t *surface = (cairo_quartz_image_surface_t *) source; *image_out = CGImageRetain (surface->image); return CAIRO_STATUS_SUCCESS; } - if (stype == CAIRO_SURFACE_TYPE_QUARTZ) { + if (_cairo_surface_is_quartz (source)) { cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) source; if (IS_EMPTY(surface)) { *image_out = NULL; @@ -2007,7 +2009,7 @@ _cairo_quartz_surface_clone_similar (void *abstract_surface, return CAIRO_STATUS_SUCCESS; } - if (src->backend->type == CAIRO_SURFACE_TYPE_QUARTZ) { + if (_cairo_surface_is_quartz (src)) { cairo_quartz_surface_t *qsurf = (cairo_quartz_surface_t *) src; if (IS_EMPTY(qsurf)) { @@ -2408,21 +2410,23 @@ _cairo_quartz_surface_stroke_cg (void *abstract_surface, CGContextRestoreGState (surface->cgContext); if (path_for_unbounded) { - CGContextSaveGState (surface->cgContext); + unbounded_op_data_t ub; + ub.op = UNBOUNDED_STROKE_FILL; + ub.u.stroke_fill.fill_rule = CAIRO_FILL_RULE_WINDING; CGContextBeginPath (surface->cgContext); CGContextAddPath (surface->cgContext, path_for_unbounded); CGPathRelease (path_for_unbounded); + CGContextSaveGState (surface->cgContext); CGContextConcatCTM (surface->cgContext, strokeTransform); CGContextReplacePathWithStrokedPath (surface->cgContext); + CGContextRestoreGState (surface->cgContext); - CGContextAddRect (surface->cgContext, CGContextGetClipBoundingBox (surface->cgContext)); - - CGContextSetRGBFillColor (surface->cgContext, 0., 0., 0., 0.); - CGContextEOFillPath (surface->cgContext); + ub.u.stroke_fill.cgPath = CGContextCopyPathPtr (surface->cgContext); - CGContextRestoreGState (surface->cgContext); + _cairo_quartz_fixup_unbounded_operation (surface, &ub, antialias); + CGPathRelease (ub.u.stroke_fill.cgPath); } ND((stderr, "-- stroke\n")); @@ -2816,7 +2820,7 @@ _cairo_quartz_surface_mask_cg (void *abstract_surface, cairo_solid_pattern_t *solid_mask = (cairo_solid_pattern_t *) mask; CGContextSetAlpha (surface->cgContext, solid_mask->color.alpha); - rv = _cairo_quartz_surface_paint (surface, op, source, clip); + rv = _cairo_quartz_surface_paint_cg (surface, op, source, clip); CGContextSetAlpha (surface->cgContext, 1.0); return rv; @@ -3171,14 +3175,18 @@ cairo_quartz_surface_create (cairo_format_t format, CGContextRef cairo_quartz_surface_get_cg_context (cairo_surface_t *surface) { - cairo_quartz_surface_t *quartz = (cairo_quartz_surface_t*)surface; - - if (cairo_surface_get_type(surface) != CAIRO_SURFACE_TYPE_QUARTZ) + if (surface && _cairo_surface_is_quartz (surface)) { + cairo_quartz_surface_t *quartz = (cairo_quartz_surface_t *) surface; + return quartz->cgContext; + } else return NULL; - - return quartz->cgContext; } +static cairo_bool_t +_cairo_surface_is_quartz (const cairo_surface_t *surface) +{ + return surface->backend == &cairo_quartz_surface_backend; +} /* Debug stuff */ diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c index f0db3b0..0f0446d 100644 --- a/src/cairo-script-surface.c +++ b/src/cairo-script-surface.c @@ -1429,7 +1429,7 @@ _emit_surface_pattern (cairo_script_surface_t *surface, case CAIRO_SURFACE_TYPE_SCRIPT: status = _emit_script_surface_pattern (surface, (cairo_script_surface_t *) source); break; - case CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE: + case CAIRO_SURFACE_TYPE_SUBSURFACE: status = _emit_subsurface_pattern (surface, (cairo_surface_subsurface_t *) source); break; default: diff --git a/src/cairo-surface-offset.c b/src/cairo-surface-offset.c index 9994d8f..fdbe1a1 100644 --- a/src/cairo-surface-offset.c +++ b/src/cairo-surface-offset.c @@ -49,18 +49,6 @@ _copy_transformed_pattern (cairo_pattern_t *pattern, { _cairo_pattern_init_static_copy (pattern, original); - /* apply device_transform first so that it is transformed by ctm_inverse */ - if (original->type == CAIRO_PATTERN_TYPE_SURFACE) { - cairo_surface_pattern_t *surface_pattern; - cairo_surface_t *surface; - - surface_pattern = (cairo_surface_pattern_t *) original; - surface = surface_pattern->surface; - - if (_cairo_surface_has_device_transform (surface)) - _cairo_pattern_transform (pattern, &surface->device_transform); - } - if (! _cairo_matrix_is_identity (ctm_inverse)) _cairo_pattern_transform (pattern, ctm_inverse); } @@ -147,7 +135,7 @@ _cairo_surface_offset_mask (cairo_surface_t *target, } status = _cairo_surface_mask (target, op, - &source_copy.base, &mask_copy.base, + source, mask, dev_clip); FINISH: diff --git a/src/cairo-surface-subsurface.c b/src/cairo-surface-subsurface.c index 3cbb516..3cf8330 100644 --- a/src/cairo-surface-subsurface.c +++ b/src/cairo-surface-subsurface.c @@ -276,16 +276,36 @@ struct extra { void *image_extra; }; +static void +cairo_surface_paint_to_target (cairo_surface_t *target, + cairo_surface_subsurface_t *subsurface) +{ + cairo_t *cr; + + cr = cairo_create (target); + + cairo_set_source_surface (cr, + subsurface->target, + - subsurface->extents.x, + - subsurface->extents.y); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_paint (cr); + + cairo_destroy (cr); +} + static cairo_status_t _cairo_surface_subsurface_acquire_source_image (void *abstract_surface, cairo_image_surface_t **image_out, void **extra_out) { + cairo_rectangle_int_t target_extents; cairo_surface_subsurface_t *surface = abstract_surface; cairo_image_surface_t *image; cairo_status_t status; struct extra *extra; uint8_t *data; + cairo_bool_t ret; if (surface->target->type == CAIRO_SURFACE_TYPE_RECORDING) { cairo_recording_surface_t *meta = (cairo_recording_surface_t *) surface->target; @@ -309,15 +329,7 @@ _cairo_surface_subsurface_acquire_source_image (void *abstrac if (unlikely (image->base.status)) return image->base.status; - cairo_surface_set_device_offset (&image->base, - -surface->extents.x, - -surface->extents.y); - - status = _cairo_recording_surface_replay (&meta->base, &image->base); - if (unlikely (status)) { - cairo_surface_destroy (&image->base); - return status; - } + cairo_surface_paint_to_target (&image->base, surface); _cairo_surface_attach_snapshot (&surface->base, &image->base, NULL); @@ -335,8 +347,16 @@ _cairo_surface_subsurface_acquire_source_image (void *abstrac if (unlikely (status)) goto CLEANUP; + ret = _cairo_surface_get_extents (&extra->image->base, &target_extents); + assert (ret); + /* only copy if we need to perform sub-byte manipulation */ - if (PIXMAN_FORMAT_BPP (extra->image->pixman_format) >= 8) { + if (PIXMAN_FORMAT_BPP (extra->image->pixman_format) >= 8 && + target_extents.x <= surface->extents.x && + target_extents.y <= surface->extents.y && + surface->extents.x + surface->extents.width <= target_extents.x + target_extents.width && + surface->extents.y + surface->extents.height <= target_extents.y + target_extents.height) { + assert ((PIXMAN_FORMAT_BPP (extra->image->pixman_format) % 8) == 0); data = extra->image->data + surface->extents.y * extra->image->stride; @@ -350,6 +370,8 @@ _cairo_surface_subsurface_acquire_source_image (void *abstrac extra->image->stride); if (unlikely ((status = image->base.status))) goto CLEANUP_IMAGE; + + image->base.is_clear = FALSE; } else { image = (cairo_image_surface_t *) _cairo_image_surface_create_with_pixman_format (NULL, @@ -360,16 +382,9 @@ _cairo_surface_subsurface_acquire_source_image (void *abstrac if (unlikely ((status = image->base.status))) goto CLEANUP_IMAGE; - pixman_image_composite32 (PIXMAN_OP_SRC, - image->pixman_image, NULL, extra->image->pixman_image, - surface->extents.x, surface->extents.y, - 0, 0, - 0, 0, - surface->extents.width, surface->extents.height); + cairo_surface_paint_to_target (&image->base, surface); } - image->base.is_clear = FALSE; - *image_out = image; *extra_out = extra; return CAIRO_STATUS_SUCCESS; @@ -428,7 +443,7 @@ _cairo_surface_subsurface_snapshot (void *abstract_surface) } static const cairo_surface_backend_t _cairo_surface_subsurface_backend = { - CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE, + CAIRO_SURFACE_TYPE_SUBSURFACE, _cairo_surface_subsurface_create_similar, _cairo_surface_subsurface_finish, @@ -476,6 +491,11 @@ static const cairo_surface_backend_t _cairo_surface_subsurface_backend = { * directly onto the parent surface, i.e. with no further backend allocations, * double buffering or copies. * + * <note><para>The semantics of subsurfaces have not been finalized yet + * unless the rectangle is in full device units, is contained within + * the extents of the target surface, and the target or subsurface's + * device transforms are not changed.</para></note> + * * Return value: a pointer to the newly allocated surface. The caller * owns the surface and should call cairo_surface_destroy() when done * with it. @@ -483,6 +503,8 @@ static const cairo_surface_backend_t _cairo_surface_subsurface_backend = { * This function always returns a valid pointer, but it will return a * pointer to a "nil" surface if @other is already in an error state * or any other error occurs. + * + * Since: 1.10 **/ cairo_surface_t * cairo_surface_create_for_rectangle (cairo_surface_t *target, @@ -490,9 +512,6 @@ cairo_surface_create_for_rectangle (cairo_surface_t *target, double width, double height) { cairo_surface_subsurface_t *surface; - cairo_rectangle_int_t target_extents; - cairo_bool_t ret; - int tx, ty; if (unlikely (target->status)) return _cairo_surface_create_in_error (target->status); @@ -503,11 +522,14 @@ cairo_surface_create_for_rectangle (cairo_surface_t *target, if (unlikely (surface == NULL)) return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); + assert (_cairo_matrix_is_translation (&target->device_transform)); + x += target->device_transform.x0; + y += target->device_transform.y0; + _cairo_surface_init (&surface->base, &_cairo_surface_subsurface_backend, NULL, /* device */ target->content); - surface->base.type = target->type; /* XXX forced integer alignment */ surface->extents.x = ceil (x); @@ -515,20 +537,12 @@ cairo_surface_create_for_rectangle (cairo_surface_t *target, surface->extents.width = floor (x + width) - surface->extents.x; surface->extents.height = floor (y + height) - surface->extents.y; - if (_cairo_surface_get_extents (target, &target_extents)) - ret = _cairo_rectangle_intersect (&surface->extents, &target_extents); - - if (target->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (target->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { /* Maintain subsurfaces as 1-depth */ cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) target; surface->extents.x += sub->extents.x; surface->extents.y += sub->extents.y; target = sub->target; - } else { - ret = _cairo_matrix_is_integer_translation (&target->device_transform, &tx, &ty); - assert (ret); - surface->extents.x += tx; - surface->extents.y += ty; } surface->target = cairo_surface_reference (target); diff --git a/src/cairo-surface.c b/src/cairo-surface.c index f4ada74..ba70a2e 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -1666,6 +1666,8 @@ _cairo_surface_clone_similar (cairo_surface_t *surface, if (unlikely (surface->finished)) return _cairo_error (CAIRO_STATUS_SURFACE_FINISHED); +#if CAIRO_HAS_TEE_SURFACE + if (src->type == CAIRO_SURFACE_TYPE_TEE) { cairo_surface_t *match; @@ -1676,6 +1678,8 @@ _cairo_surface_clone_similar (cairo_surface_t *surface, src = match; } +#endif + if (surface->backend->clone_similar != NULL) { status = surface->backend->clone_similar (surface, src, src_x, src_y, diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c index f17c37c..e37cef8 100644 --- a/src/cairo-tee-surface.c +++ b/src/cairo-tee-surface.c @@ -40,6 +40,8 @@ #include "cairoint.h" +#include "cairo-tee.h" + #include "cairo-error-private.h" #include "cairo-tee-surface-private.h" #include "cairo-surface-wrapper-private.h" diff --git a/src/cairo-tee.h b/src/cairo-tee.h new file mode 100644 index 0000000..9c048c6 --- /dev/null +++ b/src/cairo-tee.h @@ -0,0 +1,66 @@ +/* cairo - a vector graphics library with display and print output + * + * Copyright © 2009 Chris Wilson + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation + * (the "LGPL") or, at your option, under the terms of the Mozilla + * Public License Version 1.1 (the "MPL"). If you do not alter this + * notice, a recipient may use your version of this file under either + * the MPL or the LGPL. + * + * You should have received a copy of the LGPL along with this library + * in the file COPYING-LGPL-2.1; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA + * You should have received a copy of the MPL along with this library + * in the file COPYING-MPL-1.1 + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY + * OF ANY KIND, either express or implied. See the LGPL or the MPL for + * the specific language governing rights and limitations. + * + * The Original Code is the cairo graphics library. + * + * The Initial Developer of the Original Code is Chris Wilson + * + * Contributor(s): + * Chris Wilson <chris@chris-wilson.co.uk> + */ + +#ifndef CAIRO_TEE_H +#define CAIRO_TEE_H + +#include "cairo.h" + +#if CAIRO_HAS_TEE_SURFACE + +CAIRO_BEGIN_DECLS + +cairo_public cairo_surface_t * +cairo_tee_surface_create (cairo_surface_t *master); + +cairo_public void +cairo_tee_surface_add (cairo_surface_t *surface, + cairo_surface_t *target); + +cairo_public void +cairo_tee_surface_remove (cairo_surface_t *surface, + cairo_surface_t *target); + +cairo_public cairo_surface_t * +cairo_tee_surface_index (cairo_surface_t *surface, + int index); + +CAIRO_END_DECLS + +#else /*CAIRO_HAS_TEE_SURFACE*/ +# error Cairo was not compiled with support for the TEE backend +#endif /*CAIRO_HAS_TEE_SURFACE*/ + +#endif /*CAIRO_TEE_H*/ diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c index 1f8160e..888a395 100644 --- a/src/cairo-tor-scan-converter.c +++ b/src/cairo-tor-scan-converter.c @@ -1182,46 +1182,111 @@ active_list_init(struct active_list *active) active_list_reset(active); } -/* Merge the edges in an unsorted list of edges into a sorted - * list. The sort order is edges ascending by edge->x.quo. Returns - * the new head of the sorted list. */ +/* + * Merge two sorted edge lists. + * Input: + * - head_a: The head of the first list. + * - head_b: The head of the second list; head_b cannot be NULL. + * Output: + * Returns the head of the merged list. + * + * Implementation notes: + * To make it fast (in particular, to reduce to an insertion sort whenever + * one of the two input lists only has a single element) we iterate through + * a list until its head becomes greater than the head of the other list, + * then we switch their roles. As soon as one of the two lists is empty, we + * just attach the other one to the current list and exit. + * Writes to memory are only needed to "switch" lists (as it also requires + * attaching to the output list the list which we will be iterating next) and + * to attach the last non-empty list. + */ static struct edge * -merge_unsorted_edges(struct edge *sorted_head, struct edge *unsorted_head) +merge_sorted_edges (struct edge *head_a, struct edge *head_b) { - struct edge **cursor = &sorted_head; - int x; - - if (sorted_head == NULL) { - sorted_head = unsorted_head; - unsorted_head = unsorted_head->next; - sorted_head->next = NULL; - if (unsorted_head == NULL) - return sorted_head; - } + struct edge *head, **next; - do { - struct edge *next = unsorted_head->next; - struct edge *prev = *cursor; + head = head_a; + next = &head; - x = unsorted_head->x.quo; - if (x < prev->x.quo) - cursor = &sorted_head; + while (1) { + while (head_a != NULL && head_a->x.quo <= head_b->x.quo) { + next = &head_a->next; + head_a = head_a->next; + } - while (1) { - UNROLL3({ - prev = *cursor; - if (NULL == prev || prev->x.quo >= x) - break; - cursor = &prev->next; - }); + *next = head_b; + if (head_a == NULL) + return head; + + while (head_b != NULL && head_b->x.quo <= head_a->x.quo) { + next = &head_b->next; + head_b = head_b->next; } - unsorted_head->next = *cursor; - *cursor = unsorted_head; - unsorted_head = next; - } while (unsorted_head != NULL); + *next = head_a; + if (head_b == NULL) + return head; + } +} - return sorted_head; +/* + * Sort (part of) a list. + * Input: + * - list: The list to be sorted; list cannot be NULL. + * - limit: Recursion limit. + * Output: + * - head_out: The head of the sorted list containing the first 2^(level+1) elements of the + * input list; if the input list has fewer elements, head_out be a sorted list + * containing all the elements of the input list. + * Returns the head of the list of unprocessed elements (NULL if the sorted list contains + * all the elements of the input list). + * + * Implementation notes: + * Special case single element list, unroll/inline the sorting of the first two elements. + * Some tail recursion is used since we iterate on the bottom-up solution of the problem + * (we start with a small sorted list and keep merging other lists of the same size to it). + */ +static struct edge * +sort_edges (struct edge *list, + unsigned int level, + struct edge **head_out) +{ + struct edge *head_other, *remaining; + unsigned int i; + + head_other = list->next; + + /* Single element list -> return */ + if (head_other == NULL) { + *head_out = list; + return NULL; + } + + /* Unroll the first iteration of the following loop (halves the number of calls to merge_sorted_edges): + * - Initialize remaining to be the list containing the elements after the second in the input list. + * - Initialize *head_out to be the sorted list containing the first two element. + */ + remaining = head_other->next; + if (list->x.quo <= head_other->x.quo) { + *head_out = list; + /* list->next = head_other; */ /* The input list is already like this. */ + head_other->next = NULL; + } else { + *head_out = head_other; + head_other->next = list; + list->next = NULL; + } + + for (i = 0; i < level && remaining; i++) { + /* Extract a sorted list of the same size as *head_out + * (2^(i+1) elements) from the list of remaining elements. */ + remaining = sort_edges (remaining, i, &head_other); + *head_out = merge_sorted_edges (*head_out, head_other); + } + + /* *head_out now contains (at most) 2^(level+1) elements. */ + + return remaining; } /* Test if the edges on the active list can be safely advanced by a @@ -1302,7 +1367,8 @@ active_list_merge_edges_from_polygon( } } if (subrow_edges) { - active->head = merge_unsorted_edges(active->head, subrow_edges); + sort_edges (subrow_edges, UINT_MAX, &subrow_edges); + active->head = merge_sorted_edges (active->head, subrow_edges); active->min_height = min_height; } } @@ -1348,8 +1414,10 @@ active_list_substep_edges( }); } - if (unsorted) - active->head = merge_unsorted_edges(active->head, unsorted); + if (unsorted) { + sort_edges (unsorted, UINT_MAX, &unsorted); + active->head = merge_sorted_edges (active->head, unsorted); + } } inline static glitter_status_t diff --git a/src/cairo-types-private.h b/src/cairo-types-private.h index d042736..ac3fda8 100644 --- a/src/cairo-types-private.h +++ b/src/cairo-types-private.h @@ -223,8 +223,7 @@ typedef enum _cairo_int_status { } cairo_int_status_t; typedef enum _cairo_internal_surface_type { - CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE = 0x1000, - CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT, + CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT = 0x1000, CAIRO_INTERNAL_SURFACE_TYPE_PAGINATED, CAIRO_INTERNAL_SURFACE_TYPE_ANALYSIS, CAIRO_INTERNAL_SURFACE_TYPE_TEST_FALLBACK, diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c index 6e6255e..8294a47 100644 --- a/src/cairo-xcb-surface-render.c +++ b/src/cairo-xcb-surface-render.c @@ -1186,7 +1186,7 @@ _cairo_xcb_surface_picture (cairo_xcb_surface_t *target, if (unlikely (picture->base.status)) return picture; } - } else if (source->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + } else if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source; cairo_xcb_surface_t *xcb = (cairo_xcb_surface_t *) sub->target; @@ -1233,7 +1233,7 @@ _cairo_xcb_surface_picture (cairo_xcb_surface_t *target, if (unlikely (picture->base.status)) return picture; } - } else if (source->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + } else if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source; cairo_xcb_surface_t *xcb = ((cairo_xlib_xcb_surface_t *) sub->target)->xcb; diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c index a86c206..dd60484 100644 --- a/src/cairo-xlib-display.c +++ b/src/cairo-xlib-display.c @@ -37,7 +37,7 @@ #include "cairo-xlib-private.h" #include "cairo-xlib-xrender-private.h" - +#include "cairo-freelist-private.h" #include "cairo-error-private.h" #include <X11/Xlibint.h> /* For XESetCloseDisplay */ diff --git a/src/cairo-xlib-private.h b/src/cairo-xlib-private.h index 24bf5e3..bd260bc 100644 --- a/src/cairo-xlib-private.h +++ b/src/cairo-xlib-private.h @@ -42,7 +42,7 @@ #include "cairo-compiler-private.h" #include "cairo-device-private.h" -#include "cairo-freelist-private.h" +#include "cairo-freelist-type-private.h" #include "cairo-list-private.h" #include "cairo-reference-count-private.h" #include "cairo-types-private.h" diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 350331d..c74f656 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -2342,7 +2342,7 @@ _cairo_xlib_surface_upload(cairo_xlib_surface_t *surface, extents.x = extents.y = 0; extents.width = image->width; extents.height = image->height; - } else if (image->base.backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + } else if (image->base.backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) image; image = (cairo_image_surface_t *) sub->target; src_x += sub->extents.x; diff --git a/src/cairo.c b/src/cairo.c index 7c1c76a..dd0bdfa 100644 --- a/src/cairo.c +++ b/src/cairo.c @@ -454,6 +454,9 @@ cairo_destroy (cairo_t *cr) _cairo_user_data_array_fini (&cr->user_data); + /* mark the context as invalid to protect against misuse */ + cr->status = CAIRO_STATUS_NULL_POINTER; + _context_put (cr); } slim_hidden_def (cairo_destroy); diff --git a/src/cairo.h b/src/cairo.h index 9251bf6..913320f 100644 --- a/src/cairo.h +++ b/src/cairo.h @@ -1941,28 +1941,13 @@ cairo_device_reference (cairo_device_t *device); /** * cairo_device_type_t: - * @CAIRO_DEVICE_TYPE_IMAGE: The surface is of type image - * @CAIRO_DEVICE_TYPE_PDF: The surface is of type pdf - * @CAIRO_DEVICE_TYPE_PS: The surface is of type ps - * @CAIRO_DEVICE_TYPE_XLIB: The surface is of type xlib - * @CAIRO_DEVICE_TYPE_XCB: The surface is of type xcb - * @CAIRO_DEVICE_TYPE_GLITZ: The surface is of type glitz - * @CAIRO_DEVICE_TYPE_QUARTZ: The surface is of type quartz - * @CAIRO_DEVICE_TYPE_WIN32: The surface is of type win32 - * @CAIRO_DEVICE_TYPE_BEOS: The surface is of type beos - * @CAIRO_DEVICE_TYPE_DIRECTFB: The surface is of type directfb - * @CAIRO_DEVICE_TYPE_SVG: The surface is of type svg - * @CAIRO_DEVICE_TYPE_OS2: The surface is of type os2 - * @CAIRO_DEVICE_TYPE_WIN32_PRINTING: The surface is a win32 printing surface - * @CAIRO_DEVICE_TYPE_QUARTZ_IMAGE: The surface is of type quartz_image - * @CAIRO_DEVICE_TYPE_SCRIPT: The surface is of type script - * @CAIRO_DEVICE_TYPE_QT: The surface is of type Qt - * @CAIRO_DEVICE_TYPE_RECORDING: The surface is of type recording - * @CAIRO_DEVICE_TYPE_VG: The surface is a OpenVG surface - * @CAIRO_DEVICE_TYPE_GL: The surface is of type OpenGL * @CAIRO_DEVICE_TYPE_DRM: The surface is of type Direct Render Manager + * @CAIRO_DEVICE_TYPE_GL: The surface is of type OpenGL + * @CAIRO_DEVICE_TYPE_SCRIPT: The surface is of type script + * @CAIRO_DEVICE_TYPE_XCB: The surface is of type xcb + * @CAIRO_DEVICE_TYPE_XLIB: The surface is of type xlib * @CAIRO_DEVICE_TYPE_XML: The surface is of type XML - * @CAIRO_DEVICE_TYPE_SKIA: The surface is of type Skia + * cairo_surface_create_for_rectangle() * * #cairo_device_type_t is used to describe the type of a given * device. The devices types are also known as "backends" within cairo. @@ -1983,28 +1968,12 @@ cairo_device_reference (cairo_device_t *device); * Since: 1.10 **/ typedef enum _cairo_device_type { - CAIRO_DEVICE_TYPE_IMAGE, - CAIRO_DEVICE_TYPE_PDF, - CAIRO_DEVICE_TYPE_PS, - CAIRO_DEVICE_TYPE_XLIB, - CAIRO_DEVICE_TYPE_XCB, - CAIRO_DEVICE_TYPE_GLITZ, - CAIRO_DEVICE_TYPE_QUARTZ, - CAIRO_DEVICE_TYPE_WIN32, - CAIRO_DEVICE_TYPE_BEOS, - CAIRO_DEVICE_TYPE_DIRECTFB, - CAIRO_DEVICE_TYPE_SVG, - CAIRO_DEVICE_TYPE_OS2, - CAIRO_DEVICE_TYPE_WIN32_PRINTING, - CAIRO_DEVICE_TYPE_QUARTZ_IMAGE, - CAIRO_DEVICE_TYPE_SCRIPT, - CAIRO_DEVICE_TYPE_QT, - CAIRO_DEVICE_TYPE_RECORDING, - CAIRO_DEVICE_TYPE_VG, - CAIRO_DEVICE_TYPE_GL, CAIRO_DEVICE_TYPE_DRM, + CAIRO_DEVICE_TYPE_GL, + CAIRO_DEVICE_TYPE_SCRIPT, + CAIRO_DEVICE_TYPE_XCB, + CAIRO_DEVICE_TYPE_XLIB, CAIRO_DEVICE_TYPE_XML, - CAIRO_DEVICE_TYPE_SKIA } cairo_device_type_t; cairo_public cairo_device_type_t @@ -2100,6 +2069,8 @@ cairo_surface_status (cairo_surface_t *surface); * @CAIRO_SURFACE_TYPE_TEE: The surface is of type 'tee' (a multiplexing surface), since 1.10 * @CAIRO_SURFACE_TYPE_XML: The surface is of type XML (for debugging), since 1.10 * @CAIRO_SURFACE_TYPE_SKIA: The surface is of type Skia, since 1.10 + * @CAIRO_SURFACE_TYPE_SUBSURFACE: The surface is a subsurface created with + * cairo_surface_create_for_rectangle(), since 1.10 * * #cairo_surface_type_t is used to describe the type of a given * surface. The surface types are also known as "backends" or "surface @@ -2147,7 +2118,8 @@ typedef enum _cairo_surface_type { CAIRO_SURFACE_TYPE_DRM, CAIRO_SURFACE_TYPE_TEE, CAIRO_SURFACE_TYPE_XML, - CAIRO_SURFACE_TYPE_SKIA + CAIRO_SURFACE_TYPE_SKIA, + CAIRO_SURFACE_TYPE_SUBSURFACE } cairo_surface_type_t; cairo_public cairo_surface_type_t @@ -2265,9 +2237,9 @@ cairo_surface_has_show_text_glyphs (cairo_surface_t *surface); * endianess of the platform. On a big-endian machine, the * first pixel is in the uppermost bit, on a little-endian * machine the first pixel is in the least-significant bit. - * @CAIRO_FORMAT_RGB16_565: This format value is deprecated. It has - * never been properly implemented in cairo and should not be used - * by applications. (since 1.2) + * @CAIRO_FORMAT_RGB16_565: each pixel is a 16-bit quantity + * with red in the upper 5 bits, then green in the middle + * 6 bits, and blue in the lower 5 bits. * * #cairo_format_t is used to identify the memory format of * image data. @@ -2338,23 +2310,6 @@ cairo_recording_surface_ink_extents (cairo_surface_t *surface, double *width, double *height); -/* Tee-surface functions */ - -cairo_public cairo_surface_t * -cairo_tee_surface_create (cairo_surface_t *master); - -cairo_public void -cairo_tee_surface_add (cairo_surface_t *surface, - cairo_surface_t *target); - -cairo_public void -cairo_tee_surface_remove (cairo_surface_t *surface, - cairo_surface_t *target); - -cairo_public cairo_surface_t * -cairo_tee_surface_index (cairo_surface_t *surface, - int index); - /* Pattern creation functions */ cairo_public cairo_pattern_t * diff --git a/src/check-def.sh b/src/check-def.sh index 4484d36..9008c58 100755 --- a/src/check-def.sh +++ b/src/check-def.sh @@ -39,7 +39,7 @@ for def in $defs; do { echo EXPORTS - eval $get_cairo_syms | c++filt --no-params | grep -v '^_cairo_test_\|^_fini\|^_init\|^_save[fg]pr\|^_rest[fg]pr\|^_Z' | sort -u + eval $get_cairo_syms | c++filt --no-params | grep -v '^_cairo_test_\|^_fini\|^_init\|^_save[fg]pr\|^_rest[fg]pr\|^_Z\|^__gnu' | sort -u # cheat: copy the last line from the def file! tail -n1 "$def" } | diff "$def" - >&2 || stat=1 diff --git a/src/drm/cairo-drm-i915-shader.c b/src/drm/cairo-drm-i915-shader.c index 4ded89e..483f187 100644 --- a/src/drm/cairo-drm-i915-shader.c +++ b/src/drm/cairo-drm-i915-shader.c @@ -1537,7 +1537,7 @@ i915_shader_acquire_surface (i915_shader_t *shader, if (surface->type == CAIRO_SURFACE_TYPE_XCB) { cairo_surface_t *xcb = surface; - if (xcb->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (xcb->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { xcb = ((cairo_surface_subsurface_t *) surface)->target; } else if (xcb->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT) { xcb = ((cairo_surface_snapshot_t *) surface)->target; @@ -1553,7 +1553,7 @@ i915_shader_acquire_surface (i915_shader_t *shader, #endif if (surface->type == CAIRO_SURFACE_TYPE_DRM) { - if (surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { drm = ((cairo_surface_subsurface_t *) surface)->target; } else if (surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT) { drm = ((cairo_surface_snapshot_t *) surface)->target; @@ -1563,7 +1563,7 @@ i915_shader_acquire_surface (i915_shader_t *shader, if (drm->type == CAIRO_SURFACE_TYPE_DRM) { i915_surface_t *s = (i915_surface_t *) drm; - if (surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { if (s->intel.drm.base.device == shader->target->intel.drm.base.device && s != shader->target) { diff --git a/src/drm/cairo-drm-i965-shader.c b/src/drm/cairo-drm-i965-shader.c index 515b4a6..5a5c966 100644 --- a/src/drm/cairo-drm-i965-shader.c +++ b/src/drm/cairo-drm-i965-shader.c @@ -402,7 +402,7 @@ i965_shader_acquire_surface (i965_shader_t *shader, if (surface->type == CAIRO_SURFACE_TYPE_XCB) { cairo_surface_t *xcb = surface; - if (xcb->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (xcb->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { xcb = ((cairo_surface_subsurface_t *) surface)->target; } else if (xcb->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT) { xcb = ((cairo_surface_snapshot_t *) surface)->target; @@ -418,7 +418,7 @@ i965_shader_acquire_surface (i965_shader_t *shader, #endif if (surface->type == CAIRO_SURFACE_TYPE_DRM) { - if (surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { drm = ((cairo_surface_subsurface_t *) surface)->target; } else if (surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT) { drm = ((cairo_surface_snapshot_t *) surface)->target; @@ -430,7 +430,7 @@ i965_shader_acquire_surface (i965_shader_t *shader, if (drm->type == CAIRO_SURFACE_TYPE_DRM) { i965_surface_t *s = (i965_surface_t *) drm; - if (surface->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SUBSURFACE) { + if (surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) { if (s->intel.drm.base.device == shader->target->intel.drm.base.device) { cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) surface; if (s != shader->target) { diff --git a/test/Makefile.am b/test/Makefile.am index 99d015c..53b03c7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -215,8 +215,26 @@ REFERENCE_IMAGES = \ clip-fill.quartz.ref.png \ clip-fill.xlib.ref.png \ clip-fill.xlib-fallback.ref.png \ + clip-fill-eo-unbounded.image16.ref.png \ + clip-fill-eo-unbounded.argb32.ref.png \ + clip-fill-eo-unbounded.rgb24.ref.png \ + clip-fill-eo-unbounded.quartz.argb32.ref.png \ + clip-fill-eo-unbounded.quartz.rgb24.ref.png \ + clip-fill-eo-unbounded.svg12.rgb24.xfail.png \ + clip-fill-eo-unbounded.xlib.argb32.ref.png \ + clip-fill-eo-unbounded.xlib.rgb24.ref.png \ + clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png \ clip-fill-no-op.image16.ref.png \ clip-fill-no-op.ref.png \ + clip-fill-nz-unbounded.image16.ref.png \ + clip-fill-nz-unbounded.argb32.ref.png \ + clip-fill-nz-unbounded.rgb24.ref.png \ + clip-fill-nz-unbounded.quartz.argb32.ref.png \ + clip-fill-nz-unbounded.quartz.rgb24.ref.png \ + clip-fill-nz-unbounded.svg12.rgb24.xfail.png \ + clip-fill-nz-unbounded.xlib.argb32.ref.png \ + clip-fill-nz-unbounded.xlib.rgb24.ref.png \ + clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png \ clip-fill-rule-pixel-aligned.ref.png \ clip-fill-rule-pixel-aligned.rgb24.ref.png \ clip-fill-rule.image16.ref.png \ @@ -228,18 +246,6 @@ REFERENCE_IMAGES = \ clip-fill-rule.rgb24.ref.png \ clip-fill-rule.test-paginated.rgb24.ref.png \ clip-fill-rule.xlib.rgb24.ref.png \ - clip-fill-unbounded.image16.ref.png \ - clip-fill-unbounded.argb32.ref.png \ - clip-fill-unbounded.rgb24.ref.png \ - clip-fill-unbounded.pdf.argb32.ref.png \ - clip-fill-unbounded.ps.argb32.xfail.png \ - clip-fill-unbounded.quartz.argb32.ref.png \ - clip-fill-unbounded.quartz.rgb24.ref.png \ - clip-fill-unbounded.svg12.argb32.xfail.png \ - clip-fill-unbounded.svg12.rgb24.xfail.png \ - clip-fill-unbounded.xlib.argb32.ref.png \ - clip-fill-unbounded.xlib.rgb24.ref.png \ - clip-fill-unbounded.xlib-fallback.rgb24.ref.png \ clip-group-shapes-aligned-rectangles.ref.png \ clip-group-shapes-unaligned-rectangles.ref.png \ clip-group-shapes-unaligned-rectangles.xlib.ref.png \ @@ -304,14 +310,11 @@ REFERENCE_IMAGES = \ clip-stroke.xlib-fallback.ref.png \ clip-stroke-no-op.image16.ref.png \ clip-stroke-no-op.ref.png \ - clip-stroke-unbounded.image16.ref.png \ + clip-stroke-unbounded.image16.rgb24.ref.png \ clip-stroke-unbounded.argb32.ref.png \ clip-stroke-unbounded.rgb24.ref.png \ - clip-stroke-unbounded.ps.argb32.ref.png \ - clip-stroke-unbounded.pdf.argb32.xfail.png \ clip-stroke-unbounded.quartz.argb32.ref.png \ clip-stroke-unbounded.quartz.rgb24.ref.png \ - clip-stroke-unbounded.svg12.argb32.xfail.png \ clip-stroke-unbounded.svg12.rgb24.xfail.png \ clip-stroke-unbounded.xlib.argb32.ref.png \ clip-stroke-unbounded.xlib.rgb24.ref.png \ @@ -776,13 +779,14 @@ REFERENCE_IMAGES = \ linear-gradient.quartz.ref.png \ linear-gradient.ref.png \ linear-gradient.xlib.ref.png \ + linear-gradient-large.ref.png \ + linear-gradient-one-stop.argb32.ref.png \ + linear-gradient-one-stop.rgb24.ref.png \ linear-gradient-subset.image16.ref.png \ linear-gradient-subset.quartz.ref.png \ linear-gradient-subset.ref.png \ linear-gradient-subset.xlib.ref.png \ linear-gradient-subset.ps3.ref.png \ - linear-gradient-one-stop.argb32.ref.png \ - linear-gradient-one-stop.rgb24.ref.png \ linear-step-function.xfail.png \ linear-uniform.image16.ref.png \ linear-uniform.ref.png \ @@ -1230,6 +1234,8 @@ REFERENCE_IMAGES = \ subsurface-pad.quartz.xfail.png \ subsurface-modify-child.ref.png \ subsurface-modify-parent.ref.png \ + subsurface-outside-target.argb32.ref.png \ + subsurface-outside-target.rgb24.ref.png \ subsurface-similar-repeat.ref.png \ surface-pattern-big-scale-down.ref.png \ surface-pattern-big-scale-down.ps.ref.png \ diff --git a/test/Makefile.in b/test/Makefile.in index bcbcd7a..cb50fd2 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -35,7 +35,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/build/Makefile.am.common \ - $(top_srcdir)/test/Makefile.sources COPYING TODO + $(top_srcdir)/test/Makefile.sources COPYING EXTRA_PROGRAMS = $(am__EXEEXT_1) imagediff$(EXEEXT) \ png-flatten$(EXEEXT) $(TESTS) check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ @@ -131,15 +131,15 @@ am__cairo_test_suite_SOURCES_DIST = buffer-diff.c cairo-test.c \ bug-seams.c caps.c caps-joins.c caps-joins-alpha.c \ caps-joins-curve.c caps-sub-paths.c clear.c clear-source.c \ clip-all.c clip-contexts.c clip-disjoint.c \ - clip-device-offset.c clip-empty.c clip-empty-group.c \ - clip-empty-save.c clip-fill.c clip-fill-no-op.c \ - clip-fill-rule.c clip-fill-rule-pixel-aligned.c \ - clip-fill-unbounded.c clip-group-shapes.c clip-image.c \ - clip-nesting.c clip-operator.c clip-push-group.c clip-shape.c \ - clip-stroke.c clip-stroke-no-op.c clip-stroke-unbounded.c \ - clip-text.c clip-twice.c clip-twice-rectangle.c \ - clip-unbounded.c clip-zero.c clipped-group.c clipped-surface.c \ - close-path.c close-path-current-point.c \ + clip-device-offset.c clip-draw-unbounded.c clip-empty.c \ + clip-empty-group.c clip-empty-save.c clip-fill.c \ + clip-fill-no-op.c clip-fill-rule.c \ + clip-fill-rule-pixel-aligned.c clip-group-shapes.c \ + clip-image.c clip-nesting.c clip-operator.c clip-push-group.c \ + clip-shape.c clip-stroke.c clip-stroke-no-op.c clip-text.c \ + clip-twice.c clip-twice-rectangle.c clip-unbounded.c \ + clip-zero.c clipped-group.c clipped-surface.c close-path.c \ + close-path-current-point.c \ composite-integer-translate-source.c \ composite-integer-translate-over.c \ composite-integer-translate-over-repeat.c copy-path.c \ @@ -177,17 +177,18 @@ am__cairo_test_suite_SOURCES_DIST = buffer-diff.c cairo-test.c \ leaky-dashed-rectangle.c leaky-dashed-stroke.c leaky-polygon.c \ line-width.c line-width-scale.c line-width-zero.c \ linear-gradient.c linear-gradient-extend.c \ - linear-gradient-one-stop.c linear-gradient-reflect.c \ - linear-gradient-subset.c linear-step-function.c \ - linear-uniform.c long-dashed-lines.c long-lines.c mask.c \ - mask-alpha.c mask-ctm.c mask-glyphs.c mask-surface-ctm.c \ - mask-transformed-image.c mask-transformed-similar.c \ - recording-surface-pattern.c mime-data.c miter-precision.c \ - move-to-show-surface.c new-sub-path.c nil-surface.c operator.c \ - operator-alpha.c operator-alpha-alpha.c operator-clear.c \ - operator-source.c over-above-source.c over-around-source.c \ - over-below-source.c over-between-source.c overlapping-glyphs.c \ - paint.c paint-repeat.c paint-source-alpha.c paint-with-alpha.c \ + linear-gradient-large.c linear-gradient-one-stop.c \ + linear-gradient-reflect.c linear-gradient-subset.c \ + linear-step-function.c linear-uniform.c long-dashed-lines.c \ + long-lines.c mask.c mask-alpha.c mask-ctm.c mask-glyphs.c \ + mask-surface-ctm.c mask-transformed-image.c \ + mask-transformed-similar.c recording-surface-pattern.c \ + mime-data.c miter-precision.c move-to-show-surface.c \ + new-sub-path.c nil-surface.c operator.c operator-alpha.c \ + operator-alpha-alpha.c operator-clear.c operator-source.c \ + over-above-source.c over-around-source.c over-below-source.c \ + over-between-source.c overlapping-glyphs.c paint.c \ + paint-repeat.c paint-source-alpha.c paint-with-alpha.c \ partial-clip-text.c partial-coverage.c path-append.c \ path-stroke-twice.c path-precision.c pattern-get-type.c \ pattern-getters.c pixman-rotate.c png.c push-group.c \ @@ -215,9 +216,10 @@ am__cairo_test_suite_SOURCES_DIST = buffer-diff.c cairo-test.c \ spline-decomposition.c subsurface.c subsurface-image-repeat.c \ subsurface-repeat.c subsurface-reflect.c subsurface-pad.c \ subsurface-modify-child.c subsurface-modify-parent.c \ - subsurface-similar-repeat.c surface-finish-twice.c \ - surface-pattern.c surface-pattern-big-scale-down.c \ - surface-pattern-operator.c surface-pattern-scale-down.c \ + subsurface-outside-target.c subsurface-similar-repeat.c \ + surface-finish-twice.c surface-pattern.c \ + surface-pattern-big-scale-down.c surface-pattern-operator.c \ + surface-pattern-scale-down.c \ surface-pattern-scale-down-extend.c surface-pattern-scale-up.c \ text-antialias-gray.c text-antialias-none.c \ text-antialias-subpixel.c text-cache-crash.c \ @@ -318,6 +320,7 @@ am__objects_29 = cairo_test_suite-a1-bug.$(OBJEXT) \ cairo_test_suite-clip-contexts.$(OBJEXT) \ cairo_test_suite-clip-disjoint.$(OBJEXT) \ cairo_test_suite-clip-device-offset.$(OBJEXT) \ + cairo_test_suite-clip-draw-unbounded.$(OBJEXT) \ cairo_test_suite-clip-empty.$(OBJEXT) \ cairo_test_suite-clip-empty-group.$(OBJEXT) \ cairo_test_suite-clip-empty-save.$(OBJEXT) \ @@ -325,7 +328,6 @@ am__objects_29 = cairo_test_suite-a1-bug.$(OBJEXT) \ cairo_test_suite-clip-fill-no-op.$(OBJEXT) \ cairo_test_suite-clip-fill-rule.$(OBJEXT) \ cairo_test_suite-clip-fill-rule-pixel-aligned.$(OBJEXT) \ - cairo_test_suite-clip-fill-unbounded.$(OBJEXT) \ cairo_test_suite-clip-group-shapes.$(OBJEXT) \ cairo_test_suite-clip-image.$(OBJEXT) \ cairo_test_suite-clip-nesting.$(OBJEXT) \ @@ -334,7 +336,6 @@ am__objects_29 = cairo_test_suite-a1-bug.$(OBJEXT) \ cairo_test_suite-clip-shape.$(OBJEXT) \ cairo_test_suite-clip-stroke.$(OBJEXT) \ cairo_test_suite-clip-stroke-no-op.$(OBJEXT) \ - cairo_test_suite-clip-stroke-unbounded.$(OBJEXT) \ cairo_test_suite-clip-text.$(OBJEXT) \ cairo_test_suite-clip-twice.$(OBJEXT) \ cairo_test_suite-clip-twice-rectangle.$(OBJEXT) \ @@ -441,6 +442,7 @@ am__objects_29 = cairo_test_suite-a1-bug.$(OBJEXT) \ cairo_test_suite-line-width-zero.$(OBJEXT) \ cairo_test_suite-linear-gradient.$(OBJEXT) \ cairo_test_suite-linear-gradient-extend.$(OBJEXT) \ + cairo_test_suite-linear-gradient-large.$(OBJEXT) \ cairo_test_suite-linear-gradient-one-stop.$(OBJEXT) \ cairo_test_suite-linear-gradient-reflect.$(OBJEXT) \ cairo_test_suite-linear-gradient-subset.$(OBJEXT) \ @@ -544,6 +546,7 @@ am__objects_29 = cairo_test_suite-a1-bug.$(OBJEXT) \ cairo_test_suite-subsurface-pad.$(OBJEXT) \ cairo_test_suite-subsurface-modify-child.$(OBJEXT) \ cairo_test_suite-subsurface-modify-parent.$(OBJEXT) \ + cairo_test_suite-subsurface-outside-target.$(OBJEXT) \ cairo_test_suite-subsurface-similar-repeat.$(OBJEXT) \ cairo_test_suite-surface-finish-twice.$(OBJEXT) \ cairo_test_suite-surface-pattern.$(OBJEXT) \ @@ -760,6 +763,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -873,7 +878,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ @@ -940,14 +944,14 @@ test_sources = a1-bug.c a1-image-sample.c a1-mask.c a1-mask-sample.c \ caps-joins.c caps-joins-alpha.c caps-joins-curve.c \ caps-sub-paths.c clear.c clear-source.c clip-all.c \ clip-contexts.c clip-disjoint.c clip-device-offset.c \ - clip-empty.c clip-empty-group.c clip-empty-save.c clip-fill.c \ - clip-fill-no-op.c clip-fill-rule.c \ - clip-fill-rule-pixel-aligned.c clip-fill-unbounded.c \ + clip-draw-unbounded.c clip-empty.c clip-empty-group.c \ + clip-empty-save.c clip-fill.c clip-fill-no-op.c \ + clip-fill-rule.c clip-fill-rule-pixel-aligned.c \ clip-group-shapes.c clip-image.c clip-nesting.c \ clip-operator.c clip-push-group.c clip-shape.c clip-stroke.c \ - clip-stroke-no-op.c clip-stroke-unbounded.c clip-text.c \ - clip-twice.c clip-twice-rectangle.c clip-unbounded.c \ - clip-zero.c clipped-group.c clipped-surface.c close-path.c \ + clip-stroke-no-op.c clip-text.c clip-twice.c \ + clip-twice-rectangle.c clip-unbounded.c clip-zero.c \ + clipped-group.c clipped-surface.c close-path.c \ close-path-current-point.c \ composite-integer-translate-source.c \ composite-integer-translate-over.c \ @@ -986,17 +990,18 @@ test_sources = a1-bug.c a1-image-sample.c a1-mask.c a1-mask-sample.c \ leaky-dashed-rectangle.c leaky-dashed-stroke.c leaky-polygon.c \ line-width.c line-width-scale.c line-width-zero.c \ linear-gradient.c linear-gradient-extend.c \ - linear-gradient-one-stop.c linear-gradient-reflect.c \ - linear-gradient-subset.c linear-step-function.c \ - linear-uniform.c long-dashed-lines.c long-lines.c mask.c \ - mask-alpha.c mask-ctm.c mask-glyphs.c mask-surface-ctm.c \ - mask-transformed-image.c mask-transformed-similar.c \ - recording-surface-pattern.c mime-data.c miter-precision.c \ - move-to-show-surface.c new-sub-path.c nil-surface.c operator.c \ - operator-alpha.c operator-alpha-alpha.c operator-clear.c \ - operator-source.c over-above-source.c over-around-source.c \ - over-below-source.c over-between-source.c overlapping-glyphs.c \ - paint.c paint-repeat.c paint-source-alpha.c paint-with-alpha.c \ + linear-gradient-large.c linear-gradient-one-stop.c \ + linear-gradient-reflect.c linear-gradient-subset.c \ + linear-step-function.c linear-uniform.c long-dashed-lines.c \ + long-lines.c mask.c mask-alpha.c mask-ctm.c mask-glyphs.c \ + mask-surface-ctm.c mask-transformed-image.c \ + mask-transformed-similar.c recording-surface-pattern.c \ + mime-data.c miter-precision.c move-to-show-surface.c \ + new-sub-path.c nil-surface.c operator.c operator-alpha.c \ + operator-alpha-alpha.c operator-clear.c operator-source.c \ + over-above-source.c over-around-source.c over-below-source.c \ + over-between-source.c overlapping-glyphs.c paint.c \ + paint-repeat.c paint-source-alpha.c paint-with-alpha.c \ partial-clip-text.c partial-coverage.c path-append.c \ path-stroke-twice.c path-precision.c pattern-get-type.c \ pattern-getters.c pixman-rotate.c png.c push-group.c \ @@ -1024,9 +1029,10 @@ test_sources = a1-bug.c a1-image-sample.c a1-mask.c a1-mask-sample.c \ spline-decomposition.c subsurface.c subsurface-image-repeat.c \ subsurface-repeat.c subsurface-reflect.c subsurface-pad.c \ subsurface-modify-child.c subsurface-modify-parent.c \ - subsurface-similar-repeat.c surface-finish-twice.c \ - surface-pattern.c surface-pattern-big-scale-down.c \ - surface-pattern-operator.c surface-pattern-scale-down.c \ + subsurface-outside-target.c subsurface-similar-repeat.c \ + surface-finish-twice.c surface-pattern.c \ + surface-pattern-big-scale-down.c surface-pattern-operator.c \ + surface-pattern-scale-down.c \ surface-pattern-scale-down-extend.c surface-pattern-scale-up.c \ text-antialias-gray.c text-antialias-none.c \ text-antialias-subpixel.c text-cache-crash.c \ @@ -1238,8 +1244,26 @@ REFERENCE_IMAGES = \ clip-fill.quartz.ref.png \ clip-fill.xlib.ref.png \ clip-fill.xlib-fallback.ref.png \ + clip-fill-eo-unbounded.image16.ref.png \ + clip-fill-eo-unbounded.argb32.ref.png \ + clip-fill-eo-unbounded.rgb24.ref.png \ + clip-fill-eo-unbounded.quartz.argb32.ref.png \ + clip-fill-eo-unbounded.quartz.rgb24.ref.png \ + clip-fill-eo-unbounded.svg12.rgb24.xfail.png \ + clip-fill-eo-unbounded.xlib.argb32.ref.png \ + clip-fill-eo-unbounded.xlib.rgb24.ref.png \ + clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png \ clip-fill-no-op.image16.ref.png \ clip-fill-no-op.ref.png \ + clip-fill-nz-unbounded.image16.ref.png \ + clip-fill-nz-unbounded.argb32.ref.png \ + clip-fill-nz-unbounded.rgb24.ref.png \ + clip-fill-nz-unbounded.quartz.argb32.ref.png \ + clip-fill-nz-unbounded.quartz.rgb24.ref.png \ + clip-fill-nz-unbounded.svg12.rgb24.xfail.png \ + clip-fill-nz-unbounded.xlib.argb32.ref.png \ + clip-fill-nz-unbounded.xlib.rgb24.ref.png \ + clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png \ clip-fill-rule-pixel-aligned.ref.png \ clip-fill-rule-pixel-aligned.rgb24.ref.png \ clip-fill-rule.image16.ref.png \ @@ -1251,18 +1275,6 @@ REFERENCE_IMAGES = \ clip-fill-rule.rgb24.ref.png \ clip-fill-rule.test-paginated.rgb24.ref.png \ clip-fill-rule.xlib.rgb24.ref.png \ - clip-fill-unbounded.image16.ref.png \ - clip-fill-unbounded.argb32.ref.png \ - clip-fill-unbounded.rgb24.ref.png \ - clip-fill-unbounded.pdf.argb32.ref.png \ - clip-fill-unbounded.ps.argb32.xfail.png \ - clip-fill-unbounded.quartz.argb32.ref.png \ - clip-fill-unbounded.quartz.rgb24.ref.png \ - clip-fill-unbounded.svg12.argb32.xfail.png \ - clip-fill-unbounded.svg12.rgb24.xfail.png \ - clip-fill-unbounded.xlib.argb32.ref.png \ - clip-fill-unbounded.xlib.rgb24.ref.png \ - clip-fill-unbounded.xlib-fallback.rgb24.ref.png \ clip-group-shapes-aligned-rectangles.ref.png \ clip-group-shapes-unaligned-rectangles.ref.png \ clip-group-shapes-unaligned-rectangles.xlib.ref.png \ @@ -1327,14 +1339,11 @@ REFERENCE_IMAGES = \ clip-stroke.xlib-fallback.ref.png \ clip-stroke-no-op.image16.ref.png \ clip-stroke-no-op.ref.png \ - clip-stroke-unbounded.image16.ref.png \ + clip-stroke-unbounded.image16.rgb24.ref.png \ clip-stroke-unbounded.argb32.ref.png \ clip-stroke-unbounded.rgb24.ref.png \ - clip-stroke-unbounded.ps.argb32.ref.png \ - clip-stroke-unbounded.pdf.argb32.xfail.png \ clip-stroke-unbounded.quartz.argb32.ref.png \ clip-stroke-unbounded.quartz.rgb24.ref.png \ - clip-stroke-unbounded.svg12.argb32.xfail.png \ clip-stroke-unbounded.svg12.rgb24.xfail.png \ clip-stroke-unbounded.xlib.argb32.ref.png \ clip-stroke-unbounded.xlib.rgb24.ref.png \ @@ -1799,13 +1808,14 @@ REFERENCE_IMAGES = \ linear-gradient.quartz.ref.png \ linear-gradient.ref.png \ linear-gradient.xlib.ref.png \ + linear-gradient-large.ref.png \ + linear-gradient-one-stop.argb32.ref.png \ + linear-gradient-one-stop.rgb24.ref.png \ linear-gradient-subset.image16.ref.png \ linear-gradient-subset.quartz.ref.png \ linear-gradient-subset.ref.png \ linear-gradient-subset.xlib.ref.png \ linear-gradient-subset.ps3.ref.png \ - linear-gradient-one-stop.argb32.ref.png \ - linear-gradient-one-stop.rgb24.ref.png \ linear-step-function.xfail.png \ linear-uniform.image16.ref.png \ linear-uniform.ref.png \ @@ -2253,6 +2263,8 @@ REFERENCE_IMAGES = \ subsurface-pad.quartz.xfail.png \ subsurface-modify-child.ref.png \ subsurface-modify-parent.ref.png \ + subsurface-outside-target.argb32.ref.png \ + subsurface-outside-target.rgb24.ref.png \ subsurface-similar-repeat.ref.png \ surface-pattern-big-scale-down.ref.png \ surface-pattern-big-scale-down.ps.ref.png \ @@ -2631,13 +2643,13 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-contexts.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-device-offset.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-disjoint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-draw-unbounded.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-empty-group.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-empty-save.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-empty.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-fill-no-op.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-fill-rule-pixel-aligned.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-fill-rule.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-fill-unbounded.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-fill.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-group-shapes.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-image.Po@am__quote@ @@ -2646,7 +2658,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-push-group.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-shape.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-stroke-no-op.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-stroke-unbounded.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-stroke.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-text.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-clip-twice-rectangle.Po@am__quote@ @@ -2762,6 +2773,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-line-width-zero.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-line-width.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-linear-gradient-extend.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-linear-gradient-large.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-linear-gradient-one-stop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-linear-gradient-reflect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-linear-gradient-subset.Po@am__quote@ @@ -2873,6 +2885,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-subsurface-image-repeat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-subsurface-modify-child.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-subsurface-modify-parent.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-subsurface-outside-target.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-subsurface-pad.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-subsurface-reflect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test_suite-subsurface-repeat.Po@am__quote@ @@ -3433,6 +3446,22 @@ cairo_test_suite-clip-device-offset.obj: clip-device-offset.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-device-offset.obj `if test -f 'clip-device-offset.c'; then $(CYGPATH_W) 'clip-device-offset.c'; else $(CYGPATH_W) '$(srcdir)/clip-device-offset.c'; fi` +cairo_test_suite-clip-draw-unbounded.o: clip-draw-unbounded.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-draw-unbounded.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-draw-unbounded.Tpo -c -o cairo_test_suite-clip-draw-unbounded.o `test -f 'clip-draw-unbounded.c' || echo '$(srcdir)/'`clip-draw-unbounded.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-draw-unbounded.Tpo $(DEPDIR)/cairo_test_suite-clip-draw-unbounded.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clip-draw-unbounded.c' object='cairo_test_suite-clip-draw-unbounded.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-draw-unbounded.o `test -f 'clip-draw-unbounded.c' || echo '$(srcdir)/'`clip-draw-unbounded.c + +cairo_test_suite-clip-draw-unbounded.obj: clip-draw-unbounded.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-draw-unbounded.obj -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-draw-unbounded.Tpo -c -o cairo_test_suite-clip-draw-unbounded.obj `if test -f 'clip-draw-unbounded.c'; then $(CYGPATH_W) 'clip-draw-unbounded.c'; else $(CYGPATH_W) '$(srcdir)/clip-draw-unbounded.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-draw-unbounded.Tpo $(DEPDIR)/cairo_test_suite-clip-draw-unbounded.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clip-draw-unbounded.c' object='cairo_test_suite-clip-draw-unbounded.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-draw-unbounded.obj `if test -f 'clip-draw-unbounded.c'; then $(CYGPATH_W) 'clip-draw-unbounded.c'; else $(CYGPATH_W) '$(srcdir)/clip-draw-unbounded.c'; fi` + cairo_test_suite-clip-empty.o: clip-empty.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-empty.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-empty.Tpo -c -o cairo_test_suite-clip-empty.o `test -f 'clip-empty.c' || echo '$(srcdir)/'`clip-empty.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-empty.Tpo $(DEPDIR)/cairo_test_suite-clip-empty.Po @@ -3545,22 +3574,6 @@ cairo_test_suite-clip-fill-rule-pixel-aligned.obj: clip-fill-rule-pixel-aligned. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-fill-rule-pixel-aligned.obj `if test -f 'clip-fill-rule-pixel-aligned.c'; then $(CYGPATH_W) 'clip-fill-rule-pixel-aligned.c'; else $(CYGPATH_W) '$(srcdir)/clip-fill-rule-pixel-aligned.c'; fi` -cairo_test_suite-clip-fill-unbounded.o: clip-fill-unbounded.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-fill-unbounded.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-fill-unbounded.Tpo -c -o cairo_test_suite-clip-fill-unbounded.o `test -f 'clip-fill-unbounded.c' || echo '$(srcdir)/'`clip-fill-unbounded.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-fill-unbounded.Tpo $(DEPDIR)/cairo_test_suite-clip-fill-unbounded.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clip-fill-unbounded.c' object='cairo_test_suite-clip-fill-unbounded.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-fill-unbounded.o `test -f 'clip-fill-unbounded.c' || echo '$(srcdir)/'`clip-fill-unbounded.c - -cairo_test_suite-clip-fill-unbounded.obj: clip-fill-unbounded.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-fill-unbounded.obj -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-fill-unbounded.Tpo -c -o cairo_test_suite-clip-fill-unbounded.obj `if test -f 'clip-fill-unbounded.c'; then $(CYGPATH_W) 'clip-fill-unbounded.c'; else $(CYGPATH_W) '$(srcdir)/clip-fill-unbounded.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-fill-unbounded.Tpo $(DEPDIR)/cairo_test_suite-clip-fill-unbounded.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clip-fill-unbounded.c' object='cairo_test_suite-clip-fill-unbounded.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-fill-unbounded.obj `if test -f 'clip-fill-unbounded.c'; then $(CYGPATH_W) 'clip-fill-unbounded.c'; else $(CYGPATH_W) '$(srcdir)/clip-fill-unbounded.c'; fi` - cairo_test_suite-clip-group-shapes.o: clip-group-shapes.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-group-shapes.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-group-shapes.Tpo -c -o cairo_test_suite-clip-group-shapes.o `test -f 'clip-group-shapes.c' || echo '$(srcdir)/'`clip-group-shapes.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-group-shapes.Tpo $(DEPDIR)/cairo_test_suite-clip-group-shapes.Po @@ -3689,22 +3702,6 @@ cairo_test_suite-clip-stroke-no-op.obj: clip-stroke-no-op.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-stroke-no-op.obj `if test -f 'clip-stroke-no-op.c'; then $(CYGPATH_W) 'clip-stroke-no-op.c'; else $(CYGPATH_W) '$(srcdir)/clip-stroke-no-op.c'; fi` -cairo_test_suite-clip-stroke-unbounded.o: clip-stroke-unbounded.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-stroke-unbounded.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-stroke-unbounded.Tpo -c -o cairo_test_suite-clip-stroke-unbounded.o `test -f 'clip-stroke-unbounded.c' || echo '$(srcdir)/'`clip-stroke-unbounded.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-stroke-unbounded.Tpo $(DEPDIR)/cairo_test_suite-clip-stroke-unbounded.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clip-stroke-unbounded.c' object='cairo_test_suite-clip-stroke-unbounded.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-stroke-unbounded.o `test -f 'clip-stroke-unbounded.c' || echo '$(srcdir)/'`clip-stroke-unbounded.c - -cairo_test_suite-clip-stroke-unbounded.obj: clip-stroke-unbounded.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-stroke-unbounded.obj -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-stroke-unbounded.Tpo -c -o cairo_test_suite-clip-stroke-unbounded.obj `if test -f 'clip-stroke-unbounded.c'; then $(CYGPATH_W) 'clip-stroke-unbounded.c'; else $(CYGPATH_W) '$(srcdir)/clip-stroke-unbounded.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-stroke-unbounded.Tpo $(DEPDIR)/cairo_test_suite-clip-stroke-unbounded.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clip-stroke-unbounded.c' object='cairo_test_suite-clip-stroke-unbounded.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-clip-stroke-unbounded.obj `if test -f 'clip-stroke-unbounded.c'; then $(CYGPATH_W) 'clip-stroke-unbounded.c'; else $(CYGPATH_W) '$(srcdir)/clip-stroke-unbounded.c'; fi` - cairo_test_suite-clip-text.o: clip-text.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-clip-text.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-clip-text.Tpo -c -o cairo_test_suite-clip-text.o `test -f 'clip-text.c' || echo '$(srcdir)/'`clip-text.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-clip-text.Tpo $(DEPDIR)/cairo_test_suite-clip-text.Po @@ -5401,6 +5398,22 @@ cairo_test_suite-linear-gradient-extend.obj: linear-gradient-extend.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-linear-gradient-extend.obj `if test -f 'linear-gradient-extend.c'; then $(CYGPATH_W) 'linear-gradient-extend.c'; else $(CYGPATH_W) '$(srcdir)/linear-gradient-extend.c'; fi` +cairo_test_suite-linear-gradient-large.o: linear-gradient-large.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-linear-gradient-large.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-linear-gradient-large.Tpo -c -o cairo_test_suite-linear-gradient-large.o `test -f 'linear-gradient-large.c' || echo '$(srcdir)/'`linear-gradient-large.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-linear-gradient-large.Tpo $(DEPDIR)/cairo_test_suite-linear-gradient-large.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linear-gradient-large.c' object='cairo_test_suite-linear-gradient-large.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-linear-gradient-large.o `test -f 'linear-gradient-large.c' || echo '$(srcdir)/'`linear-gradient-large.c + +cairo_test_suite-linear-gradient-large.obj: linear-gradient-large.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-linear-gradient-large.obj -MD -MP -MF $(DEPDIR)/cairo_test_suite-linear-gradient-large.Tpo -c -o cairo_test_suite-linear-gradient-large.obj `if test -f 'linear-gradient-large.c'; then $(CYGPATH_W) 'linear-gradient-large.c'; else $(CYGPATH_W) '$(srcdir)/linear-gradient-large.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-linear-gradient-large.Tpo $(DEPDIR)/cairo_test_suite-linear-gradient-large.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linear-gradient-large.c' object='cairo_test_suite-linear-gradient-large.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-linear-gradient-large.obj `if test -f 'linear-gradient-large.c'; then $(CYGPATH_W) 'linear-gradient-large.c'; else $(CYGPATH_W) '$(srcdir)/linear-gradient-large.c'; fi` + cairo_test_suite-linear-gradient-one-stop.o: linear-gradient-one-stop.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-linear-gradient-one-stop.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-linear-gradient-one-stop.Tpo -c -o cairo_test_suite-linear-gradient-one-stop.o `test -f 'linear-gradient-one-stop.c' || echo '$(srcdir)/'`linear-gradient-one-stop.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-linear-gradient-one-stop.Tpo $(DEPDIR)/cairo_test_suite-linear-gradient-one-stop.Po @@ -7049,6 +7062,22 @@ cairo_test_suite-subsurface-modify-parent.obj: subsurface-modify-parent.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-subsurface-modify-parent.obj `if test -f 'subsurface-modify-parent.c'; then $(CYGPATH_W) 'subsurface-modify-parent.c'; else $(CYGPATH_W) '$(srcdir)/subsurface-modify-parent.c'; fi` +cairo_test_suite-subsurface-outside-target.o: subsurface-outside-target.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-subsurface-outside-target.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-subsurface-outside-target.Tpo -c -o cairo_test_suite-subsurface-outside-target.o `test -f 'subsurface-outside-target.c' || echo '$(srcdir)/'`subsurface-outside-target.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-subsurface-outside-target.Tpo $(DEPDIR)/cairo_test_suite-subsurface-outside-target.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='subsurface-outside-target.c' object='cairo_test_suite-subsurface-outside-target.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-subsurface-outside-target.o `test -f 'subsurface-outside-target.c' || echo '$(srcdir)/'`subsurface-outside-target.c + +cairo_test_suite-subsurface-outside-target.obj: subsurface-outside-target.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-subsurface-outside-target.obj -MD -MP -MF $(DEPDIR)/cairo_test_suite-subsurface-outside-target.Tpo -c -o cairo_test_suite-subsurface-outside-target.obj `if test -f 'subsurface-outside-target.c'; then $(CYGPATH_W) 'subsurface-outside-target.c'; else $(CYGPATH_W) '$(srcdir)/subsurface-outside-target.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-subsurface-outside-target.Tpo $(DEPDIR)/cairo_test_suite-subsurface-outside-target.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='subsurface-outside-target.c' object='cairo_test_suite-subsurface-outside-target.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -c -o cairo_test_suite-subsurface-outside-target.obj `if test -f 'subsurface-outside-target.c'; then $(CYGPATH_W) 'subsurface-outside-target.c'; else $(CYGPATH_W) '$(srcdir)/subsurface-outside-target.c'; fi` + cairo_test_suite-subsurface-similar-repeat.o: subsurface-similar-repeat.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_test_suite_CFLAGS) $(CFLAGS) -MT cairo_test_suite-subsurface-similar-repeat.o -MD -MP -MF $(DEPDIR)/cairo_test_suite-subsurface-similar-repeat.Tpo -c -o cairo_test_suite-subsurface-similar-repeat.o `test -f 'subsurface-similar-repeat.c' || echo '$(srcdir)/'`subsurface-similar-repeat.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cairo_test_suite-subsurface-similar-repeat.Tpo $(DEPDIR)/cairo_test_suite-subsurface-similar-repeat.Po diff --git a/test/Makefile.sources b/test/Makefile.sources index 42afafd..e497cd7 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -25,6 +25,7 @@ test_sources = \ clip-contexts.c \ clip-disjoint.c \ clip-device-offset.c \ + clip-draw-unbounded.c \ clip-empty.c \ clip-empty-group.c \ clip-empty-save.c \ @@ -32,7 +33,6 @@ test_sources = \ clip-fill-no-op.c \ clip-fill-rule.c \ clip-fill-rule-pixel-aligned.c \ - clip-fill-unbounded.c \ clip-group-shapes.c \ clip-image.c \ clip-nesting.c \ @@ -41,7 +41,6 @@ test_sources = \ clip-shape.c \ clip-stroke.c \ clip-stroke-no-op.c \ - clip-stroke-unbounded.c \ clip-text.c \ clip-twice.c \ clip-twice-rectangle.c \ @@ -148,6 +147,7 @@ test_sources = \ line-width-zero.c \ linear-gradient.c \ linear-gradient-extend.c \ + linear-gradient-large.c \ linear-gradient-one-stop.c \ linear-gradient-reflect.c \ linear-gradient-subset.c \ @@ -251,6 +251,7 @@ test_sources = \ subsurface-pad.c \ subsurface-modify-child.c \ subsurface-modify-parent.c \ + subsurface-outside-target.c \ subsurface-similar-repeat.c \ surface-finish-twice.c \ surface-pattern.c \ diff --git a/test/TODO b/test/TODO deleted file mode 100644 index 06a3fcb..0000000 --- a/test/TODO +++ /dev/null @@ -1 +0,0 @@ -ickle: if you give gs -sOutputFile=foo-%05d.ext it will do one-page-per-file diff --git a/test/api-special-cases.c b/test/api-special-cases.c index 63eb5d0..95a0a7c 100644 --- a/test/api-special-cases.c +++ b/test/api-special-cases.c @@ -84,6 +84,9 @@ #if CAIRO_HAS_SVG_SURFACE #include <cairo-svg.h> #endif +#if CAIRO_HAS_TEE_SURFACE +#include <cairo-tee.h> +#endif #if CAIRO_HAS_XCB_SURFACE #include <cairo-xcb.h> #endif @@ -387,6 +390,8 @@ test_cairo_recording_surface_ink_extents (cairo_surface_t *surface) return x == 0 && y == 0 && w == 0 && h == 0 ? CAIRO_TEST_SUCCESS : CAIRO_TEST_ERROR; } +#if CAIRO_HAS_TEE_SURFACE + static cairo_test_status_t test_cairo_tee_surface_add (cairo_surface_t *surface) { @@ -419,6 +424,8 @@ test_cairo_tee_surface_index (cairo_surface_t *surface) return status ? CAIRO_TEST_SUCCESS : CAIRO_TEST_ERROR; } +#endif /* CAIRO_HAS_TEE_SURFACE */ + #if CAIRO_HAS_GL_SURFACE static cairo_test_status_t @@ -664,9 +671,11 @@ struct { TEST (cairo_surface_write_to_png_stream, -1, FALSE), #endif TEST (cairo_recording_surface_ink_extents, CAIRO_SURFACE_TYPE_RECORDING, FALSE), +#if CAIRO_HAS_TEE_SURFACE TEST (cairo_tee_surface_add, CAIRO_SURFACE_TYPE_TEE, TRUE), TEST (cairo_tee_surface_remove, CAIRO_SURFACE_TYPE_TEE, TRUE), TEST (cairo_tee_surface_index, CAIRO_SURFACE_TYPE_TEE, FALSE), +#endif #if CAIRO_HAS_GL_SURFACE TEST (cairo_gl_surface_set_size, CAIRO_SURFACE_TYPE_GL, TRUE), TEST (cairo_gl_surface_get_width, CAIRO_SURFACE_TYPE_GL, FALSE), diff --git a/test/cairo-test-constructors.c b/test/cairo-test-constructors.c index 885320e..6858d04 100644 --- a/test/cairo-test-constructors.c +++ b/test/cairo-test-constructors.c @@ -31,6 +31,9 @@ extern void _register_clip_all (void); extern void _register_clip_contexts (void); extern void _register_clip_disjoint (void); extern void _register_clip_device_offset (void); +extern void _register_clip_stroke_unbounded (void); +extern void _register_clip_fill_nz_unbounded (void); +extern void _register_clip_fill_eo_unbounded (void); extern void _register_clip_empty (void); extern void _register_clip_empty_group (void); extern void _register_clip_empty_save (void); @@ -38,7 +41,6 @@ extern void _register_clip_fill (void); extern void _register_clip_fill_no_op (void); extern void _register_clip_fill_rule (void); extern void _register_clip_fill_rule_pixel_aligned (void); -extern void _register_clip_fill_unbounded (void); extern void _register_clip_group_shapes_aligned_rectangles (void); extern void _register_clip_group_shapes_unaligned_rectangles (void); extern void _register_clip_group_shapes_circles (void); @@ -49,7 +51,6 @@ extern void _register_clip_push_group (void); extern void _register_clip_shape (void); extern void _register_clip_stroke (void); extern void _register_clip_stroke_no_op (void); -extern void _register_clip_stroke_unbounded (void); extern void _register_clip_text (void); extern void _register_clip_twice (void); extern void _register_clip_twice_rectangle (void); @@ -163,6 +164,7 @@ extern void _register_line_width_scale (void); extern void _register_line_width_zero (void); extern void _register_linear_gradient (void); extern void _register_linear_gradient_extend (void); +extern void _register_linear_gradient_large (void); extern void _register_linear_gradient_one_stop (void); extern void _register_linear_gradient_reflect (void); extern void _register_linear_gradient_subset (void); @@ -276,6 +278,7 @@ extern void _register_subsurface_reflect (void); extern void _register_subsurface_pad (void); extern void _register_subsurface_modify_child (void); extern void _register_subsurface_modify_parent (void); +extern void _register_subsurface_outside_target (void); extern void _register_subsurface_similar_repeat (void); extern void _register_surface_finish_twice (void); extern void _register_surface_pattern (void); @@ -316,9 +319,6 @@ extern void _register_xcomposite_projection (void); extern void _register_xlib_expose_event (void); extern void _register_zero_alpha (void); extern void _register_zero_mask (void); -extern void _register_pthread_same_source (void); -extern void _register_pthread_show_text (void); -extern void _register_pthread_similar (void); extern void _register_bitmap_font (void); extern void _register_ft_font_create_for_ft_face (void); extern void _register_ft_show_glyphs_positioning (void); @@ -335,6 +335,7 @@ extern void _register_ps_surface_source (void); extern void _register_svg_surface (void); extern void _register_svg_clip (void); extern void _register_svg_surface_source (void); +extern void _register_test_fallback16_surface_source (void); extern void _register_xlib_surface (void); extern void _register_xlib_surface_source (void); extern void _register_get_xrender_format (void); @@ -371,6 +372,9 @@ _cairo_test_runner_register_tests (void) _register_clip_contexts (); _register_clip_disjoint (); _register_clip_device_offset (); + _register_clip_stroke_unbounded (); + _register_clip_fill_nz_unbounded (); + _register_clip_fill_eo_unbounded (); _register_clip_empty (); _register_clip_empty_group (); _register_clip_empty_save (); @@ -378,7 +382,6 @@ _cairo_test_runner_register_tests (void) _register_clip_fill_no_op (); _register_clip_fill_rule (); _register_clip_fill_rule_pixel_aligned (); - _register_clip_fill_unbounded (); _register_clip_group_shapes_aligned_rectangles (); _register_clip_group_shapes_unaligned_rectangles (); _register_clip_group_shapes_circles (); @@ -389,7 +392,6 @@ _cairo_test_runner_register_tests (void) _register_clip_shape (); _register_clip_stroke (); _register_clip_stroke_no_op (); - _register_clip_stroke_unbounded (); _register_clip_text (); _register_clip_twice (); _register_clip_twice_rectangle (); @@ -503,6 +505,7 @@ _cairo_test_runner_register_tests (void) _register_line_width_zero (); _register_linear_gradient (); _register_linear_gradient_extend (); + _register_linear_gradient_large (); _register_linear_gradient_one_stop (); _register_linear_gradient_reflect (); _register_linear_gradient_subset (); @@ -616,6 +619,7 @@ _cairo_test_runner_register_tests (void) _register_subsurface_pad (); _register_subsurface_modify_child (); _register_subsurface_modify_parent (); + _register_subsurface_outside_target (); _register_subsurface_similar_repeat (); _register_surface_finish_twice (); _register_surface_pattern (); @@ -656,9 +660,6 @@ _cairo_test_runner_register_tests (void) _register_xlib_expose_event (); _register_zero_alpha (); _register_zero_mask (); - _register_pthread_same_source (); - _register_pthread_show_text (); - _register_pthread_similar (); _register_bitmap_font (); _register_ft_font_create_for_ft_face (); _register_ft_show_glyphs_positioning (); @@ -675,6 +676,7 @@ _cairo_test_runner_register_tests (void) _register_svg_surface (); _register_svg_clip (); _register_svg_surface_source (); + _register_test_fallback16_surface_source (); _register_xlib_surface (); _register_xlib_surface_source (); _register_get_xrender_format (); diff --git a/test/clip-draw-unbounded.c b/test/clip-draw-unbounded.c new file mode 100644 index 0000000..a2121d2 --- /dev/null +++ b/test/clip-draw-unbounded.c @@ -0,0 +1,184 @@ +/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ +/* + * Copyright 2009 Chris Wilson + * Copyright 2010 Andrea Canciani + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Chris Wilson <chris@chris-wilson.co.uk> + */ + +#include "cairo-test.h" + +#define WIDTH 60 +#define HEIGHT 60 + +static void +stroke (cairo_t *cr) +{ + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + cairo_set_source_rgb (cr, 1, 0, 0); + cairo_paint (cr); + + cairo_set_operator (cr, CAIRO_OPERATOR_IN); + cairo_set_source_rgb (cr, 0, 0.7, 0); + cairo_arc (cr, 10, 10, 7.5, 0, 2 * M_PI); + cairo_move_to (cr, 0, 20); + cairo_line_to (cr, 20, 0); + cairo_stroke (cr); +} + +static void +fill (cairo_t *cr) +{ + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + cairo_set_source_rgb (cr, 1, 0, 0); + cairo_paint (cr); + + cairo_set_operator (cr, CAIRO_OPERATOR_IN); + cairo_set_source_rgb (cr, 0, 0.7, 0); + cairo_new_sub_path (cr); + cairo_arc (cr, 10, 10, 8.5, 0, 2 * M_PI); + cairo_new_sub_path (cr); + cairo_arc_negative (cr, 10, 10, 6.5, 2 * M_PI, 0); + + cairo_move_to (cr, -1, 19); + cairo_line_to (cr, 1, 21); + cairo_line_to (cr, 21, 1); + cairo_line_to (cr, 19, -1); + cairo_line_to (cr, -1, 19); + + cairo_fill (cr); +} + +static void +clip_simple (cairo_t *cr) +{ + cairo_rectangle (cr, 0, 0, 20, 20); + cairo_clip (cr); +} + +static void +clip_unaligned (cairo_t *cr) +{ + cairo_rectangle (cr, 0.5, 0.5, 20, 20); + cairo_clip (cr); +} + +static void +clip_aligned (cairo_t *cr) +{ + cairo_fill_rule_t orig_rule; + + orig_rule = cairo_get_fill_rule (cr); + cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); + cairo_rectangle (cr, 0, 0, 20, 20); + cairo_rectangle (cr, 3, 3, 10, 10); + cairo_rectangle (cr, 7, 7, 10, 10); + cairo_clip (cr); + cairo_set_fill_rule (cr, orig_rule); +} + +static void +clip_mask (cairo_t *cr) +{ + cairo_arc (cr, 10, 10, 10, 0, 2 * M_PI); + cairo_new_sub_path (cr); + cairo_arc_negative (cr, 10, 10, 5, 2 * M_PI, 0); + cairo_new_sub_path (cr); + cairo_arc (cr, 10, 10, 2, 0, 2 * M_PI); + cairo_clip (cr); +} + +static void (* const clip_funcs[])(cairo_t *cr) = { + clip_simple, + clip_unaligned, + clip_aligned, + clip_mask +}; + +static double translations[][2] = { + { 10, 10 }, + { WIDTH, 0 }, + { -WIDTH, HEIGHT }, + { WIDTH, 0 } +}; + +static cairo_test_status_t +draw (cairo_t *cr, void (*shapes)(cairo_t *)) +{ + int i; + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_paint (cr); + + for (i = 0; i < sizeof (clip_funcs) / sizeof (clip_funcs[0]); i++) { + cairo_translate (cr, translations[i][0], translations[i][1]); + + cairo_save (cr); + cairo_scale (cr, 2, 2); + clip_funcs[i] (cr); + shapes (cr); + cairo_restore (cr); + } + + return CAIRO_TEST_SUCCESS; +} + +static cairo_test_status_t +draw_stroke (cairo_t *cr, int width, int height) +{ + return draw (cr, stroke); +} + +static cairo_test_status_t +draw_fill_nz (cairo_t *cr, int width, int height) +{ + cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING); + return draw (cr, fill); +} + +static cairo_test_status_t +draw_fill_eo (cairo_t *cr, int width, int height) +{ + cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); + return draw (cr, fill); +} + +CAIRO_TEST (clip_stroke_unbounded, + "Tests unbounded stroke through complex clips.", + "clip, stroke, unbounded", /* keywords */ + NULL, /* requirements */ + 2 * WIDTH, 2 * HEIGHT, + NULL, draw_stroke) + +CAIRO_TEST (clip_fill_nz_unbounded, + "Tests unbounded fill through complex clips (with winding fill rule).", + "clip, fill, unbounded", /* keywords */ + NULL, /* requirements */ + 2 * WIDTH, 2 * HEIGHT, + NULL, draw_fill_nz) + +CAIRO_TEST (clip_fill_eo_unbounded, + "Tests unbounded fill through complex clips (with even-odd fill rule).", + "clip, fill, unbounded", /* keywords */ + NULL, /* requirements */ + 2 * WIDTH, 2 * HEIGHT, + NULL, draw_fill_eo) diff --git a/test/clip-fill-eo-unbounded.argb32.ref.png b/test/clip-fill-eo-unbounded.argb32.ref.png Binary files differnew file mode 100644 index 0000000..4557bf0 --- /dev/null +++ b/test/clip-fill-eo-unbounded.argb32.ref.png diff --git a/test/clip-fill-eo-unbounded.image16.ref.png b/test/clip-fill-eo-unbounded.image16.ref.png Binary files differnew file mode 100644 index 0000000..e0e66ff --- /dev/null +++ b/test/clip-fill-eo-unbounded.image16.ref.png diff --git a/test/clip-fill-eo-unbounded.quartz.argb32.ref.png b/test/clip-fill-eo-unbounded.quartz.argb32.ref.png Binary files differnew file mode 100644 index 0000000..2ea24a3 --- /dev/null +++ b/test/clip-fill-eo-unbounded.quartz.argb32.ref.png diff --git a/test/clip-fill-eo-unbounded.quartz.rgb24.ref.png b/test/clip-fill-eo-unbounded.quartz.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..2705008 --- /dev/null +++ b/test/clip-fill-eo-unbounded.quartz.rgb24.ref.png diff --git a/test/clip-fill-eo-unbounded.rgb24.ref.png b/test/clip-fill-eo-unbounded.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..8e88cf4 --- /dev/null +++ b/test/clip-fill-eo-unbounded.rgb24.ref.png diff --git a/test/clip-fill-eo-unbounded.svg12.rgb24.xfail.png b/test/clip-fill-eo-unbounded.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 0000000..f949de1 --- /dev/null +++ b/test/clip-fill-eo-unbounded.svg12.rgb24.xfail.png diff --git a/test/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png b/test/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..ec25896 --- /dev/null +++ b/test/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png diff --git a/test/clip-fill-eo-unbounded.xlib.argb32.ref.png b/test/clip-fill-eo-unbounded.xlib.argb32.ref.png Binary files differnew file mode 100644 index 0000000..3a2363c --- /dev/null +++ b/test/clip-fill-eo-unbounded.xlib.argb32.ref.png diff --git a/test/clip-fill-eo-unbounded.xlib.rgb24.ref.png b/test/clip-fill-eo-unbounded.xlib.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..1461e66 --- /dev/null +++ b/test/clip-fill-eo-unbounded.xlib.rgb24.ref.png diff --git a/test/clip-fill-nz-unbounded.argb32.ref.png b/test/clip-fill-nz-unbounded.argb32.ref.png Binary files differnew file mode 100644 index 0000000..4557bf0 --- /dev/null +++ b/test/clip-fill-nz-unbounded.argb32.ref.png diff --git a/test/clip-fill-nz-unbounded.image16.ref.png b/test/clip-fill-nz-unbounded.image16.ref.png Binary files differnew file mode 100644 index 0000000..e0e66ff --- /dev/null +++ b/test/clip-fill-nz-unbounded.image16.ref.png diff --git a/test/clip-fill-nz-unbounded.quartz.argb32.ref.png b/test/clip-fill-nz-unbounded.quartz.argb32.ref.png Binary files differnew file mode 100644 index 0000000..2ea24a3 --- /dev/null +++ b/test/clip-fill-nz-unbounded.quartz.argb32.ref.png diff --git a/test/clip-fill-nz-unbounded.quartz.rgb24.ref.png b/test/clip-fill-nz-unbounded.quartz.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..2705008 --- /dev/null +++ b/test/clip-fill-nz-unbounded.quartz.rgb24.ref.png diff --git a/test/clip-fill-nz-unbounded.rgb24.ref.png b/test/clip-fill-nz-unbounded.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..8e88cf4 --- /dev/null +++ b/test/clip-fill-nz-unbounded.rgb24.ref.png diff --git a/test/clip-fill-nz-unbounded.svg12.rgb24.xfail.png b/test/clip-fill-nz-unbounded.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 0000000..f949de1 --- /dev/null +++ b/test/clip-fill-nz-unbounded.svg12.rgb24.xfail.png diff --git a/test/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png b/test/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..ec25896 --- /dev/null +++ b/test/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png diff --git a/test/clip-fill-nz-unbounded.xlib.argb32.ref.png b/test/clip-fill-nz-unbounded.xlib.argb32.ref.png Binary files differnew file mode 100644 index 0000000..3a2363c --- /dev/null +++ b/test/clip-fill-nz-unbounded.xlib.argb32.ref.png diff --git a/test/clip-fill-nz-unbounded.xlib.rgb24.ref.png b/test/clip-fill-nz-unbounded.xlib.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..1461e66 --- /dev/null +++ b/test/clip-fill-nz-unbounded.xlib.rgb24.ref.png diff --git a/test/clip-fill-unbounded.argb32.ref.png b/test/clip-fill-unbounded.argb32.ref.png Binary files differdeleted file mode 100644 index b87efd4..0000000 --- a/test/clip-fill-unbounded.argb32.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.c b/test/clip-fill-unbounded.c deleted file mode 100644 index 893eb41..0000000 --- a/test/clip-fill-unbounded.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright 2009 Chris Wilson - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of - * Chris Wilson not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. Chris Wilson makes no representations about the - * suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL CHRIS WILSON BE LIABLE FOR ANY SPECIAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Chris Wilson <chris@chris-wilson.co.uk> - */ - -#include "cairo-test.h" - -#define WIDTH 40 -#define HEIGHT 40 - -static void -shapes (cairo_t *cr) -{ - cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - cairo_set_source_rgb (cr, 1, 0, 0); - cairo_paint (cr); - - cairo_set_operator (cr, CAIRO_OPERATOR_IN); - cairo_set_source_rgb (cr, 0, 0.7, 0); - cairo_new_sub_path (cr); - cairo_arc (cr, 10, 10, 8.5, 0, 2 * M_PI); - cairo_new_sub_path (cr); - cairo_arc_negative (cr, 10, 10, 6.5, 2 * M_PI, 0); - cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING); - cairo_fill (cr); -} - -static cairo_test_status_t -draw (cairo_t *cr, int width, int height) -{ - cairo_set_source_rgb (cr, 1, 1, 1); - cairo_paint (cr); - - cairo_translate (cr, 10, 10); - - /* simple clip */ - cairo_save (cr); - cairo_rectangle (cr, 0, 0, 20, 20); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - cairo_translate (cr, WIDTH, 0); - - /* unaligned clip */ - cairo_save (cr); - cairo_rectangle (cr, 0.5, 0.5, 20, 20); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - cairo_translate (cr, -WIDTH, HEIGHT); - - /* aligned-clip */ - cairo_save (cr); - cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); - cairo_rectangle (cr, 0, 0, 20, 20); - cairo_rectangle (cr, 3, 3, 10, 10); - cairo_rectangle (cr, 7, 7, 10, 10); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - cairo_translate (cr, WIDTH, 0); - - /* force a clip-mask */ - cairo_save (cr); - cairo_arc (cr, 10, 10, 10, 0, 2 * M_PI); - cairo_new_sub_path (cr); - cairo_arc_negative (cr, 10, 10, 5, 2 * M_PI, 0); - cairo_new_sub_path (cr); - cairo_arc (cr, 10, 10, 2, 0, 2 * M_PI); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - return CAIRO_TEST_SUCCESS; -} - -CAIRO_TEST (clip_fill_unbounded, - "Tests unbounded fill through complex clips.", - "clip, fill, unbounded", /* keywords */ - NULL, /* requirements */ - 2 * WIDTH, 2* HEIGHT, - NULL, draw) diff --git a/test/clip-fill-unbounded.image16.ref.png b/test/clip-fill-unbounded.image16.ref.png Binary files differdeleted file mode 100644 index 117bd87..0000000 --- a/test/clip-fill-unbounded.image16.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.pdf.argb32.ref.png b/test/clip-fill-unbounded.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index c2f491e..0000000 --- a/test/clip-fill-unbounded.pdf.argb32.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.ps.argb32.xfail.png b/test/clip-fill-unbounded.ps.argb32.xfail.png Binary files differdeleted file mode 100644 index c2f491e..0000000 --- a/test/clip-fill-unbounded.ps.argb32.xfail.png +++ /dev/null diff --git a/test/clip-fill-unbounded.quartz.argb32.ref.png b/test/clip-fill-unbounded.quartz.argb32.ref.png Binary files differdeleted file mode 100644 index 2915e6c..0000000 --- a/test/clip-fill-unbounded.quartz.argb32.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.quartz.rgb24.ref.png b/test/clip-fill-unbounded.quartz.rgb24.ref.png Binary files differdeleted file mode 100644 index c410400..0000000 --- a/test/clip-fill-unbounded.quartz.rgb24.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.rgb24.ref.png b/test/clip-fill-unbounded.rgb24.ref.png Binary files differdeleted file mode 100644 index 915ebe1..0000000 --- a/test/clip-fill-unbounded.rgb24.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.svg12.argb32.xfail.png b/test/clip-fill-unbounded.svg12.argb32.xfail.png Binary files differdeleted file mode 100644 index 32c760e..0000000 --- a/test/clip-fill-unbounded.svg12.argb32.xfail.png +++ /dev/null diff --git a/test/clip-fill-unbounded.svg12.rgb24.xfail.png b/test/clip-fill-unbounded.svg12.rgb24.xfail.png Binary files differdeleted file mode 100644 index 32c760e..0000000 --- a/test/clip-fill-unbounded.svg12.rgb24.xfail.png +++ /dev/null diff --git a/test/clip-fill-unbounded.xlib-fallback.rgb24.ref.png b/test/clip-fill-unbounded.xlib-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 2d7ab77..0000000 --- a/test/clip-fill-unbounded.xlib-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.xlib.argb32.ref.png b/test/clip-fill-unbounded.xlib.argb32.ref.png Binary files differdeleted file mode 100644 index a4eaf02..0000000 --- a/test/clip-fill-unbounded.xlib.argb32.ref.png +++ /dev/null diff --git a/test/clip-fill-unbounded.xlib.rgb24.ref.png b/test/clip-fill-unbounded.xlib.rgb24.ref.png Binary files differdeleted file mode 100644 index c4e4f3c..0000000 --- a/test/clip-fill-unbounded.xlib.rgb24.ref.png +++ /dev/null diff --git a/test/clip-stroke-unbounded.argb32.ref.png b/test/clip-stroke-unbounded.argb32.ref.png Binary files differindex e48537f..eed9bad 100644 --- a/test/clip-stroke-unbounded.argb32.ref.png +++ b/test/clip-stroke-unbounded.argb32.ref.png diff --git a/test/clip-stroke-unbounded.c b/test/clip-stroke-unbounded.c deleted file mode 100644 index 990b618..0000000 --- a/test/clip-stroke-unbounded.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright 2009 Chris Wilson - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of - * Chris Wilson not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. Chris Wilson makes no representations about the - * suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL CHRIS WILSON BE LIABLE FOR ANY SPECIAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Chris Wilson <chris@chris-wilson.co.uk> - */ - -#include "cairo-test.h" - -#define WIDTH 40 -#define HEIGHT 40 - -static void -shapes (cairo_t *cr) -{ - cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - cairo_set_source_rgb (cr, 1, 0, 0); - cairo_paint (cr); - - cairo_set_operator (cr, CAIRO_OPERATOR_IN); - cairo_set_source_rgb (cr, 0, 0.7, 0); - cairo_arc (cr, 10, 10, 7.5, 0, 2 * M_PI); - cairo_stroke (cr); -} - -static cairo_test_status_t -draw (cairo_t *cr, int width, int height) -{ - cairo_set_source_rgb (cr, 1, 1, 1); - cairo_paint (cr); - - cairo_translate (cr, 10, 10); - - /* simple clip */ - cairo_save (cr); - cairo_rectangle (cr, 0, 0, 20, 20); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - cairo_translate (cr, WIDTH, 0); - - /* unaligned clip */ - cairo_save (cr); - cairo_rectangle (cr, 0.5, 0.5, 20, 20); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - cairo_translate (cr, -WIDTH, HEIGHT); - - /* aligned-clip */ - cairo_save (cr); - cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); - cairo_rectangle (cr, 0, 0, 20, 20); - cairo_rectangle (cr, 3, 3, 10, 10); - cairo_rectangle (cr, 7, 7, 10, 10); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - cairo_translate (cr, WIDTH, 0); - - /* force a clip-mask */ - cairo_save (cr); - cairo_arc (cr, 10, 10, 10, 0, 2 * M_PI); - cairo_new_sub_path (cr); - cairo_arc_negative (cr, 10, 10, 5, 2 * M_PI, 0); - cairo_new_sub_path (cr); - cairo_arc (cr, 10, 10, 2, 0, 2 * M_PI); - cairo_clip (cr); - shapes (cr); - cairo_restore (cr); - - return CAIRO_TEST_SUCCESS; -} - -CAIRO_TEST (clip_stroke_unbounded, - "Tests unbounded stroke through complex clips.", - "clip, stroke, unbounded", /* keywords */ - NULL, /* requirements */ - 2 * WIDTH, 2* HEIGHT, - NULL, draw) - diff --git a/test/clip-stroke-unbounded.image16.ref.png b/test/clip-stroke-unbounded.image16.ref.png Binary files differdeleted file mode 100644 index cfc2873..0000000 --- a/test/clip-stroke-unbounded.image16.ref.png +++ /dev/null diff --git a/test/clip-stroke-unbounded.image16.rgb24.ref.png b/test/clip-stroke-unbounded.image16.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..2dfd48b --- /dev/null +++ b/test/clip-stroke-unbounded.image16.rgb24.ref.png diff --git a/test/clip-stroke-unbounded.pdf.argb32.xfail.png b/test/clip-stroke-unbounded.pdf.argb32.xfail.png Binary files differdeleted file mode 100644 index 2e197c5..0000000 --- a/test/clip-stroke-unbounded.pdf.argb32.xfail.png +++ /dev/null diff --git a/test/clip-stroke-unbounded.ps.argb32.ref.png b/test/clip-stroke-unbounded.ps.argb32.ref.png Binary files differdeleted file mode 100644 index 2e197c5..0000000 --- a/test/clip-stroke-unbounded.ps.argb32.ref.png +++ /dev/null diff --git a/test/clip-stroke-unbounded.quartz.argb32.ref.png b/test/clip-stroke-unbounded.quartz.argb32.ref.png Binary files differindex 0bf0df7..c6124dd 100644 --- a/test/clip-stroke-unbounded.quartz.argb32.ref.png +++ b/test/clip-stroke-unbounded.quartz.argb32.ref.png diff --git a/test/clip-stroke-unbounded.quartz.rgb24.ref.png b/test/clip-stroke-unbounded.quartz.rgb24.ref.png Binary files differindex 1f28649..c6e0eb9 100644 --- a/test/clip-stroke-unbounded.quartz.rgb24.ref.png +++ b/test/clip-stroke-unbounded.quartz.rgb24.ref.png diff --git a/test/clip-stroke-unbounded.rgb24.ref.png b/test/clip-stroke-unbounded.rgb24.ref.png Binary files differindex d2880f1..0560893 100644 --- a/test/clip-stroke-unbounded.rgb24.ref.png +++ b/test/clip-stroke-unbounded.rgb24.ref.png diff --git a/test/clip-stroke-unbounded.svg12.argb32.xfail.png b/test/clip-stroke-unbounded.svg12.argb32.xfail.png Binary files differdeleted file mode 100644 index 6e7b48d..0000000 --- a/test/clip-stroke-unbounded.svg12.argb32.xfail.png +++ /dev/null diff --git a/test/clip-stroke-unbounded.svg12.rgb24.xfail.png b/test/clip-stroke-unbounded.svg12.rgb24.xfail.png Binary files differindex 6e7b48d..c35fc83 100644 --- a/test/clip-stroke-unbounded.svg12.rgb24.xfail.png +++ b/test/clip-stroke-unbounded.svg12.rgb24.xfail.png diff --git a/test/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png b/test/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png Binary files differindex ced4616..20ebfe4 100644 --- a/test/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png +++ b/test/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png diff --git a/test/clip-stroke-unbounded.xlib.argb32.ref.png b/test/clip-stroke-unbounded.xlib.argb32.ref.png Binary files differindex 9e90319..4c7077d 100644 --- a/test/clip-stroke-unbounded.xlib.argb32.ref.png +++ b/test/clip-stroke-unbounded.xlib.argb32.ref.png diff --git a/test/clip-stroke-unbounded.xlib.rgb24.ref.png b/test/clip-stroke-unbounded.xlib.rgb24.ref.png Binary files differindex d068fdd..5d5188b 100644 --- a/test/clip-stroke-unbounded.xlib.rgb24.ref.png +++ b/test/clip-stroke-unbounded.xlib.rgb24.ref.png diff --git a/test/degenerate-linear-gradient.ref.png b/test/degenerate-linear-gradient.ref.png Binary files differindex e44cc33..1de7ca6 100644 --- a/test/degenerate-linear-gradient.ref.png +++ b/test/degenerate-linear-gradient.ref.png diff --git a/test/linear-gradient-large.c b/test/linear-gradient-large.c new file mode 100644 index 0000000..f5e6a66 --- /dev/null +++ b/test/linear-gradient-large.c @@ -0,0 +1,67 @@ +/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ +/* + * Copyright 2010 Krzysztof Kosiński + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Krzysztof Kosiński <tweenk.pl@gmail.com> + */ + +#include "cairo-test.h" + +/* originally reported in https://bugs.freedesktop.org/show_bug.cgi?id=29470 */ + +#define OFFSET 50 +#define SIZE 1000 + +static void mark_point(cairo_t *ct, double x, double y) +{ + cairo_rectangle(ct, x-2, y-2, 4, 4); + cairo_set_source_rgb(ct, 1,0,0); + cairo_fill(ct); +} + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_pattern_t *gr = cairo_pattern_create_linear (SIZE - OFFSET, OFFSET, + OFFSET, SIZE - OFFSET); + + cairo_pattern_add_color_stop_rgb (gr, 0.0, 1, 1, 1); + cairo_pattern_add_color_stop_rgb (gr, 0.0, 0, 0, 0); + cairo_pattern_add_color_stop_rgb (gr, 1.0, 0, 0, 0); + cairo_pattern_add_color_stop_rgb (gr, 1.0, 1, 1, 1); + + cairo_set_source (cr, gr); + cairo_paint (cr); + + mark_point(cr, SIZE - OFFSET, OFFSET); + mark_point(cr, OFFSET, SIZE - OFFSET); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (linear_gradient_large, + "Tests that large linear gradients get rendered at the correct place", + "linear, pattern", /* keywords */ + NULL, /* requirements */ + SIZE, SIZE, + NULL, draw) diff --git a/test/linear-gradient-large.ref.png b/test/linear-gradient-large.ref.png Binary files differnew file mode 100644 index 0000000..753fe2a --- /dev/null +++ b/test/linear-gradient-large.ref.png diff --git a/test/pdiff/Makefile.in b/test/pdiff/Makefile.in index 4801648..70d178a 100644 --- a/test/pdiff/Makefile.in +++ b/test/pdiff/Makefile.in @@ -167,6 +167,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -280,7 +282,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ diff --git a/test/subsurface-outside-target.argb32.ref.png b/test/subsurface-outside-target.argb32.ref.png Binary files differnew file mode 100644 index 0000000..337cdd8 --- /dev/null +++ b/test/subsurface-outside-target.argb32.ref.png diff --git a/test/subsurface-outside-target.c b/test/subsurface-outside-target.c new file mode 100644 index 0000000..fd51243 --- /dev/null +++ b/test/subsurface-outside-target.c @@ -0,0 +1,178 @@ +/* + * Copyright 2010 Red Hat Inc. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Benjamin Otte <otte@gnome.org> + */ + +#include "cairo-test.h" + +#define ARRAY_LENGTH(array) (sizeof (array) / sizeof ((array)[0])) + +#define TARGET_SIZE 10 + +#define SUB_SIZE 15 +#define SUB_OFFSET -5 + +#define PAINT_OFFSET SUB_SIZE +#define PAINT_SIZE (3 * SUB_SIZE) + +static cairo_content_t contents[] = { CAIRO_CONTENT_ALPHA, + CAIRO_CONTENT_COLOR, + CAIRO_CONTENT_COLOR_ALPHA }; + +#define N_CONTENTS ARRAY_LENGTH (contents) +#define N_PADS (CAIRO_EXTEND_PAD + 1) + + +static cairo_surface_t * +create_target (cairo_surface_t *similar_to, + cairo_content_t content) +{ + cairo_surface_t *surface; + cairo_t *cr; + + surface = cairo_surface_create_similar (similar_to, + content, + TARGET_SIZE, TARGET_SIZE); + + cr = cairo_create (surface); + cairo_test_paint_checkered (cr); + cairo_destroy (cr); + + return surface; +} + +static cairo_test_status_t +check_surface_extents (const cairo_test_context_t *ctx, + cairo_surface_t * surface, + double x, + double y, + double width, + double height) +{ + double x1, y1, x2, y2; + cairo_t *cr; + + cr = cairo_create (surface); + cairo_clip_extents (cr, &x1, &y1, &x2, &y2); + + if (x != x1 || + y != y1 || + width != x2 - x1 || + height != y2 - y1) { + cairo_test_log (ctx, + "surface extents should be (%g, %g, %g, %g), but are (%g, %g, %g, %g)\n", + x, y, width, height, + x1, y1, x2 - x1, y2 - y1); + return CAIRO_TEST_FAILURE; + } + + return CAIRO_TEST_SUCCESS; +} + +static cairo_test_status_t +draw_for_size (cairo_t *cr, + double x, + double y) +{ + cairo_surface_t *target, *subsurface; + cairo_extend_t extend; + cairo_test_status_t check, result = CAIRO_TEST_SUCCESS; + unsigned int content; + + for (content = 0; content < N_CONTENTS; content++) { + cairo_save (cr); + + /* create a target surface for our subsurface */ + target = create_target (cairo_get_target (cr), + contents[content]); + + /* create a subsurface that extends the target surface */ + subsurface = cairo_surface_create_for_rectangle (target, + x, y, + SUB_SIZE, SUB_SIZE); + + /* ensure the extents are ok */ + check = check_surface_extents (cairo_test_get_context (cr), + subsurface, + 0, 0, + SUB_SIZE, SUB_SIZE); + if (result == CAIRO_TEST_SUCCESS) + result = check; + + /* paint this surface with all extend modes. */ + for (extend = 0; extend < N_PADS; extend++) { + cairo_save (cr); + + cairo_rectangle (cr, 0, 0, PAINT_SIZE, PAINT_SIZE); + cairo_clip (cr); + + cairo_set_source_surface (cr, subsurface, PAINT_OFFSET, PAINT_OFFSET); + cairo_pattern_set_extend (cairo_get_source (cr), extend); + cairo_paint (cr); + + cairo_restore (cr); + + cairo_translate (cr, PAINT_SIZE + TARGET_SIZE, 0); + } + + cairo_surface_destroy (subsurface); + cairo_surface_destroy (target); + + cairo_restore (cr); + + cairo_translate (cr, 0, PAINT_SIZE + TARGET_SIZE); + } + + return result; +} + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_test_status_t check, result = CAIRO_TEST_SUCCESS; + + /* paint background in nice gray */ + cairo_set_source_rgb (cr, 0.51613, 0.55555, 0.51613); + cairo_paint (cr); + + /* Use CAIRO_OPERATOR_SOURCE in the tests so we get the actual + * contents of the subsurface */ + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + + result = draw_for_size (cr, SUB_OFFSET, SUB_OFFSET); + + check = draw_for_size (cr, 0, 0); + if (result == CAIRO_TEST_SUCCESS) + result = check; + + return result; +} + +CAIRO_TEST (subsurface_outside_target, + "Tests contents of subsurfaces outside target area", + "subsurface, pad", /* keywords */ + NULL, /* requirements */ + (PAINT_SIZE + TARGET_SIZE) * N_PADS - TARGET_SIZE, + (PAINT_SIZE + TARGET_SIZE) * N_CONTENTS * 2 - TARGET_SIZE, + NULL, draw) diff --git a/test/subsurface-outside-target.rgb24.ref.png b/test/subsurface-outside-target.rgb24.ref.png Binary files differnew file mode 100644 index 0000000..368936e --- /dev/null +++ b/test/subsurface-outside-target.rgb24.ref.png diff --git a/util/Makefile.am b/util/Makefile.am index 4394fe3..0826763 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -2,6 +2,10 @@ include $(top_srcdir)/build/Makefile.am.common SUBDIRS = . +if CAIRO_HAS_GOBJECT_FUNCTIONS +SUBDIRS += cairo-gobject +endif + if CAIRO_HAS_INTERPRETER SUBDIRS += cairo-script endif diff --git a/util/Makefile.in b/util/Makefile.in index 6eb0457..a0faca7 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -39,14 +39,15 @@ EXTRA_PROGRAMS = show-traps$(EXEEXT) show-edges$(EXEEXT) \ show-events$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) TESTS = check_PROGRAMS = -@CAIRO_HAS_INTERPRETER_TRUE@am__append_1 = cairo-script -@CAIRO_HAS_TRACE_TRUE@am__append_2 = cairo-trace -@CAIRO_HAS_SCRIPT_SURFACE_TRUE@@CAIRO_HAS_TRACE_TRUE@am__append_3 = cairo-fdr -@BUILD_SPHINX_TRUE@@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_4 = cairo-sphinx -@CAIRO_HAS_INTERPRETER_TRUE@am__append_5 = trace-to-xml xml-to-trace +@CAIRO_HAS_GOBJECT_FUNCTIONS_TRUE@am__append_1 = cairo-gobject +@CAIRO_HAS_INTERPRETER_TRUE@am__append_2 = cairo-script +@CAIRO_HAS_TRACE_TRUE@am__append_3 = cairo-trace +@CAIRO_HAS_SCRIPT_SURFACE_TRUE@@CAIRO_HAS_TRACE_TRUE@am__append_4 = cairo-fdr +@BUILD_SPHINX_TRUE@@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_5 = cairo-sphinx +@CAIRO_HAS_INTERPRETER_TRUE@am__append_6 = trace-to-xml xml-to-trace #malloc_stats_la_LIBADD = $(backtrace_symbols_la_LIBADD) backtrace-symbols.lo -@HAVE_GTK_TRUE@am__append_6 = font-view +@HAVE_GTK_TRUE@am__append_7 = font-view subdir = util ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ @@ -171,7 +172,8 @@ ETAGS = etags CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= -DIST_SUBDIRS = . cairo-script cairo-trace cairo-fdr cairo-sphinx +DIST_SUBDIRS = . cairo-gobject cairo-script cairo-trace cairo-fdr \ + cairo-sphinx DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -251,6 +253,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -364,7 +368,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ @@ -414,7 +417,7 @@ EXTRA_DIST = COPYING xr2cairo cairo-api-update cairo-view waterfall EXTRA_LTLIBRARIES = malloc-stats.la backtrace-symbols.la MAINTAINERCLEANFILES = Makefile.in SUBDIRS = . $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) + $(am__append_4) $(am__append_5) AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_builddir)/src \ -I$(top_srcdir)/util/cairo-script \ diff --git a/util/cairo-fdr/Makefile.in b/util/cairo-fdr/Makefile.in index 314a5f6..51fe80a 100644 --- a/util/cairo-fdr/Makefile.in +++ b/util/cairo-fdr/Makefile.in @@ -181,6 +181,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -294,7 +296,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ diff --git a/util/cairo-fdr/fdr.c b/util/cairo-fdr/fdr.c index 30f2dda..209c380 100644 --- a/util/cairo-fdr/fdr.c +++ b/util/cairo-fdr/fdr.c @@ -24,6 +24,7 @@ #include <cairo.h> #include <cairo-script.h> +#include <cairo-tee.h> #include <stdlib.h> #include <assert.h> #include <signal.h> diff --git a/util/cairo-gobject/Makefile.am b/util/cairo-gobject/Makefile.am new file mode 100644 index 0000000..22c1a27 --- /dev/null +++ b/util/cairo-gobject/Makefile.am @@ -0,0 +1,15 @@ +lib_LTLIBRARIES = libcairo-gobject.la + +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src + +cairoincludedir=$(includedir)/cairo +cairoinclude_HEADERS = cairo-gobject.h +libcairo_gobject_la_SOURCES = \ + cairo-gobject-enums.c \ + cairo-gobject-structs.c \ + $(NULL) + +libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS) +libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) +libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS) + diff --git a/util/cairo-gobject/Makefile.in b/util/cairo-gobject/Makefile.in new file mode 100644 index 0000000..1f016e4 --- /dev/null +++ b/util/cairo-gobject/Makefile.in @@ -0,0 +1,708 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = util/cairo-gobject +DIST_COMMON = $(cairoinclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ + $(top_srcdir)/build/aclocal.compare.m4 \ + $(top_srcdir)/build/aclocal.enable.m4 \ + $(top_srcdir)/build/aclocal.float.m4 \ + $(top_srcdir)/build/aclocal.gtk-doc.m4 \ + $(top_srcdir)/build/aclocal.makefile.m4 \ + $(top_srcdir)/build/aclocal.pkg.m4 \ + $(top_srcdir)/build/libtool.m4 \ + $(top_srcdir)/build/ltoptions.m4 \ + $(top_srcdir)/build/ltsugar.m4 \ + $(top_srcdir)/build/ltversion.m4 \ + $(top_srcdir)/build/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/cairo-version.h \ + $(top_srcdir)/build/configure.ac.version \ + $(top_srcdir)/build/configure.ac.tools \ + $(top_srcdir)/build/configure.ac.features \ + $(top_srcdir)/build/configure.ac.warnings \ + $(top_srcdir)/build/configure.ac.system \ + $(top_srcdir)/build/configure.ac.analysis \ + $(top_srcdir)/build/configure.ac.noversion \ + $(top_srcdir)/build/configure.ac.pthread \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cairoincludedir)" +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +libcairo_gobject_la_DEPENDENCIES = $(top_builddir)/src/libcairo.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am_libcairo_gobject_la_OBJECTS = \ + libcairo_gobject_la-cairo-gobject-enums.lo \ + libcairo_gobject_la-cairo-gobject-structs.lo +libcairo_gobject_la_OBJECTS = $(am_libcairo_gobject_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +libcairo_gobject_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libcairo_gobject_la_CFLAGS) $(CFLAGS) \ + $(libcairo_gobject_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/build/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libcairo_gobject_la_SOURCES) +DIST_SOURCES = $(libcairo_gobject_la_SOURCES) +HEADERS = $(cairoinclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BFD_LIBS = @BFD_LIBS@ +CAIROBOILERPLATE_LIBS = @CAIROBOILERPLATE_LIBS@ +CAIROPERF_LIBS = @CAIROPERF_LIBS@ +CAIRO_CFLAGS = @CAIRO_CFLAGS@ +CAIRO_LDFLAGS = @CAIRO_LDFLAGS@ +CAIRO_LIBS = @CAIRO_LIBS@ +CAIRO_LIBTOOL_VERSION_INFO = @CAIRO_LIBTOOL_VERSION_INFO@ +CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@ +CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@ +CAIRO_RELEASE_STATUS = @CAIRO_RELEASE_STATUS@ +CAIRO_REQUIRES = @CAIRO_REQUIRES@ +CAIRO_TEST_MODE = @CAIRO_TEST_MODE@ +CAIRO_TEST_UNDEFINED_LDFLAGS = @CAIRO_TEST_UNDEFINED_LDFLAGS@ +CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@ +CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@ +CAIRO_VERSION_MINOR = @CAIRO_VERSION_MINOR@ +CAIRO_VERSION_SONUM = @CAIRO_VERSION_SONUM@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FIND = @FIND@ +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GREP = @GREP@ +GS = @GS@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ +LIBOBJS = @LIBOBJS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSPECTRE_CFLAGS = @LIBSPECTRE_CFLAGS@ +LIBSPECTRE_LIBS = @LIBSPECTRE_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKG_CONFIG = @PKG_CONFIG@ +POPPLER_CFLAGS = @POPPLER_CFLAGS@ +POPPLER_LIBS = @POPPLER_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SHLIB_EXT = @SHLIB_EXT@ +SHM_LIBS = @SHM_LIBS@ +SHTOOL = @SHTOOL@ +STRIP = @STRIP@ +VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ +VALGRIND_LIBS = @VALGRIND_LIBS@ +VERSION = @VERSION@ +XARGS = @XARGS@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +directfb_CFLAGS = @directfb_CFLAGS@ +directfb_LIBS = @directfb_LIBS@ +docdir = @docdir@ +drm_CFLAGS = @drm_CFLAGS@ +drm_LIBS = @drm_LIBS@ +drm_xr_CFLAGS = @drm_xr_CFLAGS@ +drm_xr_LIBS = @drm_xr_LIBS@ +dvidir = @dvidir@ +egl_CFLAGS = @egl_CFLAGS@ +egl_LIBS = @egl_LIBS@ +exec_prefix = @exec_prefix@ +gallium_DIR = @gallium_DIR@ +gl_CFLAGS = @gl_CFLAGS@ +gl_LIBS = @gl_LIBS@ +glib_CFLAGS = @glib_CFLAGS@ +glib_LIBS = @glib_LIBS@ +gtk_CFLAGS = @gtk_CFLAGS@ +gtk_LIBS = @gtk_LIBS@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mesa_DIR = @mesa_DIR@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pixman_CFLAGS = @pixman_CFLAGS@ +pixman_LIBS = @pixman_LIBS@ +png_CFLAGS = @png_CFLAGS@ +png_LIBS = @png_LIBS@ +png_REQUIRES = @png_REQUIRES@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pthread_CFLAGS = @pthread_CFLAGS@ +pthread_LIBS = @pthread_LIBS@ +qt_CFLAGS = @qt_CFLAGS@ +qt_LIBS = @qt_LIBS@ +real_pthread_CFLAGS = @real_pthread_CFLAGS@ +real_pthread_LIBS = @real_pthread_LIBS@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +shm_LIBS = @shm_LIBS@ +skia_DIR = @skia_DIR@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xcb_CFLAGS = @xcb_CFLAGS@ +xcb_LIBS = @xcb_LIBS@ +xcb_drm_CFLAGS = @xcb_drm_CFLAGS@ +xcb_drm_LIBS = @xcb_drm_LIBS@ +xcb_shm_CFLAGS = @xcb_shm_CFLAGS@ +xcb_shm_LIBS = @xcb_shm_LIBS@ +xlib_CFLAGS = @xlib_CFLAGS@ +xlib_LIBS = @xlib_LIBS@ +xlib_xcb_CFLAGS = @xlib_xcb_CFLAGS@ +xlib_xcb_LIBS = @xlib_xcb_LIBS@ +xlib_xrender_CFLAGS = @xlib_xrender_CFLAGS@ +xlib_xrender_LIBS = @xlib_xrender_LIBS@ +lib_LTLIBRARIES = libcairo-gobject.la +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src +cairoincludedir = $(includedir)/cairo +cairoinclude_HEADERS = cairo-gobject.h +libcairo_gobject_la_SOURCES = \ + cairo-gobject-enums.c \ + cairo-gobject-structs.c \ + $(NULL) + +libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS) +libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) +libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu util/cairo-gobject/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu util/cairo-gobject/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libcairo-gobject.la: $(libcairo_gobject_la_OBJECTS) $(libcairo_gobject_la_DEPENDENCIES) + $(AM_V_CCLD)$(libcairo_gobject_la_LINK) -rpath $(libdir) $(libcairo_gobject_la_OBJECTS) $(libcairo_gobject_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_gobject_la-cairo-gobject-enums.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_gobject_la-cairo-gobject-structs.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +libcairo_gobject_la-cairo-gobject-enums.lo: cairo-gobject-enums.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_gobject_la_CFLAGS) $(CFLAGS) -MT libcairo_gobject_la-cairo-gobject-enums.lo -MD -MP -MF $(DEPDIR)/libcairo_gobject_la-cairo-gobject-enums.Tpo -c -o libcairo_gobject_la-cairo-gobject-enums.lo `test -f 'cairo-gobject-enums.c' || echo '$(srcdir)/'`cairo-gobject-enums.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_gobject_la-cairo-gobject-enums.Tpo $(DEPDIR)/libcairo_gobject_la-cairo-gobject-enums.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cairo-gobject-enums.c' object='libcairo_gobject_la-cairo-gobject-enums.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_gobject_la_CFLAGS) $(CFLAGS) -c -o libcairo_gobject_la-cairo-gobject-enums.lo `test -f 'cairo-gobject-enums.c' || echo '$(srcdir)/'`cairo-gobject-enums.c + +libcairo_gobject_la-cairo-gobject-structs.lo: cairo-gobject-structs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_gobject_la_CFLAGS) $(CFLAGS) -MT libcairo_gobject_la-cairo-gobject-structs.lo -MD -MP -MF $(DEPDIR)/libcairo_gobject_la-cairo-gobject-structs.Tpo -c -o libcairo_gobject_la-cairo-gobject-structs.lo `test -f 'cairo-gobject-structs.c' || echo '$(srcdir)/'`cairo-gobject-structs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_gobject_la-cairo-gobject-structs.Tpo $(DEPDIR)/libcairo_gobject_la-cairo-gobject-structs.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cairo-gobject-structs.c' object='libcairo_gobject_la-cairo-gobject-structs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_gobject_la_CFLAGS) $(CFLAGS) -c -o libcairo_gobject_la-cairo-gobject-structs.lo `test -f 'cairo-gobject-structs.c' || echo '$(srcdir)/'`cairo-gobject-structs.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-cairoincludeHEADERS: $(cairoinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(cairoincludedir)" || $(MKDIR_P) "$(DESTDIR)$(cairoincludedir)" + @list='$(cairoinclude_HEADERS)'; test -n "$(cairoincludedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(cairoincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(cairoincludedir)" || exit $$?; \ + done + +uninstall-cairoincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(cairoinclude_HEADERS)'; test -n "$(cairoincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(cairoincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(cairoincludedir)" && rm -f $$files + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cairoincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-cairoincludeHEADERS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-libLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-cairoincludeHEADERS uninstall-libLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-cairoincludeHEADERS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-cairoincludeHEADERS \ + uninstall-libLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/util/cairo-gobject/cairo-gobject-enums.c b/util/cairo-gobject/cairo-gobject-enums.c new file mode 100644 index 0000000..1fcd3d0 --- /dev/null +++ b/util/cairo-gobject/cairo-gobject-enums.c @@ -0,0 +1,503 @@ + +/* Generated data (by glib-mkenums) */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "cairo-gobject.h" + +GType +cairo_gobject_status_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_STATUS_SUCCESS, "CAIRO_STATUS_SUCCESS", "success" }, + { CAIRO_STATUS_NO_MEMORY, "CAIRO_STATUS_NO_MEMORY", "no-memory" }, + { CAIRO_STATUS_INVALID_RESTORE, "CAIRO_STATUS_INVALID_RESTORE", "invalid-restore" }, + { CAIRO_STATUS_INVALID_POP_GROUP, "CAIRO_STATUS_INVALID_POP_GROUP", "invalid-pop-group" }, + { CAIRO_STATUS_NO_CURRENT_POINT, "CAIRO_STATUS_NO_CURRENT_POINT", "no-current-point" }, + { CAIRO_STATUS_INVALID_MATRIX, "CAIRO_STATUS_INVALID_MATRIX", "invalid-matrix" }, + { CAIRO_STATUS_INVALID_STATUS, "CAIRO_STATUS_INVALID_STATUS", "invalid-status" }, + { CAIRO_STATUS_NULL_POINTER, "CAIRO_STATUS_NULL_POINTER", "null-pointer" }, + { CAIRO_STATUS_INVALID_STRING, "CAIRO_STATUS_INVALID_STRING", "invalid-string" }, + { CAIRO_STATUS_INVALID_PATH_DATA, "CAIRO_STATUS_INVALID_PATH_DATA", "invalid-path-data" }, + { CAIRO_STATUS_READ_ERROR, "CAIRO_STATUS_READ_ERROR", "read-error" }, + { CAIRO_STATUS_WRITE_ERROR, "CAIRO_STATUS_WRITE_ERROR", "write-error" }, + { CAIRO_STATUS_SURFACE_FINISHED, "CAIRO_STATUS_SURFACE_FINISHED", "surface-finished" }, + { CAIRO_STATUS_SURFACE_TYPE_MISMATCH, "CAIRO_STATUS_SURFACE_TYPE_MISMATCH", "surface-type-mismatch" }, + { CAIRO_STATUS_PATTERN_TYPE_MISMATCH, "CAIRO_STATUS_PATTERN_TYPE_MISMATCH", "pattern-type-mismatch" }, + { CAIRO_STATUS_INVALID_CONTENT, "CAIRO_STATUS_INVALID_CONTENT", "invalid-content" }, + { CAIRO_STATUS_INVALID_FORMAT, "CAIRO_STATUS_INVALID_FORMAT", "invalid-format" }, + { CAIRO_STATUS_INVALID_VISUAL, "CAIRO_STATUS_INVALID_VISUAL", "invalid-visual" }, + { CAIRO_STATUS_FILE_NOT_FOUND, "CAIRO_STATUS_FILE_NOT_FOUND", "file-not-found" }, + { CAIRO_STATUS_INVALID_DASH, "CAIRO_STATUS_INVALID_DASH", "invalid-dash" }, + { CAIRO_STATUS_INVALID_DSC_COMMENT, "CAIRO_STATUS_INVALID_DSC_COMMENT", "invalid-dsc-comment" }, + { CAIRO_STATUS_INVALID_INDEX, "CAIRO_STATUS_INVALID_INDEX", "invalid-index" }, + { CAIRO_STATUS_CLIP_NOT_REPRESENTABLE, "CAIRO_STATUS_CLIP_NOT_REPRESENTABLE", "clip-not-representable" }, + { CAIRO_STATUS_TEMP_FILE_ERROR, "CAIRO_STATUS_TEMP_FILE_ERROR", "temp-file-error" }, + { CAIRO_STATUS_INVALID_STRIDE, "CAIRO_STATUS_INVALID_STRIDE", "invalid-stride" }, + { CAIRO_STATUS_FONT_TYPE_MISMATCH, "CAIRO_STATUS_FONT_TYPE_MISMATCH", "font-type-mismatch" }, + { CAIRO_STATUS_USER_FONT_IMMUTABLE, "CAIRO_STATUS_USER_FONT_IMMUTABLE", "user-font-immutable" }, + { CAIRO_STATUS_USER_FONT_ERROR, "CAIRO_STATUS_USER_FONT_ERROR", "user-font-error" }, + { CAIRO_STATUS_NEGATIVE_COUNT, "CAIRO_STATUS_NEGATIVE_COUNT", "negative-count" }, + { CAIRO_STATUS_INVALID_CLUSTERS, "CAIRO_STATUS_INVALID_CLUSTERS", "invalid-clusters" }, + { CAIRO_STATUS_INVALID_SLANT, "CAIRO_STATUS_INVALID_SLANT", "invalid-slant" }, + { CAIRO_STATUS_INVALID_WEIGHT, "CAIRO_STATUS_INVALID_WEIGHT", "invalid-weight" }, + { CAIRO_STATUS_INVALID_SIZE, "CAIRO_STATUS_INVALID_SIZE", "invalid-size" }, + { CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, "CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED", "user-font-not-implemented" }, + { CAIRO_STATUS_DEVICE_TYPE_MISMATCH, "CAIRO_STATUS_DEVICE_TYPE_MISMATCH", "device-type-mismatch" }, + { CAIRO_STATUS_DEVICE_ERROR, "CAIRO_STATUS_DEVICE_ERROR", "device-error" }, + { CAIRO_STATUS_LAST_STATUS, "CAIRO_STATUS_LAST_STATUS", "last-status" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_status_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_content_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_CONTENT_COLOR, "CAIRO_CONTENT_COLOR", "color" }, + { CAIRO_CONTENT_ALPHA, "CAIRO_CONTENT_ALPHA", "alpha" }, + { CAIRO_CONTENT_COLOR_ALPHA, "CAIRO_CONTENT_COLOR_ALPHA", "color-alpha" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_content_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_operator_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_OPERATOR_CLEAR, "CAIRO_OPERATOR_CLEAR", "clear" }, + { CAIRO_OPERATOR_SOURCE, "CAIRO_OPERATOR_SOURCE", "source" }, + { CAIRO_OPERATOR_OVER, "CAIRO_OPERATOR_OVER", "over" }, + { CAIRO_OPERATOR_IN, "CAIRO_OPERATOR_IN", "in" }, + { CAIRO_OPERATOR_OUT, "CAIRO_OPERATOR_OUT", "out" }, + { CAIRO_OPERATOR_ATOP, "CAIRO_OPERATOR_ATOP", "atop" }, + { CAIRO_OPERATOR_DEST, "CAIRO_OPERATOR_DEST", "dest" }, + { CAIRO_OPERATOR_DEST_OVER, "CAIRO_OPERATOR_DEST_OVER", "dest-over" }, + { CAIRO_OPERATOR_DEST_IN, "CAIRO_OPERATOR_DEST_IN", "dest-in" }, + { CAIRO_OPERATOR_DEST_OUT, "CAIRO_OPERATOR_DEST_OUT", "dest-out" }, + { CAIRO_OPERATOR_DEST_ATOP, "CAIRO_OPERATOR_DEST_ATOP", "dest-atop" }, + { CAIRO_OPERATOR_XOR, "CAIRO_OPERATOR_XOR", "xor" }, + { CAIRO_OPERATOR_ADD, "CAIRO_OPERATOR_ADD", "add" }, + { CAIRO_OPERATOR_SATURATE, "CAIRO_OPERATOR_SATURATE", "saturate" }, + { CAIRO_OPERATOR_MULTIPLY, "CAIRO_OPERATOR_MULTIPLY", "multiply" }, + { CAIRO_OPERATOR_SCREEN, "CAIRO_OPERATOR_SCREEN", "screen" }, + { CAIRO_OPERATOR_OVERLAY, "CAIRO_OPERATOR_OVERLAY", "overlay" }, + { CAIRO_OPERATOR_DARKEN, "CAIRO_OPERATOR_DARKEN", "darken" }, + { CAIRO_OPERATOR_LIGHTEN, "CAIRO_OPERATOR_LIGHTEN", "lighten" }, + { CAIRO_OPERATOR_COLOR_DODGE, "CAIRO_OPERATOR_COLOR_DODGE", "color-dodge" }, + { CAIRO_OPERATOR_COLOR_BURN, "CAIRO_OPERATOR_COLOR_BURN", "color-burn" }, + { CAIRO_OPERATOR_HARD_LIGHT, "CAIRO_OPERATOR_HARD_LIGHT", "hard-light" }, + { CAIRO_OPERATOR_SOFT_LIGHT, "CAIRO_OPERATOR_SOFT_LIGHT", "soft-light" }, + { CAIRO_OPERATOR_DIFFERENCE, "CAIRO_OPERATOR_DIFFERENCE", "difference" }, + { CAIRO_OPERATOR_EXCLUSION, "CAIRO_OPERATOR_EXCLUSION", "exclusion" }, + { CAIRO_OPERATOR_HSL_HUE, "CAIRO_OPERATOR_HSL_HUE", "hsl-hue" }, + { CAIRO_OPERATOR_HSL_SATURATION, "CAIRO_OPERATOR_HSL_SATURATION", "hsl-saturation" }, + { CAIRO_OPERATOR_HSL_COLOR, "CAIRO_OPERATOR_HSL_COLOR", "hsl-color" }, + { CAIRO_OPERATOR_HSL_LUMINOSITY, "CAIRO_OPERATOR_HSL_LUMINOSITY", "hsl-luminosity" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_operator_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_antialias_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_ANTIALIAS_DEFAULT, "CAIRO_ANTIALIAS_DEFAULT", "default" }, + { CAIRO_ANTIALIAS_NONE, "CAIRO_ANTIALIAS_NONE", "none" }, + { CAIRO_ANTIALIAS_GRAY, "CAIRO_ANTIALIAS_GRAY", "gray" }, + { CAIRO_ANTIALIAS_SUBPIXEL, "CAIRO_ANTIALIAS_SUBPIXEL", "subpixel" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_antialias_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_fill_rule_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_FILL_RULE_WINDING, "CAIRO_FILL_RULE_WINDING", "winding" }, + { CAIRO_FILL_RULE_EVEN_ODD, "CAIRO_FILL_RULE_EVEN_ODD", "even-odd" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_fill_rule_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_line_cap_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_LINE_CAP_BUTT, "CAIRO_LINE_CAP_BUTT", "butt" }, + { CAIRO_LINE_CAP_ROUND, "CAIRO_LINE_CAP_ROUND", "round" }, + { CAIRO_LINE_CAP_SQUARE, "CAIRO_LINE_CAP_SQUARE", "square" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_line_cap_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_line_join_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_LINE_JOIN_MITER, "CAIRO_LINE_JOIN_MITER", "miter" }, + { CAIRO_LINE_JOIN_ROUND, "CAIRO_LINE_JOIN_ROUND", "round" }, + { CAIRO_LINE_JOIN_BEVEL, "CAIRO_LINE_JOIN_BEVEL", "bevel" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_line_join_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_text_cluster_flags_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_TEXT_CLUSTER_FLAG_BACKWARD, "CAIRO_TEXT_CLUSTER_FLAG_BACKWARD", "backward" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_text_cluster_flags_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_font_slant_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_FONT_SLANT_NORMAL, "CAIRO_FONT_SLANT_NORMAL", "normal" }, + { CAIRO_FONT_SLANT_ITALIC, "CAIRO_FONT_SLANT_ITALIC", "italic" }, + { CAIRO_FONT_SLANT_OBLIQUE, "CAIRO_FONT_SLANT_OBLIQUE", "oblique" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_font_slant_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_font_weight_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_FONT_WEIGHT_NORMAL, "CAIRO_FONT_WEIGHT_NORMAL", "normal" }, + { CAIRO_FONT_WEIGHT_BOLD, "CAIRO_FONT_WEIGHT_BOLD", "bold" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_font_weight_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_subpixel_order_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_SUBPIXEL_ORDER_DEFAULT, "CAIRO_SUBPIXEL_ORDER_DEFAULT", "default" }, + { CAIRO_SUBPIXEL_ORDER_RGB, "CAIRO_SUBPIXEL_ORDER_RGB", "rgb" }, + { CAIRO_SUBPIXEL_ORDER_BGR, "CAIRO_SUBPIXEL_ORDER_BGR", "bgr" }, + { CAIRO_SUBPIXEL_ORDER_VRGB, "CAIRO_SUBPIXEL_ORDER_VRGB", "vrgb" }, + { CAIRO_SUBPIXEL_ORDER_VBGR, "CAIRO_SUBPIXEL_ORDER_VBGR", "vbgr" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_subpixel_order_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_hint_style_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_HINT_STYLE_DEFAULT, "CAIRO_HINT_STYLE_DEFAULT", "default" }, + { CAIRO_HINT_STYLE_NONE, "CAIRO_HINT_STYLE_NONE", "none" }, + { CAIRO_HINT_STYLE_SLIGHT, "CAIRO_HINT_STYLE_SLIGHT", "slight" }, + { CAIRO_HINT_STYLE_MEDIUM, "CAIRO_HINT_STYLE_MEDIUM", "medium" }, + { CAIRO_HINT_STYLE_FULL, "CAIRO_HINT_STYLE_FULL", "full" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_hint_style_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_hint_metrics_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_HINT_METRICS_DEFAULT, "CAIRO_HINT_METRICS_DEFAULT", "default" }, + { CAIRO_HINT_METRICS_OFF, "CAIRO_HINT_METRICS_OFF", "off" }, + { CAIRO_HINT_METRICS_ON, "CAIRO_HINT_METRICS_ON", "on" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_hint_metrics_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_font_type_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_FONT_TYPE_TOY, "CAIRO_FONT_TYPE_TOY", "toy" }, + { CAIRO_FONT_TYPE_FT, "CAIRO_FONT_TYPE_FT", "ft" }, + { CAIRO_FONT_TYPE_WIN32, "CAIRO_FONT_TYPE_WIN32", "win32" }, + { CAIRO_FONT_TYPE_QUARTZ, "CAIRO_FONT_TYPE_QUARTZ", "quartz" }, + { CAIRO_FONT_TYPE_USER, "CAIRO_FONT_TYPE_USER", "user" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_font_type_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_path_data_type_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_PATH_MOVE_TO, "CAIRO_PATH_MOVE_TO", "move-to" }, + { CAIRO_PATH_LINE_TO, "CAIRO_PATH_LINE_TO", "line-to" }, + { CAIRO_PATH_CURVE_TO, "CAIRO_PATH_CURVE_TO", "curve-to" }, + { CAIRO_PATH_CLOSE_PATH, "CAIRO_PATH_CLOSE_PATH", "close-path" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_path_data_type_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_device_type_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_DEVICE_TYPE_DRM, "CAIRO_DEVICE_TYPE_DRM", "drm" }, + { CAIRO_DEVICE_TYPE_GL, "CAIRO_DEVICE_TYPE_GL", "gl" }, + { CAIRO_DEVICE_TYPE_SCRIPT, "CAIRO_DEVICE_TYPE_SCRIPT", "script" }, + { CAIRO_DEVICE_TYPE_XCB, "CAIRO_DEVICE_TYPE_XCB", "xcb" }, + { CAIRO_DEVICE_TYPE_XLIB, "CAIRO_DEVICE_TYPE_XLIB", "xlib" }, + { CAIRO_DEVICE_TYPE_XML, "CAIRO_DEVICE_TYPE_XML", "xml" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_device_type_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_surface_type_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_SURFACE_TYPE_IMAGE, "CAIRO_SURFACE_TYPE_IMAGE", "image" }, + { CAIRO_SURFACE_TYPE_PDF, "CAIRO_SURFACE_TYPE_PDF", "pdf" }, + { CAIRO_SURFACE_TYPE_PS, "CAIRO_SURFACE_TYPE_PS", "ps" }, + { CAIRO_SURFACE_TYPE_XLIB, "CAIRO_SURFACE_TYPE_XLIB", "xlib" }, + { CAIRO_SURFACE_TYPE_XCB, "CAIRO_SURFACE_TYPE_XCB", "xcb" }, + { CAIRO_SURFACE_TYPE_GLITZ, "CAIRO_SURFACE_TYPE_GLITZ", "glitz" }, + { CAIRO_SURFACE_TYPE_QUARTZ, "CAIRO_SURFACE_TYPE_QUARTZ", "quartz" }, + { CAIRO_SURFACE_TYPE_WIN32, "CAIRO_SURFACE_TYPE_WIN32", "win32" }, + { CAIRO_SURFACE_TYPE_BEOS, "CAIRO_SURFACE_TYPE_BEOS", "beos" }, + { CAIRO_SURFACE_TYPE_DIRECTFB, "CAIRO_SURFACE_TYPE_DIRECTFB", "directfb" }, + { CAIRO_SURFACE_TYPE_SVG, "CAIRO_SURFACE_TYPE_SVG", "svg" }, + { CAIRO_SURFACE_TYPE_OS2, "CAIRO_SURFACE_TYPE_OS2", "os2" }, + { CAIRO_SURFACE_TYPE_WIN32_PRINTING, "CAIRO_SURFACE_TYPE_WIN32_PRINTING", "win32-printing" }, + { CAIRO_SURFACE_TYPE_QUARTZ_IMAGE, "CAIRO_SURFACE_TYPE_QUARTZ_IMAGE", "quartz-image" }, + { CAIRO_SURFACE_TYPE_SCRIPT, "CAIRO_SURFACE_TYPE_SCRIPT", "script" }, + { CAIRO_SURFACE_TYPE_QT, "CAIRO_SURFACE_TYPE_QT", "qt" }, + { CAIRO_SURFACE_TYPE_RECORDING, "CAIRO_SURFACE_TYPE_RECORDING", "recording" }, + { CAIRO_SURFACE_TYPE_VG, "CAIRO_SURFACE_TYPE_VG", "vg" }, + { CAIRO_SURFACE_TYPE_GL, "CAIRO_SURFACE_TYPE_GL", "gl" }, + { CAIRO_SURFACE_TYPE_DRM, "CAIRO_SURFACE_TYPE_DRM", "drm" }, + { CAIRO_SURFACE_TYPE_TEE, "CAIRO_SURFACE_TYPE_TEE", "tee" }, + { CAIRO_SURFACE_TYPE_XML, "CAIRO_SURFACE_TYPE_XML", "xml" }, + { CAIRO_SURFACE_TYPE_SKIA, "CAIRO_SURFACE_TYPE_SKIA", "skia" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_surface_type_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_format_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_FORMAT_INVALID, "CAIRO_FORMAT_INVALID", "invalid" }, + { CAIRO_FORMAT_ARGB32, "CAIRO_FORMAT_ARGB32", "argb32" }, + { CAIRO_FORMAT_RGB24, "CAIRO_FORMAT_RGB24", "rgb24" }, + { CAIRO_FORMAT_A8, "CAIRO_FORMAT_A8", "a8" }, + { CAIRO_FORMAT_A1, "CAIRO_FORMAT_A1", "a1" }, + { CAIRO_FORMAT_RGB16_565, "CAIRO_FORMAT_RGB16_565", "rgb16-565" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_format_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_pattern_type_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_PATTERN_TYPE_SOLID, "CAIRO_PATTERN_TYPE_SOLID", "solid" }, + { CAIRO_PATTERN_TYPE_SURFACE, "CAIRO_PATTERN_TYPE_SURFACE", "surface" }, + { CAIRO_PATTERN_TYPE_LINEAR, "CAIRO_PATTERN_TYPE_LINEAR", "linear" }, + { CAIRO_PATTERN_TYPE_RADIAL, "CAIRO_PATTERN_TYPE_RADIAL", "radial" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_pattern_type_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_extend_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_EXTEND_NONE, "CAIRO_EXTEND_NONE", "none" }, + { CAIRO_EXTEND_REPEAT, "CAIRO_EXTEND_REPEAT", "repeat" }, + { CAIRO_EXTEND_REFLECT, "CAIRO_EXTEND_REFLECT", "reflect" }, + { CAIRO_EXTEND_PAD, "CAIRO_EXTEND_PAD", "pad" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_extend_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_filter_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_FILTER_FAST, "CAIRO_FILTER_FAST", "fast" }, + { CAIRO_FILTER_GOOD, "CAIRO_FILTER_GOOD", "good" }, + { CAIRO_FILTER_BEST, "CAIRO_FILTER_BEST", "best" }, + { CAIRO_FILTER_NEAREST, "CAIRO_FILTER_NEAREST", "nearest" }, + { CAIRO_FILTER_BILINEAR, "CAIRO_FILTER_BILINEAR", "bilinear" }, + { CAIRO_FILTER_GAUSSIAN, "CAIRO_FILTER_GAUSSIAN", "gaussian" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_filter_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + +GType +cairo_gobject_region_overlap_get_type (void) +{ + static volatile gsize type_volatile = 0; + if (g_once_init_enter (&type_volatile)) { + static const GEnumValue values[] = { + { CAIRO_REGION_OVERLAP_IN, "CAIRO_REGION_OVERLAP_IN", "in" }, + { CAIRO_REGION_OVERLAP_OUT, "CAIRO_REGION_OVERLAP_OUT", "out" }, + { CAIRO_REGION_OVERLAP_PART, "CAIRO_REGION_OVERLAP_PART", "part" }, + { 0, NULL, NULL } + }; + GType type = g_enum_register_static (g_intern_static_string ("cairo_region_overlap_t"), values); + + g_once_init_leave (&type_volatile, type); + } + return type_volatile; +} + + +/* Generated data ends here */ + diff --git a/util/cairo-gobject/cairo-gobject-structs.c b/util/cairo-gobject/cairo-gobject-structs.c new file mode 100644 index 0000000..05e3ece --- /dev/null +++ b/util/cairo-gobject/cairo-gobject-structs.c @@ -0,0 +1,87 @@ +/* cairo - a vector graphics library with display and print output + * + * Copyright © 2010 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation + * (the "LGPL") or, at your option, under the terms of the Mozilla + * Public License Version 1.1 (the "MPL"). If you do not alter this + * notice, a recipient may use your version of this file under either + * the MPL or the LGPL. + * + * You should have received a copy of the LGPL along with this library + * in the file COPYING-LGPL-2.1; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA + * You should have received a copy of the MPL along with this library + * in the file COPYING-MPL-1.1 + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY + * OF ANY KIND, either express or implied. See the LGPL or the MPL for + * the specific language governing rights and limitations. + * + * The Original Code is the cairo graphics library. + * + * The Initial Developer of the Original Code is University of Southern + * California. + * + * Contributor(s): + * Benjamin Otte <otte@redhat.com> + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "cairo-gobject.h" + +#define CAIRO_DEFINE_BOXED(Name,underscore_name,copy_func,free_func) \ +GType \ +underscore_name ## _get_type (void) \ +{ \ + static volatile gsize type_volatile = 0; \ + if (g_once_init_enter (&type_volatile)) { \ + GType type = g_boxed_type_register_static (g_intern_static_string (Name), \ + (GBoxedCopyFunc)copy_func, \ + (GBoxedFreeFunc)free_func); \ + g_once_init_leave (&type_volatile, type); \ + } \ + return type_volatile; \ +} + +CAIRO_DEFINE_BOXED ("CairoContext", cairo_gobject_context, + cairo_reference, cairo_destroy); +CAIRO_DEFINE_BOXED ("CairoDevice", cairo_gobject_device, + cairo_device_reference, cairo_device_destroy); +CAIRO_DEFINE_BOXED ("CairoPattern", cairo_gobject_pattern, + cairo_pattern_reference, cairo_pattern_destroy); +CAIRO_DEFINE_BOXED ("CairoSurface", cairo_gobject_surface, + cairo_surface_reference, cairo_surface_destroy); +CAIRO_DEFINE_BOXED ("CairoScaledFont", cairo_gobject_scaled_font, + cairo_scaled_font_reference, cairo_scaled_font_destroy); +CAIRO_DEFINE_BOXED ("CairoFontFace", cairo_gobject_font_face, + cairo_font_face_reference, cairo_font_face_destroy); +CAIRO_DEFINE_BOXED ("CairoFontOptions", cairo_gobject_font_options, + cairo_font_options_copy, cairo_font_options_destroy); +CAIRO_DEFINE_BOXED ("CairoRegion", cairo_gobject_region, + cairo_region_reference, cairo_region_destroy); + +#define COPY_FUNC(name) \ +static gpointer \ +cairo_gobject_cairo_ ## name ## _copy (gpointer src) \ +{ \ + return g_memdup (src, sizeof (cairo_ ## name ## _t)); \ +} + +COPY_FUNC (rectangle) +CAIRO_DEFINE_BOXED ("CairoRectangle", cairo_gobject_rectangle, + cairo_gobject_cairo_rectangle_copy, g_free); +COPY_FUNC (rectangle_int) +CAIRO_DEFINE_BOXED ("CairoRectangleInt", cairo_gobject_rectangle_int, + cairo_gobject_cairo_rectangle_int_copy, g_free); + diff --git a/util/cairo-gobject/cairo-gobject.h b/util/cairo-gobject/cairo-gobject.h new file mode 100644 index 0000000..f43a6d0 --- /dev/null +++ b/util/cairo-gobject/cairo-gobject.h @@ -0,0 +1,186 @@ +/* cairo - a vector graphics library with display and print output + * + * Copyright © 2010 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation + * (the "LGPL") or, at your option, under the terms of the Mozilla + * Public License Version 1.1 (the "MPL"). If you do not alter this + * notice, a recipient may use your version of this file under either + * the MPL or the LGPL. + * + * You should have received a copy of the LGPL along with this library + * in the file COPYING-LGPL-2.1; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA + * You should have received a copy of the MPL along with this library + * in the file COPYING-MPL-1.1 + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY + * OF ANY KIND, either express or implied. See the LGPL or the MPL for + * the specific language governing rights and limitations. + * + * The Original Code is the cairo graphics library. + * + * The Initial Developer of the Original Code is University of Southern + * California. + * + * Contributor(s): + * Benjamin Otte <otte@redhat.com> + */ + +#ifndef CAIRO_GOBJECT_H +#define CAIRO_GOBJECT_H + +#include <cairo.h> + +#if CAIRO_HAS_GOBJECT_FUNCTIONS + +#include <glib-object.h> + +CAIRO_BEGIN_DECLS + +/* structs */ + +#define CAIRO_GOBJECT_TYPE_CONTEXT cairo_gobject_context_get_type () +cairo_public GType +cairo_gobject_context_get_type (void); + +#define CAIRO_GOBJECT_TYPE_DEVICE cairo_gobject_device_get_type () +cairo_public GType +cairo_gobject_device_get_type (void); + +#define CAIRO_GOBJECT_TYPE_PATTERN cairo_gobject_pattern_get_type () +cairo_public GType +cairo_gobject_pattern_get_type (void); + +#define CAIRO_GOBJECT_TYPE_SURFACE cairo_gobject_surface_get_type () +cairo_public GType +cairo_gobject_surface_get_type (void); + +#define CAIRO_GOBJECT_TYPE_RECTANGLE cairo_gobject_rectangle_get_type () +cairo_public GType +cairo_gobject_rectangle_get_type (void); + +#define CAIRO_GOBJECT_TYPE_SCALED_FONT cairo_gobject_scaled_font_get_type () +cairo_public GType +cairo_gobject_scaled_font_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FONT_FACE cairo_gobject_font_face_get_type () +cairo_public GType +cairo_gobject_font_face_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FONT_OPTIONS cairo_gobject_font_options_get_type () +cairo_public GType +cairo_gobject_font_options_get_type (void); + +#define CAIRO_GOBJECT_TYPE_RECTANGLE_INT cairo_gobject_rectangle_int_get_type () +cairo_public GType +cairo_gobject_rectangle_int_get_type (void); + +#define CAIRO_GOBJECT_TYPE_REGION cairo_gobject_region_get_type () +cairo_public GType +cairo_gobject_region_get_type (void); + +/* enums */ + +#define CAIRO_GOBJECT_TYPE_STATUS cairo_gobject_status_get_type () +cairo_public GType +cairo_gobject_status_get_type (void); + +#define CAIRO_GOBJECT_TYPE_CONTENT cairo_gobject_content_get_type () +cairo_public GType +cairo_gobject_content_get_type (void); + +#define CAIRO_GOBJECT_TYPE_OPERATOR cairo_gobject_operator_get_type () +cairo_public GType +cairo_gobject_operator_get_type (void); + +#define CAIRO_GOBJECT_TYPE_ANTIALIAS cairo_gobject_antialias_get_type () +cairo_public GType +cairo_gobject_antialias_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FILL_RULE cairo_gobject_fill_rule_get_type () +cairo_public GType +cairo_gobject_fill_rule_get_type (void); + +#define CAIRO_GOBJECT_TYPE_LINE_CAP cairo_gobject_line_cap_get_type () +cairo_public GType +cairo_gobject_line_cap_get_type (void); + +#define CAIRO_GOBJECT_TYPE_LINE_JOIN cairo_gobject_line_join_get_type () +cairo_public GType +cairo_gobject_line_join_get_type (void); + +#define CAIRO_GOBJECT_TYPE_CLUSTER_FLAGS cairo_gobject_cluster_flags_get_type () +cairo_public GType +cairo_gobject_text_cluster_flags_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FONT_SLANT cairo_gobject_font_slant_get_type () +cairo_public GType +cairo_gobject_font_slant_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FONT_WEIGHT cairo_gobject_font_weight_get_type () +cairo_public GType +cairo_gobject_font_weight_get_type (void); + +#define CAIRO_GOBJECT_TYPE_SUBPIXEL_ORDER cairo_gobject_subpixel_order_get_type () +cairo_public GType +cairo_gobject_subpixel_order_get_type (void); + +#define CAIRO_GOBJECT_TYPE_HINT_STYLE cairo_gobject_hint_style_get_type () +cairo_public GType +cairo_gobject_hint_style_get_type (void); + +#define CAIRO_GOBJECT_TYPE_HNT_METRICS cairo_gobject_hint_metrics_get_type () +cairo_public GType +cairo_gobject_hint_metrics_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FONT_TYPE cairo_gobject_font_type_get_type () +cairo_public GType +cairo_gobject_font_type_get_type (void); + +#define CAIRO_GOBJECT_TYPE_PATH_DATA_TYPE cairo_gobject_path_data_type_get_type () +cairo_public GType +cairo_gobject_path_data_type_get_type (void); + +#define CAIRO_GOBJECT_TYPE_DEVICE_TYPE cairo_gobject_device_type_get_type () +cairo_public GType +cairo_gobject_device_type_get_type (void); + +#define CAIRO_GOBJECT_TYPE_SURFACE_TYPE cairo_gobject_surface_type_get_type () +cairo_public GType +cairo_gobject_surface_type_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FORMAT cairo_gobject_format_get_type () +cairo_public GType +cairo_gobject_format_get_type (void); + +#define CAIRO_GOBJECT_TYPE_PATTERN_TYPE cairo_gobject_pattern_type_get_type () +cairo_public GType +cairo_gobject_pattern_type_get_type (void); + +#define CAIRO_GOBJECT_TYPE_EXTEND cairo_gobject_extend_get_type () +cairo_public GType +cairo_gobject_extend_get_type (void); + +#define CAIRO_GOBJECT_TYPE_FILTER cairo_gobject_filter_get_type () +cairo_public GType +cairo_gobject_filter_get_type (void); + +#define CAIRO_GOBJECT_TYPE_REGION_OVERLAP cairo_gobject_region_overlap_get_type () +cairo_public GType +cairo_gobject_region_overlap_get_type (void); + +CAIRO_END_DECLS + +#else /* CAIRO_HAS_GOBJECT_FUNCTIONS */ +# error Cairo was not compiled with support for GObject +#endif /* CAIRO_HAS_GOBJECT_FUNCTIONS */ + +#endif /* CAIRO_GOBJECT_H */ diff --git a/util/cairo-script/Makefile.in b/util/cairo-script/Makefile.in index e5679b8..06161bf 100644 --- a/util/cairo-script/Makefile.in +++ b/util/cairo-script/Makefile.in @@ -262,6 +262,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -375,7 +377,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ diff --git a/util/cairo-script/examples/Makefile.in b/util/cairo-script/examples/Makefile.in index 491dbc3..fccc6f8 100644 --- a/util/cairo-script/examples/Makefile.in +++ b/util/cairo-script/examples/Makefile.in @@ -126,6 +126,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -239,7 +241,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ diff --git a/util/cairo-sphinx/Makefile.in b/util/cairo-sphinx/Makefile.in index 3905aca..8fe767b 100644 --- a/util/cairo-sphinx/Makefile.in +++ b/util/cairo-sphinx/Makefile.in @@ -191,6 +191,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -304,7 +306,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ diff --git a/util/cairo-sphinx/fdr.c b/util/cairo-sphinx/fdr.c index 31945f6..aeda89b 100644 --- a/util/cairo-sphinx/fdr.c +++ b/util/cairo-sphinx/fdr.c @@ -24,6 +24,7 @@ #include <cairo.h> #include <cairo-script.h> +#include <cairo-tee.h> #include <stdlib.h> #include <stdint.h> #include <assert.h> diff --git a/util/cairo-trace/Makefile.in b/util/cairo-trace/Makefile.in index 9425b21..60d1691 100644 --- a/util/cairo-trace/Makefile.in +++ b/util/cairo-trace/Makefile.in @@ -199,6 +199,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GS = @GS@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -312,7 +314,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mesa_DIR = @mesa_DIR@ mkdir_p = @mkdir_p@ |
