Merge lp:~tkluck/ubuntu/oneiric/goocanvas/v2 into lp:ubuntu/oneiric/goocanvas

Proposed by Jeremy Bicha
Status: Superseded
Proposed branch: lp:~tkluck/ubuntu/oneiric/goocanvas/v2
Merge into: lp:ubuntu/oneiric/goocanvas
Diff against target: 117464 lines
To merge this branch: bzr merge lp:~tkluck/ubuntu/oneiric/goocanvas/v2
Reviewer Review Type Date Requested Status
Jeremy Bicha Needs Fixing
Ubuntu branches Pending
Review via email: mp+82969@code.launchpad.net

This proposal has been superseded by a proposal from 2011-11-24.

To post a comment you must log in.
Revision history for this message
Jeremy Bicha (jbicha) wrote :

Hi, thanks for your work on this. Next time, please consider subscribing ubuntu-sponsors to your bug report when you feel that your packaging work is ready to go into Ubuntu. Launchpad is so huge that it's easy for useful contributions to go unseen if they don't show up in the right places!

I wasn't able to build this. First, because of:

usr/bin/make -f debian/rules reverse-config
make[1]: Entering directory `/home/jeremy/devel/goocanvas/build-area/goocanvas-2.0.0'
/usr/share/cdbs/1/rules/dpatch.mk:33: WARNING: dpatch.mk is deprecated - please use source format 3.0 (quilt) instead
for i in ./config.guess ./config.sub ; do \
  if test -e $i.cdbs-orig ; then \
   mv $i.cdbs-orig $i ; \
  fi ; \
 done
make[1]: Leaving directory `/home/jeremy/devel/goocanvas/build-area/goocanvas-2.0.0'
dpatch deapply-all
make: dpatch: Command not found
make: *** [deapply-dpatches] Error 127
E: Failed to clean source directory
bzr: ERROR: The build failed.

After removing the dpatch line from debian/rules I got quite a few errors about modified upstream files. I don't think you meant to be modifying upstream.

1. Remove the dpatch line from debian/rules
2. Cleanly extract the upstream tarball
3. Please also fix this lintian warning:
libgoocanvas-2.0: package-name-doesnt-match-sonames libgoocanvas-2.0-9

review: Needs Fixing
Revision history for this message
Timo Kluck (tkluck) wrote :

Hi Jeremy, thanks for reviewing! I will make the corrections you
suggest and call back here.

2011/11/22 Jeremy Bicha <email address hidden>:
> Review: Needs Fixing
>
> Hi, thanks for your work on this. Next time, please consider subscribing ubuntu-sponsors to your bug report when you feel that your packaging work is ready to go into Ubuntu. Launchpad is so huge that it's easy for useful contributions to go unseen if they don't show up in the right places!
>
> I wasn't able to build this. First, because of:
>
> usr/bin/make -f debian/rules reverse-config
> make[1]: Entering directory `/home/jeremy/devel/goocanvas/build-area/goocanvas-2.0.0'
> /usr/share/cdbs/1/rules/dpatch.mk:33: WARNING:  dpatch.mk is deprecated - please use source format 3.0 (quilt) instead
> for i in ./config.guess ./config.sub  ; do \
>                if test -e $i.cdbs-orig ; then \
>                        mv $i.cdbs-orig $i ; \
>                fi ; \
>        done
> make[1]: Leaving directory `/home/jeremy/devel/goocanvas/build-area/goocanvas-2.0.0'
> dpatch deapply-all
> make: dpatch: Command not found
> make: *** [deapply-dpatches] Error 127
> E: Failed to clean source directory
> bzr: ERROR: The build failed.
>
> After removing the dpatch line from debian/rules I got quite a few errors about modified upstream files. I don't think you meant to be modifying upstream.
>
> 1. Remove the dpatch line from debian/rules
> 2. Cleanly extract the upstream tarball
> 3. Please also fix this lintian warning:
> libgoocanvas-2.0: package-name-doesnt-match-sonames libgoocanvas-2.0-9
> --
> https://code.launchpad.net/~tkluck/ubuntu/oneiric/goocanvas/v2/+merge/82969
> You are the owner of lp:~tkluck/ubuntu/oneiric/goocanvas/v2.
>

Revision history for this message
Sebastien Bacher (seb128) wrote :

Jeremy or Timo, could one you change the merge request to not be against Oneiric (which is stable and can't get that update), could you also set it to "work in progress" until it's updated so it gets out of the review queue?

Revision history for this message
Timo Kluck (tkluck) wrote :

I put it on "work in progress". I can't change the branch the proposal is for, but I will submit a new merge proposal against lp:ubuntu/goocanvas when I'm done.

Unmerged revisions

19. By Timo Kluck

Updated copyright info

18. By Timo Kluck

debian/libgoocanvas-2.0-dev.install: Add .pc file to dev package

17. By Timo Kluck

Added cairo and gtk+3 build dependencies

16. By Timo Kluck

updated maintainer field and rules

15. By Timo Kluck

Don't relibtoolize

14. By Timo Kluck

Added results of autogen.sh

13. By Timo Kluck

Redo debian packaging update

12. By Timo Kluck

Redid patching v0.15 up to v2.0.0 because I forgot to bring the new files under version control

11. By Timo Kluck

Updated debian packaging for version 2.0

10. By Timo Kluck

Applied diff from lp:goocanvas -r49..82 (i.e. from v0.15 up to v2.0.0)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2009-07-28 20:38:41 +0000
3+++ ChangeLog 2011-11-22 04:29:25 +0000
4@@ -1,3 +1,244 @@
5+2011-02-27 Damon Chaplin <damon@gnome.org>
6+
7+ * Released GooCanvas 2.0.0
8+
9+2011-02-14 Damon Chaplin <damon@gnome.org>
10+
11+ * src/goocanvas.c (goo_canvas_set_property): use gtk_widget_modify_bg()
12+ instead of gtk_widget_modify_base() to change the background color.
13+
14+2011-02-14 Damon Chaplin <damon@gnome.org>
15+
16+ * Released GooCanvas 1.90.3
17+
18+2011-02-11 Damon Chaplin <damon@gnome.org>
19+
20+ * docs/Makefile.am: set DOC_MODULE to goocanvas2 to make it parallel
21+ installable with 1.x. Also renamed several of the files from
22+ goocanvasXXX to goocanvas2XXX.
23+
24+2011-01-10 Damon Chaplin <damon@gnome.org>
25+
26+ * src/goocanvasutils.h (enum): added docs for GooCanvasAnchorType.
27+
28+2011-01-10 Damon Chaplin <damon@gnome.org>
29+
30+ * src/goocanvasimage.c: added "alpha" property. Patch from xapantu
31+ plus a few changes.
32+
33+ * demo/mv-demo.c:
34+ * demo/demo.c: added test for the above for the flowers.
35+
36+2010-11-03 Damon Chaplin <damon@gnome.org>
37+
38+ * Released GooCanvas 1.90.2
39+
40+2010-11-03 Damon Chaplin <damon@gnome.org>
41+
42+ * src/goocanvas.c: added goo_canvas_get_preferred_width() and
43+ goo_canvas_get_preferred_height() and removed goo_canvas_size_request().
44+
45+ * configure.in: depend on GTK+ 2.91.3 for the above.
46+
47+2010-10-27 Damon Chaplin <damon@gnome.org>
48+
49+ * src/goocanvas.c: switched the get_property/set_property code and
50+ added "hscroll-policy" and "vscroll-policy".
51+
52+2010-10-27 Murray Cumming <murrayc@murrayc.com>
53+
54+ Fix the build with GTK+ 2.91.2, using GtkScrollable.
55+
56+ * src/goocanvas.[h|c] (goo_canvas_class_init): Implemeent the GtkScrollable
57+ interface, overriding the hadjustment and vadjustment properties, instead
58+ of implementing the set_scroll_adjustments vfunc, which was removed from
59+ GtkWidget. Likewise remove the set_scroll_adjustments_signal because it
60+ is no longer needed.
61+ (goo_canvas_get_property), (goo_canvas_set_property): Handle the new
62+ properties.
63+ (goo_canvas_set_hadjustment), (goo_canvas_set_vadjustment): Replace
64+ the old goo_canvas_set_adjustments() function with individual functions
65+ because they can be set separately, and to have code that is as similar as
66+ possible to, for instance, GtkTextView.
67+
68+2010-10-24 Damon Chaplin <damon@gnome.org>
69+
70+ * src/goocanvas.c (redraw_static_items_at_position)
71+ (goo_canvas_adjustment_value_changed): comment out the calls to
72+ gdk_window_process_updates() as they cause flickering when zooming.
73+ I'm not sure if we should use something else instead.
74+
75+2010-10-24 Damon Chaplin <damon@gnome.org>
76+
77+ * Released GooCanvas 1.90.1
78+
79+2010-10-24 Damon Chaplin <damon@gnome.org>
80+
81+ * src/goocanvas.c: updated the drawing code to work with GTK+ 3.
82+ It seems to work now, but it still flickers when zooming in & out,
83+ since we can't use our old trick of mapping a temporary window with
84+ no background over it while changing the scale.
85+
86+2010-10-01 Damon Chaplin <damon@gnome.org>
87+
88+ * demo/*.c
89+ * src/goocanvas.c (goo_canvas_draw): applied patch from Murray to
90+ compile with latest GTK+, with minor changes.
91+ Note that drawing doesn't work properly at present.
92+
93+2010-09-02 Murray Cumming <murrayc@murrayc.com>
94+
95+ Fix build with latest GTK+, which has no GdkGC.
96+
97+ * src/goocanvas.c (goo_canvas_expose_event): When clearing the background,
98+ use gdk_cairo_set_source_color() and GtkWidget::base instead of
99+ gdk_draw_rectangle() and GtkWidget::base_gc. Thanks to Benjamin Otte for
100+ this code.
101+
102+2010-07-27 Damon Chaplin <damon@gnome.org>
103+
104+ * src/goocanvas.c (goo_canvas_adjustment_value_changed): fixed call
105+ to redraw_static_items_at_position() - was using hadjustment twice.
106+
107+2010-07-25 Damon Chaplin <damon@gnome.org>
108+
109+ * src/goocanvas.c (goo_canvas_configure_hadjustment)
110+ (goo_canvas_configure_vadjustment): freeze updates until finished,
111+ and fixed bug setting hadjustment page size.
112+ (goo_canvas_focus_in, goo_canvas_focus_out): removed grab_focus()
113+ calls that replaced "GTK_WIDGET_SET/UNSET_FLAGS (widget, GTK_HAS_FOCUS)"
114+ I don't think the macros should have been there anyway.
115+
116+ * src/goocanvasatk.c (goo_canvas_item_accessible_get_extents): tidied
117+ up a little - get canvas window once and reuse.
118+
119+2010-07-25 Murray Cumming <murrayc@murrayc.com>
120+
121+ Fix the build with the latest GTK+ 3.0 API.
122+
123+ * demo/demo-focus.c (create_focus_page):
124+ * demo/demo-grabs.c (on_widget_expose), (on_widget_button_press):
125+ * demo/demo-large-items.c (zoom_changed):
126+ * demo/demo.c (zoom_changed), (zoom_x_changed), (zoom_y_changed),
127+ (anchor_toggled):
128+ * demo/mv-demo-focus.c (create_focus_page):
129+ * demo/mv-demo-grabs.c (on_widget_expose),
130+ (on_widget_button_press):
131+ * demo/mv-demo.c (zoom_changed), (anchor_toggled):
132+ * demo/units-demo.c (zoom_changed):
133+ * demo/widgets-demo.c (main):
134+ * src/goocanvas.c (goo_canvas_init), (goo_canvas_realize),
135+ (goo_canvas_map), (goo_canvas_style_set),
136+ (goo_canvas_configure_hadjustment),
137+ (goo_canvas_configure_vadjustment), (reconfigure_canvas),
138+ (goo_canvas_size_allocate), (goo_canvas_adjustment_value_changed),
139+ (goo_canvas_scroll_to), (goo_canvas_scroll_to_item),
140+ (goo_canvas_set_scale_internal), (paint_static_items),
141+ (goo_canvas_expose_event), (goo_canvas_scroll),
142+ (goo_canvas_focus_in), (goo_canvas_focus_out),
143+ (goo_canvas_convert_from_window_pixels),
144+ (goo_canvas_convert_to_static_item_space),
145+ (goo_canvas_get_start_bounds), (goo_canvas_focus):
146+ * src/goocanvasatk.c (goo_canvas_item_accessible_get_item_extents),
147+ (goo_canvas_item_accessible_is_item_in_window),
148+ (goo_canvas_item_accessible_get_extents),
149+ (goo_canvas_accessible_get_n_children),
150+ (goo_canvas_accessible_ref_child): Replace use of direct struct field access
151+ in GtkWidget, GtkWindow, and GtkAdjustment, with use of the new get/set
152+ functions, to fix the build with the latest GTK+ 3.0 API.
153+
154+2010-06-30 Damon Chaplin <damon@gnome.org>
155+
156+ * docs: added empty internal subset "[]" to the DOCTYPEs to keep
157+ gtk-doc happy.
158+
159+ * src/goocanvas.c (goo_canvas_expose_event): do a cairo_save()/restore()
160+ around painting the main items, so the static items don't get clipped.
161+
162+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_set_property):
163+ handle setting "clip-path" to NULL to reset it.
164+
165+ * src/goocanvastable.c: try to handle RTL direction better.
166+
167+ * src/goocanvasgroup.c (goo_canvas_group_paint): use the scale
168+ argument rather than the canvas scale.
169+
170+ * src/goocanvas.c: added "before-initial-expose" flag which we use
171+ to ignore any redraw requests before the initial expose (since we
172+ know the entire canvas needs redrawing anyway). This speeds up the
173+ creation of lots of items, e.g. scalability-demo.
174+
175+ * demo/Makefile.am (mv_demo_LDADD, demo_LDADD): added -lm to compile.
176+
177+ * demo/mv-scalability-demo.c:
178+ * demo/scalability-demo.c: updated to compare with the new-api code.
179+
180+2010-06-21 Damon Chaplin <damon@gnome.org>
181+
182+ * Released GooCanvas 1.90.0
183+
184+2010-06-21 Damon Chaplin <damon@gnome.org>
185+
186+ Got rid of all the GTK_CHECK_VERSION stuff as we depend on 3.0 now.
187+
188+2010-06-11 Murray Cumming <murrayc@murrayc.com>
189+
190+ Update source code for GTK+ 3.
191+
192+ * demo/Makefile.am: Fix a typo.
193+ * demo/demo-grabs.c (create_fixed):
194+ * demo/mv-demo-grabs.c (create_fixed):
195+ * src/goocanvas.c (goo_canvas_grab_focus), (goo_canvas_focus):
196+ * src/goocanvasatk.c (goo_canvas_item_accessible_grab_focus),
197+ (goo_canvas_item_accessible_ref_state_set):
198+ Replace use of gtk_fixed_set_has_window() with gtk_widget_set_has_window().
199+ Replace use of GTK_WIDGET_CAN_FOCUS() with gtk_widget_get_can_focus().
200+ Replace use of GTK_WIDGET_TOPLEVEL() with gtk_widget_is_toplevel().
201+
202+ This seems to all work fine.
203+
204+2010-06-11 Murray Cumming <murrayc@murrayc.com>
205+
206+ Use GTK+ 3 instead of GTK+ 2.
207+
208+ * goocanvas.pc.in: Rename to goocanvas-2.0.pc.in:
209+ * configure.in
210+ * Makefile.am
211+ * demo/Makefile.am: Depend on GTK+ 3 instead of GTK+ 2.
212+ Change the library name from libgoocanvas to libgoocanvas-2.0.
213+ Install the headers in <prefix>/include/goocanvas-2.0 instead of
214+ <prefix>/include/goocanvas-1.0.
215+
216+This is the master branch for goocanvas-2.0, using GTK+ 3
217+See also the goocanvas-1.0 branch.
218+
219+2010-05-10 Damon Chaplin <damon@gnome.org>
220+
221+ * src/goocanvastext.c: improve docs for "width" and "height" properties.
222+ #595164.
223+
224+2010-05-10 Damon Chaplin <damon@gnome.org>
225+
226+ * src/goocanvaspolyline.c: don't use the reconfigure_arrows flag
227+ any more - always reconfigure the arrows during an update. This
228+ avoids a bug where the line width changes but the arrows don't get
229+ reconfigured, since the line width is an inherited property and
230+ reconfigure_arrows wasn't being set when it changed.
231+
232+2010-05-07 Damon Chaplin <damon@gnome.org>
233+
234+ * src/goocanvasstyle.c (goo_canvas_style_set_stroke_options): handle
235+ a NULL dash setting. #617960.
236+
237+2010-04-28 Luis Medinas <lmedinas@gnome.org>
238+
239+ * applied small patch to compile with GTK+ 3.0. #615435.
240+
241+2009-08-20 Murray Cumming <murrayc@murrayc.com>
242+
243+ * docs/architecture.xml: Fixed documenation typo. Bug #591983.
244+ (Martin Olsson)
245+
246 2009-06-29 Damon Chaplin <damon@gnome.org>
247
248 * Released GooCanvas 0.15
249@@ -7,8 +248,8 @@
250 * src/goocanvasimage.c: added "scale-to-fit" property, which scales
251 the image to fit the "width" and "height" settings.
252
253- * demo/units-demo.c:
254- * demo/mv-demo.c (plant_flower):
255+ * demo/units-demo.c:
256+ * demo/mv-demo.c (plant_flower):
257 * demo/demo.c (plant_flower): test "scale-to-fit" property.
258
259 2009-05-07 Damon Chaplin <damon@gnome.org>
260@@ -20,7 +261,7 @@
261
262 2009-03-16 Damon Chaplin <damon@gnome.org>
263
264- * src/goocanvasitem.c: changed docs referring to "root_x" and "root_y"
265+ * src/goocanvasitem.c: changed docs referring to "root_x" and "root_y"
266 fields of event structs to "x_root" and "y_root".
267
268 2009-03-15 Damon Chaplin <damon@gnome.org>
269@@ -39,7 +280,7 @@
270
271 * configure.in: added dependancy on GTK+ 2.12 for tooltips.
272
273- * demo/mv-demo.c:
274+ * demo/mv-demo.c:
275 * demo/demo.c: added tests for tooltips.
276
277 2009-03-15 Damon Chaplin <damon@gnome.org>
278@@ -50,9 +291,9 @@
279
280 2009-03-15 Damon Chaplin <damon@gnome.org>
281
282- * docs/coordinates.xml:
283- * docs/architecture.xml:
284- * docs/creating-items.xml:
285+ * docs/coordinates.xml:
286+ * docs/architecture.xml:
287+ * docs/creating-items.xml:
288 * src/goocanvasitemsimple.c: use the terms "canvas coordinate space" or
289 "canvas space" rather than "device space" which is a bit misleading.
290
291@@ -66,7 +307,7 @@
292 scroll_event() signals on items.
293
294 * src/goocanvasitem.c: implemented "scroll_event" signals on items.
295-
296+
297 * src/goocanvas.c: implemented "scroll_event" signals on items.
298
299 * demo/demo.c: added test for above. #566110
300@@ -117,7 +358,7 @@
301
302 2008-11-19 Damon Chaplin <damon@gnome.org>
303
304- * src/goocanvasitemmodel.c (goo_canvas_item_model_stop_animation):
305+ * src/goocanvasitemmodel.c (goo_canvas_item_model_stop_animation):
306 * src/goocanvasitem.c (goo_canvas_item_animate_cb)
307 (goo_canvas_item_stop_animation): remove the current animation data
308 before emitting "animation-finished", so signal handlers can start a
309@@ -134,7 +375,7 @@
310 group of static items separately, to stop GTK+ merging the redraw
311 rect into one massive one.
312
313- * demo/mv-demo.c (create_static_model):
314+ * demo/mv-demo.c (create_static_model):
315 * demo/demo.c (setup_static_items): use a group for all the static
316 items.
317
318@@ -162,7 +403,7 @@
319
320 * src/goocanvaswidget.c: note that widgets can't be static.
321
322- * README:
323+ * README:
324 * docs/overview.xml: mention static items and the grid item.
325
326 2008-11-03 Damon Chaplin <damon@gnome.org>
327@@ -172,7 +413,7 @@
328 (emit_pointer_event): convert the pointer position to static item space
329 for static items.
330
331- * src/goocanvasatk.c (goo_canvas_item_accessible_get_item_extents):
332+ * src/goocanvasatk.c (goo_canvas_item_accessible_get_item_extents):
333 handle static items - don't need to convert to pixels within the
334 window as they are already like that.
335
336@@ -180,7 +421,7 @@
337
338 * src/goocanvasgrid.[hc]: new grid item.
339
340- * demo/mv-demo.c (setup_grids):
341+ * demo/mv-demo.c (setup_grids):
342 * demo/demo.c (setup_grids): added a grid.
343
344 * src/Makefile.am: added grid.
345@@ -201,27 +442,27 @@
346
347 2008-10-31 Damon Chaplin <damon@gnome.org>
348
349- * src/goocanvasitemmodel.h (struct _GooCanvasItemModelIface):
350+ * src/goocanvasitemmodel.h (struct _GooCanvasItemModelIface):
351 * src/goocanvasitem.h (struct _GooCanvasItemIface): added
352 animation_finished() signals.
353
354- * src/goocanvasitemmodel.c:
355+ * src/goocanvasitemmodel.c:
356 * src/goocanvasitem.c: implemented "animation-finished" signals.
357
358- * demo/mv-demo-animation.c:
359+ * demo/mv-demo-animation.c:
360 * demo/demo-animation.c: added test for above.
361
362 2008-10-31 Damon Chaplin <damon@gnome.org>
363
364- * demo/mv-demo-arrowhead.c (on_button_press):
365- * demo/demo-arrowhead.c (on_button_press):
366- * demo/mv-demo.c (on_button_press):
367+ * demo/mv-demo-arrowhead.c (on_button_press):
368+ * demo/demo-arrowhead.c (on_button_press):
369+ * demo/mv-demo.c (on_button_press):
370 * demo/demo.c (on_button_press): use GDK_POINTER_MOTION_HINT_MASK for
371 the pointer grab, so we don't get too many events.
372
373 2008-10-31 Damon Chaplin <damon@gnome.org>
374
375- * src/goocanvas.h:
376+ * src/goocanvas.h:
377 (goo_canvas_get_static_root_item): new function to get static root item.
378 (goo_canvas_set_static_root_item): new function to set static root item.
379 (goo_canvas_get_static_root_item_model): new function to get static
380@@ -280,7 +521,7 @@
381 * src/goocanvastable.c: use new goo_canvas_request_item_redraw()
382 function so static items are redrawn correctly.
383
384- * demo/mv-demo.c (create_static_model):
385+ * demo/mv-demo.c (create_static_model):
386 * demo/demo.c (setup_static_items): added some static items to test.
387 Note that dragging around when scale != 1.0 is weird as the coord
388 spaces are different, but is expected.
389@@ -359,7 +600,7 @@
390
391 2008-08-17 Damon Chaplin <damon@gnome.org>
392
393- * src/Makefile.am (INCLUDES):
394+ * src/Makefile.am (INCLUDES):
395 * demo/Makefile.am (INCLUDES): get rid of the XXX_DISABLE_DEPRECATED
396 flags so we don't break compilation when GTK+ deprecates stuff. #548086
397
398@@ -369,7 +610,7 @@
399 (goo_canvas_group_model_get_child): return NULL if child_num is out
400 of range. #535150
401
402- * src/goocanvasitemmodel.c (goo_canvas_item_model_get_child):
403+ * src/goocanvasitemmodel.c (goo_canvas_item_model_get_child):
404 * src/goocanvasitem.c (goo_canvas_item_get_child): updated docs.
405
406 2008-06-24 Damon Chaplin <damon@gnome.org>
407@@ -436,7 +677,7 @@
408
409 2008-05-09 Damon Chaplin <damon@gnome.org>
410
411- * src/goocanvasitemmodel.h:
412+ * src/goocanvasitemmodel.h:
413 * src/goocanvasitem.h: removed _CLASS macros since they are interfaces.
414 (From Masatake YAMATO).
415
416@@ -456,17 +697,17 @@
417 "x-border-spacing" and "y-border-spacing" properties.
418 (Patch applied by Damon with a few changes.)
419
420- * demo/mv-table-demo.c:
421+ * demo/mv-table-demo.c:
422 * demo/table-demo.c: added tests for the gridlines.
423
424 2008-04-04 Damon Chaplin <damon@gnome.org>
425
426- * docs/coordinates.xml:
427+ * docs/coordinates.xml:
428 * docs/architecture.xml: new sections.
429
430 * docs/creating-items.xml: rewritten.
431
432- * src/goocanvasitemmodel.c (goo_canvas_item_model_set_parent):
433+ * src/goocanvasitemmodel.c (goo_canvas_item_model_set_parent):
434 * src/goocanvasitem.c (goo_canvas_item_set_parent): note in the docs
435 that the "parent" property can be used to set the parent, but that
436 these functions are only for implementing new items (a bit confusing).
437@@ -481,11 +722,11 @@
438
439 2008-03-27 Damon Chaplin <damon@gnome.org>
440
441- * src/goocanvasitem.c (goo_canvas_item_get_simple_transform):
442- * src/goocanvasitemmodel.c (goo_canvas_item_model_get_simple_transform):
443+ * src/goocanvasitem.c (goo_canvas_item_get_simple_transform):
444+ * src/goocanvasitemmodel.c (goo_canvas_item_model_get_simple_transform):
445 new functions to do opposite of set_simple_transform().
446
447- * demo/mv-demo.c (test_simple_transforms):
448+ * demo/mv-demo.c (test_simple_transforms):
449 * demo/demo.c (test_simple_transforms): added some test code for above.
450
451 2008-03-27 Damon Chaplin <damon@gnome.org>
452@@ -508,7 +749,7 @@
453 simple_update/paint/get_item_at() virtual functions that call
454 simple_create_path(). These make it easier for language bindings.
455 Based on patch from Jonathon Jongsma.
456-
457+
458 2008-02-25 Damon Chaplin <damon@gnome.org>
459
460 * src/goocanvastext.c (goo_canvas_text_get_natural_extents): added
461@@ -527,13 +768,13 @@
462
463 2007-11-18 Damon Chaplin <damon@gnome.org>
464
465- * src/goocanvasitem.c (goo_canvas_item_get_child_property)
466- (goo_canvas_item_set_child_property):
467- * src/goocanvasitemmodel.c (goo_canvas_item_model_get_child_property)
468+ * src/goocanvasitem.c (goo_canvas_item_get_child_property)
469+ (goo_canvas_item_set_child_property):
470+ * src/goocanvasitemmodel.c (goo_canvas_item_model_get_child_property)
471 (goo_canvas_item_model_set_child_property): new functions to get/set
472 individual child properties (to help language bindings).
473
474- * demo/demo-table.c (create_demo_item):
475+ * demo/demo-table.c (create_demo_item):
476 * demo/mv-demo-table.c (create_demo_item): test the above.
477
478 * src/goocanvasitem.c:
479@@ -543,19 +784,19 @@
480 2007-11-13 Murray Cumming <murrayc@murrayc.com>
481
482 * src/goocanvasitem.c: goo_canvas_item_add_child():
483- * src/goocanvasitemmodel.c: goo_canvas_item_model_add_child():
484+ * src/goocanvasitemmodel.c: goo_canvas_item_model_add_child():
485 Add a debugging check to make sure the child is not the same as the
486 parent, preventing an endless loop.
487
488 2007-11-13 Murray Cumming <murrayc@murrayc.com>
489
490- * src/goocanvasimage.c: goo_canvas_image_set_common_property():
491- Support setting the pixbuf property to NULL.
492+ * src/goocanvasimage.c: goo_canvas_image_set_common_property():
493+ Support setting the pixbuf property to NULL.
494
495 2007-11-13 Murray Cumming <murrayc@murrayc.com>
496
497- * src/goocanvas.c: goo_canvas_render(): Call goo_canvas_update()
498- if necessary, as suggested by Damon, to fix a crash when rendering
499+ * src/goocanvas.c: goo_canvas_render(): Call goo_canvas_update()
500+ if necessary, as suggested by Damon, to fix a crash when rendering
501 a GooCanvasTable that has never been shown on screen.
502
503 2007-08-13 Damon Chaplin <damon@gnome.org>
504@@ -579,7 +820,7 @@
505 * src/goocanvasitem.c (goo_canvas_item_request_update): don't use
506 return here as it is a void function.
507
508- * src/goocanvastable.c (goo_canvas_table_remove_child):
509+ * src/goocanvastable.c (goo_canvas_table_remove_child):
510 * src/goocanvasgroup.c (goo_canvas_group_remove_child): check the
511 child_num arg is valid.
512
513@@ -589,7 +830,7 @@
514 "bounds-padding" properties, used to calculate the canvas bounds
515 automatically.
516
517- * demo/demo.c (change_bounds_clicked):
518+ * demo/demo.c (change_bounds_clicked):
519 * demo/mv-demo.c (change_bounds_clicked): test the above.
520
521 2007-06-19 Damon Chaplin <damon@gnome.org>
522@@ -600,7 +841,7 @@
523
524 * src/goocanvastable.c: implement integer layout.
525
526- * demo/table-demo.c:
527+ * demo/table-demo.c:
528 * demo/mv-table-demo.c: tests for integer layout.
529
530 2007-05-15 Damon Chaplin <damon@gnome.org>
531@@ -622,11 +863,11 @@
532
533 2007-05-14 Damon Chaplin <damon@gnome.org>
534
535- * src/goocanvas.c (goo_canvas_set_property)
536+ * src/goocanvas.c (goo_canvas_set_property)
537 (goo_canvas_set_bounds): queue a redraw of the widget.
538 (goo_canvas_expose_event): clip to the canvas bounds if necessary.
539
540- * demo/mv-demo.c (change_bounds_clicked):
541+ * demo/mv-demo.c (change_bounds_clicked):
542 * demo/demo.c (change_bounds_clicked): test changing the bounds
543 dynamically.
544
545@@ -637,23 +878,23 @@
546 GArray was updated but the view still pointed to the old GArray
547 which had been freed.
548
549- * demo/mv-demo-paths.c:
550+ * demo/mv-demo-paths.c:
551 * demo/demo-paths.c: added a button to test changing the path data
552 dynamically.
553
554 2007-05-11 Damon Chaplin <damon@gnome.org>
555
556- * demo/demo-large-rect.c:
557- * demo/demo-large-line.c:
558+ * demo/demo-large-rect.c:
559+ * demo/demo-large-line.c:
560 * demo/demo-large-items.c: new demo and items to show how to create a
561 very large canvas and very large items.
562
563- * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_line_width):
564+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_line_width):
565 added utility function to get an item's line width.
566 Also changed default line width property value to 2.0, and returned
567 canvas line width setting if item's line width isn't set.
568
569- * src/goocanvasrect.c (goo_canvas_rect_update):
570+ * src/goocanvasrect.c (goo_canvas_rect_update):
571 * src/goocanvaspolyline.c (goo_canvas_polyline_reconfigure_arrows): use
572 the above function to get the line width.
573
574@@ -666,26 +907,26 @@
575
576 2007-04-27 Damon Chaplin <damon@gnome.org>
577
578- * src/goocanvasitem.h:
579+ * src/goocanvasitem.h:
580 * src/goocanvasutils.c (goo_canvas_bounds_get_type): added type stuff
581 for language bindings (patch from Murray Cumming).
582
583 2007-04-25 Damon Chaplin <damon@gnome.org>
584
585- * src/goocanvasitemmodel.c (_goo_canvas_item_model_emit_child_added)
586+ * src/goocanvasitemmodel.c (_goo_canvas_item_model_emit_child_added)
587 (_goo_canvas_item_model_emit_changed): new simple functions to emit
588 signals faster (avoids signal name lookups).
589
590 * src/goocanvasitemsimple.c
591- (goo_canvas_item_model_simple_set_property)
592- (goo_canvas_item_model_simple_set_transform)
593- (goo_canvas_item_model_simple_set_style):
594+ (goo_canvas_item_model_simple_set_property)
595+ (goo_canvas_item_model_simple_set_transform)
596+ (goo_canvas_item_model_simple_set_style):
597 * src/goocanvasgroup.c (goo_canvas_group_model_add_child): use the
598 above functions for a little speedup.
599
600 2007-04-25 Damon Chaplin <damon@gnome.org>
601
602- * demo/mv-scalability-demo.c:
603+ * demo/mv-scalability-demo.c:
604 * demo/scalability-demo.c: instead of connecting signals to all items
605 we just use a handler on the root item. Also added a switch to turn
606 off the text items, to see the difference in performance (a lot).
607@@ -709,7 +950,7 @@
608
609 2007-04-16 Damon Chaplin <damon@gnome.org>
610
611- * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
612+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
613 handle empty bounds for an item's fill or stroke. cairo 1.4.x returns
614 0.0 for x1/y1/x2/y2 in that case, though older versions of cairo
615 returned odd values. So I've added a workaround for that as well.
616@@ -727,14 +968,14 @@
617
618 2007-04-03 Damon Chaplin <damon@gnome.org>
619
620- * demo/mv-demo.c (create_canvas_primitives):
621+ * demo/mv-demo.c (create_canvas_primitives):
622 * demo/demo.c (create_canvas_primitives): set the maximum scale to 50,
623 since if we go above that we hit the cairo 16-bit limit and the large
624 rectangle isn't painted correctly.
625
626 * src/goocanvasitemsimple.c (goo_canvas_item_simple_install_common_properties): improved docs for fill/stroke properties.
627
628- * src/goocanvaswidget.c (goo_canvas_widget_new)
629+ * src/goocanvaswidget.c (goo_canvas_widget_new)
630 (goo_canvas_widget_set_widget): keep our own reference to the widget,
631 rather than just relying on the canvas widget's reference. Otherwise
632 once the widget is removed from the canvas we have an invalid pointer.
633@@ -748,7 +989,7 @@
634 accumulator for the event signals, so returning TRUE from a handler
635 stops the signal.
636
637- * src/goocanvasitemsimple.h (struct _GooCanvasItemSimpleData):
638+ * src/goocanvasitemsimple.h (struct _GooCanvasItemSimpleData):
639 * src/goocanvasitem.h (struct _GooCanvasItemIface): added a few bits
640 that will be needed to support tooltips with GTK+ 2.12. I have a patch
641 to support tooltips but I don't want to depend on GTK+ 2.12 yet.
642@@ -769,12 +1010,12 @@
643 properties to set the background color of the canvas, based on a patch
644 from Gian Mario Tagliaretti.
645
646- * demo/demo.c (create_canvas_primitives):
647+ * demo/demo.c (create_canvas_primitives):
648 * demo/mv-demo.c (create_canvas_primitives): use above properties.
649
650 2007-03-16 Murray Cumming <murrayc@murrayc.com>
651
652- * src/goocanvasitemsimple.h: Change the struct field name from
653+ * src/goocanvasitemsimple.h: Change the struct field name from
654 private to priv, to avoid problems when using this from C++.
655
656 2007-03-08 Damon Chaplin <damon@gnome.org>
657@@ -794,14 +1035,14 @@
658
659 2007-03-08 Damon Chaplin <damon@gnome.org>
660
661- * src/goocanvasitemmodel.c (goo_canvas_item_model_remove):
662+ * src/goocanvasitemmodel.c (goo_canvas_item_model_remove):
663 * src/goocanvasitem.c (goo_canvas_item_remove): new convenience
664 functions to easily remove items & models from the canvas.
665
666- * demo/mv-demo-features.c (on_button_press):
667- * demo/demo-features.c (on_button_press):
668- * demo/demo.c (on_button_press):
669- * demo/mv-demo.c (on_button_press):
670+ * demo/mv-demo-features.c (on_button_press):
671+ * demo/demo-features.c (on_button_press):
672+ * demo/demo.c (on_button_press):
673+ * demo/mv-demo.c (on_button_press):
674 * demo/widgets-demo.c (remove_widget_clicked): use new remove()
675 functions to test them.
676
677@@ -815,8 +1056,8 @@
678
679 * demo/demo.c (setup_texts): added test for ellipsized text.
680
681- * demo/mv-demo.c:
682- * demo/mv-demo-table.c:
683+ * demo/mv-demo.c:
684+ * demo/mv-demo-table.c:
685 * demo/mv-demo-clipping.c: updated model-view demos, adding new stuff
686 from simple demo.
687
688@@ -860,7 +1101,7 @@
689 calculates the requested height for the given width, or just returns
690 -1 if the text item is rotated or has a clip path, in which case the
691 original height is used.
692- (goo_canvas_text_init, goo_canvas_text_create_layout)
693+ (goo_canvas_text_init, goo_canvas_text_create_layout)
694 (goo_canvas_text_update): use layout_width.
695
696 * demo/demo-table.c (create_width_for_height_table): added tests for
697@@ -883,13 +1124,13 @@
698
699 2007-02-27 Damon Chaplin <damon@gnome.org>
700
701- * src/goocanvasitemmodel.[hc]:
702+ * src/goocanvasitemmodel.[hc]:
703 * src/goocanvasitem.[hc]: used name "transform" for all arguments
704 to get/set_transform functions.
705
706 2007-02-27 Damon Chaplin <damon@gnome.org>
707
708- * src/goocanvasitemmodel.[hc]:
709+ * src/goocanvasitemmodel.[hc]:
710 * src/goocanvasitem.[hc]: changed get_transform() method to take a
711 cairo_matrix_t* to fill in, and return a boolean if a transform is set.
712 This is better for bindings.
713@@ -907,13 +1148,13 @@
714 * src/goocanvas.c (goo_canvas_get_item_at): updated to use new API.
715 (goo_canvas_get_items_at): new function to return list of found items.
716
717- * src/goocanvastable.c (goo_canvas_table_get_items_at):
718+ * src/goocanvastable.c (goo_canvas_table_get_items_at):
719 * src/goocanvasgroup.c (goo_canvas_group_get_items_at):
720- * src/goocanvasimage.c (goo_canvas_image_is_item_at):
721- * src/goocanvaspolyline.c (goo_canvas_polyline_is_item_at):
722- * src/goocanvastext.c (goo_canvas_text_is_item_at):
723- * src/goocanvaswidget.c (goo_canvas_widget_is_item_at):
724- * docs/creating-items.xml:
725+ * src/goocanvasimage.c (goo_canvas_image_is_item_at):
726+ * src/goocanvaspolyline.c (goo_canvas_polyline_is_item_at):
727+ * src/goocanvastext.c (goo_canvas_text_is_item_at):
728+ * src/goocanvaswidget.c (goo_canvas_widget_is_item_at):
729+ * docs/creating-items.xml:
730 * demo/demo-item.c (goo_demo_item_is_item_at): updated for new API.
731
732 2007-02-25 Damon Chaplin <damon@gnome.org>
733@@ -921,7 +1162,7 @@
734 * src/goocanvasitemsimple.c: added "hint-metrics" property so people
735 can use hinted metrics for prettier text if they aren't scaling the
736 canvas at all.
737-
738+
739 * src/goocanvasstyle.c: added goo_canvas_style_hint_metrics_id quark.
740
741 * src/goocanvasutils.c (goo_cairo_hint_metrics_get_type): added enum
742@@ -943,7 +1184,7 @@
743 any other objects.) This was done to help the Ruby bindings.
744 It was a bit fiddly so it might cause a few bugs.
745
746- * src/goocanvasutils.c (goo_cairo_matrix_copy)
747+ * src/goocanvasutils.c (goo_cairo_matrix_copy)
748 (goo_cairo_matrix_free): allocate and free with g_slice_new/free() as
749 that is what was being used in GooCanvasItemSimple.
750
751@@ -952,11 +1193,11 @@
752
753 2007-02-24 Damon Chaplin <damon@gnome.org>
754
755- * demo/widgets-demo.c (on_delete_event):
756- * demo/units-demo.c (on_delete_event):
757- * demo/mv-scalability-demo.c (on_delete_event):
758- * demo/scalability-demo.c (on_delete_event):
759- * demo/mv-demo.c (on_delete_event):
760+ * demo/widgets-demo.c (on_delete_event):
761+ * demo/units-demo.c (on_delete_event):
762+ * demo/mv-scalability-demo.c (on_delete_event):
763+ * demo/scalability-demo.c (on_delete_event):
764+ * demo/mv-demo.c (on_delete_event):
765 * demo/demo.c (on_delete_event): use gtk_main_quit() rather than exit()
766 here, so GTK+ destroys the window and the finalization code gets
767 tested.
768@@ -966,19 +1207,19 @@
769
770 2007-02-20 Damon Chaplin <damon@gnome.org>
771
772- * demo/demo-table.c:
773+ * demo/demo-table.c:
774 * demo/mv-demo-table.c: moved table-demo.c into main demo app, and
775 made a model-view version.
776
777 2007-02-20 Damon Chaplin <damon@gnome.org>
778
779- * src/goocanvastable.c (goo_canvas_table_get_item_at)
780+ * src/goocanvastable.c (goo_canvas_table_get_item_at)
781 (goo_canvas_table_paint): if the table was shrunk below its requested
782 size, clip the children if appropriate.
783
784- * src/goocanvastable.c (goo_canvas_table_get_item_at)
785- (goo_canvas_table_paint):
786- * src/goocanvasgroup.c (goo_canvas_group_get_item_at)
787+ * src/goocanvastable.c (goo_canvas_table_get_item_at)
788+ (goo_canvas_table_paint):
789+ * src/goocanvasgroup.c (goo_canvas_group_get_item_at)
790 (goo_canvas_group_paint): check the bounds and handle the clip path.
791
792 * demo/table-demo.c (create_demo_table): added parameters and created
793@@ -986,7 +1227,7 @@
794
795 2007-02-20 Damon Chaplin <damon@gnome.org>
796
797- * src/goocanvastext.c (goo_canvas_text_create_layout):
798+ * src/goocanvastext.c (goo_canvas_text_create_layout):
799 (goo_canvas_text_get_item_at): use the ink rect as well as the logical
800 rect when calculating the bounds or doing hit-testing.
801
802@@ -1011,15 +1252,15 @@
803
804 2007-02-19 Damon Chaplin <damon@gnome.org>
805
806- * demo/demo.c:
807- * demo/mv-demo.c:
808- * demo/demo-animation.c:
809+ * demo/demo.c:
810+ * demo/mv-demo.c:
811+ * demo/demo-animation.c:
812 * demo/mv-demo-animation.c: made the file-global variables static so
813 they don't clash, and updated the demos a bit.
814
815 2007-02-19 Damon Chaplin <damon@gnome.org>
816
817- * configure.in:
818+ * configure.in:
819 * src/Makefile.am: rewrote the stuff that handles the autogeneration
820 of goocanvasmarshal.[hc] and goocanvasenumtypes.[hc], copying what
821 GTK+ does. It now has a --disable-rebuilds option to disable the
822@@ -1038,32 +1279,32 @@
823 This avoids confusion with the GooCanvasItem interface methods with the
824 same name (and may avoid problems with language bindings etc.)
825
826- * src/goocanvasellipse.c (goo_canvas_ellipse_class_init):
827- * src/goocanvasimage.c (goo_canvas_image_class_init):
828- * src/goocanvaspath.c (goo_canvas_path_class_init):
829- * src/goocanvaspolyline.c (goo_canvas_polyline_class_init):
830- * src/goocanvasrect.c (goo_canvas_rect_class_init):
831- * src/goocanvastext.c (goo_canvas_text_class_init):
832- * src/goocanvaswidget.c (goo_canvas_widget_class_init):
833- * demo/demo-item.c (goo_demo_item_class_init):
834+ * src/goocanvasellipse.c (goo_canvas_ellipse_class_init):
835+ * src/goocanvasimage.c (goo_canvas_image_class_init):
836+ * src/goocanvaspath.c (goo_canvas_path_class_init):
837+ * src/goocanvaspolyline.c (goo_canvas_polyline_class_init):
838+ * src/goocanvasrect.c (goo_canvas_rect_class_init):
839+ * src/goocanvastext.c (goo_canvas_text_class_init):
840+ * src/goocanvaswidget.c (goo_canvas_widget_class_init):
841+ * demo/demo-item.c (goo_demo_item_class_init):
842 * src/goocanvasitemsimple.c: updated use of above class methods.
843
844 * src/goocanvasgroup.c (goo_canvas_group_update): handle children with
845 empty bounds (i.e. ignore their bounds when computing the group's
846 bounds).
847
848- * src/goocanvastable.c (goo_canvas_table_paint)
849- (goo_canvas_table_get_item_at):
850+ * src/goocanvastable.c (goo_canvas_table_paint)
851+ (goo_canvas_table_get_item_at):
852 * src/goocanvasgroup.c (goo_canvas_group_get_item_at)
853 (goo_canvas_group_paint): don't check the
854 child bounds here. Leave it up to the children to do that.
855
856- * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_item_at)
857+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_item_at)
858 (goo_canvas_item_simple_paint): check the item's bounds here.
859
860 2007-02-15 Damon Chaplin <damon@gnome.org>
861
862- * src/goocanvasutils.c:
863+ * src/goocanvasutils.c:
864 * src/goocanvaspath.c: moved data structures and code for parsing and
865 creating SVG paths from goocanvaspath.[hc] to goocanvasutils.[hc].
866 Added goo_canvas_parse_path_data() and goo_canvas_create_path() public
867@@ -1076,23 +1317,23 @@
868 * src/goocanvasitemsimple.h (struct _GooCanvasItemSimpleData): added
869 clip_path_commands and clip_fill_rule.
870
871- * src/goocanvastext.c (goo_canvas_text_set_model):
872- * src/goocanvasrect.c (goo_canvas_rect_set_model):
873- * src/goocanvaspolyline.c (goo_canvas_polyline_set_model):
874- * src/goocanvaspath.c (goo_canvas_path_set_model):
875- * src/goocanvasimage.c (goo_canvas_image_set_model):
876- * src/goocanvasgroup.c (goo_canvas_group_set_model):
877+ * src/goocanvastext.c (goo_canvas_text_set_model):
878+ * src/goocanvasrect.c (goo_canvas_rect_set_model):
879+ * src/goocanvaspolyline.c (goo_canvas_polyline_set_model):
880+ * src/goocanvaspath.c (goo_canvas_path_set_model):
881+ * src/goocanvasimage.c (goo_canvas_image_set_model):
882+ * src/goocanvasgroup.c (goo_canvas_group_set_model):
883 * src/goocanvasellipse.c (goo_canvas_ellipse_set_model): use
884 goo_canvas_item_simple_set_model() rather than getting parent iface.
885 (For GooCanvasTable this actually caused a crash as when it called
886 the GooCanvasGroup function that got the parent iface which pointed to
887 itself so it got into an infinite loop.)
888
889- * demo/mv-demo-clipping.c:
890+ * demo/mv-demo-clipping.c:
891 * demo/demo-clipping.c: new files for clipping demo pages.
892
893- * demo/Makefile.am:
894- * demo/mv-demo.c:
895+ * demo/Makefile.am:
896+ * demo/mv-demo.c:
897 * demo/demo.c: added clipping pages.
898
899 2007-02-13 Damon Chaplin <damon@gnome.org>
900@@ -1102,20 +1343,20 @@
901
902 2007-02-13 Damon Chaplin <damon@gnome.org>
903
904- * src/goocanvasitemmodel.c (goo_canvas_item_model_animate):
905+ * src/goocanvasitemmodel.c (goo_canvas_item_model_animate):
906 * src/goocanvasitem.c (goo_canvas_item_animate): added "absolute"
907 parameter, and rewrote the animation code, using the same code for
908 GooCanvasItem and GooCanvasItemModel.
909
910- * demo/demo-animation.c:
911+ * demo/demo-animation.c:
912 * demo/mv-demo-animation.c: new files for animation demo pages.
913
914- * demo/mv-demo.c:
915+ * demo/mv-demo.c:
916 * demo/demo.c: added new animation pages and updated animation calls.
917
918 2007-02-12 Damon Chaplin <damon@gnome.org>
919
920- * src/goocanvasitemmodel.c (goo_canvas_item_model_set_simple_transform):
921+ * src/goocanvasitemmodel.c (goo_canvas_item_model_set_simple_transform):
922 * src/goocanvasitem.c (goo_canvas_item_set_simple_transform): convert
923 rotation to radians.
924
925@@ -1130,13 +1371,13 @@
926 * docs/*.xml: added example code to the introductory sections.
927 Needs more explanation at some point.
928
929- * configure.in:
930+ * configure.in:
931 * src/Makefile.am: added libtool version numbers.
932
933 2007-02-08 Damon Chaplin <damon@gnome.org>
934
935 * src/goocanvasitemmodel.c
936- (goo_canvas_item_model_set_simple_transform):
937+ (goo_canvas_item_model_set_simple_transform):
938 * src/goocanvasitem.c (goo_canvas_item_set_simple_transform): new
939 convenience functions to set the position, scale and rotation easily.
940
941@@ -1197,7 +1438,7 @@
942 * demo/table-demo.c: added more test tables with various transforms
943 and settings.
944
945- * src/goocanvasitem.c (goo_canvas_item_get_requested_area)
946+ * src/goocanvasitem.c (goo_canvas_item_get_requested_area)
947 (goo_canvas_item_allocate_area)
948 (goo_canvas_item_get_transform_for_child) : new functions and interface
949 methods to support GooCanvasTable and other layout containers.
950@@ -1206,13 +1447,13 @@
951 initialized the model's visibility setting to GOO_CANVAS_ITEM_VISIBLE.
952 (goo_canvas_item_simple_update): split part of it out into
953 goo_canvas_item_simple_update_internal and updated slightly.
954- (goo_canvas_item_simple_get_requested_area)
955+ (goo_canvas_item_simple_get_requested_area)
956 (goo_canvas_item_simple_allocate_area): new functions to support
957 GooCanvasTable and other layout containers.
958 (goo_canvas_item_simple_get_path_bounds): don't convert to device space
959 as some code needs the bounds in user space.
960
961- * src/goocanvas.c (goo_canvas_convert_to_item_space)
962+ * src/goocanvas.c (goo_canvas_convert_to_item_space)
963 (goo_canvas_convert_from_item_space): used the new
964 goo_canvas_item_get_transform_for_child() function to get the transform
965 for each item.
966@@ -1221,7 +1462,7 @@
967 which is used for items which are invisible and not allocated any space
968 in containter items like GooCanvasTable.
969
970- * src/goocanvasgroup.c (goo_canvas_group_get_item_at)
971+ * src/goocanvasgroup.c (goo_canvas_group_get_item_at)
972 (goo_canvas_group_paint): support GOO_CANVAS_ITEM_HIDDEN.
973
974 * src/goocanvaspolyline.c (goo_canvas_polyline_compute_bounds):
975@@ -1238,7 +1479,7 @@
976
977 2006-12-09 Damon Chaplin <damon@gnome.org>
978
979- * docs/goocanvas-sections.txt:
980+ * docs/goocanvas-sections.txt:
981 * docs/goocanvas-docs.sgml: use separate sections for model objects,
982 as gtk-doc doesn't support multiple objects per section.
983
984@@ -1248,7 +1489,7 @@
985 * src/goocanvasutils.c (goo_canvas_query_child_properties): new
986 function to allow documentation of child properties with gtk-doc.
987
988- * src/goocanvasitemmodel.c:
989+ * src/goocanvasitemmodel.c:
990 * src/goocanvasitem.c: added support for child properties of item
991 models.
992
993@@ -1271,9 +1512,9 @@
994 standard stuff before passing control to them. This makes it much
995 easier to create simple canvas items.
996
997- * demo/demo-item.c:
998- * src/goocanvaspolyline.c:
999- * src/goocanvastext.c:
1000+ * demo/demo-item.c:
1001+ * src/goocanvaspolyline.c:
1002+ * src/goocanvastext.c:
1003 * src/goocanvasimage.c: use the above methods, so we can get rid of
1004 all the boilerplate code.
1005
1006@@ -1293,11 +1534,11 @@
1007 Also added support for cascading styles, with arbitrary properties,
1008 and embedded widget items. I'm in the middle of adding support for
1009 layout items as well (e.g. something like a GtkTable for items).
1010-
1011+
1012 2006-10-12 Damon Chaplin <damon@gnome.org>
1013
1014- * src/goocanvastextview.c (goo_canvas_text_view_create_layout)
1015- (goo_canvas_text_view_get_item_view_at)
1016+ * src/goocanvastextview.c (goo_canvas_text_view_create_layout)
1017+ (goo_canvas_text_view_get_item_view_at)
1018 (goo_canvas_text_view_paint): patch from Martin Soto to fix a text
1019 positioning bug. The position was wrong when the text width was set
1020 and the alignment wasn't PANGO_ALIGN_LEFT. (Pango uses the set width
1021@@ -1305,7 +1546,7 @@
1022
1023 2006-10-12 Damon Chaplin <damon@gnome.org>
1024
1025- * src/goocanvasutils.h:
1026+ * src/goocanvasutils.h:
1027 * src/goocanvasprivate.h: make get_type() declarations public as
1028 they are useful for bindings.
1029
1030@@ -1325,7 +1566,7 @@
1031 in goocanvasenums.h, and modifed GooCanvasPointerEvents so glib_mkenums
1032 could parse it.
1033
1034- * src/goocanvas.h:
1035+ * src/goocanvas.h:
1036 * src/goocanvasitem.c: include goocanvasenums.h.
1037
1038 2006-10-12 Damon Chaplin <damon@gnome.org>
1039@@ -1366,8 +1607,8 @@
1040
1041 2006-08-30 Damon Chaplin <damon@gnome.org>
1042
1043- * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_update)
1044- * src/goocanvaspolylineview.c (goo_canvas_polyline_view_update):
1045+ * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_update)
1046+ * src/goocanvaspolylineview.c (goo_canvas_polyline_view_update):
1047 added a workaround for cairo limits. Cairo uses fixed point integer
1048 maths and is currently limited to 16-bits for the integer component.
1049 So we remove any current translation before calculating the bounds
1050@@ -1375,7 +1616,7 @@
1051 limit only applies to items' user space rather than the entire canvas.
1052
1053 * src/goocanvasitemviewsimple.c
1054- (goo_canvas_item_view_simple_get_item_view_at):
1055+ (goo_canvas_item_view_simple_get_item_view_at):
1056 * src/goocanvaspolylineview.c
1057 (goo_canvas_polyline_view_get_item_view_at): as above, remove any
1058 current translation before checking if the point is in the item.
1059@@ -1389,13 +1630,13 @@
1060
1061 2006-08-27 Damon Chaplin <damon@gnome.org>
1062
1063- * src/goocanvasview.c (goo_canvas_view_class_init):
1064- * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_class_init)
1065+ * src/goocanvasview.c (goo_canvas_view_class_init):
1066+ * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_class_init)
1067 * src/goocanvasgroupview.c (goo_canvas_group_view_class_init): only
1068 register the accessible factories if accessibility is enabled (i.e.
1069 GtkWidget has registered a factory).
1070
1071- * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_setup_accessibility):
1072+ * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_setup_accessibility):
1073 * src/goocanvasgroupview.c (goo_canvas_group_view_set_group): only
1074 set the accessible title & description and connect the signal handlers
1075 if accessibility is enabled. (It would be better to not call
1076@@ -1466,10 +1707,10 @@
1077
1078 2006-08-08 Damon Chaplin <damon@gnome.org>
1079
1080- * src/goocanvastextview.c (goo_canvas_text_view_update):
1081- * src/goocanvaspolylineview.c (goo_canvas_polyline_view_update):
1082- * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_update):
1083- * src/goocanvasimageview.c (goo_canvas_image_view_update):
1084+ * src/goocanvastextview.c (goo_canvas_text_view_update):
1085+ * src/goocanvaspolylineview.c (goo_canvas_polyline_view_update):
1086+ * src/goocanvasitemviewsimple.c (goo_canvas_item_view_simple_update):
1087+ * src/goocanvasimageview.c (goo_canvas_image_view_update):
1088 * src/goocanvasgroupview.c (goo_canvas_group_view_update): rewrote the
1089 update methods to make sure the bounds is always set and returned
1090 correctly.
1091@@ -1532,8 +1773,8 @@
1092 * src/goocanvasutils.c (goo_canvas_pointer_events_get_type): use a
1093 flags type rather than an enum type (from Gustavo J. A. M. Carneiro).
1094
1095- * src/goocanvasitem.c (goo_canvas_item_base_init):
1096- * src/goocanvasitemsimple.c:
1097+ * src/goocanvasitem.c (goo_canvas_item_base_init):
1098+ * src/goocanvasitemsimple.c:
1099 * src/goocanvasgroup.c: updated to use the flags type for
1100 "pointer-events" instead of enum.
1101
1102@@ -1544,7 +1785,7 @@
1103
1104 2006-06-08 Damon Chaplin <damon@gnome.org>
1105
1106- * src/goocanvasitemsimple.c (goo_canvas_item_simple_set_property):
1107+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_set_property):
1108 only create the item's style when needed.
1109 (goo_canvas_style_get_type): register boxed type (from Gustavo J. A. M.
1110 Carneiro).
1111@@ -1564,8 +1805,8 @@
1112
1113 2006-05-16 Damon Chaplin <damon@gnome.org>
1114
1115- * goocanvas.pc.in:
1116- * Makefile.am:
1117+ * goocanvas.pc.in:
1118+ * Makefile.am:
1119 * configure.in: added .pc file (patch from Gian Mario Tagliaretti).
1120
1121 2006-05-12 Damon Chaplin <damon@gnome.org>
1122@@ -1589,11 +1830,11 @@
1123 Removed goo_canvas_view_set_anchor() as the property should be enough.
1124 (I think we should only have accessor functions for major properties.)
1125
1126- * src/goocanvasitemview.c (goo_canvas_item_view_is_visible)
1127+ * src/goocanvasitemview.c (goo_canvas_item_view_is_visible)
1128 (goo_canvas_item_view_get_item_at): removed scale argument. We get it
1129 from the canvas view now, to make the API a little simpler.
1130
1131- * src/goocanvasitemviewsimple.h (struct _GooCanvasItemViewSimple):
1132+ * src/goocanvasitemviewsimple.h (struct _GooCanvasItemViewSimple):
1133 added pointer to the canvas view.
1134
1135 * src/*view.[hc]: added canvas view argument to all view creation
1136@@ -1617,7 +1858,7 @@
1137 * src/goocanvasitemview.c: added "focus-in-event" & "focus-out-event"
1138 signals.
1139
1140- * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
1141+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
1142 make sure we do min/max over all points of bounds.
1143
1144 * src/goocanvasview.c (goo_canvas_view_focus_out): emit
1145@@ -1630,14 +1871,14 @@
1146 per-item settings for the standard canvas items, though more complex
1147 items may want to support per-view settings.
1148
1149- * src/goocanvasitemsimple.c:
1150+ * src/goocanvasitemsimple.c:
1151 * src/goocanvasgroup.c: implemented "title" and "description"
1152 properties.
1153
1154 * src/goocanvas*view.c: set the accessible name & description based
1155 on the item's settings, and update them if changed.
1156
1157- * src/goocanvasatk.c (goo_canvas_item_view_accessible_ref_child):
1158+ * src/goocanvasatk.c (goo_canvas_item_view_accessible_ref_child):
1159 return the accessible rather than the item view.
1160
1161 2006-04-18 Damon Chaplin <damon@gnome.org>
1162@@ -1684,8 +1925,8 @@
1163
1164 * src/*.c: removed lots of unused debugging code.
1165
1166- * src/goocanvasitem.c:
1167- * src/goocanvasitemsimple.c:
1168+ * src/goocanvasitem.c:
1169+ * src/goocanvasitemsimple.c:
1170 * src/goocanvasgroup.c: moved "pointer-events" and "transform"
1171 properties, and the "changed" signal to the GooCanvasItem interface.
1172
1173@@ -1725,15 +1966,15 @@
1174
1175 * src/goocanvas.h: new main header to include all the public headers.
1176
1177- * autogen.sh:
1178- * configure.in:
1179+ * autogen.sh:
1180+ * configure.in:
1181 * Makefile.am: setup to use gtk-doc.
1182
1183 * src/Makefile.am: build libgoocanvas as a library now, so we can
1184 document it with gtk-doc. The demo will be moved to a separate
1185 directory.
1186
1187- * src/goocanvastext.h:
1188+ * src/goocanvastext.h:
1189 * src/goocanvasitem.h: rename a few parameters to match the sources,
1190 since gtk-doc complains if they are different.
1191
1192@@ -1746,7 +1987,7 @@
1193
1194 2006-04-10 Damon Chaplin <damon@gnome.org>
1195
1196- * src/goocanvaspathview.[hc]:
1197+ * src/goocanvaspathview.[hc]:
1198 * src/goocanvaspath.[hc]: new path item and view, that uses the same
1199 path spec strings as SVG. I think everything works, except the
1200 elliptical arc, which I haven't finished yet.
1201@@ -1755,14 +1996,14 @@
1202
1203 2006-04-08 Damon Chaplin <damon@gnome.org>
1204
1205- * src/goocanvasitemsimple.[hc]:
1206+ * src/goocanvasitemsimple.[hc]:
1207 * src/goocanvasgroup.[hc]: added "pointer-events" property, like SVG.
1208
1209- * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
1210+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
1211 changed to include both the stroke and fill extents, even if they will
1212 not be painted. This is needed to handle the "pointer-events" property.
1213
1214- * src/goocanvasitemsimple.c (goo_canvas_item_simple_check_in_path):
1215+ * src/goocanvasitemsimple.c (goo_canvas_item_simple_check_in_path):
1216 added "pointer_events" argument, to specify which parts of the path
1217 to check.
1218
1219@@ -1770,11 +2011,11 @@
1220 "is_pointer_event", "parent_visible", and "scale" properties, so we
1221 can handle the "pointer-events" property.
1222
1223- * src/goocanvasgroupview.c (goo_canvas_group_view_get_item_at):
1224- * src/goocanvasellipseview.c (goo_canvas_ellipse_view_get_item_at):
1225- * src/goocanvasimageview.c (goo_canvas_image_view_get_item_at):
1226- * src/goocanvaspolylineview.c (goo_canvas_polyline_view_get_item_at):
1227- * src/goocanvasrectview.c (goo_canvas_rect_view_get_item_at):
1228+ * src/goocanvasgroupview.c (goo_canvas_group_view_get_item_at):
1229+ * src/goocanvasellipseview.c (goo_canvas_ellipse_view_get_item_at):
1230+ * src/goocanvasimageview.c (goo_canvas_image_view_get_item_at):
1231+ * src/goocanvaspolylineview.c (goo_canvas_polyline_view_get_item_at):
1232+ * src/goocanvasrectview.c (goo_canvas_rect_view_get_item_at):
1233 * src/goocanvastextview.c (goo_canvas_text_view_get_item_at): updated
1234 to support "pointer-events".
1235
1236@@ -1788,7 +2029,7 @@
1237
1238 2006-04-03 Damon Chaplin <damon@gnome.org>
1239
1240- * src/goocanvasview.c (goo_canvas_view_style_set)
1241+ * src/goocanvasview.c (goo_canvas_view_style_set)
1242 (goo_canvas_view_realize): use the base color for the background.
1243
1244 * src/demo.c (create_canvas_primitives): use gtk_widget_modify_base()
1245@@ -1802,17 +2043,17 @@
1246 * src/goocanvasview.c (goo_canvas_view_update): turned this into a
1247 public function for use by the above.
1248
1249- * src/goocanvastextview.c (goo_canvas_text_view_get_bounds)
1250- (goo_canvas_text_view_get_item_at):
1251- * src/goocanvasrectview.c (goo_canvas_rect_view_get_bounds)
1252- (goo_canvas_rect_view_get_item_at):
1253- * src/goocanvaspolylineview.c (goo_canvas_polyline_view_get_bounds)
1254- (goo_canvas_polyline_view_get_item_at):
1255- * src/goocanvasgroupview.c (goo_canvas_group_view_get_bounds)
1256- (goo_canvas_group_view_get_item_at):
1257- * src/goocanvasimageview.c (goo_canvas_image_view_get_bounds)
1258- (goo_canvas_image_view_get_item_at):
1259- * src/goocanvasellipseview.c (goo_canvas_ellipse_view_get_bounds)
1260+ * src/goocanvastextview.c (goo_canvas_text_view_get_bounds)
1261+ (goo_canvas_text_view_get_item_at):
1262+ * src/goocanvasrectview.c (goo_canvas_rect_view_get_bounds)
1263+ (goo_canvas_rect_view_get_item_at):
1264+ * src/goocanvaspolylineview.c (goo_canvas_polyline_view_get_bounds)
1265+ (goo_canvas_polyline_view_get_item_at):
1266+ * src/goocanvasgroupview.c (goo_canvas_group_view_get_bounds)
1267+ (goo_canvas_group_view_get_item_at):
1268+ * src/goocanvasimageview.c (goo_canvas_image_view_get_bounds)
1269+ (goo_canvas_image_view_get_item_at):
1270+ * src/goocanvasellipseview.c (goo_canvas_ellipse_view_get_bounds)
1271 (goo_canvas_ellipse_view_get_item_at): make sure the canvas is updated
1272 first, if needed.
1273
1274@@ -1828,11 +2069,11 @@
1275 right, top, bottom for the bounds. Also renamed "pixels_per_unit"
1276 to "scale".
1277
1278- * src/goocanvasitemview.[hc]:
1279- * src/goocanvastextview.c (goo_canvas_text_view_paint):
1280- * src/goocanvasgroupview.c (goo_canvas_group_view_paint):
1281- * src/goocanvasellipseview.c (goo_canvas_ellipse_view_paint):
1282- * src/goocanvasimageview.c (goo_canvas_image_view_paint):
1283+ * src/goocanvasitemview.[hc]:
1284+ * src/goocanvastextview.c (goo_canvas_text_view_paint):
1285+ * src/goocanvasgroupview.c (goo_canvas_group_view_paint):
1286+ * src/goocanvasellipseview.c (goo_canvas_ellipse_view_paint):
1287+ * src/goocanvasimageview.c (goo_canvas_image_view_paint):
1288 * src/goocanvaspolylineview.c (goo_canvas_polyline_view_paint): we
1289 now just pass the effective scale to the paint function rather than the
1290 GooCanvasView*, since when rendering to an arbitrary cairo_t we may not
1291@@ -1847,13 +2088,13 @@
1292
1293 * src/goocanvasutils.[hc]: added GooCanvasItemVisibility enum stuff.
1294
1295- * src/goocanvasitemsimple.[hc]:
1296+ * src/goocanvasitemsimple.[hc]:
1297 * src/goocanvasgroup.[hc]: implemented new properties.
1298
1299- * src/goocanvasgroupview.c (goo_canvas_group_view_paint):
1300- * src/goocanvastextview.c (goo_canvas_text_view_paint):
1301- * src/goocanvasrectview.c (goo_canvas_rect_view_paint):
1302- * src/goocanvasimageview.c (goo_canvas_image_view_paint):
1303+ * src/goocanvasgroupview.c (goo_canvas_group_view_paint):
1304+ * src/goocanvastextview.c (goo_canvas_text_view_paint):
1305+ * src/goocanvasrectview.c (goo_canvas_rect_view_paint):
1306+ * src/goocanvasimageview.c (goo_canvas_image_view_paint):
1307 * src/goocanvasellipseview.c (goo_canvas_ellipse_view_paint): check
1308 the visibility settings to see if the items should be painted.
1309
1310@@ -1878,7 +2119,7 @@
1311
1312 Added a goo_canvas_view_scroll_to() function to scroll to a desired
1313 position.
1314-
1315+
1316 Added an anchor setting to specify where to place the contents of the
1317 canvas if it is smaller than the allocated widget area. (Like the
1318 "center_scroll_region" setting in GnomeCanvas but a bit more general.)
1319@@ -1904,4 +2145,3 @@
1320 cairo_set_font_options(cr) before, but that isn't picked up by Pango
1321 so didn't work. (Font options seem to be associated with surfaces and
1322 also with the graphics state which is confusing.)
1323-
1324
1325=== modified file 'Makefile.am'
1326--- Makefile.am 2006-08-28 11:47:12 +0000
1327+++ Makefile.am 2011-11-22 04:29:25 +0000
1328@@ -6,6 +6,6 @@
1329 AUTOMAKE_OPTIONS = 1.7
1330
1331 pkgconfigdir = $(libdir)/pkgconfig
1332-pkgconfig_DATA = goocanvas.pc
1333+pkgconfig_DATA = goocanvas-2.0.pc
1334
1335-EXTRA_DIST = goocanvas.pc.in autogen.sh
1336+EXTRA_DIST = goocanvas-2.0.pc.in autogen.sh
1337
1338=== modified file 'Makefile.in'
1339--- Makefile.in 2008-05-25 13:53:01 +0000
1340+++ Makefile.in 2011-11-22 04:29:25 +0000
1341@@ -1,8 +1,9 @@
1342-# Makefile.in generated by automake 1.10 from Makefile.am.
1343+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1344 # @configure_input@
1345
1346 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1347-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1348+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1349+# Inc.
1350 # This Makefile.in is free software; the Free Software Foundation
1351 # gives unlimited permission to copy and/or distribute it,
1352 # with or without modifications, as long as this notice is preserved.
1353@@ -16,8 +17,9 @@
1354
1355 VPATH = @srcdir@
1356 pkgdatadir = $(datadir)/@PACKAGE@
1357+pkgincludedir = $(includedir)/@PACKAGE@
1358 pkglibdir = $(libdir)/@PACKAGE@
1359-pkgincludedir = $(includedir)/@PACKAGE@
1360+pkglibexecdir = $(libexecdir)/@PACKAGE@
1361 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1362 install_sh_DATA = $(install_sh) -c -m 644
1363 install_sh_PROGRAM = $(install_sh) -c
1364@@ -35,7 +37,7 @@
1365 subdir = .
1366 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
1367 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
1368- $(srcdir)/goocanvas.pc.in $(top_srcdir)/configure AUTHORS \
1369+ $(srcdir)/goocanvas-2.0.pc.in $(top_srcdir)/configure AUTHORS \
1370 COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
1371 depcomp install-sh ltmain.sh missing mkinstalldirs
1372 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1373@@ -46,7 +48,8 @@
1374 configure.lineno config.status.lineno
1375 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1376 CONFIG_HEADER = config.h
1377-CONFIG_CLEAN_FILES = goocanvas.pc
1378+CONFIG_CLEAN_FILES = goocanvas-2.0.pc
1379+CONFIG_CLEAN_VPATH_FILES =
1380 SOURCES =
1381 DIST_SOURCES =
1382 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
1383@@ -61,12 +64,29 @@
1384 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1385 *) f=$$p;; \
1386 esac;
1387-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
1388+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1389+am__install_max = 40
1390+am__nobase_strip_setup = \
1391+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1392+am__nobase_strip = \
1393+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1394+am__nobase_list = $(am__nobase_strip_setup); \
1395+ for p in $$list; do echo "$$p $$p"; done | \
1396+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1397+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1398+ if (++n[$$2] == $(am__install_max)) \
1399+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1400+ END { for (dir in files) print dir, files[dir] }'
1401+am__base_list = \
1402+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1403+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1404 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
1405-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
1406 DATA = $(pkgconfig_DATA)
1407 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
1408 distclean-recursive maintainer-clean-recursive
1409+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
1410+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
1411+ distdir dist dist-all distcheck
1412 ETAGS = etags
1413 CTAGS = ctags
1414 DIST_SUBDIRS = $(SUBDIRS)
1415@@ -74,9 +94,34 @@
1416 distdir = $(PACKAGE)-$(VERSION)
1417 top_distdir = $(distdir)
1418 am__remove_distdir = \
1419- { test ! -d $(distdir) \
1420- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
1421- && rm -fr $(distdir); }; }
1422+ { test ! -d "$(distdir)" \
1423+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
1424+ && rm -fr "$(distdir)"; }; }
1425+am__relativize = \
1426+ dir0=`pwd`; \
1427+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
1428+ sed_rest='s,^[^/]*/*,,'; \
1429+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
1430+ sed_butlast='s,/*[^/]*$$,,'; \
1431+ while test -n "$$dir1"; do \
1432+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
1433+ if test "$$first" != "."; then \
1434+ if test "$$first" = ".."; then \
1435+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
1436+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
1437+ else \
1438+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
1439+ if test "$$first2" = "$$first"; then \
1440+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
1441+ else \
1442+ dir2="../$$dir2"; \
1443+ fi; \
1444+ dir0="$$dir0"/"$$first"; \
1445+ fi; \
1446+ fi; \
1447+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
1448+ done; \
1449+ reldir="$$dir2"
1450 DIST_ARCHIVES = $(distdir).tar.gz
1451 GZIP_ENV = --best
1452 distuninstallcheck_listfiles = find . -type f -print
1453@@ -95,22 +140,19 @@
1454 CFLAGS = @CFLAGS@
1455 CPP = @CPP@
1456 CPPFLAGS = @CPPFLAGS@
1457-CXX = @CXX@
1458-CXXCPP = @CXXCPP@
1459-CXXDEPMODE = @CXXDEPMODE@
1460-CXXFLAGS = @CXXFLAGS@
1461 CYGPATH_W = @CYGPATH_W@
1462 DATADIRNAME = @DATADIRNAME@
1463 DEFS = @DEFS@
1464 DEPDIR = @DEPDIR@
1465-ECHO = @ECHO@
1466+DLLTOOL = @DLLTOOL@
1467+DSYMUTIL = @DSYMUTIL@
1468+DUMPBIN = @DUMPBIN@
1469 ECHO_C = @ECHO_C@
1470 ECHO_N = @ECHO_N@
1471 ECHO_T = @ECHO_T@
1472 EGREP = @EGREP@
1473 EXEEXT = @EXEEXT@
1474-F77 = @F77@
1475-FFLAGS = @FFLAGS@
1476+FGREP = @FGREP@
1477 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1478 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
1479 GLIB_MKENUMS = @GLIB_MKENUMS@
1480@@ -118,6 +160,10 @@
1481 GMSGFMT = @GMSGFMT@
1482 GREP = @GREP@
1483 GTKDOC_CHECK = @GTKDOC_CHECK@
1484+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
1485+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
1486+GTKDOC_MKPDF = @GTKDOC_MKPDF@
1487+GTKDOC_REBASE = @GTKDOC_REBASE@
1488 HTML_DIR = @HTML_DIR@
1489 INSTALL = @INSTALL@
1490 INSTALL_DATA = @INSTALL_DATA@
1491@@ -126,20 +172,28 @@
1492 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1493 INSTOBJEXT = @INSTOBJEXT@
1494 INTLLIBS = @INTLLIBS@
1495+LD = @LD@
1496 LDFLAGS = @LDFLAGS@
1497 LIBOBJS = @LIBOBJS@
1498 LIBS = @LIBS@
1499 LIBTOOL = @LIBTOOL@
1500+LIPO = @LIPO@
1501 LN_S = @LN_S@
1502 LTLIBOBJS = @LTLIBOBJS@
1503 LT_VERSION_INFO = @LT_VERSION_INFO@
1504 MAINT = @MAINT@
1505 MAKEINFO = @MAKEINFO@
1506+MANIFEST_TOOL = @MANIFEST_TOOL@
1507 MKDIR_P = @MKDIR_P@
1508 MKINSTALLDIRS = @MKINSTALLDIRS@
1509 MSGFMT = @MSGFMT@
1510 MSGFMT_OPTS = @MSGFMT_OPTS@
1511+NM = @NM@
1512+NMEDIT = @NMEDIT@
1513+OBJDUMP = @OBJDUMP@
1514 OBJEXT = @OBJEXT@
1515+OTOOL = @OTOOL@
1516+OTOOL64 = @OTOOL64@
1517 PACKAGE = @PACKAGE@
1518 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
1519 PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
1520@@ -147,10 +201,13 @@
1521 PACKAGE_NAME = @PACKAGE_NAME@
1522 PACKAGE_STRING = @PACKAGE_STRING@
1523 PACKAGE_TARNAME = @PACKAGE_TARNAME@
1524+PACKAGE_URL = @PACKAGE_URL@
1525 PACKAGE_VERSION = @PACKAGE_VERSION@
1526 PATH_SEPARATOR = @PATH_SEPARATOR@
1527 PERL = @PERL@
1528 PKG_CONFIG = @PKG_CONFIG@
1529+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
1530+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
1531 POFILES = @POFILES@
1532 POSUB = @POSUB@
1533 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
1534@@ -168,9 +225,9 @@
1535 abs_srcdir = @abs_srcdir@
1536 abs_top_builddir = @abs_top_builddir@
1537 abs_top_srcdir = @abs_top_srcdir@
1538+ac_ct_AR = @ac_ct_AR@
1539 ac_ct_CC = @ac_ct_CC@
1540-ac_ct_CXX = @ac_ct_CXX@
1541-ac_ct_F77 = @ac_ct_F77@
1542+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
1543 am__include = @am__include@
1544 am__leading_dot = @am__leading_dot@
1545 am__quote = @am__quote@
1546@@ -213,6 +270,7 @@
1547 srcdir = @srcdir@
1548 sysconfdir = @sysconfdir@
1549 target_alias = @target_alias@
1550+top_build_prefix = @top_build_prefix@
1551 top_builddir = @top_builddir@
1552 top_srcdir = @top_srcdir@
1553 SUBDIRS = src demo docs po
1554@@ -220,8 +278,8 @@
1555 # require automake 1.7
1556 AUTOMAKE_OPTIONS = 1.7
1557 pkgconfigdir = $(libdir)/pkgconfig
1558-pkgconfig_DATA = goocanvas.pc
1559-EXTRA_DIST = goocanvas.pc.in autogen.sh
1560+pkgconfig_DATA = goocanvas-2.0.pc
1561+EXTRA_DIST = goocanvas-2.0.pc.in autogen.sh
1562 all: config.h
1563 $(MAKE) $(AM_MAKEFLAGS) all-recursive
1564
1565@@ -232,15 +290,15 @@
1566 @for dep in $?; do \
1567 case '$(am__configure_deps)' in \
1568 *$$dep*) \
1569- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
1570- cd $(srcdir) && $(AUTOMAKE) --gnu \
1571+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
1572+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
1573 && exit 0; \
1574 exit 1;; \
1575 esac; \
1576 done; \
1577- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
1578- cd $(top_srcdir) && \
1579- $(AUTOMAKE) --gnu Makefile
1580+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
1581+ $(am__cd) $(top_srcdir) && \
1582+ $(AUTOMAKE) --gnu Makefile
1583 .PRECIOUS: Makefile
1584 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1585 @case '$?' in \
1586@@ -256,9 +314,10 @@
1587 $(SHELL) ./config.status --recheck
1588
1589 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1590- cd $(srcdir) && $(AUTOCONF)
1591+ $(am__cd) $(srcdir) && $(AUTOCONF)
1592 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
1593- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
1594+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
1595+$(am__aclocal_m4_deps):
1596
1597 config.h: stamp-h1
1598 @if test ! -f $@; then \
1599@@ -270,13 +329,13 @@
1600 @rm -f stamp-h1
1601 cd $(top_builddir) && $(SHELL) ./config.status config.h
1602 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1603- cd $(top_srcdir) && $(AUTOHEADER)
1604+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
1605 rm -f stamp-h1
1606 touch $@
1607
1608 distclean-hdr:
1609 -rm -f config.h stamp-h1
1610-goocanvas.pc: $(top_builddir)/config.status $(srcdir)/goocanvas.pc.in
1611+goocanvas-2.0.pc: $(top_builddir)/config.status $(srcdir)/goocanvas-2.0.pc.in
1612 cd $(top_builddir) && $(SHELL) ./config.status $@
1613
1614 mostlyclean-libtool:
1615@@ -286,24 +345,27 @@
1616 -rm -rf .libs _libs
1617
1618 distclean-libtool:
1619- -rm -f libtool
1620+ -rm -f libtool config.lt
1621 install-pkgconfigDATA: $(pkgconfig_DATA)
1622 @$(NORMAL_INSTALL)
1623 test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
1624- @list='$(pkgconfig_DATA)'; for p in $$list; do \
1625+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
1626+ for p in $$list; do \
1627 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1628- f=$(am__strip_dir) \
1629- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
1630- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
1631+ echo "$$d$$p"; \
1632+ done | $(am__base_list) | \
1633+ while read files; do \
1634+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
1635+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
1636 done
1637
1638 uninstall-pkgconfigDATA:
1639 @$(NORMAL_UNINSTALL)
1640- @list='$(pkgconfig_DATA)'; for p in $$list; do \
1641- f=$(am__strip_dir) \
1642- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
1643- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
1644- done
1645+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
1646+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1647+ test -n "$$files" || exit 0; \
1648+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
1649+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
1650
1651 # This directory's subdirectories are mostly independent; you can cd
1652 # into them and run `make' without going through this Makefile.
1653@@ -312,7 +374,7 @@
1654 # (which will cause the Makefiles to be regenerated when you run `make');
1655 # (2) otherwise, pass the desired values on the `make' command line.
1656 $(RECURSIVE_TARGETS):
1657- @failcom='exit 1'; \
1658+ @fail= failcom='exit 1'; \
1659 for f in x $$MAKEFLAGS; do \
1660 case $$f in \
1661 *=* | --[!k]*);; \
1662@@ -329,7 +391,7 @@
1663 else \
1664 local_target="$$target"; \
1665 fi; \
1666- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1667+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1668 || eval $$failcom; \
1669 done; \
1670 if test "$$dot_seen" = "no"; then \
1671@@ -337,7 +399,7 @@
1672 fi; test -z "$$fail"
1673
1674 $(RECURSIVE_CLEAN_TARGETS):
1675- @failcom='exit 1'; \
1676+ @fail= failcom='exit 1'; \
1677 for f in x $$MAKEFLAGS; do \
1678 case $$f in \
1679 *=* | --[!k]*);; \
1680@@ -363,16 +425,16 @@
1681 else \
1682 local_target="$$target"; \
1683 fi; \
1684- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1685+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1686 || eval $$failcom; \
1687 done && test -z "$$fail"
1688 tags-recursive:
1689 list='$(SUBDIRS)'; for subdir in $$list; do \
1690- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1691+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1692 done
1693 ctags-recursive:
1694 list='$(SUBDIRS)'; for subdir in $$list; do \
1695- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1696+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1697 done
1698
1699 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1700@@ -380,14 +442,14 @@
1701 unique=`for i in $$list; do \
1702 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1703 done | \
1704- $(AWK) ' { files[$$0] = 1; } \
1705- END { for (i in files) print i; }'`; \
1706+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1707+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1708 mkid -fID $$unique
1709 tags: TAGS
1710
1711 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
1712 $(TAGS_FILES) $(LISP)
1713- tags=; \
1714+ set x; \
1715 here=`pwd`; \
1716 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1717 include_option=--etags-include; \
1718@@ -399,46 +461,50 @@
1719 list='$(SUBDIRS)'; for subdir in $$list; do \
1720 if test "$$subdir" = .; then :; else \
1721 test ! -f $$subdir/TAGS || \
1722- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
1723+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
1724 fi; \
1725 done; \
1726 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
1727 unique=`for i in $$list; do \
1728 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1729 done | \
1730- $(AWK) ' { files[$$0] = 1; } \
1731- END { for (i in files) print i; }'`; \
1732- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1733+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1734+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1735+ shift; \
1736+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1737 test -n "$$unique" || unique=$$empty_fix; \
1738- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1739- $$tags $$unique; \
1740+ if test $$# -gt 0; then \
1741+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1742+ "$$@" $$unique; \
1743+ else \
1744+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1745+ $$unique; \
1746+ fi; \
1747 fi
1748 ctags: CTAGS
1749 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
1750 $(TAGS_FILES) $(LISP)
1751- tags=; \
1752- here=`pwd`; \
1753 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
1754 unique=`for i in $$list; do \
1755 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1756 done | \
1757- $(AWK) ' { files[$$0] = 1; } \
1758- END { for (i in files) print i; }'`; \
1759- test -z "$(CTAGS_ARGS)$$tags$$unique" \
1760+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1761+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1762+ test -z "$(CTAGS_ARGS)$$unique" \
1763 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1764- $$tags $$unique
1765+ $$unique
1766
1767 GTAGS:
1768 here=`$(am__cd) $(top_builddir) && pwd` \
1769- && cd $(top_srcdir) \
1770- && gtags -i $(GTAGS_ARGS) $$here
1771+ && $(am__cd) $(top_srcdir) \
1772+ && gtags -i $(GTAGS_ARGS) "$$here"
1773
1774 distclean-tags:
1775 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1776
1777 distdir: $(DISTFILES)
1778 $(am__remove_distdir)
1779- test -d $(distdir) || mkdir $(distdir)
1780+ test -d "$(distdir)" || mkdir "$(distdir)"
1781 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1782 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1783 list='$(DISTFILES)'; \
1784@@ -454,38 +520,55 @@
1785 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1786 if test -d $$d/$$file; then \
1787 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1788+ if test -d "$(distdir)/$$file"; then \
1789+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1790+ fi; \
1791 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1792- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1793+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1794+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1795 fi; \
1796- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1797+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1798 else \
1799- test -f $(distdir)/$$file \
1800- || cp -p $$d/$$file $(distdir)/$$file \
1801+ test -f "$(distdir)/$$file" \
1802+ || cp -p $$d/$$file "$(distdir)/$$file" \
1803 || exit 1; \
1804 fi; \
1805 done
1806- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1807+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1808 if test "$$subdir" = .; then :; else \
1809 test -d "$(distdir)/$$subdir" \
1810 || $(MKDIR_P) "$(distdir)/$$subdir" \
1811 || exit 1; \
1812- distdir=`$(am__cd) $(distdir) && pwd`; \
1813- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
1814- (cd $$subdir && \
1815+ fi; \
1816+ done
1817+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1818+ if test "$$subdir" = .; then :; else \
1819+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
1820+ $(am__relativize); \
1821+ new_distdir=$$reldir; \
1822+ dir1=$$subdir; dir2="$(top_distdir)"; \
1823+ $(am__relativize); \
1824+ new_top_distdir=$$reldir; \
1825+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
1826+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
1827+ ($(am__cd) $$subdir && \
1828 $(MAKE) $(AM_MAKEFLAGS) \
1829- top_distdir="$$top_distdir" \
1830- distdir="$$distdir/$$subdir" \
1831+ top_distdir="$$new_top_distdir" \
1832+ distdir="$$new_distdir" \
1833 am__remove_distdir=: \
1834 am__skip_length_check=: \
1835+ am__skip_mode_fix=: \
1836 distdir) \
1837 || exit 1; \
1838 fi; \
1839 done
1840- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
1841+ -test -n "$(am__skip_mode_fix)" \
1842+ || find "$(distdir)" -type d ! -perm -755 \
1843+ -exec chmod u+rwx,go+rx {} \; -o \
1844 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
1845 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
1846 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1847- || chmod -R a+r $(distdir)
1848+ || chmod -R a+r "$(distdir)"
1849 dist-gzip: distdir
1850 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1851 $(am__remove_distdir)
1852@@ -494,6 +577,14 @@
1853 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
1854 $(am__remove_distdir)
1855
1856+dist-lzma: distdir
1857+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
1858+ $(am__remove_distdir)
1859+
1860+dist-xz: distdir
1861+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
1862+ $(am__remove_distdir)
1863+
1864 dist-tarZ: distdir
1865 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
1866 $(am__remove_distdir)
1867@@ -517,13 +608,17 @@
1868 distcheck: dist
1869 case '$(DIST_ARCHIVES)' in \
1870 *.tar.gz*) \
1871- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
1872+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1873 *.tar.bz2*) \
1874- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
1875+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1876+ *.tar.lzma*) \
1877+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
1878+ *.tar.xz*) \
1879+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
1880 *.tar.Z*) \
1881 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1882 *.shar.gz*) \
1883- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
1884+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
1885 *.zip*) \
1886 unzip $(distdir).zip ;;\
1887 esac
1888@@ -531,9 +626,11 @@
1889 mkdir $(distdir)/_build
1890 mkdir $(distdir)/_inst
1891 chmod a-w $(distdir)
1892+ test -d $(distdir)/_build || exit 0; \
1893 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
1894 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
1895- && cd $(distdir)/_build \
1896+ && am__cwd=`pwd` \
1897+ && $(am__cd) $(distdir)/_build \
1898 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
1899 $(DISTCHECK_CONFIGURE_FLAGS) \
1900 && $(MAKE) $(AM_MAKEFLAGS) \
1901@@ -555,13 +652,15 @@
1902 && rm -rf "$$dc_destdir" \
1903 && $(MAKE) $(AM_MAKEFLAGS) dist \
1904 && rm -rf $(DIST_ARCHIVES) \
1905- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
1906+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
1907+ && cd "$$am__cwd" \
1908+ || exit 1
1909 $(am__remove_distdir)
1910 @(echo "$(distdir) archives ready for distribution: "; \
1911 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
1912 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
1913 distuninstallcheck:
1914- @cd $(distuninstallcheck_dir) \
1915+ @$(am__cd) '$(distuninstallcheck_dir)' \
1916 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
1917 || { echo "ERROR: files left after uninstall:" ; \
1918 if test -n "$(DESTDIR)"; then \
1919@@ -606,6 +705,7 @@
1920
1921 distclean-generic:
1922 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1923+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1924
1925 maintainer-clean-generic:
1926 @echo "This command is intended for maintainers to use"
1927@@ -626,6 +726,8 @@
1928
1929 html: html-recursive
1930
1931+html-am:
1932+
1933 info: info-recursive
1934
1935 info-am:
1936@@ -634,18 +736,28 @@
1937
1938 install-dvi: install-dvi-recursive
1939
1940+install-dvi-am:
1941+
1942 install-exec-am:
1943
1944 install-html: install-html-recursive
1945
1946+install-html-am:
1947+
1948 install-info: install-info-recursive
1949
1950+install-info-am:
1951+
1952 install-man:
1953
1954 install-pdf: install-pdf-recursive
1955
1956+install-pdf-am:
1957+
1958 install-ps: install-ps-recursive
1959
1960+install-ps-am:
1961+
1962 installcheck-am:
1963
1964 maintainer-clean: maintainer-clean-recursive
1965@@ -668,25 +780,26 @@
1966
1967 uninstall-am: uninstall-pkgconfigDATA
1968
1969-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
1970- install-strip
1971+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
1972+ ctags-recursive install-am install-strip tags-recursive
1973
1974 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1975 all all-am am--refresh check check-am clean clean-generic \
1976 clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1977- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
1978- distclean-generic distclean-hdr distclean-libtool \
1979- distclean-tags distcleancheck distdir distuninstallcheck dvi \
1980- dvi-am html html-am info info-am install install-am \
1981- install-data install-data-am install-dvi install-dvi-am \
1982- install-exec install-exec-am install-html install-html-am \
1983- install-info install-info-am install-man install-pdf \
1984- install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
1985- install-strip installcheck installcheck-am installdirs \
1986- installdirs-am maintainer-clean maintainer-clean-generic \
1987- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
1988- ps ps-am tags tags-recursive uninstall uninstall-am \
1989- uninstall-pkgconfigDATA
1990+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
1991+ distcheck distclean distclean-generic distclean-hdr \
1992+ distclean-libtool distclean-tags distcleancheck distdir \
1993+ distuninstallcheck dvi dvi-am html html-am info info-am \
1994+ install install-am install-data install-data-am install-dvi \
1995+ install-dvi-am install-exec install-exec-am install-html \
1996+ install-html-am install-info install-info-am install-man \
1997+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \
1998+ install-ps-am install-strip installcheck installcheck-am \
1999+ installdirs installdirs-am maintainer-clean \
2000+ maintainer-clean-generic mostlyclean mostlyclean-generic \
2001+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
2002+ uninstall uninstall-am uninstall-pkgconfigDATA
2003+
2004
2005 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2006 # Otherwise a system limit (for SysV at least) may be exceeded.
2007
2008=== modified file 'NEWS'
2009--- NEWS 2009-07-28 20:38:41 +0000
2010+++ NEWS 2011-11-22 04:29:25 +0000
2011@@ -1,4 +1,24 @@
2012
2013+GooCanvas 2.0.0 (Feb 27 2011)
2014+===============
2015+
2016+ o Ported to GTK+ 3.0.
2017+ o Can be installed with GooCanvas 1.0.x without conflicting.
2018+
2019+
2020+GooCanvas 1.0.0 (Jan 10 2011)
2021+===============
2022+
2023+ o Added "alpha" property to GooCanvasImage to set opacity.
2024+ o Allow setting clip path to NULL to reset it.
2025+ o Allow setting line dash to NULL to reset it.
2026+ o Handle RTL direction better in GooCanvasTable.
2027+ o Fixed GooCanvasGroup bug - use the correct scale argument in paint.
2028+ o Fixed GooCanvasPolyline bug - update arrows when line width changes.
2029+ o Fixed static items bug - don't clip incorrectly.
2030+ o Improved performance a bit when creating lots of items.
2031+
2032+
2033 GooCanvas 0.15 (Jun 29 2009)
2034 ==============
2035
2036
2037=== modified file 'README'
2038--- README 2009-07-28 20:38:41 +0000
2039+++ README 2011-11-22 04:29:25 +0000
2040@@ -8,10 +8,8 @@
2041 GooCanvas Home Page : http://live.gnome.org/GooCanvas
2042
2043
2044-GooCanvas is similar in many ways to GnomeCanvas and FooCanvas.
2045-But it uses cairo for rendering, has an optional model/view split,
2046-and uses interfaces for items & models (so you can easily turn any
2047-application object into a canvas item or model).
2048+GooCanvas is similar in many ways to GnomeCanvas and FooCanvas, but it uses
2049+cairo for rendering.
2050
2051 NOTE: I am no longer actively developing GooCanvas, so no major new
2052 features will be added (unless a new maintainer takes over). I'll still
2053@@ -23,8 +21,6 @@
2054
2055 Features:
2056
2057- o Optional model/view split.
2058- o Uses interfaces for items & views.
2059 o Basic items - rect/ellipse/polyline/text/image/grid/group.
2060 o Path item, using SVG path specification strings.
2061 o Table item for layout of other items (similar to the GtkTable widget).
2062@@ -32,7 +28,6 @@
2063 their allocated width, such as text items.)
2064 o Embedded GTK+ widgets.
2065 o Layers/stacking order with raise/lower functions.
2066- o Cascading styles - line width/style/dashes, colors, fill patterns.
2067 o Affine transformations for all items - rotations/scales/skews.
2068 o Clip paths to support clipping items.
2069 o Event handling - button/motion events, "pointer-events" property like SVG.
2070@@ -50,6 +45,13 @@
2071 o Support for different units - pixels/points/inches/millimeters.
2072 o API docs.
2073
2074+Features that may be removed in future to simplify the code:
2075+
2076+ o Optional model/view split.
2077+ o Uses interfaces for items & views.
2078+ o Cascading styles - line width/style/dashes, colors, fill patterns.
2079+ (The style properties will remain, but will not cascade.)
2080+
2081
2082 Damon Chaplin (damon@gnome.org)
2083
2084
2085=== modified file 'aclocal.m4'
2086--- aclocal.m4 2008-12-07 17:18:43 +0000
2087+++ aclocal.m4 2011-11-22 04:29:25 +0000
2088@@ -1,7 +1,7 @@
2089-# generated automatically by aclocal 1.10 -*- Autoconf -*-
2090+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
2091
2092 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2093-# 2005, 2006 Free Software Foundation, Inc.
2094+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
2095 # This file is free software; the Free Software Foundation
2096 # gives unlimited permission to copy and/or distribute it,
2097 # with or without modifications, as long as this notice is preserved.
2098@@ -11,10 +11,13 @@
2099 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
2100 # PARTICULAR PURPOSE.
2101
2102-m4_if(m4_PACKAGE_VERSION, [2.61],,
2103-[m4_fatal([this file was generated for autoconf 2.61.
2104-You have another version of autoconf. If you want to use that,
2105-you should regenerate the build system entirely.], [63])])
2106+m4_ifndef([AC_AUTOCONF_VERSION],
2107+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2108+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
2109+[m4_warning([this file was generated for autoconf 2.68.
2110+You have another version of autoconf. It may work, but is not guaranteed to.
2111+If you have problems, you may need to regenerate the build system entirely.
2112+To do so, use the procedure documented by the package, typically `autoreconf'.])])
2113
2114 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
2115 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
2116@@ -298,7 +301,7 @@
2117
2118 dnl These rules are solely for the distribution goal. While doing this
2119 dnl we only have to keep exactly one list of the available catalogs
2120- dnl in configure.in.
2121+ dnl in configure.ac.
2122 for lang in $ALL_LINGUAS; do
2123 GMOFILES="$GMOFILES $lang.gmo"
2124 POFILES="$POFILES $lang.po"
2125@@ -427,7 +430,7 @@
2126 dnl
2127 dnl Now the definitions that aclocal will find
2128 dnl
2129-ifdef(glib_configure_in,[],[
2130+ifdef(glib_configure_ac,[],[
2131 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
2132 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
2133 ])dnl
2134@@ -457,8 +460,15 @@
2135 dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
2136 AC_DEFUN([GTK_DOC_CHECK],
2137 [
2138+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
2139 AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
2140 AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
2141+
2142+ dnl check for tools we added during development
2143+ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
2144+ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
2145+ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
2146+
2147 dnl for overriding the documentation installation directory
2148 AC_ARG_WITH([html-dir],
2149 AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
2150@@ -477,115 +487,231 @@
2151 [PKG_CHECK_EXISTS([gtk-doc],,
2152 AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
2153 [PKG_CHECK_EXISTS([gtk-doc >= $1],,
2154- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
2155+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
2156+ dnl don't check for glib if we build glib
2157+ if test "x$PACKAGE_NAME" != "xglib"; then
2158+ dnl don't fail if someone does not have glib
2159+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,)
2160+ fi
2161 fi
2162
2163 AC_MSG_CHECKING([whether to build gtk-doc documentation])
2164 AC_MSG_RESULT($enable_gtk_doc)
2165
2166- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
2167+ dnl enable/disable output formats
2168+ AC_ARG_ENABLE([gtk-doc-html],
2169+ AS_HELP_STRING([--enable-gtk-doc-html],
2170+ [build documentation in html format [[default=yes]]]),,
2171+ [enable_gtk_doc_html=yes])
2172+ AC_ARG_ENABLE([gtk-doc-pdf],
2173+ AS_HELP_STRING([--enable-gtk-doc-pdf],
2174+ [build documentation in pdf format [[default=no]]]),,
2175+ [enable_gtk_doc_pdf=no])
2176+
2177+ if test -z "$GTKDOC_MKPDF"; then
2178+ enable_gtk_doc_pdf=no
2179+ fi
2180+
2181
2182 AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
2183+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
2184+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
2185 AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
2186+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
2187 ])
2188
2189 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
2190-
2191-# serial 51 AC_PROG_LIBTOOL
2192-
2193-
2194-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
2195-# -----------------------------------------------------------
2196-# If this macro is not defined by Autoconf, define it here.
2197-m4_ifdef([AC_PROVIDE_IFELSE],
2198- [],
2199- [m4_define([AC_PROVIDE_IFELSE],
2200- [m4_ifdef([AC_PROVIDE_$1],
2201- [$2], [$3])])])
2202-
2203-
2204-# AC_PROG_LIBTOOL
2205-# ---------------
2206-AC_DEFUN([AC_PROG_LIBTOOL],
2207-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
2208-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
2209-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
2210- AC_PROVIDE_IFELSE([AC_PROG_CXX],
2211- [AC_LIBTOOL_CXX],
2212- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
2213- ])])
2214-dnl And a similar setup for Fortran 77 support
2215- AC_PROVIDE_IFELSE([AC_PROG_F77],
2216- [AC_LIBTOOL_F77],
2217- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
2218-])])
2219-
2220-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
2221-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
2222-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
2223- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
2224- [AC_LIBTOOL_GCJ],
2225- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
2226- [AC_LIBTOOL_GCJ],
2227- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
2228- [AC_LIBTOOL_GCJ],
2229- [ifdef([AC_PROG_GCJ],
2230- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
2231- ifdef([A][M_PROG_GCJ],
2232- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
2233- ifdef([LT_AC_PROG_GCJ],
2234- [define([LT_AC_PROG_GCJ],
2235- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
2236-])])# AC_PROG_LIBTOOL
2237-
2238-
2239-# _AC_PROG_LIBTOOL
2240-# ----------------
2241-AC_DEFUN([_AC_PROG_LIBTOOL],
2242-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
2243-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
2244-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
2245-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
2246+#
2247+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
2248+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
2249+# Inc.
2250+# Written by Gordon Matzigkeit, 1996
2251+#
2252+# This file is free software; the Free Software Foundation gives
2253+# unlimited permission to copy and/or distribute it, with or without
2254+# modifications, as long as this notice is preserved.
2255+
2256+m4_define([_LT_COPYING], [dnl
2257+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
2258+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
2259+# Inc.
2260+# Written by Gordon Matzigkeit, 1996
2261+#
2262+# This file is part of GNU Libtool.
2263+#
2264+# GNU Libtool is free software; you can redistribute it and/or
2265+# modify it under the terms of the GNU General Public License as
2266+# published by the Free Software Foundation; either version 2 of
2267+# the License, or (at your option) any later version.
2268+#
2269+# As a special exception to the GNU General Public License,
2270+# if you distribute this file as part of a program or library that
2271+# is built using GNU Libtool, you may include this file under the
2272+# same distribution terms that you use for the rest of that program.
2273+#
2274+# GNU Libtool is distributed in the hope that it will be useful,
2275+# but WITHOUT ANY WARRANTY; without even the implied warranty of
2276+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2277+# GNU General Public License for more details.
2278+#
2279+# You should have received a copy of the GNU General Public License
2280+# along with GNU Libtool; see the file COPYING. If not, a copy
2281+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
2282+# obtained by writing to the Free Software Foundation, Inc.,
2283+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2284+])
2285+
2286+# serial 57 LT_INIT
2287+
2288+
2289+# LT_PREREQ(VERSION)
2290+# ------------------
2291+# Complain and exit if this libtool version is less that VERSION.
2292+m4_defun([LT_PREREQ],
2293+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
2294+ [m4_default([$3],
2295+ [m4_fatal([Libtool version $1 or higher is required],
2296+ 63)])],
2297+ [$2])])
2298+
2299+
2300+# _LT_CHECK_BUILDDIR
2301+# ------------------
2302+# Complain if the absolute build directory name contains unusual characters
2303+m4_defun([_LT_CHECK_BUILDDIR],
2304+[case `pwd` in
2305+ *\ * | *\ *)
2306+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
2307+esac
2308+])
2309+
2310+
2311+# LT_INIT([OPTIONS])
2312+# ------------------
2313+AC_DEFUN([LT_INIT],
2314+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
2315+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
2316+AC_BEFORE([$0], [LT_LANG])dnl
2317+AC_BEFORE([$0], [LT_OUTPUT])dnl
2318+AC_BEFORE([$0], [LTDL_INIT])dnl
2319+m4_require([_LT_CHECK_BUILDDIR])dnl
2320+
2321+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
2322+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
2323+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
2324+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
2325+dnl unless we require an AC_DEFUNed macro:
2326+AC_REQUIRE([LTOPTIONS_VERSION])dnl
2327+AC_REQUIRE([LTSUGAR_VERSION])dnl
2328+AC_REQUIRE([LTVERSION_VERSION])dnl
2329+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
2330+m4_require([_LT_PROG_LTMAIN])dnl
2331+
2332+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
2333+
2334+dnl Parse OPTIONS
2335+_LT_SET_OPTIONS([$0], [$1])
2336
2337 # This can be used to rebuild libtool when needed
2338-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
2339+LIBTOOL_DEPS="$ltmain"
2340
2341 # Always use our own libtool.
2342 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2343 AC_SUBST(LIBTOOL)dnl
2344
2345-# Prevent multiple expansion
2346-define([AC_PROG_LIBTOOL], [])
2347-])# _AC_PROG_LIBTOOL
2348-
2349-
2350-# AC_LIBTOOL_SETUP
2351-# ----------------
2352-AC_DEFUN([AC_LIBTOOL_SETUP],
2353-[AC_PREREQ(2.50)dnl
2354-AC_REQUIRE([AC_ENABLE_SHARED])dnl
2355-AC_REQUIRE([AC_ENABLE_STATIC])dnl
2356-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
2357-AC_REQUIRE([AC_CANONICAL_HOST])dnl
2358+_LT_SETUP
2359+
2360+# Only expand once:
2361+m4_define([LT_INIT])
2362+])# LT_INIT
2363+
2364+# Old names:
2365+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
2366+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
2367+dnl aclocal-1.4 backwards compatibility:
2368+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
2369+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
2370+
2371+
2372+# _LT_CC_BASENAME(CC)
2373+# -------------------
2374+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
2375+m4_defun([_LT_CC_BASENAME],
2376+[for cc_temp in $1""; do
2377+ case $cc_temp in
2378+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
2379+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
2380+ \-*) ;;
2381+ *) break;;
2382+ esac
2383+done
2384+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
2385+])
2386+
2387+
2388+# _LT_FILEUTILS_DEFAULTS
2389+# ----------------------
2390+# It is okay to use these file commands and assume they have been set
2391+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
2392+m4_defun([_LT_FILEUTILS_DEFAULTS],
2393+[: ${CP="cp -f"}
2394+: ${MV="mv -f"}
2395+: ${RM="rm -f"}
2396+])# _LT_FILEUTILS_DEFAULTS
2397+
2398+
2399+# _LT_SETUP
2400+# ---------
2401+m4_defun([_LT_SETUP],
2402+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
2403 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
2404+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
2405+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
2406+
2407+_LT_DECL([], [host_alias], [0], [The host system])dnl
2408+_LT_DECL([], [host], [0])dnl
2409+_LT_DECL([], [host_os], [0])dnl
2410+dnl
2411+_LT_DECL([], [build_alias], [0], [The build system])dnl
2412+_LT_DECL([], [build], [0])dnl
2413+_LT_DECL([], [build_os], [0])dnl
2414+dnl
2415 AC_REQUIRE([AC_PROG_CC])dnl
2416-AC_REQUIRE([AC_PROG_LD])dnl
2417-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
2418-AC_REQUIRE([AC_PROG_NM])dnl
2419-
2420+AC_REQUIRE([LT_PATH_LD])dnl
2421+AC_REQUIRE([LT_PATH_NM])dnl
2422+dnl
2423 AC_REQUIRE([AC_PROG_LN_S])dnl
2424-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
2425-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
2426-AC_REQUIRE([AC_OBJEXT])dnl
2427-AC_REQUIRE([AC_EXEEXT])dnl
2428-dnl
2429-
2430-AC_LIBTOOL_SYS_MAX_CMD_LEN
2431-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
2432-AC_LIBTOOL_OBJDIR
2433-
2434-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
2435-_LT_AC_PROG_ECHO_BACKSLASH
2436+test -z "$LN_S" && LN_S="ln -s"
2437+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
2438+dnl
2439+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
2440+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
2441+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
2442+dnl
2443+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2444+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
2445+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
2446+m4_require([_LT_CMD_RELOAD])dnl
2447+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
2448+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
2449+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
2450+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
2451+m4_require([_LT_WITH_SYSROOT])dnl
2452+
2453+_LT_CONFIG_LIBTOOL_INIT([
2454+# See if we are running on zsh, and set the options which allow our
2455+# commands through without removal of \ escapes INIT.
2456+if test -n "\${ZSH_VERSION+set}" ; then
2457+ setopt NO_GLOB_SUBST
2458+fi
2459+])
2460+if test -n "${ZSH_VERSION+set}" ; then
2461+ setopt NO_GLOB_SUBST
2462+fi
2463+
2464+_LT_CHECK_OBJDIR
2465+
2466+m4_require([_LT_TAG_COMPILER])dnl
2467
2468 case $host_os in
2469 aix3*)
2470@@ -599,116 +725,678 @@
2471 ;;
2472 esac
2473
2474-# Sed substitution that helps us do robust quoting. It backslashifies
2475-# metacharacters that are still active within double-quoted strings.
2476-Xsed='sed -e 1s/^X//'
2477-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
2478-
2479-# Same as above, but do not quote variable references.
2480-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
2481-
2482-# Sed substitution to delay expansion of an escaped shell variable in a
2483-# double_quote_subst'ed string.
2484-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
2485-
2486-# Sed substitution to avoid accidental globbing in evaled expressions
2487-no_glob_subst='s/\*/\\\*/g'
2488-
2489-# Constants:
2490-rm="rm -f"
2491-
2492 # Global variables:
2493-default_ofile=libtool
2494+ofile=libtool
2495 can_build_shared=yes
2496
2497 # All known linkers require a `.a' archive for static linking (except MSVC,
2498 # which needs '.lib').
2499 libext=a
2500-ltmain="$ac_aux_dir/ltmain.sh"
2501-ofile="$default_ofile"
2502+
2503 with_gnu_ld="$lt_cv_prog_gnu_ld"
2504
2505-AC_CHECK_TOOL(AR, ar, false)
2506-AC_CHECK_TOOL(RANLIB, ranlib, :)
2507-AC_CHECK_TOOL(STRIP, strip, :)
2508-
2509 old_CC="$CC"
2510 old_CFLAGS="$CFLAGS"
2511
2512 # Set sane defaults for various variables
2513-test -z "$AR" && AR=ar
2514-test -z "$AR_FLAGS" && AR_FLAGS=cru
2515-test -z "$AS" && AS=as
2516 test -z "$CC" && CC=cc
2517 test -z "$LTCC" && LTCC=$CC
2518 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
2519-test -z "$DLLTOOL" && DLLTOOL=dlltool
2520 test -z "$LD" && LD=ld
2521-test -z "$LN_S" && LN_S="ln -s"
2522-test -z "$MAGIC_CMD" && MAGIC_CMD=file
2523-test -z "$NM" && NM=nm
2524-test -z "$SED" && SED=sed
2525-test -z "$OBJDUMP" && OBJDUMP=objdump
2526-test -z "$RANLIB" && RANLIB=:
2527-test -z "$STRIP" && STRIP=:
2528 test -z "$ac_objext" && ac_objext=o
2529
2530-# Determine commands to create old-style static archives.
2531-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
2532-old_postinstall_cmds='chmod 644 $oldlib'
2533-old_postuninstall_cmds=
2534-
2535-if test -n "$RANLIB"; then
2536- case $host_os in
2537- openbsd*)
2538- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
2539- ;;
2540- *)
2541- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
2542- ;;
2543- esac
2544- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
2545-fi
2546-
2547 _LT_CC_BASENAME([$compiler])
2548
2549 # Only perform the check for file, if the check method requires it
2550+test -z "$MAGIC_CMD" && MAGIC_CMD=file
2551 case $deplibs_check_method in
2552 file_magic*)
2553 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
2554- AC_PATH_MAGIC
2555+ _LT_PATH_MAGIC
2556 fi
2557 ;;
2558 esac
2559
2560-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
2561-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
2562-enable_win32_dll=yes, enable_win32_dll=no)
2563-
2564-AC_ARG_ENABLE([libtool-lock],
2565- [AC_HELP_STRING([--disable-libtool-lock],
2566- [avoid locking (might break parallel builds)])])
2567-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
2568-
2569-AC_ARG_WITH([pic],
2570- [AC_HELP_STRING([--with-pic],
2571- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
2572- [pic_mode="$withval"],
2573- [pic_mode=default])
2574-test -z "$pic_mode" && pic_mode=default
2575-
2576 # Use C for the default configuration in the libtool script
2577-tagname=
2578-AC_LIBTOOL_LANG_C_CONFIG
2579-_LT_AC_TAGCONFIG
2580-])# AC_LIBTOOL_SETUP
2581-
2582-
2583-# _LT_AC_SYS_COMPILER
2584+LT_SUPPORTED_TAG([CC])
2585+_LT_LANG_C_CONFIG
2586+_LT_LANG_DEFAULT_CONFIG
2587+_LT_CONFIG_COMMANDS
2588+])# _LT_SETUP
2589+
2590+
2591+# _LT_PREPARE_SED_QUOTE_VARS
2592+# --------------------------
2593+# Define a few sed substitution that help us do robust quoting.
2594+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
2595+[# Backslashify metacharacters that are still active within
2596+# double-quoted strings.
2597+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
2598+
2599+# Same as above, but do not quote variable references.
2600+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
2601+
2602+# Sed substitution to delay expansion of an escaped shell variable in a
2603+# double_quote_subst'ed string.
2604+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
2605+
2606+# Sed substitution to delay expansion of an escaped single quote.
2607+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
2608+
2609+# Sed substitution to avoid accidental globbing in evaled expressions
2610+no_glob_subst='s/\*/\\\*/g'
2611+])
2612+
2613+# _LT_PROG_LTMAIN
2614+# ---------------
2615+# Note that this code is called both from `configure', and `config.status'
2616+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
2617+# `config.status' has no value for ac_aux_dir unless we are using Automake,
2618+# so we pass a copy along to make sure it has a sensible value anyway.
2619+m4_defun([_LT_PROG_LTMAIN],
2620+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
2621+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
2622+ltmain="$ac_aux_dir/ltmain.sh"
2623+])# _LT_PROG_LTMAIN
2624+
2625+
2626+
2627+# So that we can recreate a full libtool script including additional
2628+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
2629+# in macros and then make a single call at the end using the `libtool'
2630+# label.
2631+
2632+
2633+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
2634+# ----------------------------------------
2635+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
2636+m4_define([_LT_CONFIG_LIBTOOL_INIT],
2637+[m4_ifval([$1],
2638+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
2639+ [$1
2640+])])])
2641+
2642+# Initialize.
2643+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
2644+
2645+
2646+# _LT_CONFIG_LIBTOOL([COMMANDS])
2647+# ------------------------------
2648+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
2649+m4_define([_LT_CONFIG_LIBTOOL],
2650+[m4_ifval([$1],
2651+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
2652+ [$1
2653+])])])
2654+
2655+# Initialize.
2656+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
2657+
2658+
2659+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
2660+# -----------------------------------------------------
2661+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
2662+[_LT_CONFIG_LIBTOOL([$1])
2663+_LT_CONFIG_LIBTOOL_INIT([$2])
2664+])
2665+
2666+
2667+# _LT_FORMAT_COMMENT([COMMENT])
2668+# -----------------------------
2669+# Add leading comment marks to the start of each line, and a trailing
2670+# full-stop to the whole comment if one is not present already.
2671+m4_define([_LT_FORMAT_COMMENT],
2672+[m4_ifval([$1], [
2673+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
2674+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
2675+)])
2676+
2677+
2678+
2679+
2680+
2681+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
2682+# -------------------------------------------------------------------
2683+# CONFIGNAME is the name given to the value in the libtool script.
2684+# VARNAME is the (base) name used in the configure script.
2685+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
2686+# VARNAME. Any other value will be used directly.
2687+m4_define([_LT_DECL],
2688+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
2689+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
2690+ [m4_ifval([$1], [$1], [$2])])
2691+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
2692+ m4_ifval([$4],
2693+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
2694+ lt_dict_add_subkey([lt_decl_dict], [$2],
2695+ [tagged?], [m4_ifval([$5], [yes], [no])])])
2696+])
2697+
2698+
2699+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
2700+# --------------------------------------------------------
2701+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
2702+
2703+
2704+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
2705+# ------------------------------------------------
2706+m4_define([lt_decl_tag_varnames],
2707+[_lt_decl_filter([tagged?], [yes], $@)])
2708+
2709+
2710+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
2711+# ---------------------------------------------------------
2712+m4_define([_lt_decl_filter],
2713+[m4_case([$#],
2714+ [0], [m4_fatal([$0: too few arguments: $#])],
2715+ [1], [m4_fatal([$0: too few arguments: $#: $1])],
2716+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
2717+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
2718+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
2719+])
2720+
2721+
2722+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
2723+# --------------------------------------------------
2724+m4_define([lt_decl_quote_varnames],
2725+[_lt_decl_filter([value], [1], $@)])
2726+
2727+
2728+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
2729+# ---------------------------------------------------
2730+m4_define([lt_decl_dquote_varnames],
2731+[_lt_decl_filter([value], [2], $@)])
2732+
2733+
2734+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
2735+# ---------------------------------------------------
2736+m4_define([lt_decl_varnames_tagged],
2737+[m4_assert([$# <= 2])dnl
2738+_$0(m4_quote(m4_default([$1], [[, ]])),
2739+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
2740+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
2741+m4_define([_lt_decl_varnames_tagged],
2742+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
2743+
2744+
2745+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
2746+# ------------------------------------------------
2747+m4_define([lt_decl_all_varnames],
2748+[_$0(m4_quote(m4_default([$1], [[, ]])),
2749+ m4_if([$2], [],
2750+ m4_quote(lt_decl_varnames),
2751+ m4_quote(m4_shift($@))))[]dnl
2752+])
2753+m4_define([_lt_decl_all_varnames],
2754+[lt_join($@, lt_decl_varnames_tagged([$1],
2755+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
2756+])
2757+
2758+
2759+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
2760+# ------------------------------------
2761+# Quote a variable value, and forward it to `config.status' so that its
2762+# declaration there will have the same value as in `configure'. VARNAME
2763+# must have a single quote delimited value for this to work.
2764+m4_define([_LT_CONFIG_STATUS_DECLARE],
2765+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
2766+
2767+
2768+# _LT_CONFIG_STATUS_DECLARATIONS
2769+# ------------------------------
2770+# We delimit libtool config variables with single quotes, so when
2771+# we write them to config.status, we have to be sure to quote all
2772+# embedded single quotes properly. In configure, this macro expands
2773+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
2774+#
2775+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
2776+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
2777+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
2778+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
2779+
2780+
2781+# _LT_LIBTOOL_TAGS
2782+# ----------------
2783+# Output comment and list of tags supported by the script
2784+m4_defun([_LT_LIBTOOL_TAGS],
2785+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
2786+available_tags="_LT_TAGS"dnl
2787+])
2788+
2789+
2790+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
2791+# -----------------------------------
2792+# Extract the dictionary values for VARNAME (optionally with TAG) and
2793+# expand to a commented shell variable setting:
2794+#
2795+# # Some comment about what VAR is for.
2796+# visible_name=$lt_internal_name
2797+m4_define([_LT_LIBTOOL_DECLARE],
2798+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
2799+ [description])))[]dnl
2800+m4_pushdef([_libtool_name],
2801+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
2802+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
2803+ [0], [_libtool_name=[$]$1],
2804+ [1], [_libtool_name=$lt_[]$1],
2805+ [2], [_libtool_name=$lt_[]$1],
2806+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
2807+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
2808+])
2809+
2810+
2811+# _LT_LIBTOOL_CONFIG_VARS
2812+# -----------------------
2813+# Produce commented declarations of non-tagged libtool config variables
2814+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
2815+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
2816+# section) are produced by _LT_LIBTOOL_TAG_VARS.
2817+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
2818+[m4_foreach([_lt_var],
2819+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
2820+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
2821+
2822+
2823+# _LT_LIBTOOL_TAG_VARS(TAG)
2824+# -------------------------
2825+m4_define([_LT_LIBTOOL_TAG_VARS],
2826+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
2827+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
2828+
2829+
2830+# _LT_TAGVAR(VARNAME, [TAGNAME])
2831+# ------------------------------
2832+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
2833+
2834+
2835+# _LT_CONFIG_COMMANDS
2836 # -------------------
2837-AC_DEFUN([_LT_AC_SYS_COMPILER],
2838+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
2839+# variables for single and double quote escaping we saved from calls
2840+# to _LT_DECL, we can put quote escaped variables declarations
2841+# into `config.status', and then the shell code to quote escape them in
2842+# for loops in `config.status'. Finally, any additional code accumulated
2843+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
2844+m4_defun([_LT_CONFIG_COMMANDS],
2845+[AC_PROVIDE_IFELSE([LT_OUTPUT],
2846+ dnl If the libtool generation code has been placed in $CONFIG_LT,
2847+ dnl instead of duplicating it all over again into config.status,
2848+ dnl then we will have config.status run $CONFIG_LT later, so it
2849+ dnl needs to know what name is stored there:
2850+ [AC_CONFIG_COMMANDS([libtool],
2851+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
2852+ dnl If the libtool generation code is destined for config.status,
2853+ dnl expand the accumulated commands and init code now:
2854+ [AC_CONFIG_COMMANDS([libtool],
2855+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
2856+])#_LT_CONFIG_COMMANDS
2857+
2858+
2859+# Initialize.
2860+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
2861+[
2862+
2863+# The HP-UX ksh and POSIX shell print the target directory to stdout
2864+# if CDPATH is set.
2865+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2866+
2867+sed_quote_subst='$sed_quote_subst'
2868+double_quote_subst='$double_quote_subst'
2869+delay_variable_subst='$delay_variable_subst'
2870+_LT_CONFIG_STATUS_DECLARATIONS
2871+LTCC='$LTCC'
2872+LTCFLAGS='$LTCFLAGS'
2873+compiler='$compiler_DEFAULT'
2874+
2875+# A function that is used when there is no print builtin or printf.
2876+func_fallback_echo ()
2877+{
2878+ eval 'cat <<_LTECHO_EOF
2879+\$[]1
2880+_LTECHO_EOF'
2881+}
2882+
2883+# Quote evaled strings.
2884+for var in lt_decl_all_varnames([[ \
2885+]], lt_decl_quote_varnames); do
2886+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
2887+ *[[\\\\\\\`\\"\\\$]]*)
2888+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
2889+ ;;
2890+ *)
2891+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
2892+ ;;
2893+ esac
2894+done
2895+
2896+# Double-quote double-evaled strings.
2897+for var in lt_decl_all_varnames([[ \
2898+]], lt_decl_dquote_varnames); do
2899+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
2900+ *[[\\\\\\\`\\"\\\$]]*)
2901+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
2902+ ;;
2903+ *)
2904+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
2905+ ;;
2906+ esac
2907+done
2908+
2909+_LT_OUTPUT_LIBTOOL_INIT
2910+])
2911+
2912+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
2913+# ------------------------------------
2914+# Generate a child script FILE with all initialization necessary to
2915+# reuse the environment learned by the parent script, and make the
2916+# file executable. If COMMENT is supplied, it is inserted after the
2917+# `#!' sequence but before initialization text begins. After this
2918+# macro, additional text can be appended to FILE to form the body of
2919+# the child script. The macro ends with non-zero status if the
2920+# file could not be fully written (such as if the disk is full).
2921+m4_ifdef([AS_INIT_GENERATED],
2922+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
2923+[m4_defun([_LT_GENERATED_FILE_INIT],
2924+[m4_require([AS_PREPARE])]dnl
2925+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
2926+[lt_write_fail=0
2927+cat >$1 <<_ASEOF || lt_write_fail=1
2928+#! $SHELL
2929+# Generated by $as_me.
2930+$2
2931+SHELL=\${CONFIG_SHELL-$SHELL}
2932+export SHELL
2933+_ASEOF
2934+cat >>$1 <<\_ASEOF || lt_write_fail=1
2935+AS_SHELL_SANITIZE
2936+_AS_PREPARE
2937+exec AS_MESSAGE_FD>&1
2938+_ASEOF
2939+test $lt_write_fail = 0 && chmod +x $1[]dnl
2940+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
2941+
2942+# LT_OUTPUT
2943+# ---------
2944+# This macro allows early generation of the libtool script (before
2945+# AC_OUTPUT is called), incase it is used in configure for compilation
2946+# tests.
2947+AC_DEFUN([LT_OUTPUT],
2948+[: ${CONFIG_LT=./config.lt}
2949+AC_MSG_NOTICE([creating $CONFIG_LT])
2950+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
2951+[# Run this file to recreate a libtool stub with the current configuration.])
2952+
2953+cat >>"$CONFIG_LT" <<\_LTEOF
2954+lt_cl_silent=false
2955+exec AS_MESSAGE_LOG_FD>>config.log
2956+{
2957+ echo
2958+ AS_BOX([Running $as_me.])
2959+} >&AS_MESSAGE_LOG_FD
2960+
2961+lt_cl_help="\
2962+\`$as_me' creates a local libtool stub from the current configuration,
2963+for use in further configure time tests before the real libtool is
2964+generated.
2965+
2966+Usage: $[0] [[OPTIONS]]
2967+
2968+ -h, --help print this help, then exit
2969+ -V, --version print version number, then exit
2970+ -q, --quiet do not print progress messages
2971+ -d, --debug don't remove temporary files
2972+
2973+Report bugs to <bug-libtool@gnu.org>."
2974+
2975+lt_cl_version="\
2976+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
2977+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
2978+configured by $[0], generated by m4_PACKAGE_STRING.
2979+
2980+Copyright (C) 2010 Free Software Foundation, Inc.
2981+This config.lt script is free software; the Free Software Foundation
2982+gives unlimited permision to copy, distribute and modify it."
2983+
2984+while test $[#] != 0
2985+do
2986+ case $[1] in
2987+ --version | --v* | -V )
2988+ echo "$lt_cl_version"; exit 0 ;;
2989+ --help | --h* | -h )
2990+ echo "$lt_cl_help"; exit 0 ;;
2991+ --debug | --d* | -d )
2992+ debug=: ;;
2993+ --quiet | --q* | --silent | --s* | -q )
2994+ lt_cl_silent=: ;;
2995+
2996+ -*) AC_MSG_ERROR([unrecognized option: $[1]
2997+Try \`$[0] --help' for more information.]) ;;
2998+
2999+ *) AC_MSG_ERROR([unrecognized argument: $[1]
3000+Try \`$[0] --help' for more information.]) ;;
3001+ esac
3002+ shift
3003+done
3004+
3005+if $lt_cl_silent; then
3006+ exec AS_MESSAGE_FD>/dev/null
3007+fi
3008+_LTEOF
3009+
3010+cat >>"$CONFIG_LT" <<_LTEOF
3011+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
3012+_LTEOF
3013+
3014+cat >>"$CONFIG_LT" <<\_LTEOF
3015+AC_MSG_NOTICE([creating $ofile])
3016+_LT_OUTPUT_LIBTOOL_COMMANDS
3017+AS_EXIT(0)
3018+_LTEOF
3019+chmod +x "$CONFIG_LT"
3020+
3021+# configure is writing to config.log, but config.lt does its own redirection,
3022+# appending to config.log, which fails on DOS, as config.log is still kept
3023+# open by configure. Here we exec the FD to /dev/null, effectively closing
3024+# config.log, so it can be properly (re)opened and appended to by config.lt.
3025+lt_cl_success=:
3026+test "$silent" = yes &&
3027+ lt_config_lt_args="$lt_config_lt_args --quiet"
3028+exec AS_MESSAGE_LOG_FD>/dev/null
3029+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
3030+exec AS_MESSAGE_LOG_FD>>config.log
3031+$lt_cl_success || AS_EXIT(1)
3032+])# LT_OUTPUT
3033+
3034+
3035+# _LT_CONFIG(TAG)
3036+# ---------------
3037+# If TAG is the built-in tag, create an initial libtool script with a
3038+# default configuration from the untagged config vars. Otherwise add code
3039+# to config.status for appending the configuration named by TAG from the
3040+# matching tagged config vars.
3041+m4_defun([_LT_CONFIG],
3042+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
3043+_LT_CONFIG_SAVE_COMMANDS([
3044+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
3045+ m4_if(_LT_TAG, [C], [
3046+ # See if we are running on zsh, and set the options which allow our
3047+ # commands through without removal of \ escapes.
3048+ if test -n "${ZSH_VERSION+set}" ; then
3049+ setopt NO_GLOB_SUBST
3050+ fi
3051+
3052+ cfgfile="${ofile}T"
3053+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
3054+ $RM "$cfgfile"
3055+
3056+ cat <<_LT_EOF >> "$cfgfile"
3057+#! $SHELL
3058+
3059+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
3060+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
3061+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
3062+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
3063+#
3064+_LT_COPYING
3065+_LT_LIBTOOL_TAGS
3066+
3067+# ### BEGIN LIBTOOL CONFIG
3068+_LT_LIBTOOL_CONFIG_VARS
3069+_LT_LIBTOOL_TAG_VARS
3070+# ### END LIBTOOL CONFIG
3071+
3072+_LT_EOF
3073+
3074+ case $host_os in
3075+ aix3*)
3076+ cat <<\_LT_EOF >> "$cfgfile"
3077+# AIX sometimes has problems with the GCC collect2 program. For some
3078+# reason, if we set the COLLECT_NAMES environment variable, the problems
3079+# vanish in a puff of smoke.
3080+if test "X${COLLECT_NAMES+set}" != Xset; then
3081+ COLLECT_NAMES=
3082+ export COLLECT_NAMES
3083+fi
3084+_LT_EOF
3085+ ;;
3086+ esac
3087+
3088+ _LT_PROG_LTMAIN
3089+
3090+ # We use sed instead of cat because bash on DJGPP gets confused if
3091+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
3092+ # text mode, it properly converts lines to CR/LF. This bash problem
3093+ # is reportedly fixed, but why not run on old versions too?
3094+ sed '$q' "$ltmain" >> "$cfgfile" \
3095+ || (rm -f "$cfgfile"; exit 1)
3096+
3097+ _LT_PROG_REPLACE_SHELLFNS
3098+
3099+ mv -f "$cfgfile" "$ofile" ||
3100+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3101+ chmod +x "$ofile"
3102+],
3103+[cat <<_LT_EOF >> "$ofile"
3104+
3105+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
3106+dnl in a comment (ie after a #).
3107+# ### BEGIN LIBTOOL TAG CONFIG: $1
3108+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
3109+# ### END LIBTOOL TAG CONFIG: $1
3110+_LT_EOF
3111+])dnl /m4_if
3112+],
3113+[m4_if([$1], [], [
3114+ PACKAGE='$PACKAGE'
3115+ VERSION='$VERSION'
3116+ TIMESTAMP='$TIMESTAMP'
3117+ RM='$RM'
3118+ ofile='$ofile'], [])
3119+])dnl /_LT_CONFIG_SAVE_COMMANDS
3120+])# _LT_CONFIG
3121+
3122+
3123+# LT_SUPPORTED_TAG(TAG)
3124+# ---------------------
3125+# Trace this macro to discover what tags are supported by the libtool
3126+# --tag option, using:
3127+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
3128+AC_DEFUN([LT_SUPPORTED_TAG], [])
3129+
3130+
3131+# C support is built-in for now
3132+m4_define([_LT_LANG_C_enabled], [])
3133+m4_define([_LT_TAGS], [])
3134+
3135+
3136+# LT_LANG(LANG)
3137+# -------------
3138+# Enable libtool support for the given language if not already enabled.
3139+AC_DEFUN([LT_LANG],
3140+[AC_BEFORE([$0], [LT_OUTPUT])dnl
3141+m4_case([$1],
3142+ [C], [_LT_LANG(C)],
3143+ [C++], [_LT_LANG(CXX)],
3144+ [Java], [_LT_LANG(GCJ)],
3145+ [Fortran 77], [_LT_LANG(F77)],
3146+ [Fortran], [_LT_LANG(FC)],
3147+ [Windows Resource], [_LT_LANG(RC)],
3148+ [m4_ifdef([_LT_LANG_]$1[_CONFIG],
3149+ [_LT_LANG($1)],
3150+ [m4_fatal([$0: unsupported language: "$1"])])])dnl
3151+])# LT_LANG
3152+
3153+
3154+# _LT_LANG(LANGNAME)
3155+# ------------------
3156+m4_defun([_LT_LANG],
3157+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
3158+ [LT_SUPPORTED_TAG([$1])dnl
3159+ m4_append([_LT_TAGS], [$1 ])dnl
3160+ m4_define([_LT_LANG_]$1[_enabled], [])dnl
3161+ _LT_LANG_$1_CONFIG($1)])dnl
3162+])# _LT_LANG
3163+
3164+
3165+# _LT_LANG_DEFAULT_CONFIG
3166+# -----------------------
3167+m4_defun([_LT_LANG_DEFAULT_CONFIG],
3168+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
3169+ [LT_LANG(CXX)],
3170+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
3171+
3172+AC_PROVIDE_IFELSE([AC_PROG_F77],
3173+ [LT_LANG(F77)],
3174+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
3175+
3176+AC_PROVIDE_IFELSE([AC_PROG_FC],
3177+ [LT_LANG(FC)],
3178+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
3179+
3180+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
3181+dnl pulling things in needlessly.
3182+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
3183+ [LT_LANG(GCJ)],
3184+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
3185+ [LT_LANG(GCJ)],
3186+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
3187+ [LT_LANG(GCJ)],
3188+ [m4_ifdef([AC_PROG_GCJ],
3189+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
3190+ m4_ifdef([A][M_PROG_GCJ],
3191+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
3192+ m4_ifdef([LT_PROG_GCJ],
3193+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
3194+
3195+AC_PROVIDE_IFELSE([LT_PROG_RC],
3196+ [LT_LANG(RC)],
3197+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
3198+])# _LT_LANG_DEFAULT_CONFIG
3199+
3200+# Obsolete macros:
3201+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
3202+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
3203+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
3204+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
3205+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
3206+dnl aclocal-1.4 backwards compatibility:
3207+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
3208+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
3209+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
3210+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
3211+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
3212+
3213+
3214+# _LT_TAG_COMPILER
3215+# ----------------
3216+m4_defun([_LT_TAG_COMPILER],
3217 [AC_REQUIRE([AC_PROG_CC])dnl
3218
3219+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
3220+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
3221+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
3222+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
3223+
3224 # If no C compiler was specified, use CC.
3225 LTCC=${LTCC-"$CC"}
3226
3227@@ -717,36 +1405,20 @@
3228
3229 # Allow CC to be a program name with arguments.
3230 compiler=$CC
3231-])# _LT_AC_SYS_COMPILER
3232-
3233-
3234-# _LT_CC_BASENAME(CC)
3235-# -------------------
3236-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
3237-AC_DEFUN([_LT_CC_BASENAME],
3238-[for cc_temp in $1""; do
3239- case $cc_temp in
3240- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
3241- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
3242- \-*) ;;
3243- *) break;;
3244- esac
3245-done
3246-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
3247-])
3248+])# _LT_TAG_COMPILER
3249
3250
3251 # _LT_COMPILER_BOILERPLATE
3252 # ------------------------
3253 # Check for compiler boilerplate output or warnings with
3254 # the simple compiler test code.
3255-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
3256-[AC_REQUIRE([LT_AC_PROG_SED])dnl
3257+m4_defun([_LT_COMPILER_BOILERPLATE],
3258+[m4_require([_LT_DECL_SED])dnl
3259 ac_outfile=conftest.$ac_objext
3260 echo "$lt_simple_compile_test_code" >conftest.$ac_ext
3261 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3262 _lt_compiler_boilerplate=`cat conftest.err`
3263-$rm conftest*
3264+$RM conftest*
3265 ])# _LT_COMPILER_BOILERPLATE
3266
3267
3268@@ -754,216 +1426,311 @@
3269 # ----------------------
3270 # Check for linker boilerplate output or warnings with
3271 # the simple link test code.
3272-AC_DEFUN([_LT_LINKER_BOILERPLATE],
3273-[AC_REQUIRE([LT_AC_PROG_SED])dnl
3274+m4_defun([_LT_LINKER_BOILERPLATE],
3275+[m4_require([_LT_DECL_SED])dnl
3276 ac_outfile=conftest.$ac_objext
3277 echo "$lt_simple_link_test_code" >conftest.$ac_ext
3278 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3279 _lt_linker_boilerplate=`cat conftest.err`
3280-$rm conftest*
3281+$RM -r conftest*
3282 ])# _LT_LINKER_BOILERPLATE
3283
3284-
3285-# _LT_AC_SYS_LIBPATH_AIX
3286-# ----------------------
3287+# _LT_REQUIRED_DARWIN_CHECKS
3288+# -------------------------
3289+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
3290+ case $host_os in
3291+ rhapsody* | darwin*)
3292+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
3293+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
3294+ AC_CHECK_TOOL([LIPO], [lipo], [:])
3295+ AC_CHECK_TOOL([OTOOL], [otool], [:])
3296+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
3297+ _LT_DECL([], [DSYMUTIL], [1],
3298+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
3299+ _LT_DECL([], [NMEDIT], [1],
3300+ [Tool to change global to local symbols on Mac OS X])
3301+ _LT_DECL([], [LIPO], [1],
3302+ [Tool to manipulate fat objects and archives on Mac OS X])
3303+ _LT_DECL([], [OTOOL], [1],
3304+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
3305+ _LT_DECL([], [OTOOL64], [1],
3306+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
3307+
3308+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
3309+ [lt_cv_apple_cc_single_mod=no
3310+ if test -z "${LT_MULTI_MODULE}"; then
3311+ # By default we will add the -single_module flag. You can override
3312+ # by either setting the environment variable LT_MULTI_MODULE
3313+ # non-empty at configure time, or by adding -multi_module to the
3314+ # link flags.
3315+ rm -rf libconftest.dylib*
3316+ echo "int foo(void){return 1;}" > conftest.c
3317+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
3318+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
3319+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
3320+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
3321+ _lt_result=$?
3322+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
3323+ lt_cv_apple_cc_single_mod=yes
3324+ else
3325+ cat conftest.err >&AS_MESSAGE_LOG_FD
3326+ fi
3327+ rm -rf libconftest.dylib*
3328+ rm -f conftest.*
3329+ fi])
3330+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
3331+ [lt_cv_ld_exported_symbols_list],
3332+ [lt_cv_ld_exported_symbols_list=no
3333+ save_LDFLAGS=$LDFLAGS
3334+ echo "_main" > conftest.sym
3335+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
3336+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
3337+ [lt_cv_ld_exported_symbols_list=yes],
3338+ [lt_cv_ld_exported_symbols_list=no])
3339+ LDFLAGS="$save_LDFLAGS"
3340+ ])
3341+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
3342+ [lt_cv_ld_force_load=no
3343+ cat > conftest.c << _LT_EOF
3344+int forced_loaded() { return 2;}
3345+_LT_EOF
3346+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
3347+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
3348+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
3349+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
3350+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
3351+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
3352+ cat > conftest.c << _LT_EOF
3353+int main() { return 0;}
3354+_LT_EOF
3355+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
3356+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
3357+ _lt_result=$?
3358+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
3359+ lt_cv_ld_force_load=yes
3360+ else
3361+ cat conftest.err >&AS_MESSAGE_LOG_FD
3362+ fi
3363+ rm -f conftest.err libconftest.a conftest conftest.c
3364+ rm -rf conftest.dSYM
3365+ ])
3366+ case $host_os in
3367+ rhapsody* | darwin1.[[012]])
3368+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
3369+ darwin1.*)
3370+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
3371+ darwin*) # darwin 5.x on
3372+ # if running on 10.5 or later, the deployment target defaults
3373+ # to the OS version, if on x86, and 10.4, the deployment
3374+ # target defaults to 10.4. Don't you love it?
3375+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
3376+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
3377+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
3378+ 10.[[012]]*)
3379+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
3380+ 10.*)
3381+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
3382+ esac
3383+ ;;
3384+ esac
3385+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
3386+ _lt_dar_single_mod='$single_module'
3387+ fi
3388+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
3389+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
3390+ else
3391+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
3392+ fi
3393+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
3394+ _lt_dsymutil='~$DSYMUTIL $lib || :'
3395+ else
3396+ _lt_dsymutil=
3397+ fi
3398+ ;;
3399+ esac
3400+])
3401+
3402+
3403+# _LT_DARWIN_LINKER_FEATURES
3404+# --------------------------
3405+# Checks for linker and compiler features on darwin
3406+m4_defun([_LT_DARWIN_LINKER_FEATURES],
3407+[
3408+ m4_require([_LT_REQUIRED_DARWIN_CHECKS])
3409+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
3410+ _LT_TAGVAR(hardcode_direct, $1)=no
3411+ _LT_TAGVAR(hardcode_automatic, $1)=yes
3412+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
3413+ if test "$lt_cv_ld_force_load" = "yes"; then
3414+ _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\"`'
3415+ else
3416+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
3417+ fi
3418+ _LT_TAGVAR(link_all_deplibs, $1)=yes
3419+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
3420+ case $cc_basename in
3421+ ifort*) _lt_dar_can_shared=yes ;;
3422+ *) _lt_dar_can_shared=$GCC ;;
3423+ esac
3424+ if test "$_lt_dar_can_shared" = "yes"; then
3425+ output_verbose_link_cmd=func_echo_all
3426+ _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}"
3427+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
3428+ _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}"
3429+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
3430+ m4_if([$1], [CXX],
3431+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
3432+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
3433+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
3434+ fi
3435+],[])
3436+ else
3437+ _LT_TAGVAR(ld_shlibs, $1)=no
3438+ fi
3439+])
3440+
3441+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
3442+# ----------------------------------
3443 # Links a minimal program and checks the executable
3444 # for the system default hardcoded library path. In most cases,
3445 # this is /usr/lib:/lib, but when the MPI compilers are used
3446 # the location of the communication and MPI libs are included too.
3447 # If we don't find anything, use the default library path according
3448 # to the aix ld manual.
3449-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
3450-[AC_REQUIRE([LT_AC_PROG_SED])dnl
3451-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
3452-lt_aix_libpath_sed='
3453- /Import File Strings/,/^$/ {
3454- /^0/ {
3455- s/^0 *\(.*\)$/\1/
3456- p
3457- }
3458- }'
3459-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3460-# Check for a 64-bit object if we didn't find anything.
3461-if test -z "$aix_libpath"; then
3462- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3463-fi],[])
3464-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3465-])# _LT_AC_SYS_LIBPATH_AIX
3466-
3467-
3468-# _LT_AC_SHELL_INIT(ARG)
3469-# ----------------------
3470-AC_DEFUN([_LT_AC_SHELL_INIT],
3471-[ifdef([AC_DIVERSION_NOTICE],
3472- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
3473- [AC_DIVERT_PUSH(NOTICE)])
3474-$1
3475-AC_DIVERT_POP
3476-])# _LT_AC_SHELL_INIT
3477-
3478-
3479-# _LT_AC_PROG_ECHO_BACKSLASH
3480-# --------------------------
3481-# Add some code to the start of the generated configure script which
3482-# will find an echo command which doesn't interpret backslashes.
3483-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
3484-[_LT_AC_SHELL_INIT([
3485-# Check that we are running under the correct shell.
3486-SHELL=${CONFIG_SHELL-/bin/sh}
3487-
3488-case X$ECHO in
3489-X*--fallback-echo)
3490- # Remove one level of quotation (which was required for Make).
3491- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
3492- ;;
3493-esac
3494-
3495-echo=${ECHO-echo}
3496-if test "X[$]1" = X--no-reexec; then
3497- # Discard the --no-reexec flag, and continue.
3498- shift
3499-elif test "X[$]1" = X--fallback-echo; then
3500- # Avoid inline document here, it may be left over
3501- :
3502-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
3503- # Yippee, $echo works!
3504- :
3505-else
3506- # Restart under the correct shell.
3507- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
3508-fi
3509-
3510-if test "X[$]1" = X--fallback-echo; then
3511- # used as fallback echo
3512- shift
3513- cat <<EOF
3514-[$]*
3515-EOF
3516- exit 0
3517-fi
3518-
3519-# The HP-UX ksh and POSIX shell print the target directory to stdout
3520-# if CDPATH is set.
3521-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
3522-
3523-if test -z "$ECHO"; then
3524-if test "X${echo_test_string+set}" != Xset; then
3525-# find a string as large as possible, as long as the shell can cope with it
3526- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
3527- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
3528- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
3529- echo_test_string=`eval $cmd` &&
3530- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
3531- then
3532- break
3533- fi
3534- done
3535-fi
3536-
3537-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
3538- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
3539- test "X$echo_testing_string" = "X$echo_test_string"; then
3540- :
3541-else
3542- # The Solaris, AIX, and Digital Unix default echo programs unquote
3543- # backslashes. This makes it impossible to quote backslashes using
3544- # echo "$something" | sed 's/\\/\\\\/g'
3545- #
3546- # So, first we look for a working echo in the user's PATH.
3547-
3548- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3549- for dir in $PATH /usr/ucb; do
3550- IFS="$lt_save_ifs"
3551- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3552- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3553- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
3554- test "X$echo_testing_string" = "X$echo_test_string"; then
3555- echo="$dir/echo"
3556- break
3557- fi
3558- done
3559- IFS="$lt_save_ifs"
3560-
3561- if test "X$echo" = Xecho; then
3562- # We didn't find a better echo, so look for alternatives.
3563- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
3564- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
3565- test "X$echo_testing_string" = "X$echo_test_string"; then
3566- # This shell has a builtin print -r that does the trick.
3567- echo='print -r'
3568- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
3569- test "X$CONFIG_SHELL" != X/bin/ksh; then
3570- # If we have ksh, try running configure again with it.
3571- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
3572- export ORIGINAL_CONFIG_SHELL
3573- CONFIG_SHELL=/bin/ksh
3574- export CONFIG_SHELL
3575- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
3576- else
3577- # Try using printf.
3578- echo='printf %s\n'
3579- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
3580- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
3581- test "X$echo_testing_string" = "X$echo_test_string"; then
3582- # Cool, printf works
3583- :
3584- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3585- test "X$echo_testing_string" = 'X\t' &&
3586- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3587- test "X$echo_testing_string" = "X$echo_test_string"; then
3588- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
3589- export CONFIG_SHELL
3590- SHELL="$CONFIG_SHELL"
3591- export SHELL
3592- echo="$CONFIG_SHELL [$]0 --fallback-echo"
3593- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3594- test "X$echo_testing_string" = 'X\t' &&
3595- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3596- test "X$echo_testing_string" = "X$echo_test_string"; then
3597- echo="$CONFIG_SHELL [$]0 --fallback-echo"
3598- else
3599- # maybe with a smaller string...
3600- prev=:
3601-
3602- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
3603- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
3604- then
3605- break
3606- fi
3607- prev="$cmd"
3608- done
3609-
3610- if test "$prev" != 'sed 50q "[$]0"'; then
3611- echo_test_string=`eval $prev`
3612- export echo_test_string
3613- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
3614- else
3615- # Oops. We lost completely, so just stick with echo.
3616- echo=echo
3617- fi
3618- fi
3619- fi
3620+# Store the results from the different compilers for each TAGNAME.
3621+# Allow to override them for all tags through lt_cv_aix_libpath.
3622+m4_defun([_LT_SYS_MODULE_PATH_AIX],
3623+[m4_require([_LT_DECL_SED])dnl
3624+if test "${lt_cv_aix_libpath+set}" = set; then
3625+ aix_libpath=$lt_cv_aix_libpath
3626+else
3627+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
3628+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
3629+ lt_aix_libpath_sed='[
3630+ /Import File Strings/,/^$/ {
3631+ /^0/ {
3632+ s/^0 *\([^ ]*\) *$/\1/
3633+ p
3634+ }
3635+ }]'
3636+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3637+ # Check for a 64-bit object if we didn't find anything.
3638+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
3639+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
3640+ fi],[])
3641+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
3642+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
3643 fi
3644-fi
3645-fi
3646-
3647-# Copy echo and quote the copy suitably for passing to libtool from
3648-# the Makefile, instead of quoting the original, which is used later.
3649-ECHO=$echo
3650-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
3651- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
3652-fi
3653-
3654-AC_SUBST(ECHO)
3655-])])# _LT_AC_PROG_ECHO_BACKSLASH
3656-
3657-
3658-# _LT_AC_LOCK
3659-# -----------
3660-AC_DEFUN([_LT_AC_LOCK],
3661+ ])
3662+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
3663+fi
3664+])# _LT_SYS_MODULE_PATH_AIX
3665+
3666+
3667+# _LT_SHELL_INIT(ARG)
3668+# -------------------
3669+m4_define([_LT_SHELL_INIT],
3670+[m4_divert_text([M4SH-INIT], [$1
3671+])])# _LT_SHELL_INIT
3672+
3673+
3674+
3675+# _LT_PROG_ECHO_BACKSLASH
3676+# -----------------------
3677+# Find how we can fake an echo command that does not interpret backslash.
3678+# In particular, with Autoconf 2.60 or later we add some code to the start
3679+# of the generated configure script which will find a shell with a builtin
3680+# printf (which we can use as an echo command).
3681+m4_defun([_LT_PROG_ECHO_BACKSLASH],
3682+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3683+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
3684+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3685+
3686+AC_MSG_CHECKING([how to print strings])
3687+# Test print first, because it will be a builtin if present.
3688+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3689+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3690+ ECHO='print -r --'
3691+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3692+ ECHO='printf %s\n'
3693+else
3694+ # Use this function as a fallback that always works.
3695+ func_fallback_echo ()
3696+ {
3697+ eval 'cat <<_LTECHO_EOF
3698+$[]1
3699+_LTECHO_EOF'
3700+ }
3701+ ECHO='func_fallback_echo'
3702+fi
3703+
3704+# func_echo_all arg...
3705+# Invoke $ECHO with all args, space-separated.
3706+func_echo_all ()
3707+{
3708+ $ECHO "$*"
3709+}
3710+
3711+case "$ECHO" in
3712+ printf*) AC_MSG_RESULT([printf]) ;;
3713+ print*) AC_MSG_RESULT([print -r]) ;;
3714+ *) AC_MSG_RESULT([cat]) ;;
3715+esac
3716+
3717+m4_ifdef([_AS_DETECT_SUGGESTED],
3718+[_AS_DETECT_SUGGESTED([
3719+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
3720+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3721+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
3722+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3723+ PATH=/empty FPATH=/empty; export PATH FPATH
3724+ test "X`printf %s $ECHO`" = "X$ECHO" \
3725+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
3726+
3727+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
3728+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
3729+])# _LT_PROG_ECHO_BACKSLASH
3730+
3731+
3732+# _LT_WITH_SYSROOT
3733+# ----------------
3734+AC_DEFUN([_LT_WITH_SYSROOT],
3735+[AC_MSG_CHECKING([for sysroot])
3736+AC_ARG_WITH([sysroot],
3737+[ --with-sysroot[=DIR] Search for dependent libraries within DIR
3738+ (or the compiler's sysroot if not specified).],
3739+[], [with_sysroot=no])
3740+
3741+dnl lt_sysroot will always be passed unquoted. We quote it here
3742+dnl in case the user passed a directory name.
3743+lt_sysroot=
3744+case ${with_sysroot} in #(
3745+ yes)
3746+ if test "$GCC" = yes; then
3747+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
3748+ fi
3749+ ;; #(
3750+ /*)
3751+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
3752+ ;; #(
3753+ no|'')
3754+ ;; #(
3755+ *)
3756+ AC_MSG_RESULT([${with_sysroot}])
3757+ AC_MSG_ERROR([The sysroot must be an absolute path.])
3758+ ;;
3759+esac
3760+
3761+ AC_MSG_RESULT([${lt_sysroot:-no}])
3762+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
3763+[dependent libraries, and in which our libraries should be installed.])])
3764+
3765+# _LT_ENABLE_LOCK
3766+# ---------------
3767+m4_defun([_LT_ENABLE_LOCK],
3768 [AC_ARG_ENABLE([libtool-lock],
3769- [AC_HELP_STRING([--disable-libtool-lock],
3770- [avoid locking (might break parallel builds)])])
3771+ [AS_HELP_STRING([--disable-libtool-lock],
3772+ [avoid locking (might break parallel builds)])])
3773 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
3774
3775 # Some flags need to be propagated to the compiler or linker for good
3776@@ -974,94 +1741,93 @@
3777 echo 'int i;' > conftest.$ac_ext
3778 if AC_TRY_EVAL(ac_compile); then
3779 case `/usr/bin/file conftest.$ac_objext` in
3780- *ELF-32*)
3781- HPUX_IA64_MODE="32"
3782- ;;
3783- *ELF-64*)
3784- HPUX_IA64_MODE="64"
3785- ;;
3786+ *ELF-32*)
3787+ HPUX_IA64_MODE="32"
3788+ ;;
3789+ *ELF-64*)
3790+ HPUX_IA64_MODE="64"
3791+ ;;
3792 esac
3793 fi
3794 rm -rf conftest*
3795 ;;
3796 *-*-irix6*)
3797 # Find out which ABI we are using.
3798- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
3799+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
3800 if AC_TRY_EVAL(ac_compile); then
3801- if test "$lt_cv_prog_gnu_ld" = yes; then
3802- case `/usr/bin/file conftest.$ac_objext` in
3803- *32-bit*)
3804- LD="${LD-ld} -melf32bsmip"
3805- ;;
3806- *N32*)
3807- LD="${LD-ld} -melf32bmipn32"
3808- ;;
3809- *64-bit*)
3810- LD="${LD-ld} -melf64bmip"
3811- ;;
3812- esac
3813- else
3814- case `/usr/bin/file conftest.$ac_objext` in
3815- *32-bit*)
3816- LD="${LD-ld} -32"
3817- ;;
3818- *N32*)
3819- LD="${LD-ld} -n32"
3820- ;;
3821- *64-bit*)
3822- LD="${LD-ld} -64"
3823- ;;
3824- esac
3825- fi
3826+ if test "$lt_cv_prog_gnu_ld" = yes; then
3827+ case `/usr/bin/file conftest.$ac_objext` in
3828+ *32-bit*)
3829+ LD="${LD-ld} -melf32bsmip"
3830+ ;;
3831+ *N32*)
3832+ LD="${LD-ld} -melf32bmipn32"
3833+ ;;
3834+ *64-bit*)
3835+ LD="${LD-ld} -melf64bmip"
3836+ ;;
3837+ esac
3838+ else
3839+ case `/usr/bin/file conftest.$ac_objext` in
3840+ *32-bit*)
3841+ LD="${LD-ld} -32"
3842+ ;;
3843+ *N32*)
3844+ LD="${LD-ld} -n32"
3845+ ;;
3846+ *64-bit*)
3847+ LD="${LD-ld} -64"
3848+ ;;
3849+ esac
3850+ fi
3851 fi
3852 rm -rf conftest*
3853 ;;
3854
3855 x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
3856-s390*-*linux*|sparc*-*linux*)
3857+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
3858 # Find out which ABI we are using.
3859 echo 'int i;' > conftest.$ac_ext
3860 if AC_TRY_EVAL(ac_compile); then
3861 case `/usr/bin/file conftest.o` in
3862- *32-bit*)
3863- case $host in
3864- x86_64-*kfreebsd*-gnu)
3865- LD="${LD-ld} -m elf_i386_fbsd"
3866- ;;
3867- x86_64-*linux*)
3868- LD="${LD-ld} -m elf_i386"
3869- ;;
3870- ppc64-*linux*|powerpc64-*linux*)
3871- LD="${LD-ld} -m elf32ppclinux"
3872- ;;
3873- s390x-*linux*)
3874- LD="${LD-ld} -m elf_s390"
3875- ;;
3876- sparc64-*linux*)
3877- LD="${LD-ld} -m elf32_sparc"
3878- ;;
3879- esac
3880- ;;
3881- *64-bit*)
3882- libsuff=64
3883- case $host in
3884- x86_64-*kfreebsd*-gnu)
3885- LD="${LD-ld} -m elf_x86_64_fbsd"
3886- ;;
3887- x86_64-*linux*)
3888- LD="${LD-ld} -m elf_x86_64"
3889- ;;
3890- ppc*-*linux*|powerpc*-*linux*)
3891- LD="${LD-ld} -m elf64ppc"
3892- ;;
3893- s390*-*linux*)
3894- LD="${LD-ld} -m elf64_s390"
3895- ;;
3896- sparc*-*linux*)
3897- LD="${LD-ld} -m elf64_sparc"
3898- ;;
3899- esac
3900- ;;
3901+ *32-bit*)
3902+ case $host in
3903+ x86_64-*kfreebsd*-gnu)
3904+ LD="${LD-ld} -m elf_i386_fbsd"
3905+ ;;
3906+ x86_64-*linux*)
3907+ LD="${LD-ld} -m elf_i386"
3908+ ;;
3909+ ppc64-*linux*|powerpc64-*linux*)
3910+ LD="${LD-ld} -m elf32ppclinux"
3911+ ;;
3912+ s390x-*linux*)
3913+ LD="${LD-ld} -m elf_s390"
3914+ ;;
3915+ sparc64-*linux*)
3916+ LD="${LD-ld} -m elf32_sparc"
3917+ ;;
3918+ esac
3919+ ;;
3920+ *64-bit*)
3921+ case $host in
3922+ x86_64-*kfreebsd*-gnu)
3923+ LD="${LD-ld} -m elf_x86_64_fbsd"
3924+ ;;
3925+ x86_64-*linux*)
3926+ LD="${LD-ld} -m elf_x86_64"
3927+ ;;
3928+ ppc*-*linux*|powerpc*-*linux*)
3929+ LD="${LD-ld} -m elf64ppc"
3930+ ;;
3931+ s390*-*linux*|s390*-*tpf*)
3932+ LD="${LD-ld} -m elf64_s390"
3933+ ;;
3934+ sparc*-*linux*)
3935+ LD="${LD-ld} -m elf64_sparc"
3936+ ;;
3937+ esac
3938+ ;;
3939 esac
3940 fi
3941 rm -rf conftest*
3942@@ -1073,7 +1839,7 @@
3943 CFLAGS="$CFLAGS -belf"
3944 AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
3945 [AC_LANG_PUSH(C)
3946- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
3947+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
3948 AC_LANG_POP])
3949 if test x"$lt_cv_cc_needs_belf" != x"yes"; then
3950 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
3951@@ -1088,37 +1854,116 @@
3952 *64-bit*)
3953 case $lt_cv_prog_gnu_ld in
3954 yes*) LD="${LD-ld} -m elf64_sparc" ;;
3955- *) LD="${LD-ld} -64" ;;
3956+ *)
3957+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
3958+ LD="${LD-ld} -64"
3959+ fi
3960+ ;;
3961 esac
3962 ;;
3963 esac
3964 fi
3965 rm -rf conftest*
3966 ;;
3967-
3968-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
3969-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
3970- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
3971- AC_CHECK_TOOL(AS, as, false)
3972- AC_CHECK_TOOL(OBJDUMP, objdump, false)
3973- ;;
3974- ])
3975 esac
3976
3977 need_locks="$enable_libtool_lock"
3978-
3979-])# _LT_AC_LOCK
3980-
3981-
3982-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
3983+])# _LT_ENABLE_LOCK
3984+
3985+
3986+# _LT_PROG_AR
3987+# -----------
3988+m4_defun([_LT_PROG_AR],
3989+[AC_CHECK_TOOLS(AR, [ar], false)
3990+: ${AR=ar}
3991+: ${AR_FLAGS=cru}
3992+_LT_DECL([], [AR], [1], [The archiver])
3993+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
3994+
3995+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
3996+ [lt_cv_ar_at_file=no
3997+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
3998+ [echo conftest.$ac_objext > conftest.lst
3999+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
4000+ AC_TRY_EVAL([lt_ar_try])
4001+ if test "$ac_status" -eq 0; then
4002+ # Ensure the archiver fails upon bogus file names.
4003+ rm -f conftest.$ac_objext libconftest.a
4004+ AC_TRY_EVAL([lt_ar_try])
4005+ if test "$ac_status" -ne 0; then
4006+ lt_cv_ar_at_file=@
4007+ fi
4008+ fi
4009+ rm -f conftest.* libconftest.a
4010+ ])
4011+ ])
4012+
4013+if test "x$lt_cv_ar_at_file" = xno; then
4014+ archiver_list_spec=
4015+else
4016+ archiver_list_spec=$lt_cv_ar_at_file
4017+fi
4018+_LT_DECL([], [archiver_list_spec], [1],
4019+ [How to feed a file listing to the archiver])
4020+])# _LT_PROG_AR
4021+
4022+
4023+# _LT_CMD_OLD_ARCHIVE
4024+# -------------------
4025+m4_defun([_LT_CMD_OLD_ARCHIVE],
4026+[_LT_PROG_AR
4027+
4028+AC_CHECK_TOOL(STRIP, strip, :)
4029+test -z "$STRIP" && STRIP=:
4030+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
4031+
4032+AC_CHECK_TOOL(RANLIB, ranlib, :)
4033+test -z "$RANLIB" && RANLIB=:
4034+_LT_DECL([], [RANLIB], [1],
4035+ [Commands used to install an old-style archive])
4036+
4037+# Determine commands to create old-style static archives.
4038+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
4039+old_postinstall_cmds='chmod 644 $oldlib'
4040+old_postuninstall_cmds=
4041+
4042+if test -n "$RANLIB"; then
4043+ case $host_os in
4044+ openbsd*)
4045+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
4046+ ;;
4047+ *)
4048+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
4049+ ;;
4050+ esac
4051+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
4052+fi
4053+
4054+case $host_os in
4055+ darwin*)
4056+ lock_old_archive_extraction=yes ;;
4057+ *)
4058+ lock_old_archive_extraction=no ;;
4059+esac
4060+_LT_DECL([], [old_postinstall_cmds], [2])
4061+_LT_DECL([], [old_postuninstall_cmds], [2])
4062+_LT_TAGDECL([], [old_archive_cmds], [2],
4063+ [Commands used to build an old-style archive])
4064+_LT_DECL([], [lock_old_archive_extraction], [0],
4065+ [Whether to use a lock for old archive extraction])
4066+])# _LT_CMD_OLD_ARCHIVE
4067+
4068+
4069+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
4070 # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
4071 # ----------------------------------------------------------------
4072 # Check whether the given compiler option works
4073-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
4074-[AC_REQUIRE([LT_AC_PROG_SED])
4075+AC_DEFUN([_LT_COMPILER_OPTION],
4076+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4077+m4_require([_LT_DECL_SED])dnl
4078 AC_CACHE_CHECK([$1], [$2],
4079 [$2=no
4080- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
4081+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
4082 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
4083 lt_compiler_flag="$3"
4084 # Insert the option either (1) after the last *FLAGS variable, or
4085@@ -1130,37 +1975,43 @@
4086 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4087 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
4088 -e 's:$: $lt_compiler_flag:'`
4089- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
4090+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
4091 (eval "$lt_compile" 2>conftest.err)
4092 ac_status=$?
4093 cat conftest.err >&AS_MESSAGE_LOG_FD
4094- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
4095+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
4096 if (exit $ac_status) && test -s "$ac_outfile"; then
4097 # The compiler can only warn and ignore the option if not recognized
4098 # So say no if there are warnings other than the usual output.
4099- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
4100+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
4101 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4102 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
4103 $2=yes
4104 fi
4105 fi
4106- $rm conftest*
4107+ $RM conftest*
4108 ])
4109
4110 if test x"[$]$2" = xyes; then
4111- ifelse([$5], , :, [$5])
4112+ m4_if([$5], , :, [$5])
4113 else
4114- ifelse([$6], , :, [$6])
4115+ m4_if([$6], , :, [$6])
4116 fi
4117-])# AC_LIBTOOL_COMPILER_OPTION
4118-
4119-
4120-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
4121-# [ACTION-SUCCESS], [ACTION-FAILURE])
4122-# ------------------------------------------------------------
4123-# Check whether the given compiler option works
4124-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
4125-[AC_REQUIRE([LT_AC_PROG_SED])dnl
4126+])# _LT_COMPILER_OPTION
4127+
4128+# Old name:
4129+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
4130+dnl aclocal-1.4 backwards compatibility:
4131+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
4132+
4133+
4134+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
4135+# [ACTION-SUCCESS], [ACTION-FAILURE])
4136+# ----------------------------------------------------
4137+# Check whether the given linker option works
4138+AC_DEFUN([_LT_LINKER_OPTION],
4139+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4140+m4_require([_LT_DECL_SED])dnl
4141 AC_CACHE_CHECK([$1], [$2],
4142 [$2=no
4143 save_LDFLAGS="$LDFLAGS"
4144@@ -1172,7 +2023,7 @@
4145 if test -s conftest.err; then
4146 # Append any errors to the config.log.
4147 cat conftest.err 1>&AS_MESSAGE_LOG_FD
4148- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
4149+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
4150 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4151 if diff conftest.exp conftest.er2 >/dev/null; then
4152 $2=yes
4153@@ -1181,22 +2032,28 @@
4154 $2=yes
4155 fi
4156 fi
4157- $rm conftest*
4158+ $RM -r conftest*
4159 LDFLAGS="$save_LDFLAGS"
4160 ])
4161
4162 if test x"[$]$2" = xyes; then
4163- ifelse([$4], , :, [$4])
4164+ m4_if([$4], , :, [$4])
4165 else
4166- ifelse([$5], , :, [$5])
4167+ m4_if([$5], , :, [$5])
4168 fi
4169-])# AC_LIBTOOL_LINKER_OPTION
4170-
4171-
4172-# AC_LIBTOOL_SYS_MAX_CMD_LEN
4173-# --------------------------
4174-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
4175-[# find the maximum length of command line arguments
4176+])# _LT_LINKER_OPTION
4177+
4178+# Old name:
4179+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
4180+dnl aclocal-1.4 backwards compatibility:
4181+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
4182+
4183+
4184+# LT_CMD_MAX_LEN
4185+#---------------
4186+AC_DEFUN([LT_CMD_MAX_LEN],
4187+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
4188+# find the maximum length of command line arguments
4189 AC_MSG_CHECKING([the maximum length of command line arguments])
4190 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
4191 i=0
4192@@ -1218,7 +2075,7 @@
4193 lt_cv_sys_max_cmd_len=-1;
4194 ;;
4195
4196- cygwin* | mingw*)
4197+ cygwin* | mingw* | cegcc*)
4198 # On Win9x/ME, this test blows up -- it succeeds, but takes
4199 # about 5 minutes as the teststring grows exponentially.
4200 # Worse, since 9x/ME are not pre-emptively multitasking,
4201@@ -1229,6 +2086,11 @@
4202 lt_cv_sys_max_cmd_len=8192;
4203 ;;
4204
4205+ mint*)
4206+ # On MiNT this can take a long time and run out of memory.
4207+ lt_cv_sys_max_cmd_len=8192;
4208+ ;;
4209+
4210 amigaos*)
4211 # On AmigaOS with pdksh, this test takes hours, literally.
4212 # So we just punt and use a minimum line length of 8192.
4213@@ -1273,7 +2135,7 @@
4214 sysv5* | sco5v6* | sysv4.2uw2*)
4215 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
4216 if test -n "$kargmax"; then
4217- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
4218+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
4219 else
4220 lt_cv_sys_max_cmd_len=32768
4221 fi
4222@@ -1284,20 +2146,28 @@
4223 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
4224 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
4225 else
4226+ # Make teststring a little bigger before we do anything with it.
4227+ # a 1K string should be a reasonable start.
4228+ for i in 1 2 3 4 5 6 7 8 ; do
4229+ teststring=$teststring$teststring
4230+ done
4231 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
4232- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
4233- = "XX$teststring") >/dev/null 2>&1 &&
4234- new_result=`expr "X$teststring" : ".*" 2>&1` &&
4235- lt_cv_sys_max_cmd_len=$new_result &&
4236+ # If test is not a shell built-in, we'll probably end up computing a
4237+ # maximum length that is only half of the actual maximum length, but
4238+ # we can't tell.
4239+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
4240+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
4241 test $i != 17 # 1/2 MB should be enough
4242 do
4243 i=`expr $i + 1`
4244 teststring=$teststring$teststring
4245 done
4246+ # Only check the string length outside the loop.
4247+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
4248 teststring=
4249- # Add a significant safety factor because C++ compilers can tack on massive
4250- # amounts of additional arguments before passing them to the linker.
4251- # It appears as though 1/2 is a usable value.
4252+ # Add a significant safety factor because C++ compilers can tack on
4253+ # massive amounts of additional arguments before passing them to the
4254+ # linker. It appears as though 1/2 is a usable value.
4255 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
4256 fi
4257 ;;
4258@@ -1308,28 +2178,36 @@
4259 else
4260 AC_MSG_RESULT(none)
4261 fi
4262-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
4263-
4264-
4265-# _LT_AC_CHECK_DLFCN
4266-# ------------------
4267-AC_DEFUN([_LT_AC_CHECK_DLFCN],
4268-[AC_CHECK_HEADERS(dlfcn.h)dnl
4269-])# _LT_AC_CHECK_DLFCN
4270-
4271-
4272-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
4273-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
4274-# ---------------------------------------------------------------------
4275-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
4276-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
4277+max_cmd_len=$lt_cv_sys_max_cmd_len
4278+_LT_DECL([], [max_cmd_len], [0],
4279+ [What is the maximum length of a command?])
4280+])# LT_CMD_MAX_LEN
4281+
4282+# Old name:
4283+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
4284+dnl aclocal-1.4 backwards compatibility:
4285+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
4286+
4287+
4288+# _LT_HEADER_DLFCN
4289+# ----------------
4290+m4_defun([_LT_HEADER_DLFCN],
4291+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
4292+])# _LT_HEADER_DLFCN
4293+
4294+
4295+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
4296+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
4297+# ----------------------------------------------------------------
4298+m4_defun([_LT_TRY_DLOPEN_SELF],
4299+[m4_require([_LT_HEADER_DLFCN])dnl
4300 if test "$cross_compiling" = yes; then :
4301 [$4]
4302 else
4303 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4304 lt_status=$lt_dlunknown
4305- cat > conftest.$ac_ext <<EOF
4306-[#line __oline__ "configure"
4307+ cat > conftest.$ac_ext <<_LT_EOF
4308+[#line $LINENO "configure"
4309 #include "confdefs.h"
4310
4311 #if HAVE_DLFCN_H
4312@@ -1370,11 +2248,13 @@
4313 # endif
4314 #endif
4315
4316-#ifdef __cplusplus
4317-extern "C" void exit (int);
4318+/* When -fvisbility=hidden is used, assume the code has been annotated
4319+ correspondingly for the symbols needed. */
4320+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
4321+int fnord () __attribute__((visibility("default")));
4322 #endif
4323
4324-void fnord() { int i=42;}
4325+int fnord () { return 42; }
4326 int main ()
4327 {
4328 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
4329@@ -1383,15 +2263,19 @@
4330 if (self)
4331 {
4332 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
4333- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4334+ else
4335+ {
4336+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4337+ else puts (dlerror ());
4338+ }
4339 /* dlclose (self); */
4340 }
4341 else
4342 puts (dlerror ());
4343
4344- exit (status);
4345+ return status;
4346 }]
4347-EOF
4348+_LT_EOF
4349 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
4350 (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
4351 lt_status=$?
4352@@ -1406,13 +2290,13 @@
4353 fi
4354 fi
4355 rm -fr conftest*
4356-])# _LT_AC_TRY_DLOPEN_SELF
4357-
4358-
4359-# AC_LIBTOOL_DLOPEN_SELF
4360-# ----------------------
4361-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
4362-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
4363+])# _LT_TRY_DLOPEN_SELF
4364+
4365+
4366+# LT_SYS_DLOPEN_SELF
4367+# ------------------
4368+AC_DEFUN([LT_SYS_DLOPEN_SELF],
4369+[m4_require([_LT_HEADER_DLFCN])dnl
4370 if test "x$enable_dlopen" != xyes; then
4371 enable_dlopen=unknown
4372 enable_dlopen_self=unknown
4373@@ -1428,15 +2312,15 @@
4374 lt_cv_dlopen_self=yes
4375 ;;
4376
4377- mingw* | pw32*)
4378+ mingw* | pw32* | cegcc*)
4379 lt_cv_dlopen="LoadLibrary"
4380 lt_cv_dlopen_libs=
4381- ;;
4382+ ;;
4383
4384 cygwin*)
4385 lt_cv_dlopen="dlopen"
4386 lt_cv_dlopen_libs=
4387- ;;
4388+ ;;
4389
4390 darwin*)
4391 # if libdl is installed we need to link against it
4392@@ -1446,13 +2330,13 @@
4393 lt_cv_dlopen_libs=
4394 lt_cv_dlopen_self=yes
4395 ])
4396- ;;
4397+ ;;
4398
4399 *)
4400 AC_CHECK_FUNC([shl_load],
4401 [lt_cv_dlopen="shl_load"],
4402 [AC_CHECK_LIB([dld], [shl_load],
4403- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
4404+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
4405 [AC_CHECK_FUNC([dlopen],
4406 [lt_cv_dlopen="dlopen"],
4407 [AC_CHECK_LIB([dl], [dlopen],
4408@@ -1460,7 +2344,7 @@
4409 [AC_CHECK_LIB([svld], [dlopen],
4410 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
4411 [AC_CHECK_LIB([dld], [dld_link],
4412- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
4413+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
4414 ])
4415 ])
4416 ])
4417@@ -1488,7 +2372,7 @@
4418
4419 AC_CACHE_CHECK([whether a program can dlopen itself],
4420 lt_cv_dlopen_self, [dnl
4421- _LT_AC_TRY_DLOPEN_SELF(
4422+ _LT_TRY_DLOPEN_SELF(
4423 lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
4424 lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
4425 ])
4426@@ -1496,8 +2380,8 @@
4427 if test "x$lt_cv_dlopen_self" = xyes; then
4428 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
4429 AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
4430- lt_cv_dlopen_self_static, [dnl
4431- _LT_AC_TRY_DLOPEN_SELF(
4432+ lt_cv_dlopen_self_static, [dnl
4433+ _LT_TRY_DLOPEN_SELF(
4434 lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
4435 lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
4436 ])
4437@@ -1519,19 +2403,32 @@
4438 *) enable_dlopen_self_static=unknown ;;
4439 esac
4440 fi
4441-])# AC_LIBTOOL_DLOPEN_SELF
4442-
4443-
4444-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
4445-# ---------------------------------
4446-# Check to see if options -c and -o are simultaneously supported by compiler
4447-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
4448-[AC_REQUIRE([LT_AC_PROG_SED])dnl
4449-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
4450+_LT_DECL([dlopen_support], [enable_dlopen], [0],
4451+ [Whether dlopen is supported])
4452+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
4453+ [Whether dlopen of programs is supported])
4454+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
4455+ [Whether dlopen of statically linked programs is supported])
4456+])# LT_SYS_DLOPEN_SELF
4457+
4458+# Old name:
4459+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
4460+dnl aclocal-1.4 backwards compatibility:
4461+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
4462+
4463+
4464+# _LT_COMPILER_C_O([TAGNAME])
4465+# ---------------------------
4466+# Check to see if options -c and -o are simultaneously supported by compiler.
4467+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
4468+m4_defun([_LT_COMPILER_C_O],
4469+[m4_require([_LT_DECL_SED])dnl
4470+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4471+m4_require([_LT_TAG_COMPILER])dnl
4472 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
4473- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
4474- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
4475- $rm -r conftest 2>/dev/null
4476+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
4477+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
4478+ $RM -r conftest 2>/dev/null
4479 mkdir conftest
4480 cd conftest
4481 mkdir out
4482@@ -1546,46 +2443,50 @@
4483 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4484 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
4485 -e 's:$: $lt_compiler_flag:'`
4486- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
4487+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
4488 (eval "$lt_compile" 2>out/conftest.err)
4489 ac_status=$?
4490 cat out/conftest.err >&AS_MESSAGE_LOG_FD
4491- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
4492+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
4493 if (exit $ac_status) && test -s out/conftest2.$ac_objext
4494 then
4495 # The compiler can only warn and ignore the option if not recognized
4496 # So say no if there are warnings
4497- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
4498+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
4499 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
4500 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
4501- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
4502+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
4503 fi
4504 fi
4505 chmod u+w . 2>&AS_MESSAGE_LOG_FD
4506- $rm conftest*
4507+ $RM conftest*
4508 # SGI C++ compiler will create directory out/ii_files/ for
4509 # template instantiation
4510- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
4511- $rm out/* && rmdir out
4512+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
4513+ $RM out/* && rmdir out
4514 cd ..
4515- rmdir conftest
4516- $rm conftest*
4517+ $RM -r conftest
4518+ $RM conftest*
4519 ])
4520-])# AC_LIBTOOL_PROG_CC_C_O
4521-
4522-
4523-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
4524-# -----------------------------------------
4525+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
4526+ [Does compiler simultaneously support -c and -o options?])
4527+])# _LT_COMPILER_C_O
4528+
4529+
4530+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
4531+# ----------------------------------
4532 # Check to see if we can do hard links to lock some files if needed
4533-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
4534-[AC_REQUIRE([_LT_AC_LOCK])dnl
4535+m4_defun([_LT_COMPILER_FILE_LOCKS],
4536+[m4_require([_LT_ENABLE_LOCK])dnl
4537+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4538+_LT_COMPILER_C_O([$1])
4539
4540 hard_links="nottested"
4541-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
4542+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
4543 # do not overwrite the value of need_locks provided by the user
4544 AC_MSG_CHECKING([if we can lock with hard links])
4545 hard_links=yes
4546- $rm conftest*
4547+ $RM conftest*
4548 ln conftest.a conftest.b 2>/dev/null && hard_links=no
4549 touch conftest.a
4550 ln conftest.a conftest.b 2>&5 || hard_links=no
4551@@ -1598,12 +2499,13 @@
4552 else
4553 need_locks=no
4554 fi
4555-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
4556-
4557-
4558-# AC_LIBTOOL_OBJDIR
4559-# -----------------
4560-AC_DEFUN([AC_LIBTOOL_OBJDIR],
4561+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
4562+])# _LT_COMPILER_FILE_LOCKS
4563+
4564+
4565+# _LT_CHECK_OBJDIR
4566+# ----------------
4567+m4_defun([_LT_CHECK_OBJDIR],
4568 [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
4569 [rm -f .libs 2>/dev/null
4570 mkdir .libs 2>/dev/null
4571@@ -1615,40 +2517,46 @@
4572 fi
4573 rmdir .libs 2>/dev/null])
4574 objdir=$lt_cv_objdir
4575-])# AC_LIBTOOL_OBJDIR
4576-
4577-
4578-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
4579-# ----------------------------------------------
4580+_LT_DECL([], [objdir], [0],
4581+ [The name of the directory that contains temporary libtool files])dnl
4582+m4_pattern_allow([LT_OBJDIR])dnl
4583+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
4584+ [Define to the sub-directory in which libtool stores uninstalled libraries.])
4585+])# _LT_CHECK_OBJDIR
4586+
4587+
4588+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
4589+# --------------------------------------
4590 # Check hardcoding attributes.
4591-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
4592+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
4593 [AC_MSG_CHECKING([how to hardcode library paths into programs])
4594-_LT_AC_TAGVAR(hardcode_action, $1)=
4595-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
4596- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
4597- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
4598+_LT_TAGVAR(hardcode_action, $1)=
4599+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
4600+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
4601+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
4602
4603- # We can hardcode non-existant directories.
4604- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
4605+ # We can hardcode non-existent directories.
4606+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
4607 # If the only mechanism to avoid hardcoding is shlibpath_var, we
4608 # have to relink, otherwise we might link with an installed library
4609 # when we should be linking with a yet-to-be-installed one
4610- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
4611- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
4612+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
4613+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
4614 # Linking always hardcodes the temporary library directory.
4615- _LT_AC_TAGVAR(hardcode_action, $1)=relink
4616+ _LT_TAGVAR(hardcode_action, $1)=relink
4617 else
4618 # We can link without hardcoding, and we can hardcode nonexisting dirs.
4619- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
4620+ _LT_TAGVAR(hardcode_action, $1)=immediate
4621 fi
4622 else
4623 # We cannot hardcode anything, or else we can only hardcode existing
4624 # directories.
4625- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
4626+ _LT_TAGVAR(hardcode_action, $1)=unsupported
4627 fi
4628-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
4629+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
4630
4631-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
4632+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
4633+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
4634 # Fast installation is not supported
4635 enable_fast_install=no
4636 elif test "$shlibpath_overrides_runpath" = yes ||
4637@@ -1656,74 +2564,79 @@
4638 # Fast installation is not necessary
4639 enable_fast_install=needless
4640 fi
4641-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
4642-
4643-
4644-# AC_LIBTOOL_SYS_LIB_STRIP
4645-# ------------------------
4646-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
4647-[striplib=
4648+_LT_TAGDECL([], [hardcode_action], [0],
4649+ [How to hardcode a shared library path into an executable])
4650+])# _LT_LINKER_HARDCODE_LIBPATH
4651+
4652+
4653+# _LT_CMD_STRIPLIB
4654+# ----------------
4655+m4_defun([_LT_CMD_STRIPLIB],
4656+[m4_require([_LT_DECL_EGREP])
4657+striplib=
4658 old_striplib=
4659 AC_MSG_CHECKING([whether stripping libraries is possible])
4660-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
4661+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
4662 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
4663 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
4664 AC_MSG_RESULT([yes])
4665 else
4666 # FIXME - insert some real tests, host_os isn't really good enough
4667 case $host_os in
4668- darwin*)
4669- if test -n "$STRIP" ; then
4670- striplib="$STRIP -x"
4671- old_striplib="$STRIP -S"
4672- AC_MSG_RESULT([yes])
4673- else
4674- AC_MSG_RESULT([no])
4675-fi
4676- ;;
4677- *)
4678- AC_MSG_RESULT([no])
4679+ darwin*)
4680+ if test -n "$STRIP" ; then
4681+ striplib="$STRIP -x"
4682+ old_striplib="$STRIP -S"
4683+ AC_MSG_RESULT([yes])
4684+ else
4685+ AC_MSG_RESULT([no])
4686+ fi
4687+ ;;
4688+ *)
4689+ AC_MSG_RESULT([no])
4690 ;;
4691 esac
4692 fi
4693-])# AC_LIBTOOL_SYS_LIB_STRIP
4694-
4695-
4696-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
4697+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
4698+_LT_DECL([], [striplib], [1])
4699+])# _LT_CMD_STRIPLIB
4700+
4701+
4702+# _LT_SYS_DYNAMIC_LINKER([TAG])
4703 # -----------------------------
4704 # PORTME Fill in your ld.so characteristics
4705-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
4706-[AC_REQUIRE([LT_AC_PROG_SED])dnl
4707+m4_defun([_LT_SYS_DYNAMIC_LINKER],
4708+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
4709+m4_require([_LT_DECL_EGREP])dnl
4710+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4711+m4_require([_LT_DECL_OBJDUMP])dnl
4712+m4_require([_LT_DECL_SED])dnl
4713+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
4714 AC_MSG_CHECKING([dynamic linker characteristics])
4715-library_names_spec=
4716-libname_spec='lib$name'
4717-soname_spec=
4718-shrext_cmds=".so"
4719-postinstall_cmds=
4720-postuninstall_cmds=
4721-finish_cmds=
4722-finish_eval=
4723-shlibpath_var=
4724-shlibpath_overrides_runpath=unknown
4725-version_type=none
4726-dynamic_linker="$host_os ld.so"
4727-sys_lib_dlsearch_path_spec="/lib /usr/lib"
4728-m4_if($1,[],[
4729+m4_if([$1],
4730+ [], [
4731 if test "$GCC" = yes; then
4732 case $host_os in
4733 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
4734 *) lt_awk_arg="/^libraries:/" ;;
4735 esac
4736- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4737- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
4738+ case $host_os in
4739+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
4740+ *) lt_sed_strip_eq="s,=/,/,g" ;;
4741+ esac
4742+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
4743+ case $lt_search_path_spec in
4744+ *\;*)
4745 # if the path contains ";" then we assume it to be the separator
4746 # otherwise default to the standard path separator (i.e. ":") - it is
4747 # assumed that no part of a normal pathname contains ";" but that should
4748 # okay in the real world where ";" in dirpaths is itself problematic.
4749- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
4750- else
4751- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4752- fi
4753+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
4754+ ;;
4755+ *)
4756+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
4757+ ;;
4758+ esac
4759 # Ok, now we have the path, separated by spaces, we can step through it
4760 # and add multilib dir if necessary.
4761 lt_tmp_lt_search_path_spec=
4762@@ -1736,7 +2649,7 @@
4763 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
4764 fi
4765 done
4766- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
4767+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
4768 BEGIN {RS=" "; FS="/|\n";} {
4769 lt_foo="";
4770 lt_count=0;
4771@@ -1756,10 +2669,29 @@
4772 if (lt_foo != "") { lt_freq[[lt_foo]]++; }
4773 if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
4774 }'`
4775- sys_lib_search_path_spec=`echo $lt_search_path_spec`
4776+ # AWK program above erroneously prepends '/' to C:/dos/paths
4777+ # for these hosts.
4778+ case $host_os in
4779+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
4780+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
4781+ esac
4782+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
4783 else
4784 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
4785 fi])
4786+library_names_spec=
4787+libname_spec='lib$name'
4788+soname_spec=
4789+shrext_cmds=".so"
4790+postinstall_cmds=
4791+postuninstall_cmds=
4792+finish_cmds=
4793+finish_eval=
4794+shlibpath_var=
4795+shlibpath_overrides_runpath=unknown
4796+version_type=none
4797+dynamic_linker="$host_os ld.so"
4798+sys_lib_dlsearch_path_spec="/lib /usr/lib"
4799 need_lib_prefix=unknown
4800 hardcode_into_libs=no
4801
4802@@ -1777,7 +2709,7 @@
4803 soname_spec='${libname}${release}${shared_ext}$major'
4804 ;;
4805
4806-aix4* | aix5*)
4807+aix[[4-9]]*)
4808 version_type=linux
4809 need_lib_prefix=no
4810 need_version=no
4811@@ -1796,7 +2728,7 @@
4812 aix4 | aix4.[[01]] | aix4.[[01]].*)
4813 if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
4814 echo ' yes '
4815- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
4816+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
4817 :
4818 else
4819 can_build_shared=no
4820@@ -1822,9 +2754,18 @@
4821 ;;
4822
4823 amigaos*)
4824- library_names_spec='$libname.ixlibrary $libname.a'
4825- # Create ${libname}_ixlibrary.a entries in /sys/libs.
4826- 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'
4827+ case $host_cpu in
4828+ powerpc)
4829+ # Since July 2007 AmigaOS4 officially supports .so libraries.
4830+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
4831+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4832+ ;;
4833+ m68k)
4834+ library_names_spec='$libname.ixlibrary $libname.a'
4835+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
4836+ 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'
4837+ ;;
4838+ esac
4839 ;;
4840
4841 beos*)
4842@@ -1847,61 +2788,112 @@
4843 # libtool to hard-code these into programs
4844 ;;
4845
4846-cygwin* | mingw* | pw32*)
4847+cygwin* | mingw* | pw32* | cegcc*)
4848 version_type=windows
4849 shrext_cmds=".dll"
4850 need_version=no
4851 need_lib_prefix=no
4852
4853- case $GCC,$host_os in
4854- yes,cygwin* | yes,mingw* | yes,pw32*)
4855+ case $GCC,$cc_basename in
4856+ yes,*)
4857+ # gcc
4858 library_names_spec='$libname.dll.a'
4859 # DLL is installed to $(libdir)/../bin by postinstall_cmds
4860 postinstall_cmds='base_file=`basename \${file}`~
4861- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
4862+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
4863 dldir=$destdir/`dirname \$dlpath`~
4864 test -d \$dldir || mkdir -p \$dldir~
4865 $install_prog $dir/$dlname \$dldir/$dlname~
4866- chmod a+x \$dldir/$dlname'
4867+ chmod a+x \$dldir/$dlname~
4868+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
4869+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
4870+ fi'
4871 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
4872 dlpath=$dir/\$dldll~
4873- $rm \$dlpath'
4874+ $RM \$dlpath'
4875 shlibpath_overrides_runpath=yes
4876
4877 case $host_os in
4878 cygwin*)
4879 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
4880 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4881- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
4882+m4_if([$1], [],[
4883+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
4884 ;;
4885- mingw*)
4886+ mingw* | cegcc*)
4887 # MinGW DLLs use traditional 'lib' prefix
4888 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4889- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4890- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
4891- # It is most probably a Windows format PATH printed by
4892- # mingw gcc, but we are running on Cygwin. Gcc prints its search
4893- # path with ; separators, and with drive letters. We can handle the
4894- # drive letters (cygwin fileutils understands them), so leave them,
4895- # especially as we might pass files found there to a mingw objdump,
4896- # which wouldn't understand a cygwinified path. Ahh.
4897- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
4898- else
4899- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4900- fi
4901 ;;
4902 pw32*)
4903 # pw32 DLLs use 'pw' prefix rather than 'lib'
4904 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4905 ;;
4906 esac
4907+ dynamic_linker='Win32 ld.exe'
4908+ ;;
4909+
4910+ *,cl*)
4911+ # Native MSVC
4912+ libname_spec='$name'
4913+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4914+ library_names_spec='${libname}.dll.lib'
4915+
4916+ case $build_os in
4917+ mingw*)
4918+ sys_lib_search_path_spec=
4919+ lt_save_ifs=$IFS
4920+ IFS=';'
4921+ for lt_path in $LIB
4922+ do
4923+ IFS=$lt_save_ifs
4924+ # Let DOS variable expansion print the short 8.3 style file name.
4925+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
4926+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
4927+ done
4928+ IFS=$lt_save_ifs
4929+ # Convert to MSYS style.
4930+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
4931+ ;;
4932+ cygwin*)
4933+ # Convert to unix form, then to dos form, then back to unix form
4934+ # but this time dos style (no spaces!) so that the unix form looks
4935+ # like /cygdrive/c/PROGRA~1:/cygdr...
4936+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
4937+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
4938+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4939+ ;;
4940+ *)
4941+ sys_lib_search_path_spec="$LIB"
4942+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
4943+ # It is most probably a Windows format PATH.
4944+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
4945+ else
4946+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4947+ fi
4948+ # FIXME: find the short name or the path components, as spaces are
4949+ # common. (e.g. "Program Files" -> "PROGRA~1")
4950+ ;;
4951+ esac
4952+
4953+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
4954+ postinstall_cmds='base_file=`basename \${file}`~
4955+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
4956+ dldir=$destdir/`dirname \$dlpath`~
4957+ test -d \$dldir || mkdir -p \$dldir~
4958+ $install_prog $dir/$dlname \$dldir/$dlname'
4959+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
4960+ dlpath=$dir/\$dldll~
4961+ $RM \$dlpath'
4962+ shlibpath_overrides_runpath=yes
4963+ dynamic_linker='Win32 link.exe'
4964 ;;
4965
4966 *)
4967+ # Assume MSVC wrapper
4968 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
4969+ dynamic_linker='Win32 ld.exe'
4970 ;;
4971 esac
4972- dynamic_linker='Win32 ld.exe'
4973 # FIXME: first we should search . and the directory the executable is in
4974 shlibpath_var=PATH
4975 ;;
4976@@ -1911,13 +2903,13 @@
4977 version_type=darwin
4978 need_lib_prefix=no
4979 need_version=no
4980- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
4981+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
4982 soname_spec='${libname}${release}${major}$shared_ext'
4983 shlibpath_overrides_runpath=yes
4984 shlibpath_var=DYLD_LIBRARY_PATH
4985 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
4986- m4_if([$1], [],[
4987- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
4988+m4_if([$1], [],[
4989+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
4990 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
4991 ;;
4992
4993@@ -1985,6 +2977,20 @@
4994 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
4995 soname_spec='${libname}${release}${shared_ext}$major'
4996 shlibpath_var=LD_LIBRARY_PATH
4997+ shlibpath_overrides_runpath=no
4998+ hardcode_into_libs=yes
4999+ ;;
5000+
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: