Geis

Merge lp:~fginther/geis/geis-2.1.2.1-rename into lp:geis/oneiric

  1. geis-2.1.2.1-rename
  2. Merge into oneiric
Proposed by Francis Ginther
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 140
Merged at revision: 138
Proposed branch: lp:~fginther/geis/geis-2.1.2.1-rename
Merge into: lp:geis/oneiric
Diff against target: 29808 lines (+10649/-9967)
135 files modified
ChangeLog (+0/-1720)
Makefile.am (+3/-3)
Makefile.in (+9/-7)
NEWS (+1/-1)
aclocal.m4 (+8/-6)
config.aux/config.guess (+120/-105)
config.aux/config.sub (+101/-55)
config.aux/ltmain.sh (+2619/-1390)
configure (+1836/-992)
configure.ac (+12/-12)
debian/changelog (+11/-253)
debian/control (+22/-14)
debian/copyright (+2/-2)
debian/libgeis-doc.doc-base (+5/-5)
debian/libgeis-doc.install (+1/-1)
debian/libgeis1.install (+1/-1)
debian/libgeis1.symbols (+1/-1)
debian/patches/0001-fix-memory-leaks.patch (+15/-15)
debian/patches/0002-fix-crash-no-X.patch (+9/-9)
debian/patches/0003-fix-crash-unlabelled-axes.patch (+3/-3)
debian/patches/0004-fix-device-array-overrun.patch (+3/-3)
debian/patches/0005-restore-11.04-v1-gesture-names.patch (+4/-4)
debian/source_geis.py (+1/-1)
debian/watch (+1/-1)
doc/Makefile.in (+3/-1)
examples/Makefile.am (+3/-3)
examples/Makefile.in (+7/-5)
include/Makefile.am (+1/-1)
include/Makefile.in (+4/-2)
include/geis/geis.h (+6/-6)
libgeis.pc.in (+2/-2)
libgeis/Makefile.am (+12/-12)
libgeis/Makefile.in (+1024/-0)
libgeis/backend/Makefile.am (+3/-3)
libgeis/backend/Makefile.in (+616/-0)
libgeis/backend/test_fixture/Makefile.am (+9/-9)
libgeis/backend/test_fixture/Makefile.in (+552/-0)
libgeis/backend/test_fixture/geis_backend_test_fixture.c (+1/-1)
libgeis/backend/xcb/Makefile.am (+8/-8)
libgeis/backend/xcb/Makefile.in (+612/-0)
libgeis/backend/xcb/geis_xcb_backend.c (+3/-3)
libgeis/geis.c (+9/-9)
libgeis/geis_atomic.h (+1/-1)
libgeis/geis_attr.c (+1/-1)
libgeis/geis_attr.h (+1/-1)
libgeis/geis_class.c (+2/-2)
libgeis/geis_class.h (+3/-3)
libgeis/geis_device.c (+2/-2)
libgeis/geis_device.h (+3/-3)
libgeis/geis_error.c (+2/-2)
libgeis/geis_event.c (+1/-1)
libgeis/geis_event.h (+1/-1)
libgeis/geis_event_queue.c (+1/-1)
libgeis/geis_event_queue.h (+1/-1)
libgeis/geis_filter.c (+2/-2)
libgeis/geis_filter.h (+3/-3)
libgeis/geis_filter_term.c (+2/-2)
libgeis/geis_filter_term.h (+3/-3)
libgeis/geis_group.c (+1/-1)
libgeis/geis_group.h (+3/-3)
libgeis/geis_region.c (+2/-2)
libgeis/geis_region.h (+1/-1)
libgeis/geis_subscription.c (+2/-2)
libgeis/geis_subscription.h (+2/-2)
libgeis/geis_timer.h (+1/-1)
libgeis/geis_touch.c (+1/-1)
libgeis/geis_touch.h (+3/-3)
libgeis/geis_v1.c (+5/-5)
libgeis/server/Makefile.am (+8/-8)
libgeis/server/Makefile.in (+571/-0)
libgeis/server/geis_dbus.h (+1/-1)
libgeis/server/geis_dbus_server.h (+0/-3)
libs/Makefile.am (+2/-2)
libs/Makefile.in (+5/-3)
libs/xcb/Makefile.am (+2/-2)
libs/xcb/Makefile.in (+5/-3)
libutouch-geis/Makefile.in (+0/-1030)
libutouch-geis/backend/Makefile.in (+0/-614)
libutouch-geis/backend/test_fixture/Makefile.in (+0/-550)
libutouch-geis/backend/xcb/Makefile.in (+0/-611)
libutouch-geis/server/Makefile.in (+0/-570)
m4/ax_enable_xi2.m4 (+1/-1)
m4/libtool.m4 (+1256/-782)
m4/ltoptions.m4 (+7/-6)
m4/ltversion.m4 (+6/-6)
m4/lt~obsolete.m4 (+9/-3)
python/Makefile.am (+3/-3)
python/Makefile.in (+6/-4)
python/_geis_bindings/_geis_bindings.c (+4/-4)
python/geis/__init__.py (+6/-6)
python/geis/geis_v2.py (+1/-1)
python/pygeis (+1/-1)
python/run_pygeis (+1/-1)
testsuite/Makefile.am (+2/-2)
testsuite/Makefile.in (+5/-3)
testsuite/geis1/Makefile.am (+2/-2)
testsuite/geis1/Makefile.in (+6/-5)
testsuite/geis1/check_gesture_attrs.c (+1/-2)
testsuite/geis1/check_gesture_types.c (+3/-0)
testsuite/geis1/check_subscription.c (+3/-8)
testsuite/geis2/Makefile.am (+2/-2)
testsuite/geis2/Makefile.in (+6/-5)
testsuite/geis2/check_class.c (+1/-1)
testsuite/geis2/check_config.c (+1/-1)
testsuite/geis2/check_device.c (+1/-1)
testsuite/geis2/check_filter.c (+1/-1)
testsuite/geis2/check_frame.c (+1/-1)
testsuite/geis2/check_geis_new.c (+1/-1)
testsuite/geis2/check_region.c (+1/-1)
testsuite/geis2/check_subscription.c (+1/-1)
testsuite/geistest/Makefile.am (+2/-2)
testsuite/geistest/Makefile.in (+6/-5)
testsuite/libgeis/Makefile.am (+6/-6)
testsuite/libgeis/Makefile.in (+936/-0)
testsuite/libgeis/check_attr.c (+2/-2)
testsuite/libgeis/check_backend_multiplexor.c (+3/-3)
testsuite/libgeis/check_backend_token.c (+5/-5)
testsuite/libgeis/check_class.c (+2/-2)
testsuite/libgeis/check_device.c (+2/-2)
testsuite/libgeis/check_error_reporting.c (+2/-2)
testsuite/libgeis/check_event_queue.c (+3/-3)
testsuite/libgeis/check_filter.c (+3/-3)
testsuite/libgeis/check_geis2_internals.c (+2/-2)
testsuite/libgeis/check_geis_private.c (+4/-4)
testsuite/libgeis/check_region.c (+4/-4)
testsuite/libgeis/check_subscription.c (+4/-4)
testsuite/libgeis/check_timer.c (+4/-4)
testsuite/libutouch-geis/Makefile.in (+0/-934)
tools/Makefile.am (+1/-1)
tools/Makefile.in (+4/-2)
tools/geisview/Makefile.am (+1/-1)
tools/geisview/Makefile.in (+4/-2)
tools/geisview/defaults.py (+1/-1)
tools/geisview/defaults.py.in (+1/-1)
tools/geisview/geisview (+1/-1)
To merge this branch: bzr merge lp:~fginther/geis/geis-2.1.2.1-rename
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Review via email: mp+121070@code.launchpad.net

Commit message

  * New upstream microrelease, bug fixes only
    - Rename project to simply 'geis' (LP: #1040755)
  * Updated debian/watch file for project rename
  * Rename package and update packaging
    - Added Conflicts and Replaces clauses for libgeis-dev, libgeis-doc,
      python-geis and geis-tools

Description of the change

The primary rationale for this change is to repackage geis for the project rename.

  * New upstream microrelease, bug fixes only
    - Rename project to simply 'geis' (LP: #1040755)
  * Updated debian/watch file for project rename
  * Rename package and update packaging
    - Added Conflicts and Replaces clauses for libgeis-dev, libgeis-doc,
      python-geis and geis-tools

To post a comment you must log in.
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looks ok. Builds fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-06-02 19:38:57 +0000
+++ ChangeLog 2012-08-23 18:45:02 +0000
@@ -1,1720 +0,0 @@
12011-03-31 Stephen M. Webb <stephen.webb@canonical.com>
2
3 Add initial python bindings.
4
5 * python/Makefile.am: new file
6 * python/_geis_bindings/_geis_bindings.c: new file
7 * python/geis/__init__.py: new file
8 * python/geis/geis_v2.py: new file
9 * python/pygeis: new script
10 * Makefile.am (SUBDIRS): added python
11 * configure.ac (AC_CONFIG_FILES): added new generated files
12
132011-04-10 Stephen M. Webb <stephen.webb@canonical.com>
14
15 Repaired a callback persistence problem (LP: #754135).
16
17 * testsuite/geis1/check_subscription.c: new test suite
18 * libutouch-geis/geis_v1.c: saved a copy of the callback tables
19 * testsuite/geis1/Makefile.am: included new test suite
20 * testsuite/geis1/check_geis1_api.c: ran new test suite
21
222011-04-12 Stephen M. Webb <stephen.webb@canonical.com>
23
24 Made direct use of XI2.1 optional at build time (LP: #741404).
25
26 * m4/ax_enable_xi2.m4: new autoconf macro
27 * configure.ac: invoked the new macro
28 * libutouch-geis/backend/xcb/geis_xcb_backend.c: optioned XI2.1 code
29
302011-04-05 Stephen M. Webb <stephen.webb@canonical.com>
31
32 Fixed invalid pointer dereference on XI initialization failure in XCB back
33 end (LP: #730899).
34
35 * libutouch-geis/backend/xcb/geis_xcb_backend.c
36 (geis_xcb_backend_new): cleared properly to indicate a failure.
37
382011-03-28 Stephen M. Webb <stephen.webb@canonical.com>
39
40 Changes the list of attrs received from grail for the Touch gesture.
41
42 * libutouch-geis/backend/xcb/grail_gestures.c: change Touch attrs
43
442011-03-25 Stephen M. Webb <stephen.webb@canonical.com>
45
46 Added new TOUCH gesture types (LP: #742555).
47
48 * include/geis/geis.h: added new TOUCH gesture types
49 * libutouch-geis/backend/xcb/geis_xcb_backend.c: tweaked gesture mask size
50 * libutouch-geis/backend/xcb/grail_gestures.c: added new TOUCH gesture types
51 added proper handling of a variable-size gesture mask
52 * libutouch-geis/geis_v1.c: mapped new TOUCH gesture types to grail TOUCH
53 gesture types
54 * testsuite/geis1/check_gesture_types.c: new testsuite
55 * testsuite/geis1/Makefile.am: added new testsuite
56 * testsuite/geis1/check_geis1_api.c: invoked new testsuite
57 * testsuite/geistest/geistest.c: added new gesture types
58
592011-03-24 Stephen M. Webb <stephen.webb@canonical.com>
60
61 Fixed a bad index when translating grail touches (LP: #742002).
62
63 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
64 fixed offset calculation for grail touch properties
65
662011-03-22 Stephen M. Webb <stephen.webb@canonical.com>
67
68 Added a default back end (LP: #740311).
69
70 * examples/geis2.c (dump_gesture_event): dumped more info
71 (main): removed GEIS_INIT_UTOUCH_XCB from geis_new call
72 * libutouch-geis/geis.c (geis_new): added GEIS_INIT_UTOUCH_XCB as default
73
742011-03-22 Stephen M. Webb <stephen.webb@canonical.com>
75
76 Passed the correct gesture_id to GEIS v1 callbacks (LP: #740284).
77
78 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
79 Used the grail gesture_id as the frame_id.
80 * testsuite/geistest/geistest.c (gesture_update): reported the gesture_id
81 (gesture_start): reported the gesture_id
82 (gesture_finish): reported the gesture_id
83
842011-03-22 Stephen M. Webb <stephen.webb@canonical.com>
85
86 Corrected the number of touches on a gesture event (LP: #737745).
87
88 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
89 replaced geis_xcb_backend_touch_count() call with a calculation based on
90 the number of touch properties passed from grail
91 * libutouch-geis/backend/xcb/grail_gestures.c (geis_xcb_backend_touch_count):
92 removed
93 * libutouch-geis/backend/xcb/grail_gestures.h (geis_xcb_backend_touch_count):
94 removed
95
962011-03-17 Stephen M. Webb <stephen.webb@canonical.com>
97
98 Added definitions for GEIS v1 gesture primitive types (LP: #737230).
99
100 * include/geis/geis.h (GEIS_GESTURE_PRIMITIVE_DRAG): new symbol
101 (GEIS_GESTURE_PRIMITIVE_PINCH): new symbol
102 (GEIS_GESTURE_PRIMITIVE_ROTATE): new symbol
103 (GEIS_GESTURE_PRIMITIVE_TAP): new symbol
104 * libutouch-geis/backend/xcb/grail_gestures.c (s_grail_class_map):
105 replaced utouch-grail symbolic constants with the new GEIS symbolic
106 constants
107
1082011-03-16 Stephen M. Webb <stephen.webb@canonical.com>
109
110 Refined the API documentation and added an examples directory.
111
112 * doc/api.dox: new documentation file
113 * doc/logo_x64.png: new logo image
114 * doc/using_geis_v2.dox: new documentation file
115 * examples/Makefile.am: examples subdirectory Makefile
116 * examples/geis2.c: new example program
117 * Makefile.am: added examples subdirectory
118 * configure.ac: added examples subdirectory
119 * doc/Doxyfile: tweaked Doxygen settings
120 * include/geis/geis.h: complete API docs refinement
121
1222011-03-16 Stephen M. Webb <stephen.webb@canonical.com>
123
124 Replaced device class with explicit attributes.
125
126 * include/geis/geis.h (GEIS_DEVICE_CLASS_*) removed
127 (GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH): added
128 (GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH): added
129 * libutouch-geis/backend/xcb/geis_xcb_backend.c:
130 (_map_xi2_mode_to_geis_device_attrs): replaced function
131 _map_xi2_mode_to_geis_device_class
132 * testsuite/geis2/check_device.c: added checks for new attributes
133
1342011-03-16 Stephen M. Webb <stephen.webb@canonical.com>
135
136 Refinement of input device class handling.
137
138 * include/geis/geis.h (GEIS_DEVICE_CLASS_UNKNOWN): new device class
139 (GEIS_DEVICE_CLASS_TOUCH_MULTIFINGER): new device class
140 * libutouch-geis/backend/xcb/geis_xcb_backend.c
141 (_map_xi2_mode_to_geis_device_class): new function
142 (_report_an_xcb_device): used it
143
1442011-03-13 Stephen M. Webb <stephen.webb@canonical.com>
145
146 Initialized an uninitialized variable.
147
148 * libutouch-geis/geis_v1.c (_v1_input_callback): initialized device_id
149
1502011-03-12 Stephen M. Webb <stephen.webb@canonical.com>
151
152 Added spcifying devices to geistest.
153
154 * libutouch-geis/backend/xcb/geis_xcb_backend.c: added -d swicth
155 * doc/geistest.1: documented its use
156
1572011-03-12 Stephen M. Webb <stephen.webb@canonical.com>
158
159 Added proper device ID filtering for GEIS v1.
160
161 * libutouch-geis/geis_v1.c (_subscribe_device): Added filter for device ID.
162
1632011-03-11 Stephen M. Webb <stephen.webb@canonical.com>
164
165 Implement device enumeration (LP: #733296)
166
167 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_report_an_xcb_device): new
168 (_report_xcb_devices): imlemented
169 * libutouch-geis/geis_device.c (geis_device_new): made "id" an attr
170 (geis_device_id): same
171 (geis_device_add_attr): implemented missing function
172 * libutouch-geis/geis_v1.c (_v1_input_callback): new function
173 (geis_input_devices): implemented
174 * testsuite/geis1/check_gesture_attrs.c: removed debug message
175 * testsuite/geistest/geistest.c (input_device_added): added a dump
176
1772011-03-11 Stephen M. Webb <stephen.webb@canonical.com>
178
179 Fix a lifetime issue with string attrs.
180
181 * libutouch_ges/geis_attr.c (geis_attr_new): dup all strings
182 (geis_attr_delete): free strings
183
1842011-03-11 Stephen M. Webb <stephen.webb@canonical.com>
185
186 Added new device symbolic constants due to a change in the GEIS spec.
187
188 * include/geis/geis.h (GEIS_DEVICE_ATTRIBUTE_CLASS): new constant
189 (GEIS_DEVICE_ATTRIBUTE_TOUCHES): new constant
190 (GEIS_DEVICE_CLASS_TOUCH_DIRECT): new constant
191 (GEIS_DEVICE_CLASS_TOUCH_DEPENDENT): new constant
192 (GEIS_DEVICE_CLASS_TOUCH_INDEPENDENT): new constant
193 (GEIS_DEVICE_CLASS_TOUCH_PARTIAL): new constant
194 * testsuite/geis2/check_device.c: added tests for the above
195
1962011-03-11 Stephen M. Webb <stephen.webb@canonical.com>
197
198 Added a required symbolic constant for device events.
199
200 * include/geis/geis.h (GEIS_EVENT_ATTRIBUTE_DEVICE): new symbol
201 (GEIS_DEVICE_ATTRIBUTE_ID): new symbol
202 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c: used them
203 * libutouch-geis/geis.c: used them
204 * testsuite/geis2/check_device.c (geis_device_types): checked them
205 * testsuite/geis2/check_subscription.c: used them
206
2072011-03-08 Stephen M. Webb <stephen.webb@canonical.com>
208
209 Released utouch-geis v2.0.3.
210
211 * configure.ac (AC_INIT): bumped version to 2.0.3
212
2132011-03-08 Stephen M. Webb <stephen.webb@canonical.com>
214
215 Added fix for LP: #732104: re-order class event pump in v1 emulation.
216
217 * libutouch-geis/geis_v1.c (_subscribe_device): added more diagnostic messages
218 (geis_subscribe): re-ordered event pump to prime the class table
219
2202011-03-08 Stephen M. Webb <stephen.webb@canonical.com>
221
222 Added a unit test and related infrastructure in the mock objects to reproduce
223 LP: #732104.
224
225 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c:
226 moved generation of gesture events to after subscription creation, added
227 support for TOUCH filters
228 * testsuite/geis1/check_gesture_attrs.c: added check for touch count,
229 changed subscription from GEIS_ALL_GESTURES to an explicit list
230 * testsuite/geis2/check_frame.c: activated subscription
231
2322011-03-07 Stephen M. Webb <stephen.webb@canonical.com>
233
234 Released GEIS v2.0.2.
235
236 * configure.ac (AC_INIT): bumped version to 2.0.2
237
2382011-03-07 Stephen M. Webb <stephen.webb@canonical.com>
239
240 Renamed test case for LP: #728606
241
242 * testsuite/geis1/check_gesture_attrs.c: renamed from
243 testsuite/geis1/check_lp728606.c
244 * testsuite/geis1/Makefile.am: renamed source file
245 added -Werror to CFLAGS
246 * testsuite/geis1/check_geis1_api.c: renamed test
247
2482011-03-07 Stephen M. Webb <stephen.webb@canonical.com>
249
250 Added regression test for LP: #728606
251
252 * testsuite/geis1/check_lp728606.c: new test suite
253 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
254 (_create_gesture_events): add some basic gesture attrs to mock events
255 * libutouch-geis/geis_v1.c (geis_init): tweaked mock object creation
256 (geis_finish): reset global Geis object
257 (geis_subscribe): relocated class event pump
258 * testsuite/geis1/Makefile.am: added new test suite source
259 * testsuite/geis1/check_geis1_api.c: ran new test suite
260
2612011-03-07 Stephen M. Webb <stephen.webb@canonical.com>
262
263 Enabled GEIS v1 for basic API unit testing.
264
265 * testsuite/geis1/check_instance.c: new test suite
266 * libutouch-geis/geis_v1.c (_generate_subscription_name): handled NULL XCB info
267 (geis_init): handled request for mock back end
268 * testsuite/geis1/Makefile.am: added new source file
269 * testsuite/geis1/check_geis1_api.c: ran new test suite
270
2712011-03-07 Stephen M. Webb <stephen.webb@canonical.com>
272
273 Re-added GEIS v1 API testing.
274
275 * testsuite/geis1/check_geis_internals.c: removed
276 * testsuite/geis1/check_instance_table.c: removed
277 * testsuite/geis1/check_geis1_api.c: new file
278 * configure.ac (AC_CONFIG_FILES): added testsuite.geis1/Makefile
279 * testsuite/Makefile.am (SUBDIRS): added geis1
280 * testsuite/geis1/Makefile.am: Removed old unit tests, added check_geis1_api
281
2822011-03-03 Stephen M. Webb <stephen.webb@canonical.com>
283
284 Fixed incorrect data conversion in GEIS v1 implementation (LP: #728606)
285
286 * libutouch_geis/geis_v1 (_map_frame_to_attrs): put float value in the float
287 member of the attr union to avoid unwanted coercion.
288
2892011-02-28 Stephen M. Webb <stephen.webb@canonical.com>
290
291 Added a graceful exit to the geistest tool.
292
293 * testsuite/geistest/geistest.c (main): added watch on stdin for exit
294 * doc/geistest.1: mentioned how to exit gracefully
295
2962011-02-28 Stephen M. Webb <stephen.webb@canonical.com>
297
298 Fixed logic in a string-to-boolean conversion.
299
300 * libutouch-geis/geis_attr.c (geis_attr_value_to_boolean): fixed logic
301
3022011-02-27 Stephen M. Webb <stephen.webb@canonical.com>
303
304 Fixed memory leaks in GEIS v2 subscriptions.
305
306 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_finalize): closed X display
307 * libutouch-geis/geis.c (geis_new): reffed the new geis object
308 (geis_delete): invalidated all outstanding subscriptions
309 * libutouch-geis/geis_backend.c: fixed debug message to avoid a bad dereference
310 * libutouch-geis/geis_filter.c: only unref ther geis object on destruction
311 * libutouch-geis/geis_filter_term.c: free the bag store on deletion
312 * libutouch-geis/geis_subscription.h (geis_subscription_bag_invalidate): new
313 (geis_subscription_invalidate): new
314 * libutouch-geis/geis_subscription.c: imlemented new functions
315 (_subscription_destroy): handled destruction in invalided state
316 * libutouch-geis/geis_v1.c (geis_finish): deleted window filter
317
3182011-02-23 Stephen M. Webb <stephen.webb@canonical.com>
319
320 Fixed memory leaks in GEIS v2 group and touch sets.
321
322 * libutouch-geis/geis_frame.c (geis_frameset_delete): fixed loop condition
323 (geis_frame_delete): freed touches
324 * libutouch-geis/geis_group.c (geis_groupset_delete): fixed loop condition
325 * libutouch-geis/geis_touch.c (geis_touchset_delete): fixed loop condition
326
3272011-02-23 Stephen M. Webb <stephen.webb@canonical.com>
328
329 Fixed a memory leak in GEIS v2 gesture events.
330
331 * libutouch-geis/geis_attr.h (GeisAttrDestructor): new type
332 (geis_attr_set_destructor): new function
333 * libutouch-geis/geis_attr.c (geis_attr_set_destructor): implemented it
334 (attr_value): named union for ISO C compatibility
335 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture): added
336 destructors to groupset and touchset attrs
337
3382011-02-22 Stephen M. Webb <stephen.webb@canonical.com>
339
340 Released version 2.0.1.
341
342 * configure.ac (AC_INIT): bumped package version to 2.0.1
343
3442011-02-22 Stephen M. Webb <stephen.webb@canonical.com>
345
346 Used standardized LGPL-v3 license text.
347
348 * COPYING: refreshed with standardized text.
349
3502011-02-22 Stephen M. Webb <stephen.webb@canonical.com>
351
352 Restored missing GEIS v1 symbols and fixed a segfault in libgrip.
353
354 * libutouch-geis/geis_v1.c (struct _GeisInstance): added window_filter field
355 (geis_init): initialized window_filter field
356 (_subscribe_device): used window_filter field from instance
357 (geis_configuration_set_value): added missing GEIS v1 function
358 (geis_unsubscribe): added missing GEIS v1 function
359
3602011-02-22 Stephen M. Webb <stephen.webb@canonical.com>
361
362 Release version 2.0.0
363
364 * configure.ac (AC_INIT): bumped package version to 2.0.0
365 * libutouch-geis/Makefile.am (libutouch_geis_la_LDFLAGS): bumped version-info
366 to 3:0:2 (gives .so version 1.2.0) to reflect the addition of a new interface
367
3682011-02-21 Stephen M. Webb <stephen.webb@canonical.com>
369
370 Added support for setting the XCB sysflg through the GEIS v1 interface.
371
372 * include/geis/geis.h (GEIS_GESTURE_TYPE_SYSTEM): new gesture type
373 * libutouch-geis/geis_subscription.h
374 (geis_subscription_set_flags): new function
375 * libutouch-geis/geis_subscription.c: implemented it
376 * libutouch-geis/geis_v1.c (geis_subscribe): used it
377
3782011-02-20 Stephen M. Webb <stephen.webb@canonical.com>
379
380 Cranked up warning level on testsuite and fixed (most of) the consequent
381 warnings.
382
383 * testsuite/geis2/check_attr.c: fxied compile-time warnings
384 * testsuite/geis2/check_class.c: same
385 * testsuite/geis2/check_device.c: same
386 * testsuite/geis2/check_event.c: same
387 * testsuite/geis2/check_filter.c: ditto
388 * testsuite/geis2/check_frame.c: same
389 * testsuite/geis2/check_geis2_api.c: same
390 * testsuite/geis2/check_geis_new.c: same
391 * testsuite/geis2/check_general_types.c: same
392 * testsuite/geis2/check_region.c: same
393 * testsuite/libutouch-geis/check_attr.c: same
394 * testsuite/libutouch-geis/check_backend_multiplexor.c: same
395 * testsuite/libutouch-geis/check_class.c: same
396 * testsuite/libutouch-geis/check_device.c: idem
397 * testsuite/libutouch-geis/check_error_reporting.c: same
398 * testsuite/libutouch-geis/check_filter.c: yep
399 * testsuite/libutouch-geis/check_geis2_internals.c: you guessed it
400 * testsuite/libutouch-geis/check_geis_private.c: uh-huh
401
4022011-02-19 Stephen M. Webb <stephen.webb@canonical.com>
403
404 Fixed failed "make distcheck".
405
406 * libutouch-geis/Makefile.am: added geis_atomic.h
407 * libutouch-geis/server/Makefile.am: added geis_dbus.h
408
4092011-02-19 Stephen M. Webb <stephen.webb@canonical.com>
410
411 Removed old crufty unused source code.
412
413 * libgeis-dbus: removed directory
414 * libutouch-geis-xcb: removed directory
415
4162011-02-17 Stephen M. Webb <stephen.webb@canonical.com>
417
418 Added proper support for region filters in XCB.
419
420 * libutouch-geis/backend/xcb/geis_xcb_backend.c
421 (XcbGestureSub): added windows and window_count fields
422 (_translate_device_term_to_xcb): eliminated duplicates
423 (_translate_region_term_to_xcb): new function
424 (_subscribe): used new fields/function
425 * libutouch-geis/geis_v1.c (geis_init): added region filter for window
426
4272011-02-17 Stephen M. Webb <stephen.webb@canonical.com>
428
429 Added a check for the maximum number of device terms.
430
431 * libutouch-geis/backend/xcb/geis_xcb_backend.c
432 (_translate_device_term_to_xcb): Added MAX_NUM_DEVICES and checked it.
433
4342011-02-17 Stephen M. Webb <stephen.webb@canonical.com>
435
436 Added proper support for continuations and system gestures.
437
438 * libutouch-geis/backend/xcb/geis_xcb_backend.c
439 (_translate_class_term_to_xcb): fixed min/max logic
440 (_translate_filter_to_xcb): added subscription parameter,
441 called new functions,
442 ORed masks from different filters on same subscription
443 (_subscribe): removed special case for no class filters
444 * libutouch-geis/backend/xcb/grail_gestures.h
445 (geis_xcb_backend_create_gesture_bitmask): removed and replaced with...
446 (geis_xcb_backend_gesture_bitmask_filter_class): new function
447 (geis_xcb_backend_gesture_bitmask_filter_touches): new function
448 (geis_xcb_backend_gesture_bitmask_init): new function
449 * libutouch-geis/backend/xcb/grail_gestures.c: implemented the above new
450 * functions
451 * libutouch-geis/geis_subscription.h (geis_subscription_flags): new function
452 * libutouch-geis/geis_subscription.c: implemented it
453 * testsuite/geistest/geistest.c: switched from 'all' to a set of gestures
454
4552011-02-17 Stephen M. Webb <stephen.webb@canonical.com>
456
457 Added the ability to fetch a filter from a subscription and clone it.
458
459 * include/geis/geis.h (geis_filter_clone): new function
460 (geis_subscription_filter_by_name): new function
461 * libutouch-geis/geis_filter.h (geis_filter_bag_filter_by_name): new function
462 * libutouch-geis/geis_filter.c (geis_filter_bag_filter_by_name): implemented
463 (_filter_new_empty): new function
464 (geis_filter_new): used it
465 (geis_filter_clone): implemented it
466 (geis_filter_delete): unreffed geis
467 * libutouch-geis/geis_filter_term.h (geis_filter_term_bag_clone): new function
468 * libutouch-geis/geis_filter_term.c (geis_filter_term_bag_clone): implemented
469 * libutouch-geis/geis_subscription.c (geis_subscription_filter_by_name): impl
470 * libutouch-geis/geis_v1.c (_subscribe): used new functions
471 * libutouch-geis/libutouch-geis.ver (geis_filter_clone): new exported symbol
472 (geis_subscription_filter_by_name): new exported symbol
473 * testsuite/geis2/Makefile.am: added -Wall -Wextra CFLAGS
474 * testsuite/geis2/check_filter.c: new test case, silenced warnings
475 * testsuite/geis2/check_subscription.c: new test case, silenced warnings
476 * testsuite/libutouch-geis/Makefile.am: added -Wall -Wextra CFLAGS
477
4782011-02-17 Stephen M. Webb <stephen.webb@canonical.com>
479
480 Reference counting fixes: added geis_atomic functions, added reference
481 counting semantics to Geis and GeisFilterTerm modules.
482
483 * libutouch-geis/geis_atomic.h: new file
484 * libutouch-geis/geis.c (_geis_destroy): new function
485 (geis_ref): new function
486 (geis_unref): new function
487 (geis_delete): used new functions
488 * libutouch-geis/geis_class.c (geis_gesture_class_ref): used new atomics
489 (geis_gesture_class_unref): same
490 * libutouch-geis/geis_device.c (geis_device_ref): used new atomics
491 (geis_device_unref): same
492 * libutouch-geis/geis_filter.c (geis_filter_ref): used new atomics
493 (geis_filter_unref): same
494 (geis_filter_bag_insert): moved ref call to after all possible errors
495 * libutouch-geis/geis_filter.h (geis_filter_ref): changed return type
496 * libutouch-geis/geis_filter_term.c (struct _GeisFilterTerm): added refcount
497 (geis_filter_term_ref): new function
498 (geis_filter_term_unref): new function
499 (geis_filter_term_new): called geis_filter_term_ref
500 (geis_filter_term_delete): made static and renamed _filter_term_destroy
501 * libutouch-geis/geis_filter_term.h: prototyped new functions
502 * libutouch-geis/geis_private.h: prototyped new functions
503 * libutouch-geis/geis_region.c: used new atomics
504 * libutouch-geis/geis_subscription.c (_subscription_ref): new static function
505 (_subscription_unref): new static function
506 (geis_subscription_bag_empty): new function
507 (geis_subscription_bag_new): used new function
508 (geis_subscription_bag_delete): used new function
509 (geis_subscription_bag_remov): used new function
510 * libutouch-geis/geis_subscription.h: prototyped new functions
511
512 2011-02-11 Stephen M. Webb <stephen.webb@canonical.com>
513
514 Implemented class and device filters properly.
515
516 * libutouch-geis/backend/xcb/geis_xcb_backend.c (struct _XcbGestureSub):
517 added new fields
518 (_translate_class_filter_to_xcb): removed function
519 (_translate_device_term_to_xcb): new function
520 (_translate_class_term_to_xcb): new function
521 (_translate_filter_to_xcb): new function
522 (_subscribe): replaced old functions with new, restructired filter loop
523 * libutouch-geis/backend/xcb/grail_gestures.c: silenced compiler warnings
524 * libutouch-geis/geis_filter.c: replace by_facility functions
525 * libutouch-geis/geis_filter.h: same
526 * libutouch-geis/geis_filter_term.c: same
527 * libutouch-geis/geis_filter_term.h: same
528 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c:
529 replaced filter by_facility calls.
530
531 2011-02-09 Stephen M. Webb <stephen.webb@canonical.com>
532
533 Fixed a memory allocation problem during error reporting.
534
535 * libutouch-geis/geis_error.c (geis_error_stack_push): fixed realloc size
536
537 2011-02-05 Stephen M. Webb <stephen.webb@canonical.com>
538
539 Fixed a memory leak in the XCB back end.
540
541 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_xcb_dispatch): freed XCB
542 event
543
544 2011-02-04 Stephen M. Webb <stephen.webb@canonical.com>
545
546 Reimplement GEIS v1.0 on top of GEIS v2.0, Part III (touch attrs).
547
548 * include/geis/geis.h (GEIS_TOUCH_ATTRIBUTE_ID): new symbol
549 (GEIS_TOUCH_ATTRIBUTE_X): new symbol
550 (GEIS_TOUCH_ATTRIBUTE_Y): new symbol
551 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
552 added touch mapping
553 * libutouch-geis/geis_v1.c (_map_frame_to_attrs): mapped touches into
554 gesture attrs
555
556 2011-02-02 Stephen M. Webb <stephen.webb@canonical.com>
557
558 Reimplement GEIS v1.0 on top of GEIS v2.0, Part II (gesture attrs).
559
560 * libutouch-geis/backend/xcb/grail_gestures.h
561 (geis_xcb_backend_map_grail_attrs): new function
562 * libutouch-geis/backend/xcb/grail_gestures.c: implemented it
563 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
564 called it
565 * libutouch-geis/geis_attr.c: fixed a memory leak
566 * libutouch-geis/geis_v1.c (_map_frame_to_attrs): new function
567 (_v1_event_callback): called it
568
569 2011-01-31 Stephen M. Webb <stephen.webb@canonical.com>
570
571 Reimplement GEIS v1.0 on top of GEIS v2.0, Part I (basic gesture events).
572
573 * libutouch-geis/geis_v1.c: new file
574 * configure.ac: removed refs to libutouch-geis-xcb and testsuite/geis1
575 * libutouch-geis/Makefile.am: removed refs to libutouch-geis-xcb
576 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
577 added basic group, frame, and touch attrs to gesture events
578 * testsuite/Makefile.am: removed refs to testsuite/geis1
579
580 2011-01-28 Stephen M. Webb <stephen.webb@canonical.com>
581
582 Implemented basic gesture subscriptions through the XCB back end.
583
584 * libutouch-geis/backend/xcb/geis_xcb_backend.c (struct _XcbGestureSub): new
585 (_dispatch_gesture): new function
586 (_xcb_dispatch): called it
587 (_subscribe): initialized XcbGestureSub
588 (_unsubscribe): destroyed XcbGestureSub
589 * libutouch-geis/backend/xcb/grail_gestures.h
590 (geis_xcb_backend_primitive_class): new function
591 (geis_xcb_backend_touch_count): implemented new functions
592 * libutouch-geis/geis_subscription.h (geis_subscription_pdata): new function
593 (geis_subscription_set_pdata): new function
594 * libutouch-geis/geis_subscription.c: implemented new functions
595
596 2011-01-27 Stephen M. Webb <stephen.webb@canonical.com>
597
598 Added GEIS v2.0 gesture module, part V (refined frame-touch interaction)
599
600 * include/geis/geis.h (GeisTouchId) new type
601 (geis_touchset_touch_by_id(): new function
602 (geis_frame_touchid_count(): renamed from geis_frame_touch_count
603 (geis_frame_touchid): renamed from geis_frame_touch
604 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
605 (_create_gesture_events): called geis_frame_add_touchid
606 * libutouch-geis/geis_frame.c (struct _GeisFrame): added touch fields
607 (geis_frame_new): initialized touch fields
608 (geis_frame_delete): destroyed touch fields
609 * libutouch-geis/geis_frame.h (geis_frame_add_touchid): new fucntion
610 * libutouch-geis/geis_touch.c: implemented new function
611 * libutouch-geis/geis_touch.h (geis_touch_new): changed parameter type
612 * libutouch-geis/libutouch-geis.ver: added/renamed symbols
613 * testsuite/geis2/check_frame.c: expanded test case to include frame-touch
614
615 2011-01-27 Stephen M. Webb <stephen.webb@canonical.com>
616
617 Added GEIS v2.0 gesture module, part IV (frame implementation)
618
619 * libutouch-geis/geis_frame.c: new file
620 * libutouch-geis/geis_frame.h: new file
621 * libutouch-geis/Makefile.am: added new files
622 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
623 (_create_gesture_events): added frame to injected event
624 * libutouch-geis/geis_group.c (struct _GeisGroup): added frameset field
625 (geis_groupset_delete): cleaned out container
626 (geis_group_new): initialized frameset member
627 (geis_group_delete): destroyed frameset member
628 (geis_group_insert_frame): added function implementation
629 (geis_group_frame_count): added function implementation
630 (geis_group_frame): added function implementation
631 (geis_group_reject): added function stub
632 * libutouch-geis/geis_group.h (geis_group_insert_frame): new function
633 * libutouch-geis/geis_touch.c (geis_touchset_delete): cleaned out container
634 (geis_touch_new): initialized attr_bag member
635 (geis_touch_delete): destroyed attr_bag member
636 * testsuite/geis2/check_frame.c: added new checks for frames
637
638 2011-01-27 Stephen M. Webb <stephen.webb@canonical.com>
639
640 Added missing callback registration function.
641
642 * libutouch-geis/geis.c (geis_register_device_callback): implemented function
643
644 2011-01-27 Stephen M. Webb <stephen.webb@canonical.com>
645
646 Added GEIS v2.0 gesture module, part III (touch/touchset implementation)
647
648 * libutouch-geis/geis_touch.c: new file
649 * libutouch-geis/geis_touch.h: new file
650 * libutouch-geis/Makefile.am: added new files
651 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
652 (_create_gesture_events): added touch set to injected event
653 * testsuite/geis2/check_frame.c: added test case
654
655 2011-01-26 Stephen M. Webb <stephen.webb@canonical.com>
656
657 Added GEIS v2.0 gesture module, part II (group/groupset implementation)
658
659 * libutouch-geis/geis_group.c: new file
660 * libutouch-geis/geis_group.h: new file
661 * libutouch-geis/Makefile.am: added new files
662 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
663 (_create_gesture_events): new function
664 (geis_backend_new_test_fixture): called it
665 * testsuite/geis2/check_class.c(receive_events): allowed for multiple events
666 * testsuite/geis2/check_device.c(receive_events): allowed for multiple events
667 * testsuite/geis2/check_frame.c (receive_events): new test case
668 * testsuite/geis2/check_subscription.c (receive_events): fixed leak
669
670 2011-01-25 Stephen M. Webb <stephen.webb@canonical.com>
671
672 Added GEIS v2.0 gesture module, part I (public API).
673
674 * testsuite/geis2/check_frame.c: new test suite
675 * include/geis/geis.h (GeisGroup): new type
676 (GeisGroupSet): new type
677 (GeisTouch): new type
678 (GeisTouchSet): new type
679 (GeisFrame): new type
680 (GEIS_EVENT_ATTRIBUTE_GROUPSET): new symbol
681 (GEIS_EVENT_ATTRIBUTE_TOUCHSET): new symbol
682 (geis_groupset_group_count): new function
683 (geis_groupset_group): new function
684 (geis_group_id): new function
685 (geis_group_frame_count): new function
686 (geis_group_frame): new function
687 (geis_group_reject): new function
688 (geis_touchset_touch_count): new function
689 (geis_touchset_touch): new function
690 (geis_touch_id): new function
691 (geis_touch_attr_count): new function
692 (geis_touch_attr): new function
693 (geis_touch_attr_by_name): new function
694 (geis_frame_id): new function
695 (geis_frame_is_class): new function
696 (geis_frame_attr_count): new function
697 (geis_frame_attr): new function
698 (geis_frame_attr_by_name): new function
699 (geis_frame_matrix): new function
700 (geis_frame_touch_count): new function
701 (geis_frame_touch): new function
702 (geis_gesture_reject): new function
703 * libutouch-geis/libutouch-geis.ver: added new symbols
704 * testsuite/geis2/Makefile.am: added new test suite file
705 * testsuite/geis2/check_geis2_api.c: referenced new test suite
706
707 2011-01-10 Stephen M. Webb <stephen.webb@canonical.com>
708
709 Added gesture class events to XCB back end.
710
711 * libutouch-geis/backend/xcb/grail_gestures.c: new file
712 * libutouch-geis/backend/xcb/grail_gestures.h: new file
713 * libutouch-geis/backend/xcb/Makefile.am: added new files
714 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_report_xcb_devices): new
715 (_report_grail_glasses): new
716 (geis_xcb_backend_new: called new functions
717
7182011-01-07 Stephen M. Webb <stephen.webb@canonical.com>
719
720 Added XCB back end convenience library.
721
722 * libutouch-geis/backend/xcb/geis_xcb_backend.c: new file
723 * libutouch-geis/backend/xcb/geis_xcb_backend.h: new file
724 * libutouch-geis/backend/xcb/Makefile.am: added rules for new library
725 * include/geis/geis.h (GEIS_INIT_UTOUCH_XCB): new init arg symbol
726 * libutouch-geis/geis.c: used it
727 * libutouch-geis/Makefile.am: added XCB protocol library
728 * libutouch-geis-xcb/Makefile.am: removed XCB protocol library
729 * testsuite/libutouch-geis/Makefile.am: added XCB runtime libraries
730
7312011-01-07 Stephen M. Webb <stephen.webb@canonical.com>
732
733 Refactored XCB protocol library into a separate convenience lib.
734
735 * libs/Makefile.am: new directory
736 * libs/xcb/Makefile.am: new subproject
737 * libs/xcb/c-client.xsl: renamed from libutouch-geis-xcb/c-client.xsl
738 * libs/xcb/c_client.py: renamed from libutouch-geis-xcb/c_client.py
739 * libs/xcb/xcb_gesture.xml.in: was libutouch-geis-xcb/xcb_gesture.xml.in
740 * Makefile.am: added new subproject
741 * configure.ac: added new subproject
742 * libutouch-geis-xcb/Makefile.am: moved XCB protocol to libs/xcb subproject
743
7442011-01-07 Stephen M. Webb <stephen.webb@canonical.com>
745
746 Added XCB back end subproject to libutouch-geis.
747
748 * libutouch-geis/backend/xcb: new subproject
749 * libutouch-geis/backend/xcb/Makefile.am: new file.
750 * Makefile.am: updated copyright
751 * configure.ac: added new subproject
752 * libutouch-geis/backend/Makefile.am: added new subproject
753
7542011-01-06 Stephen M. Webb <stephen.webb@canonical.com>
755
756 Added Geis v2.0 gesture class implementation (part 2, utouch internals)
757
758 * testsuite/libutouch-geis/check_class.c: new test suite
759 * include/geis/geis.h: fixed GEIS_FILTER_CLASS
760 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
761 (_create_test_classes): new function
762 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.h
763 (geis_backend_new_test_fixture): added track_classes parameter
764 * libutouch-geis/geis.c (struct _Geis): added new fields
765 (_class_event_handler): implemented event handling
766 (geis_new_empty): initialized new fields
767 (_set_valist): handled GEIS_INIT_TRACK_GESTURE_CLASSES
768 (geis_get_class_attr_type): new function
769 * libutouch-geis/geis_class.h (GeisGestureClassBag): new data structure
770 (geis_gesture_class_bag_new): new function
771 (geis_gesture_class_bag_delete): new function
772 (geis_gesture_class_bag_count): new function
773 (geis_gesture_class_bag_gesture_class): new function
774 (geis_gesture_class_bag_insert): new function
775 (geis_gesture_class_bag_remove): new function
776 * libutouch-geis/geis_class.c: implemented above new functions
777 * libutouch-geis/geis_filter.c (_facility_is_valid): fixed facility name
778 * libutouch-geis/geis_private.h (geis_get_class_attr_type): new function
779 * testsuite/geis2/check_filter.c: fixed facility name
780 * testsuite/geis2/check_subscription.c: added check for class subscription
781 * testsuite/libutouch-geis/Makefile.am: added new test suite file
782 * testsuite/libutouch-geis/check_geis2_internals.c: called new test suite
783
7842011-01-06 Stephen M. Webb <stephen.webb@canonical.com>
785
786 Added Geis v2.0 gesture class implementation (part 1, basic API)
787
788 * libutouch-geis/geis_class.c: new file
789 * libutouch-geis/geis_class.h: new file
790 * libutouch-geis/Makefile.am: added new source files
791 * libutouch-geis/geis.c (struct _Geis): added new class callback fields
792 (_class_event_handler): new function
793 (_input_event_handler): added case for gesture class events
794 (geis_register_class_callback): implemented function
795 * include/geis/geis.h (geis_gesture_class_ref): adjusted return type
796 (geis_gesture_class_unref): same
797
7982011-01-06 Stephen M. Webb <stephen.webb@canonical.com>
799
800 Added GEIS v2.0 gesture class API
801
802 * testsuite/geis2/check_class.c: new test suite
803 * include/geis/geis.h (GEIS_INIT_TRACK_GESTURE_CLASSES): new init ath
804 (GEIS_EVENT_CLASS_AVAILABLE): new event type
805 (GEIS_EVENT_CLASS_CHANGED): new event type
806 (GEIS_EVENT_CLASS_UNAVAILABLE): new event type
807 (GeisGestureClass): new opaque type
808 (GEIS_CLASS_ATTRIBUTE_NAME): new attribute name
809 (GEIS_CLASS_ATTRIBUTE_ID): new attribute name
810 (GEIS_EVENT_ATTRIBUTE_CLASS): new attribute name
811 (geis_register_class_callback): new function
812 (geis_gesture_class_ref): new function
813 (geis_gesture_class_unref): new function
814 (geis_gesture_class_name): new function
815 (geis_gesture_class_id): new function
816 (geis_gesture_class_attr_count): new function
817 (geis_gesture_class_attr): new function
818 * libutouch-geis/libutouch-geis.ver: added new exported symbols
819 * testsuite/geis2/Makefile.am: build new test suite
820 * testsuite/geis2/check_event.c: changed event type names
821 * testsuite/geis2/check_geis2_api.c: used new test suite
822 * testsuite/geis2/check_geis_new.c: changed init constant names
823
8242011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
825
826 Minor tweaks.
827
828 * include/geis/geis.h: fixed typos in comments
829 (GEIS_DEVICE_ATTRIBUTE_NAME): new constant
830 * libutouch-geis/geis_device.c: used new constant instead of hard-coded string
831 * testsuite/geis2/check_subscription.c: same
832
8332011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
834
835 Added GEIS v2.0 filter implementation (part 4, device subscription)
836
837 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
838 (_subscription): add debug output to the test fixture
839 * libutouch-geis/geis_device.c: made name an attr for filtering on
840 * libutouch-geis/geis_filter.h
841 (geis_filter_term_by_facility_count): new function
842 (geis_filter_term_by_facility): new function
843 * libutouch-geis/geis_filter.c: implemented the above new functions
844 * libutouch-geis/geis_subscription.h
845 (geis_subscription_filter_count): new function
846 (geis_subscription_filter): new function
847 * libutouch-geis/geis_subscription.c: implemented the above new functions
848 * testsuite/geis2/check_subscription.c (device_filter): new test case
849
8502011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
851
852 Added group test for back end device creation.
853
854 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
855 (_create_test_devices): new function
856 (geis_backend_new_test_fixture): used it
857 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.h
858 (geis_backend_new_test_fixture): added track_devices parameter
859 * libutouch-geis/geis.c (_set_valist): refactored to propagate init args
860 * testsuite/geis2/check_device.c: new test case
861
8622011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
863
864 Marked missing geis_event_* symbols as exported.
865
866 * libutouch-geis/libutouch-geis.ver (geis_event_attr): exported
867 (geis_event_attr_by_name): exported
868 (geis_event_attr_count): exported
869 (geis_event_delete): exported
870 (geis_event_type): exported
871
8722011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
873
874 Moved back end test fixture into a subproject.
875
876 * libutouch-geis/backend/test_fixture: new subproject
877 * libutouch-geis/backend/test_fixture/Makefile.am: new file
878 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c: renamed
879 from libutouch-geis/geis_backend_test_fixture.c
880 * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.h: renamed
881 from libutouch-geis/geis_backend_test_fixture.h
882 * configure.ac (AC_OUTPUT): added libutouch-geis/backend/test_fixture/Makefile
883 * libutouch-geis/Makefile.am: linked in new subproject
884 * libutouch-geis/backend/Makefile.am: added new subproject
885 * libutouch-geis/geis.c: changed header qualification
886
8872011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
888
889 Added device cacheing.
890
891 * libutouch-geis/geis_private.h (geis_get_device_attr_type): new function
892 * libutouch-geis/geis.c (struct _Geis): added devices field
893 (_device_event_handler): new function
894 (_input_event_handler): dispatched BE device events
895 (geis_new_empty): initialized devices field
896 (geis_new_delete): destroyed devices field
897 * libutouch-geis/geis_filter.c (_get_attr_type_for_facility): implemented for
898 the device facility
899
9002011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
901
902 Fixed failure-mode return value from geis_filter_term_bag_new
903
904 * libutouch-geis/geis_filter_term.c (geis_filter_term_bag_new): returned
905 NULL on failure
906
9072011-01-05 Stephen M. Webb <stephen.webb@canonical.com>
908
909 Added missing geis_attr_value_to_pointer.
910
911 * libutouch-geis/geis_attr.c (geis_attr_value_to_pointer): new function
912 (geis_attr_value_to_string): added case to handle GEIS_ATTR_TYPE_POINTER
913
9142011-01-03 Stephen M. Webb <stephen.webb@canonical.com>
915
916 Added GEIS v2.0 filter implementation (part 3, filter terms)
917
918 * libutouch-geis/geis_filter_term.c: new file
919 * libutouch-geis/geis_filter_term.h: new file
920 * include/geis/geis.h (GeisFilterOperation): fixed typo
921 * libutouch-geis/Makefile.am: added new files
922 * libutouch-geis/geis_filter.c (geis_filter_add_term): implemented function
923 (_facility_is_valid): new function
924 (_operation_is_valid): new function
925 (_get_attr_for_facility): new function
926
9272011-01-01 Stephen M. Webb <stephen.webb@canonical.com>
928
929 Added GEIS v2.0 filter implementation (part 2)
930
931 * libutouch-geis/geis_filter.c: fixed refcounting on bag insertion
932 * libutouch-geis/geis_subscription.c
933 (geis_subscription_add_filter): implemented stubbed-out function
934 (geis_subscription_remove_filter): implemented stubbed-out function
935 * testsuite/geis2/check_subscription.c: new test case
936
9372010-12-20 Stephen M. Webb <stephen.webb@canonical.com>
938
939 Added GEIS v2.0 filter implementation (part 1)
940
941 * testsuite/libutouch-geis/check_filter.c: new test suite
942 * libutouch-geis/geis_filter.h (GeisFilterBag): new data structure
943 (geis_filter_bag_new): new function
944 (geis_filter_bag_delete): new function
945 (geis_filter_bag_count): new function
946 (geis_filter_bag_filter): new function
947 (geis_filter_bag_insert): new function
948 (geis_filter_bag_remove): new function
949 (geis_filter_ref): new function
950 (geis_filter_unref): new function
951 * libutouch-geis/geis_filter.c: implemented new functions
952 * testsuite/libutouch-geis/Makefile.am: added new test suite
953 * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
954
9552010-12-29 Stephen M. Webb <stephen.webb@canonical.com>
956
957 Added GEIS v2.0 filter API
958
959 * libutouch-geis/geis_filter.c: new file
960 * libutouch-geis/geis_filter.h: new file
961 * testsuite/geis2/check_filter.c: new test suite
962 * include/geis/geis.h (GeisFilter): new type
963 (GeisFilterFacility): new enumeration
964 (GeisFilterOperation): new enumeration
965 (gei_filter_new): new function
966 (geis_filter_delete): new function
967 (geis_filter_name): new function
968 (geis_filter_add_term): new function
969 * libutouch-geis/Makefile.am: added new files
970 * libutouch-geis/libutouch-geis.ver: added new symbols
971 * testsuite/geis2/Makefile.am: added new test suite
972 * testsuite/geis2/check_geis2_api.c: added new test suite
973
9742010-12-29 Stephen M. Webb <stephen.webb@canonical.com>
975
976 Added backend subdirectory to libutouch-geis.
977
978 * libutouch-geis/backend/Makefile.am: new file
979 * configure.ac (AC_OUTPUT): added libutouch-geis/backend/Makefile
980 * libutouch-geis/Makefile.am (SUBDORS): added backend
981
9822010-12-29 Stephen M. Webb <stephen.webb@canonical.com>
983
984 Moved geis/geisimpl.h into GEIS v2.0 sources.
985
986 * libutouch-geis/geis/geisimple.h: renamed from libutouch-geis-xcb/geis
987 * libutouch-geis-xcb/Makefile.am: changed header search path
988 * libutouch-geis/Makefile.am: changed header search path
989 * testsuite/geis1/Makefile.am: changed header search path
990 * testsuite/geis2/Makefile.am: changed header search path
991 * testsuite/geistest/Makefile.am: changed header search path
992 * testsuite/libutouch-geis/Makefile.am: changed header search path
993
9942010-12-20 Stephen M. Webb <stephen.webb@canonical.com>
995
996 Added GEIS v2.0 input device implementation.
997
998 * libutouch-geis/geis_device.h (GeisDeviceBag): new type
999 (geis_device_bag_new): new function
1000 (geis_device_bag_delete): new function
1001 (geis_device_bag_count): new function
1002 (geis_device_bag_device): new function
1003 (geis_device_bag_insert): new function
1004 (geis_device_bag_remove): new function
1005 * libutouch-geis/geis_device.c: implemented new functions
1006 * testsuite/libutouch-geis/check_device.c: new test suite
1007 * testsuite/libutouch-geis/Makefile.am: added new test suite
1008 * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
1009
10102010-12-20 Stephen M. Webb <stephen.webb@canonical.com>
1011
1012 Added GEIS v2.0 input device API
1013
1014 * libutouch-geis/geis_device.c: new file
1015 * libutouch-geis/geis_device.h: new file
1016 * testsuite/geis2/check_device.c: new test suite
1017 * include/geis/geis.h (GeisDevice): new type
1018 (geis_register_device_callback): new function
1019 (geis_device_ref): new function
1020 (geis_device_unref): new function
1021 (geis_device_name): new function
1022 (geis_device_id): new function
1023 (geis_device_attr_count): new function
1024 (geis_device_attr): new function
1025 * libutouch-geis/Makefile.am: added new files
1026 * libutouch-geis/libutouch-geis.ver: added new API symbols
1027 * testsuite/geis2/Makefile.am: added new test suite
1028 * testsuite/geis2/check_geis2_api.c: added new test suite
1029
10302010-12-20 Stephen M. Webb <stephen.webb@canonical.com>
1031
1032 Updates to match new GEIS v2.0 spec release of 2010.12.20.
1033 - added a pointer type to the GEIS attr module
1034 - added additional required GEIS initialization arguments
1035 - event type enumarant name changes
1036
1037 * testsuite/geis2/check_attr.c: new test suite
1038 * testsuite/geis2/check_event.c: new test suite
1039 * include/geis/geis.h (GEIS_INIT_TRACK_DEVICES): new init arg
1040 (GEIS_INIT_TRACK_GESTURE_TYPES): new init arg
1041 (GeisAttrType): added GEIS_ATTR_TYPE_POINTER enumerant
1042 (geis_attr_value_to_pointer): new function
1043 (GeisEventType): added new enumerants
1044 * libutouch-geis-xcb/geis/geisimpl.h: added GeisPointer type
1045 * libutouch-geis/Makefile.am: added libutouch-geis-xcb to header search path
1046 * libutouch-geis/libutouch-geis.ver (geis_attr_value_to_pointer): new symbol
1047 * testsuite/geis2/Makefile.am: added new test suites
1048 * testsuite/geis2/check_geis2_api.c: added new test suites
1049 * testsuite/geis2/check_geis_new.c: added new test case for init args
1050 * testsuite/geis2/check_general_types.c: added new test case fo GeisPointer
1051 * testsuite/geistest/Makefile.am: added libutouch-geis-xcb to header search path
1052 * testsuite/libutouch-geis/Makefile.am: same
1053 * testsuite/libutouch-geis/check_event_queue.c: changed name of event types
1054 * testsuite/libutouch-geis/check_geis_private.c: changed name of event types
1055
10562010-12-15 Stephen M. Webb <stephen.webb@canonical.com>
1057
1058 Added GEIS v2.0 region module.
1059
1060 * libutouch-geis/geis_region.c: new file
1061 * libutouch-geis/geis_region.h: new file
1062 * testsuite/geis2/check_region.c: new test suite
1063 * testsuite/libutouch-geis/check_region.c: new test suite
1064 * include/geis/geis.h (GeisRegion): new typedef
1065 (GEIS_REGION_X11_ROOT): new region initialization constant
1066 (GEIS_REGION_X11_WINDOWID): new region initialization constant
1067 (geis_region_new): new function
1068 (geis_region_delete): new function
1069 (geis_region_name): new function
1070 * libutouch-geis/Makefile.am: added new files
1071 * libutouch-geis/libutouch-geis.ver: added new symbols
1072 * testsuite/geis2/Makefile.am: added new test suite files
1073 * testsuite/geis2/check_geis2_api.c: added new test suite
1074 * testsuite/libutouch-geis/Makefile.am: added new test suite files
1075 * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
1076
10772010-12-12 Stephen M. Webb <stephen.webb@canonical.com>
1078
1079 Fixed some container expansion errors.
1080
1081 * libutouch-geis/geis_attr.c (geis_attr_bag_insert): fixed realloc size
1082 * libutouch-geis/geis_subscription.c (geis_subscription_bag_insert):
1083 fixed realloc size, cleared newly realloc'd memory
1084 * testsuite/libutouch-geis/check_attr.c (expansion): new check
1085 * testsuite/libutouch-geis/check_subscription.c (expansion): new check
1086
10872010-12-12 Stephen M. Webb <stephen.webb@canonical.com>
1088
1089 Added GEIS v2.0 subscription activation calls.
1090
1091 * include/geis/geis.h (geis_subscription_activate): new function
1092 (geis_subscription_deactivate): new function
1093 * libutouch-geis/geis_subscription.c: implemented above new functions
1094 * libutouch-geis/geis_backend.h (geis_backend_subscribe) new function
1095 (geis_backend_unsubscribe): new function
1096 * libutouch-geis/geis_backend.c: implemented above new functions
1097 * libutouch-geis/geis_backend_protected.h (GeisBackendVtable): added new
1098 subscribe and unsubscribe function pointers
1099 * libutouch-geis/geis_backend_test_fixture.c (_subscribe): new vfunction
1100 (_unsubscribe): new vfunction
1101 * libutouch-geis/geis_private.h (geis_activate_subscription): new function
1102 (geis_deactivate_subscription): new function
1103 * libutouch-geis/geis.c: implemented above new functions
1104 * libutouch-geis/geis_subscription.h: fixed a typo in a prototype
1105 * libutouch-geis/libutouch-geis.ver: added new GEIS v2.0 symbols
1106 * testsuite/geis2/check_subscription.c: new test cases
1107
11082010-12-12 Stephen M. Webb <stephen.webb@canonical.com>
1109
1110 Added forwarding functions so back ends can multiplex file descriptors through
1111 the API.
1112
1113 * libutouch-geis/geis_private.h (geis_multiplex_fd): new function
1114 (geis_demultiplex_fd): new function
1115 * libutouch-geis/geis.c: implemented above new functions
1116 * testsuite/libutouch-geis/check_geis_private.c:
1117 renamed from check_backend_event_posting.c
1118 (multiplex_fd): new test case
1119 * testsuite/libutouch-geis/Makefile.am: renamed above file
1120 * testsuite/libutouch-geis/check_backend_multiplexor.c: removed debug message
1121 silenced build warnings
1122
11232010-12-08 Stephen M. Webb <stephen.webb@canonical.com>
1124
1125 Refactored event queue style.
1126
1127 * libutouch-geis/geis_event_queue.h (geis_event_queue_enqueue): renamed from
1128 geis_event_queue_push
1129 (geis_event_queue_dequeue): renamed from geis_event_queue_pop
1130 changed event output parameter to return value
1131 * libutouch-geis/geis_event_queue.c: refactored for above
1132 * libutouch-geis/geis.c: refactored for above
1133 * testsuite/libutouch-geis/check_event_queue.c: refactored for above
1134
1135
11362010-12-08 Stephen M. Webb <stephen.webb@canonical.com>
1137
1138 Added an event queue.
1139
1140 * libutouch-geis/geis_event.c: new file
1141 * libutouch-geis/geis_event.h: new file
1142 * libutouch-geis/geis_event_queue.c: new file
1143 * libutouch-geis/geis_event_queue.h: new file
1144 * testsuite/libutouch-geis/check_backend_event_posting.c: new test case
1145 * testsuite/libutouch-geis/check_event_queue.c: new test case
1146 * include/geis/geis.h (GeisEventType): new enum type
1147 (geis_event_delete): new function
1148 (geis_event_type): new function
1149 (geis_event_attr_count): new function
1150 (geis_event_attr): new function
1151 (geis_event_attr_by_name): new function
1152 * libutouch-geis/Makefile.am: added new files
1153 * libutouch-geis/geis.c (struct _Geis): added input_event_queue,
1154 output_event_queue, and input_signal_pipe members
1155 (_default_output_event_callback): new function
1156 (_input_event_handler): new function
1157 (geis_new_empty): initialized new members
1158 (geis_register_event_callback): used _default_output_event_callback
1159 (geis_next_event): implemented stubbed-out function
1160 * testsuite/libutouch-geis/Makefile.am: added new test cases
1161 * testsuite/libutouch-geis/check_geis2_internals.c: added new test cases
1162
1163
11642010-12-02 Stephen M. Webb <stephen.webb@canonical.com>
1165
1166 Added GEIS v2.0 event control functions.
1167
1168 * include/geis/geis.h (GeisEvent): new type
1169 (GeisEventCallback): new type
1170 (GEIS_DEFAULT_EVENT_CALLBACK): new constant
1171 (geis_register_event_callback): new function
1172 (geis_dispatch_events): new function
1173 (geis_next_event): new function
1174 * libutouch-geis/geis_private.h (geis_post_event): new function
1175 * libutouch-geis/geis.c: implemented new functions
1176 * libutouch-geis/libutouch-geis.ver: added new symbols
1177
11782010-12-02 Stephen M. Webb <stephen.webb@canonical.com>
1179
1180 Added a back end base and test fixture.
1181
1182 * libutouch-geis/geis_backend.c: new file
1183 * libutouch-geis/geis_backend.h: new file
1184 * libutouch-geis/geis_backend_protected.h: new file
1185 * libutouch-geis/geis_backend_test_fixture.c: new file
1186 * libutouch-geis/geis_backend_test_fixture.h: new file
1187 * include/geis/geis.h (GEIS_INIT_SERVICE_PROVIDER): changed constant value
1188 (GEIS_INIT_UTOUCH_MOCK_ENGINE): added new constant
1189 * libutouch-geis/Makefile.am: added new files
1190 * libutouch-geis/geis.c (struct _Geis): replaced is_test_fixture with backend
1191 (geis_set_valist): created new test fixture backend
1192 (geis_delete): destroyed backend
1193 * testsuite/geis2/check_config.c: used new name for test fixture back end
1194 * testsuite/geis2/check_geis_new.c: same
1195 * testsuite/geis2/check_subscription.c: idem
1196 * testsuite/libutouch-geis/check_subscription.c: ditto
1197
11982010-12-02 Stephen M. Webb <stephen.webb@canonical.com>
1199
1200 Added a back end multiplexor.
1201
1202 * libutouch-geis/geis_backend_multiplexor.c: new file
1203 * libutouch-geis/geis_backend_multiplexor.h: new file
1204 * testsuite/libutouch-geis/check_backend_multiplexor.c: new testsuite
1205 * include/geis/geis.h (GeisStatus): added new status codes
1206 GEIS_STATUS_CONTINUE and GEIS_STATUS_EMPTY
1207 (GEIS_CONFIG_UTOUCH_MAX_EVENTS): new configuration item
1208 * libutouch-geis/Makefile.am: added new files
1209 * libutouch-geis/geis.c (struct _Geis): added backend_multiplexor field
1210 (geis_new_empty): initialized it
1211 (geis_delete): destroyed it
1212 (geis_get_configuration): retrieved its file descriptor and config value
1213 (geis_set_configuration): set its configuration value
1214 * testsuite/geis2/check_error_codes.c: checked new status codes
1215 * testsuite/libutouch-geis/Makefile.am
1216 * testsuite/libutouch-geis/check_geis2_internals.c
1217
12182010-11-29 Stephen M. Webb <stephen.webb@canonical.com>
1219
1220 Refactored geis_private.h to provide improved data encapsulation.
1221
1222 * libutouch-geis/geis_private.h (struct _Geis): moved to geis.c
1223 (geis_error_stack): new function
1224 * libutouch-geis/geis.c: implemented new function
1225 * libutouch-geis/geis_error.c: used new function
1226
12272010-11-29 Stephen M. Webb <stephen.webb@canonical.com>
1228
1229 Fixed a typo in the Doxygen comments in geis.h.
1230
1231 * include/geis/geis.h: fixed typo in documentation
1232
12332010-11-28 Stephen M. Webb <stephen.webb@canonical.com>
1234
1235 Added Geis Subscription creation and accessors.
1236
1237 * libutouch-geis/geis_subscription.c: new file
1238 * libutouch-geis/geis_subscription.h: new file
1239 * testsuite/geis2/check_subscription.c: new API test suite
1240 * testsuite/libutouch-geis/check_subscription.c: new internals test suite
1241 * include/geis/geis.h (GeisFilter): new type
1242 (GeisSubscription): new type
1243 (GeisSubscriptionFlags): new type
1244 (geis_subscription_new): new function
1245 (geis_subscription_delete): new function
1246 (geis_subscription_name): new function
1247 (geis_subscription_id): new function
1248 (geis_subscription_add_filter): new function
1249 (geis_subscription_remove_filter): new function
1250 * libutouch-geis/Makefile.am: added new files
1251 * libutouch-geis/geis_private.h (geis_subscription_bag): new function
1252 (struct _Geis): added subscription_bag field
1253 * libutouch-geis/geis.c (geis_subscription_bag): implemented it
1254 (geis_new_empty): created an empty subscription bag
1255 * libutouch-geis/libutouch-geis.ver: added new geis_subscription_* symbols
1256 * testsuite/geis2/Makefile.am: added new test suite source
1257 * testsuite/geis2/check_geis2_api.c: added new test suite
1258 * testsuite/libutouch-geis/Makefile.am: added new test suite source
1259 * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
1260
1261
12622010-11-26 Stephen M. Webb <stephen.webb@canonical.com>
1263
1264 Added Geis Attr functions.
1265
1266 * libutouch-geis/geis_attr.c: new file
1267 * libutouch-geis/geis_attr.h: new file
1268 * testsuite/libutouch-geis/check_attr.c: new unit test suite
1269 * include/geis/geis.h (GeisAttr): new type
1270 (geis_attr_name): new function
1271 (geis_attr_type): new function
1272 (geis_attr_value_to_boolean): new function
1273 (geis_attr_value_to_float): new function
1274 (geis_attr_value_to_integer): new function
1275 (geis_attr_value_to_string): new function
1276 * libutouch-geis/Makefile.am: added new files
1277 * libutouch-geis/libutouch-geis.ver: added new symbols
1278 * testsuite/libutouch-geis/Makefile.am: added new test suite
1279 * testsuite/libutouch-geis/check_error_reporting.c: renamed test suite
1280 * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
1281
12822010-11-24 Stephen M. Webb <stephen.webb@canonical.com>
1283
1284 Added Geis configuration functions.
1285
1286 * include/geis/geis.h (geis_get_config): new function
1287 (geis_set_config): new function
1288 * libutouch-geis/geis.c: added stubs for new functions
1289 * libutouch-geis/libutouch-geis.ver: added symbols for new functions
1290 * testsuite/geis2/check_config.c: new test suite for new functions
1291 * testsuite/geis2/Makefile.am: added above new file
1292
12932010-11-24 Stephen M. Webb <stephen.webb@canonical.com>
1294
1295 Added silent rules to build.
1296
1297 * configure.ac (AM_INIT_AUTOMAKE): required minimum version 1.11
1298 (AM_SILENT_RULES): new macros to set silent build rules on by default
1299
13002010-11-24 Stephen M. Webb <stephen.webb@canonical.com>
1301
1302 Fixed a "make distcheck" problem.
1303
1304 * testsuite/libutouch-geis/Makefile.am (check_geis2_internals_CFLAGS): added
1305 $(top_srcdir) to the header search path
1306
13072010-11-24 Stephen M. Webb <stephen.webb@canonical.com>
1308
1309 Added unit testing for uTouch GEIS v2.0 internals.
1310
1311 * testsuite/libutouch-geis: new subdirectory
1312 * testsuite/libutouch-geis/Makefile.am: new file
1313 * testsuite/libutouch-geis/check_error_reporting.c: new file
1314 * testsuite/libutouch-geis/check_geis2_internals.c: new file
1315 * configure.ac (AC_OUTPUT): added new Makefile
1316 * testsuite/Makefile.am (SUBDIRS): added new subdirectory
1317 * testsuite/geis1/check_geis_internals.c: renamed test suite
1318 * testsuite/geis2/check_geis2_api.c: renamed test suite
1319
13202010-11-23 Stephen M. Webb <stephen.webb@canonical.com>
1321
1322 Added Error Reporting functions.
1323
1324 * libutouch-geis/geis_error.c: new file
1325 * libutouch-geis/geis_error.h: new file
1326 * libutouch-geis/geis_private.h: new file
1327 * include/geis/geis.h (geis_error_count): new function
1328 (geis_error_code): new function
1329 (geis_error_message): new function
1330 * libutouch-geis/Makefile.am: added new files
1331 * libutouch-geis/geis.c: used new functions
1332 * libutouch-geis/libutouch-geis.ver: added new function symbols
1333
13342010-11-23 Stephen M. Webb <stephen.webb@canonical.com>
1335
1336 Added diagnostics to geis_new().
1337
1338 * libutouch-geis/geis.c (geis_error): reported calloc failure
1339 (geis_set_valist): added debug diagnostics for init args
1340
13412010-11-23 Stephen M. Webb <stephen.webb@canonical.com>
1342
1343 Moved diagnostic logging from GEIS v1.0 to GEIS v2.0 libraries.
1344
1345 * libutouch-geis/geis_logging.h: renamed from libutouch-geis-xcb/geis_logging.h
1346 * libutouch-geis/geis_logging.c: renamed from libutouch-geis-xcb/geis_logging.c
1347 * libutouch-geis-xcb/Makefile.am: removed above renamed files
1348 * libutouch-geis/Makefile.am: added above renamed files
1349 * testsuite/geis1/Makefile.am: changed library path
1350 * testsuite/geistest/Makefile.am: changed library path
1351
13522010-11-23 Stephen M. Webb <stephen.webb@canonical.com>
1353
1354 Merged GEIS v1.0 into GEIS v2.0 library for backwards compatibility.
1355
1356 * libutouch-geis-xcb/libutouch-geis-xcb.ver: removed
1357 * libutouch-geis-xcb/Makefile.am: converted to build a convenience lib
1358 * libutouch-geis/Makefile.am: added libutouch-geis-xcb as a conveniemnce lib
1359 * libutouch-geis/libutouch-geis.ver: Added GEIS v1.0 symbols
1360 * testsuite/geis2/Makefile.am: fixed path to shared library in build tree
1361
13622010-11-22 Stephen M. Webb <stephen.webb@canonical.com>
1363
1364 Refactored API initialization to use variadic arguments a la spec change.
1365
1366 * include/geis/geis.h (geis_new): changed function prototype
1367 * libutouch-geis/geis.c (geis_new_empty): new function
1368 (geis_set_valist): new function
1369 (geis_new): changed parameters, used new functions
1370 * testsuite/geis2/check_geis_new.c (geis_new_and_delete): changed geis_new()
1371 arguments
1372
13732010-11-22 Stephen M. Webb <stephen.webb@canonical.com>
1374
1375 Fixed visibility of new GEIS 2.0 symbols.
1376
1377 * include/geis/geis.h (geis_new): fixed visibility
1378 (geis_delete): same
1379
13802010-11-22 Stephen M. Webb <stephen.webb@canonical.com>
1381
1382 Made geis2_geis_new test case pass.
1383
1384 * libutouch-geis/geis.c (geis_hints_find_by_id): new static function
1385 (geis_hints_append): new static function
1386 (geis_new): used them, malloc'd struct _Geis
1387 (geis_delete): free'd struct _Geis
1388
13892010-11-22 Stephen M. Webb <stephen.webb@canonical.com>
1390
1391 Added test case for GEIS v2.0 geis_new() and geis_delete() functions, together
1392 with a skeletal implementation of the libutouch-geis v2.0 library.
1393
1394 * libutouch-geis: new source directory
1395 * libutouch-geis/Makefile.am: new build recipe for libutouch-geis v2.0
1396 * libutouch-geis/geis.c: new source file
1397 * libutouch-geis/libutouch-geis.ver: new library version map
1398 * testsuite/geis2/check_geis_new.c: new test suite
1399 * Makefile.am (SUBDIRS): added libutouch-geis
1400 * configure.ac (AC_OUTPUT): added libutouch-geis/Makefile
1401 * include/geis/geis.h (GeisHints): new data structure
1402 (Geis): new opaque data structure
1403 (geis_new): new function
1404 (geis_delete): new function
1405 * testsuite/geis2/Makefile.am (check_geis2_api_SOURCES): added check_geis_new
1406 * testsuite/geis2/check_geis2_api.c (main): added geis_new_suite
1407
14082010-11-21 Stephen M. Webb <stephen.webb@canonical.com>
1409
1410 Added test case for geis v2.0 error codes.
1411
1412 * include/geis/geis.h: added required v2.0 error codes
1413 * testsuite/geis2/check_error_codes.c: new test case
1414 * testsuite/geis2/Makefile.am: added new test case
1415 * testsuite/geis2/check_geis2_api.c: same
1416
14172010-11-20 Stephen M. Webb <stephen.webb@canonical.com>
1418
1419 Added test case for geis v2.0 basic types.
1420
1421 * testsuite/geis2/check_general_types.c: new file
1422 * testsuite/geis2/Makefile.am: added above new file
1423 * testsuite/geis2/check_geis2_api.c (geis2_general_types_suite_new): added new
1424 unit test
1425
14262010-11-19 Stephen M. Webb <stephen.webb@canonical.com>
1427
1428 Added geis v2.0 test hardness and version macro test.
1429
1430 * include/geis/geis.h (GEIS_VERSION_2_0): added macro
1431 * testsuite/geis2/check_geis_api.c: new testsuite.
1432 * testsuite/geis2/check_version_macro.c: added unit test for geis 2.0 version
1433 macro
1434 * testsuite/geis2/Makefile: new file
1435 * configure.ac (AC_OUTPUT): added above enw file
1436 * testsuite/Makefile: added new testsuite directory geis2
1437
14382010-11-12 Stephen M. Webb <stephen.webb@canonical.com>
1439
1440 Made existing unit test directory specific to geis v1.0.
1441
1442 * testsuite/geis1: renamed from testsuite/check
1443 * configure.ac: renamed testsuite/check
1444 * testsuite/Makefile.am: same
1445 * testsuite/geis1/Makefile.am: same
1446
14472010-10-20 Stephen M. Webb <stephen.webb@canonical.com>
1448
1449 Added unit tests for internal geis_instance_table.
1450
1451 * testsuite/check/check_instance_table.c: new file
1452 * testsuite/check/Makefile.am (check_geis_internals_SOURCES): added it
1453 (MOSTLYCLEANFILES): new target to clean up unit test logs
1454 * testsuite/check/check_geis_internals.c (main): added unit test suite
1455
14562010-10-20 Stephen M. Webb <stephen.webb@canonical.com>
1457
1458 Added unit test infrastructure based on 'check'.
1459
1460 * testsuite/check/Makefile.am: new file
1461 * testsuite/check/check_geis_internals.c: new file
1462 * testsuite/Makefile.am (SUBDIRS): added check target
1463 * configure.ac: added new stanza for detecting check package
1464 (AC_CONFIG_FILES): added testsuite/check/Makefile
1465
14662010-10-18 Stephen M. Webb <stephen.webb@canonical.com>
1467
1468 Added configury check for xcb-proto package >= 1.6 (LP: #661946).
1469
1470 * configure.ac: added PKG_CHECK_MODULES for xcb-proto >= 1.6
1471
14722010-10-14 Stephen M. Webb <stephen.webb@canonical.com>
1473
1474 Release version 1.0.13.
1475
1476 * configure.ac (AC_INIT): bumped package version to 1.0.13
1477
14782010-10-12 Stephen M. Webb <stephen.webb@canonical.com>
1479
1480 Removed extra newlines from diagnostic messages
1481
1482 * libutouch-geis-xcb/geis_xcb.c: removed newline from several diagnostic
1483 messages.
1484
14852010-10-07 Stephen M. Webb <stephen.webb@canonical.com>
1486
1487 Fixed LP: #656503 - event dispatch can hang under some circumstances
1488
1489 * libutouch-geis-xcb/geis_xcb.c (geis_xcb_dispatch): changed loop condition
1490 * libutouch-geis-xcb/Makefile.am (libutouch_geis_la_LDFLAGS): bumped library
1491 revision
1492
14932010-09-28 Stephen M. Webb <stephen.webb@canonical.com>
1494
1495 Version bump to 1.0.12.
1496
1497 * configure.ac (AC_INIT): bumped package version to 1.0.12
1498
14992010-09-28 Stephen M. Webb <stephen.webb@canonical.com>
1500
1501 Made lib compatible with C++.
1502
1503 * geis/geis.h: forced C linkage
1504
15052010-09-14 Stephen M. Webb <stephen.webb@canonical.com>
1506
1507 Version bump tp 1.0.11
1508
1509 * configure.ac: bumped package version to 1.0.11
1510 * libutouch-geis-xcb/Makefile.am: bumped shlib version to reflect changes
1511
15122010-09-01 Stephen M. Webb <stephen.webb@canonical.com>
1513
1514 Fixed typos in manpage.
1515
1516 * doc/geistest.1: fixed several typographical errors
1517
15182010-09-01 Stephen M. Webb <stephen.webb@canonical.com>
1519
1520 Fixed a memory leak when logging messages.
1521
1522 * libutouch-geis-xcb/geis_logging.c (_geis_message): fixed memory leak
1523
15242010-08-31 Stephen M. Webb <stephen.webb@canonical.com>
1525
1526 Fixed prefix string used in diagnostics.
1527
1528 * libutouch-geis-xcb/geis_logging.c (_geis_message): fixed which prefix string
1529 gets used for which diagnostic level
1530
15312010-08-31 Stephen M. Webb <stephen.webb@canonical.com>
1532
1533 Removed input device enumeration handling until later.
1534
1535 * libutouch-geis-xcb/geis.c (geis_input_devices): removed #if 0 block
1536 * libutouch-geis-xcb/geis_instance.h (geis_instance_input_devices): removed
1537 * libutouch-geis-xcb/geis_instance.c (geis_instance_input_devices): removed
1538 * libutouch-geis-xcb/geis_xcb.h (geis_xcb_input_devices): added funcs and
1539 cookie parameters
1540 * libutouch-geis-xcb/geis_xcb.c (_GeisXcb): added input_funcs and input_cookie
1541 (geis_xcb_new): removed #if 0 blocks
1542 (geis_xcb_input_devices): removed XInput handling until later
1543
15442010-08-30 Stephen M. Webb <stephen.webb@canonical.com>
1545
1546 Removed some debug code and fixed pasto.
1547
1548 * libutouch-geis-xcb/geis_instance.c: fixed a pasto
1549 * testsuite/geistest/geistest.c: removed debug code
1550
15512010-08-30 Stephen M. Webb <stephen.webb@canonical.com>
1552
1553 Fixed so multiple windows will work.
1554
1555 Altered geistest to work with a single window or all windows, had to fix geis
1556 implementation so this was possible.
1557
1558 * libutouch-geis-xcb/geis_instance_table.c: new file
1559 * libutouch-geis-xcb/geis_instance_table.h: new file
1560 * configure.ac: added package checks for x11-xcb and xi
1561 * doc/geistest.1: documented new CLI switches
1562 * geis/geis.h (geis_input_devices): fixed argument type
1563 * libutouch-geis-xcb/Makefile.am (libutouch_geis_la_SOURCES): added new files
1564 (libutouch_geis_la_CFLAGS): aded X11XCB_CFLAGS and XI2_CFLAGS
1565 (libutouch_geis_la_LIBADD): aded X11XCB_LIBS and XI2LIBS_
1566 * libutouch-geis-xcb/geis.c (s_geis_xcb): new static global
1567 (geis_init): used it
1568 * libutouch-geis-xcb/geis_instance.h (_GeisInstance): added window_id
1569 (geis_instance_new): renamed from geis_instance_get
1570 (geis_instance_input_devices): new function
1571 (geis_instance_subscribe): added GeisXcb parameter
1572 (geis_instance_get_window_id): new function
1573 (geis_instance_fd): removed function
1574 (geis_instance_event_dispatch): removed function
1575 * libutouch-geis-xcb/geis_instance.c: implemented new functions
1576 * libutouch-geis-xcb/geis_xcb.h (geis_xcb_new): renamed from geis_xcb_get
1577 (geis_xcb_create_instance): new function
1578 (geis_xcb_input_devices): new function
1579 (geis_xcb_subscribe): added GeisInstance parameter
1580 (geis_xcb_dispatch): changed parameter type to GeisXcb
1581 * libutouch-geis-xcb/geis_xcb.c: Implemeneted new functions
1582 * testsuite/geistest/geistest.c (parse_opts): added -w switch
1583 (subscribe_window): new function
1584 (subscribe_windows_preorder): new function
1585 (subscribe_all_windows): new function
1586 (main): used the new functions
1587
15882010-08-30 Stephen M. Webb <stephen.webb@canonical.com>
1589
1590 Added runtime diagnostic facility.
1591
1592 * libutouch-geis-xcb/geis_debug.h: replaced with
1593 * libutouch-geis-xcb/geis_logging.h: mew file
1594 * libutouch-geis-xcb/geis_logging.c: new file
1595 * libutouch-geis-xcb/Makefile.am: replaced above files
1596 * libutouch-geis-xcb/geis_xcb.c: replaced geis_debug calls with
1597 geis_warning or geis_error as appropriate
1598
15992010-08-27 Stephen M. Webb <stephen.webb@canonical.com>
1600
1601 Fixed checking of gesture masks for multiple input devices.
1602
1603 * libutouch-geis-xcb/geis_instance.c (geis_instance_subscribe):
1604 added missing index increment
1605 * libutouch-geis-xcb/geis_xcb.c (geis_xcb_verify_event_selection):
1606 added logic for iterating through multiple input devices
1607
16082010-08-27 Stephen M. Webb <stephen.webb@canonical.com>
1609
1610 Move gesture-type-added callback until later in the subscription sequence.
1611
1612 * libutouch-geis-xcb/geis_xcb.c (geis_xcb_subscribe): move call to
1613 geis_xcb_dispatch_gesture_type until later in sequence
1614
16152010-08-27 Stephen M. Webb <stephen.webb@canonical.com>
1616
1617 Removed "Grab" gestire entirely from the list of known gestures.
1618
1619 * libutouch-geis-xcb/geis_xcb.c (s_grail_type_map): removed GRAIL_TYPE_SYSFLAG1
1620 (geis_xcb_dispatch_gesture_type): removed references to GRAIL_TYPE_SYSFLAG1
1621
16222010-08-26 Stephen M. Webb <stephen.webb@canonical.com>
1623
1624 Prevented "Grab" gesture from being propagated.
1625
1626 * libutouch-geis-xcb/geis_xcb.c (geis_xcb_dispatch_gesture_type): skipped
1627 notification of the availability of the "Grab" gesture type.
1628
16292010-08-26 Stephen M. Webb <stephen.webb@canonical.com>
1630
1631 Fixed an allocation size issue.
1632
1633 * libutouch-geis-xcb/geis_instance.c (geis_instance_get): fixed allocation
1634 size issue
1635
16362010-08-26 Stephen M. Webb <stephen.webb@canonical.com>
1637
1638 Minor style adjustments. Adjusted whitespace for consistency.
1639
1640 * libutouch-geis-xcb/geis_xcb.c (geis_xcb_verify_event_selection):
1641 renamed function from geis_xcb_select_events
1642 (geis_xcb_determine_primitive_type): renamed from
1643 geis_xcb_determine_fundamental_gesture_type
1644 (geis_xcb_get_gesture_type_primitive_name): renamed form
1645 geis_xcb_get_gesture_type_fundamental_name
1646
16472010-08-25 Stephen M. Webb <stephen.webb@canonical.com>
1648
1649 Reverted version bump.
1650
1651 * configure,.ac (AC_INIT): reverted to version 1.0.10
1652
16532010-08-23 Stephen M. Webb <stephen.webb@canonical.com>
1654
1655 Implemented gesture and input device selection.
1656
1657 * geis/geis.h: new gesture definitions
1658 * libutouch-geis-xcb/geis_xcb.h (geis_xcb_subscribe):
1659 added device_id parameter
1660 * libutouch-geis-xcb/geis_xcb.c (s_grail_type_map): new gesture definitions
1661 (geis_xcb_map_gestures_to_mask): new function
1662 (geis_xcb_select_events): new function
1663 (geis_xcb_subscribe): used them
1664 added device_id parameter
1665 (geis_xcb_determine_gesture_type): renamed to
1666 geis_xcb_determine_fundamental_gesture_type
1667 (geis_xcb_get_gesture_type_fundamental_name): new function
1668 (geis_xcb_dispatch_gesture_type): mapped public gesture definitions to
1669 fundamental gesture types
1670 * libutouch-geis-xcb/geis_instance.c (geis_instance_subscribe):
1671 handled input_list argument
1672 * testsuite/geistest/geistest.c: included an example of selecting gestures
1673
16742010-08-22 Chase Douglas <chase.douglas@canonical.com>
1675
1676 Bumped to version 1.0.10 for various fixes
1677
1678 * geisimple.h: Define the correct number of attributes for each gesture
1679 * geis.h: Sync up with latest grail ABI for gesture attributes
1680 * geis_xcb.c: Sync up with latest grail ABI for gesture attributes
1681 * geisspec-1.0.asc: Sync up with latest grail ABI for gesture attributes
1682 * geis_instance.h: Fix header include macro typo
1683 * geisimple.h: Use int32_t instead of long for integer values
1684 * geis.h: Make win_type unsigned to match usage in code
1685 * geis_xcb.c: Fix missing initializer value issue
1686 * geis_xcb.c: Fix unused variable warning
1687
16882010-08-20 Stephen M. Webb <stephen.webb@canonical.com>
1689
1690 Removed spec build from packaged files.
1691
1692 * doc/Makefile.am (doc-html): removed doc-html-asciidoc
1693
16942010-08-16 Stephen M. Webb <stephen.webb@canonical.com>
1695
1696 Conformed to GNU strictness for consistency.
1697
1698 * AUTHORS: New file.
1699 * COPYING: new file renamed from COPYING.LGPL.
1700 * INSTALL: New file.
1701 * NEWS: New file.
1702 * README: New file.
1703 * Makefile.am: distributed the new files.
1704 * configure.ac: Swicthed from foreign to gnu conformance level.
1705 * libutouch-geis-xcb/Makefile.am: Fixed relative paths.
1706
17072010-08-16 Stephen M. Webb <stephen.webb@canonical.com>
1708
1709 Bumped version to 1.0.9 to replect API change.
1710
1711 * configure.ac: bumped package version.
1712
17132010-08-16 Stephen M. Webb <stephen.webb@canonical.com>
1714
1715 Added standard fundamental gesture constants.
1716
1717 * doc/geisspec-1.0.asc: Added section on fundamental gestures.
1718 * geis/geis.h: Added fundamental gestures and attributes.
1719 * libutouch-geis-xcb/geis_xcb.c: Used them.
1720
17210
=== modified file 'Makefile.am'
--- Makefile.am 2011-06-02 19:38:57 +0000
+++ Makefile.am 2012-08-23 18:45:02 +0000
@@ -4,7 +4,7 @@
4#4#
5# Copyright 2010, 2011 Canonical, Ltd.5# Copyright 2010, 2011 Canonical, Ltd.
6#6#
7# This file is part of the utouch-geis library. This library is free software;7# This file is part of the geis library. This library is free software;
8# you can redistribute it and/or modify it under the terms of the GNU Lesser8# you can redistribute it and/or modify it under the terms of the GNU Lesser
9# General Public License as published by the Free Software Foundation; either9# General Public License as published by the Free Software Foundation; either
10# version 3 of the License, or (at your option) any later version.10# version 3 of the License, or (at your option) any later version.
@@ -21,14 +21,14 @@
2121
22ACLOCAL_MFLAGS = -I m422ACLOCAL_MFLAGS = -I m4
2323
24SUBDIRS = include libs libutouch-geis testsuite python tools examples doc24SUBDIRS = include libs libgeis testsuite python tools examples doc
2525
26doc-%:26doc-%:
27 $(MAKE) -C doc $@27 $(MAKE) -C doc $@
2828
29pkgconfigdir = $(libdir)/pkgconfig29pkgconfigdir = $(libdir)/pkgconfig
3030
31pkgconfig_DATA = libutouch-geis.pc31pkgconfig_DATA = libgeis.pc
3232
33EXTRA_DIST = \33EXTRA_DIST = \
34 AUTHORS \34 AUTHORS \
3535
=== modified file 'Makefile.in'
--- Makefile.in 2011-07-27 19:55:58 +0000
+++ Makefile.in 2012-08-23 18:45:02 +0000
@@ -21,7 +21,7 @@
21#21#
22# Copyright 2010, 2011 Canonical, Ltd.22# Copyright 2010, 2011 Canonical, Ltd.
23#23#
24# This file is part of the utouch-geis library. This library is free software;24# This file is part of the geis library. This library is free software;
25# you can redistribute it and/or modify it under the terms of the GNU Lesser25# you can redistribute it and/or modify it under the terms of the GNU Lesser
26# General Public License as published by the Free Software Foundation; either26# General Public License as published by the Free Software Foundation; either
27# version 3 of the License, or (at your option) any later version.27# version 3 of the License, or (at your option) any later version.
@@ -57,7 +57,7 @@
57subdir = .57subdir = .
58DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \58DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
59 $(srcdir)/Makefile.in $(srcdir)/geis_config.h.in \59 $(srcdir)/Makefile.in $(srcdir)/geis_config.h.in \
60 $(srcdir)/libutouch-geis.pc.in $(top_srcdir)/configure AUTHORS \60 $(srcdir)/libgeis.pc.in $(top_srcdir)/configure AUTHORS \
61 COPYING ChangeLog INSTALL NEWS config.aux/compile \61 COPYING ChangeLog INSTALL NEWS config.aux/compile \
62 config.aux/config.guess config.aux/config.sub \62 config.aux/config.guess config.aux/config.sub \
63 config.aux/depcomp config.aux/install-sh config.aux/ltmain.sh \63 config.aux/depcomp config.aux/install-sh config.aux/ltmain.sh \
@@ -73,7 +73,7 @@
73 configure.lineno config.status.lineno73 configure.lineno config.status.lineno
74mkinstalldirs = $(install_sh) -d74mkinstalldirs = $(install_sh) -d
75CONFIG_HEADER = geis_config.h75CONFIG_HEADER = geis_config.h
76CONFIG_CLEAN_FILES = libutouch-geis.pc76CONFIG_CLEAN_FILES = libgeis.pc
77CONFIG_CLEAN_VPATH_FILES =77CONFIG_CLEAN_VPATH_FILES =
78AM_V_GEN = $(am__v_GEN_$(V))78AM_V_GEN = $(am__v_GEN_$(V))
79am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))79am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -177,6 +177,7 @@
177DBUS_LIBS = @DBUS_LIBS@177DBUS_LIBS = @DBUS_LIBS@
178DEFS = @DEFS@178DEFS = @DEFS@
179DEPDIR = @DEPDIR@179DEPDIR = @DEPDIR@
180DLLTOOL = @DLLTOOL@
180DSYMUTIL = @DSYMUTIL@181DSYMUTIL = @DSYMUTIL@
181DUMPBIN = @DUMPBIN@182DUMPBIN = @DUMPBIN@
182ECHO_C = @ECHO_C@183ECHO_C = @ECHO_C@
@@ -202,6 +203,7 @@
202LN_S = @LN_S@203LN_S = @LN_S@
203LTLIBOBJS = @LTLIBOBJS@204LTLIBOBJS = @LTLIBOBJS@
204MAKEINFO = @MAKEINFO@205MAKEINFO = @MAKEINFO@
206MANIFEST_TOOL = @MANIFEST_TOOL@
205MKDIR_P = @MKDIR_P@207MKDIR_P = @MKDIR_P@
206NM = @NM@208NM = @NM@
207NMEDIT = @NMEDIT@209NMEDIT = @NMEDIT@
@@ -250,6 +252,7 @@
250abs_srcdir = @abs_srcdir@252abs_srcdir = @abs_srcdir@
251abs_top_builddir = @abs_top_builddir@253abs_top_builddir = @abs_top_builddir@
252abs_top_srcdir = @abs_top_srcdir@254abs_top_srcdir = @abs_top_srcdir@
255ac_ct_AR = @ac_ct_AR@
253ac_ct_CC = @ac_ct_CC@256ac_ct_CC = @ac_ct_CC@
254ac_ct_DUMPBIN = @ac_ct_DUMPBIN@257ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
255am__include = @am__include@258am__include = @am__include@
@@ -282,7 +285,6 @@
282libexecdir = @libexecdir@285libexecdir = @libexecdir@
283localedir = @localedir@286localedir = @localedir@
284localstatedir = @localstatedir@287localstatedir = @localstatedir@
285lt_ECHO = @lt_ECHO@
286mandir = @mandir@288mandir = @mandir@
287mkdir_p = @mkdir_p@289mkdir_p = @mkdir_p@
288oldincludedir = @oldincludedir@290oldincludedir = @oldincludedir@
@@ -303,9 +305,9 @@
303top_builddir = @top_builddir@305top_builddir = @top_builddir@
304top_srcdir = @top_srcdir@306top_srcdir = @top_srcdir@
305ACLOCAL_MFLAGS = -I m4307ACLOCAL_MFLAGS = -I m4
306SUBDIRS = include libs libutouch-geis testsuite python tools examples doc308SUBDIRS = include libs libgeis testsuite python tools examples doc
307pkgconfigdir = $(libdir)/pkgconfig309pkgconfigdir = $(libdir)/pkgconfig
308pkgconfig_DATA = libutouch-geis.pc310pkgconfig_DATA = libgeis.pc
309EXTRA_DIST = \311EXTRA_DIST = \
310 AUTHORS \312 AUTHORS \
311 COPYING \313 COPYING \
@@ -369,7 +371,7 @@
369371
370distclean-hdr:372distclean-hdr:
371 -rm -f geis_config.h stamp-h1373 -rm -f geis_config.h stamp-h1
372libutouch-geis.pc: $(top_builddir)/config.status $(srcdir)/libutouch-geis.pc.in374libgeis.pc: $(top_builddir)/config.status $(srcdir)/libgeis.pc.in
373 cd $(top_builddir) && $(SHELL) ./config.status $@375 cd $(top_builddir) && $(SHELL) ./config.status $@
374376
375mostlyclean-libtool:377mostlyclean-libtool:
376378
=== modified file 'NEWS'
--- NEWS 2011-02-21 16:08:50 +0000
+++ NEWS 2012-08-23 18:45:02 +0000
@@ -1,4 +1,4 @@
1uTouch-geis NEWS -- a history of user-visible changes1geis NEWS -- a history of user-visible changes
22
3Copyright 2010, 2011 Canonical Ltd.3Copyright 2010, 2011 Canonical Ltd.
44
55
=== modified file 'aclocal.m4'
--- aclocal.m4 2011-06-02 19:38:57 +0000
+++ aclocal.m4 2012-08-23 18:45:02 +0000
@@ -13,8 +13,8 @@
1313
14m4_ifndef([AC_AUTOCONF_VERSION],14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
17[m4_warning([this file was generated for autoconf 2.67.17[m4_warning([this file was generated for autoconf 2.68.
18You have another version of autoconf. It may work, but is not guaranteed to.18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely.19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])])20To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -47,7 +47,8 @@
47# ----------------------------------47# ----------------------------------
48AC_DEFUN([PKG_PROG_PKG_CONFIG],48AC_DEFUN([PKG_PROG_PKG_CONFIG],
49[m4_pattern_forbid([^_?PKG_[A-Z_]+$])49[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
50m4_pattern_allow([^PKG_CONFIG(_PATH)?$])50m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
51m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
51AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])52AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
52AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])53AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
53AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])54AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -93,7 +94,8 @@
93 pkg_cv_[]$1="$$1"94 pkg_cv_[]$1="$$1"
94 elif test -n "$PKG_CONFIG"; then95 elif test -n "$PKG_CONFIG"; then
95 PKG_CHECK_EXISTS([$3],96 PKG_CHECK_EXISTS([$3],
96 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],97 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
98 test "x$?" != "x0" && pkg_failed=yes ],
97 [pkg_failed=yes])99 [pkg_failed=yes])
98 else100 else
99 pkg_failed=untried101 pkg_failed=untried
@@ -141,9 +143,9 @@
141 AC_MSG_RESULT([no])143 AC_MSG_RESULT([no])
142 _PKG_SHORT_ERRORS_SUPPORTED144 _PKG_SHORT_ERRORS_SUPPORTED
143 if test $_pkg_short_errors_supported = yes; then145 if test $_pkg_short_errors_supported = yes; then
144 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`146 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
145 else 147 else
146 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`148 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
147 fi149 fi
148 # Put the nasty error message in config.log where it belongs150 # Put the nasty error message in config.log where it belongs
149 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD151 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
150152
=== modified file 'config.aux/config.guess'
--- config.aux/config.guess 2010-08-11 16:07:43 +0000
+++ config.aux/config.guess 2012-08-23 18:45:02 +0000
@@ -1,10 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Attempt to guess a canonical system name.2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 20104# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5# Free Software Foundation, Inc.5# 2011 Free Software Foundation, Inc.
66
7timestamp='2009-12-30'7timestamp='2011-05-11'
88
9# This file is free software; you can redistribute it and/or modify it9# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by10# under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
5757
58Originally written by Per Bothner.58Originally written by Per Bothner.
59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
602001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free602001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
61Software Foundation, Inc.61Software Foundation, Inc.
6262
63This is free software; see the source for copying conditions. There is NO63This is free software; see the source for copying conditions. There is NO
@@ -181,7 +181,7 @@
181 fi181 fi
182 ;;182 ;;
183 *)183 *)
184 os=netbsd184 os=netbsd
185 ;;185 ;;
186 esac186 esac
187 # The OS release187 # The OS release
@@ -224,7 +224,7 @@
224 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`224 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
225 ;;225 ;;
226 *5.*)226 *5.*)
227 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`227 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
228 ;;228 ;;
229 esac229 esac
230 # According to Compaq, /usr/sbin/psrinfo has been available on230 # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@
270 # A Xn.n version is an unreleased experimental baselevel.270 # A Xn.n version is an unreleased experimental baselevel.
271 # 1.2 uses "1.2" for uname -r.271 # 1.2 uses "1.2" for uname -r.
272 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`272 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
273 exit ;;273 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
274 exitcode=$?
275 trap '' 0
276 exit $exitcode ;;
274 Alpha\ *:Windows_NT*:*)277 Alpha\ *:Windows_NT*:*)
275 # How do we know it's Interix rather than the generic POSIX subsystem?278 # How do we know it's Interix rather than the generic POSIX subsystem?
276 # Should we change UNAME_MACHINE based on the output of uname instead279 # Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@
296 echo s390-ibm-zvmoe299 echo s390-ibm-zvmoe
297 exit ;;300 exit ;;
298 *:OS400:*:*)301 *:OS400:*:*)
299 echo powerpc-ibm-os400302 echo powerpc-ibm-os400
300 exit ;;303 exit ;;
301 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)304 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
302 echo arm-acorn-riscix${UNAME_RELEASE}305 echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@
395 # MiNT. But MiNT is downward compatible to TOS, so this should398 # MiNT. But MiNT is downward compatible to TOS, so this should
396 # be no problem.399 # be no problem.
397 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)400 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
398 echo m68k-atari-mint${UNAME_RELEASE}401 echo m68k-atari-mint${UNAME_RELEASE}
399 exit ;;402 exit ;;
400 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)403 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
401 echo m68k-atari-mint${UNAME_RELEASE}404 echo m68k-atari-mint${UNAME_RELEASE}
402 exit ;;405 exit ;;
403 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)406 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
404 echo m68k-atari-mint${UNAME_RELEASE}407 echo m68k-atari-mint${UNAME_RELEASE}
405 exit ;;408 exit ;;
406 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)409 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
407 echo m68k-milan-mint${UNAME_RELEASE}410 echo m68k-milan-mint${UNAME_RELEASE}
408 exit ;;411 exit ;;
409 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)412 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
410 echo m68k-hades-mint${UNAME_RELEASE}413 echo m68k-hades-mint${UNAME_RELEASE}
411 exit ;;414 exit ;;
412 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)415 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
413 echo m68k-unknown-mint${UNAME_RELEASE}416 echo m68k-unknown-mint${UNAME_RELEASE}
414 exit ;;417 exit ;;
415 m68k:machten:*:*)418 m68k:machten:*:*)
416 echo m68k-apple-machten${UNAME_RELEASE}419 echo m68k-apple-machten${UNAME_RELEASE}
417 exit ;;420 exit ;;
@@ -481,8 +484,8 @@
481 echo m88k-motorola-sysv3484 echo m88k-motorola-sysv3
482 exit ;;485 exit ;;
483 AViiON:dgux:*:*)486 AViiON:dgux:*:*)
484 # DG/UX returns AViiON for all architectures487 # DG/UX returns AViiON for all architectures
485 UNAME_PROCESSOR=`/usr/bin/uname -p`488 UNAME_PROCESSOR=`/usr/bin/uname -p`
486 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]489 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
487 then490 then
488 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \491 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@
495 else498 else
496 echo i586-dg-dgux${UNAME_RELEASE}499 echo i586-dg-dgux${UNAME_RELEASE}
497 fi500 fi
498 exit ;;501 exit ;;
499 M88*:DolphinOS:*:*) # DolphinOS (SVR3)502 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
500 echo m88k-dolphin-sysv3503 echo m88k-dolphin-sysv3
501 exit ;;504 exit ;;
@@ -552,7 +555,7 @@
552 echo rs6000-ibm-aix3.2555 echo rs6000-ibm-aix3.2
553 fi556 fi
554 exit ;;557 exit ;;
555 *:AIX:*:[456])558 *:AIX:*:[4567])
556 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`559 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
557 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then560 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
558 IBM_ARCH=rs6000561 IBM_ARCH=rs6000
@@ -595,52 +598,52 @@
595 9000/[678][0-9][0-9])598 9000/[678][0-9][0-9])
596 if [ -x /usr/bin/getconf ]; then599 if [ -x /usr/bin/getconf ]; then
597 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`600 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
598 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`601 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
599 case "${sc_cpu_version}" in602 case "${sc_cpu_version}" in
600 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0603 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
601 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1604 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
602 532) # CPU_PA_RISC2_0605 532) # CPU_PA_RISC2_0
603 case "${sc_kernel_bits}" in606 case "${sc_kernel_bits}" in
604 32) HP_ARCH="hppa2.0n" ;;607 32) HP_ARCH="hppa2.0n" ;;
605 64) HP_ARCH="hppa2.0w" ;;608 64) HP_ARCH="hppa2.0w" ;;
606 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20609 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
607 esac ;;610 esac ;;
608 esac611 esac
609 fi612 fi
610 if [ "${HP_ARCH}" = "" ]; then613 if [ "${HP_ARCH}" = "" ]; then
611 eval $set_cc_for_build614 eval $set_cc_for_build
612 sed 's/^ //' << EOF >$dummy.c615 sed 's/^ //' << EOF >$dummy.c
613616
614 #define _HPUX_SOURCE617 #define _HPUX_SOURCE
615 #include <stdlib.h>618 #include <stdlib.h>
616 #include <unistd.h>619 #include <unistd.h>
617620
618 int main ()621 int main ()
619 {622 {
620 #if defined(_SC_KERNEL_BITS)623 #if defined(_SC_KERNEL_BITS)
621 long bits = sysconf(_SC_KERNEL_BITS);624 long bits = sysconf(_SC_KERNEL_BITS);
622 #endif625 #endif
623 long cpu = sysconf (_SC_CPU_VERSION);626 long cpu = sysconf (_SC_CPU_VERSION);
624627
625 switch (cpu)628 switch (cpu)
626 {629 {
627 case CPU_PA_RISC1_0: puts ("hppa1.0"); break;630 case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
628 case CPU_PA_RISC1_1: puts ("hppa1.1"); break;631 case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
629 case CPU_PA_RISC2_0:632 case CPU_PA_RISC2_0:
630 #if defined(_SC_KERNEL_BITS)633 #if defined(_SC_KERNEL_BITS)
631 switch (bits)634 switch (bits)
632 {635 {
633 case 64: puts ("hppa2.0w"); break;636 case 64: puts ("hppa2.0w"); break;
634 case 32: puts ("hppa2.0n"); break;637 case 32: puts ("hppa2.0n"); break;
635 default: puts ("hppa2.0"); break;638 default: puts ("hppa2.0"); break;
636 } break;639 } break;
637 #else /* !defined(_SC_KERNEL_BITS) */640 #else /* !defined(_SC_KERNEL_BITS) */
638 puts ("hppa2.0"); break;641 puts ("hppa2.0"); break;
639 #endif642 #endif
640 default: puts ("hppa1.0"); break;643 default: puts ("hppa1.0"); break;
641 }644 }
642 exit (0);645 exit (0);
643 }646 }
644EOF647EOF
645 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`648 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
646 test -z "$HP_ARCH" && HP_ARCH=hppa649 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@
731 exit ;;734 exit ;;
732 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)735 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
733 echo c1-convex-bsd736 echo c1-convex-bsd
734 exit ;;737 exit ;;
735 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)738 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
736 if getsysinfo -f scalar_acc739 if getsysinfo -f scalar_acc
737 then echo c32-convex-bsd740 then echo c32-convex-bsd
738 else echo c2-convex-bsd741 else echo c2-convex-bsd
739 fi742 fi
740 exit ;;743 exit ;;
741 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)744 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
742 echo c34-convex-bsd745 echo c34-convex-bsd
743 exit ;;746 exit ;;
744 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)747 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
745 echo c38-convex-bsd748 echo c38-convex-bsd
746 exit ;;749 exit ;;
747 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)750 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
748 echo c4-convex-bsd751 echo c4-convex-bsd
749 exit ;;752 exit ;;
750 CRAY*Y-MP:*:*:*)753 CRAY*Y-MP:*:*:*)
751 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'754 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
752 exit ;;755 exit ;;
@@ -770,14 +773,14 @@
770 exit ;;773 exit ;;
771 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)774 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
772 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`775 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
773 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`776 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
774 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`777 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
775 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"778 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
776 exit ;;779 exit ;;
777 5000:UNIX_System_V:4.*:*)780 5000:UNIX_System_V:4.*:*)
778 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`781 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
779 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`782 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
780 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"783 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
781 exit ;;784 exit ;;
782 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)785 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
783 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}786 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@
805 echo ${UNAME_MACHINE}-pc-mingw32808 echo ${UNAME_MACHINE}-pc-mingw32
806 exit ;;809 exit ;;
807 i*:windows32*:*)810 i*:windows32*:*)
808 # uname -m includes "-pc" on this system.811 # uname -m includes "-pc" on this system.
809 echo ${UNAME_MACHINE}-mingw32812 echo ${UNAME_MACHINE}-mingw32
810 exit ;;813 exit ;;
811 i*:PW*:*)814 i*:PW*:*)
812 echo ${UNAME_MACHINE}-pc-pw32815 echo ${UNAME_MACHINE}-pc-pw32
813 exit ;;816 exit ;;
814 *:Interix*:*)817 *:Interix*:*)
815 case ${UNAME_MACHINE} in818 case ${UNAME_MACHINE} in
816 x86)819 x86)
817 echo i586-pc-interix${UNAME_RELEASE}820 echo i586-pc-interix${UNAME_RELEASE}
818 exit ;;821 exit ;;
@@ -867,7 +870,7 @@
867 EV6) UNAME_MACHINE=alphaev6 ;;870 EV6) UNAME_MACHINE=alphaev6 ;;
868 EV67) UNAME_MACHINE=alphaev67 ;;871 EV67) UNAME_MACHINE=alphaev67 ;;
869 EV68*) UNAME_MACHINE=alphaev68 ;;872 EV68*) UNAME_MACHINE=alphaev68 ;;
870 esac873 esac
871 objdump --private-headers /bin/sh | grep -q ld.so.1874 objdump --private-headers /bin/sh | grep -q ld.so.1
872 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi875 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
873 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}876 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@
879 then882 then
880 echo ${UNAME_MACHINE}-unknown-linux-gnu883 echo ${UNAME_MACHINE}-unknown-linux-gnu
881 else884 else
882 echo ${UNAME_MACHINE}-unknown-linux-gnueabi885 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
886 | grep -q __ARM_PCS_VFP
887 then
888 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
889 else
890 echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
891 fi
883 fi892 fi
884 exit ;;893 exit ;;
885 avr32*:Linux:*:*)894 avr32*:Linux:*:*)
@@ -892,7 +901,7 @@
892 echo crisv32-axis-linux-gnu901 echo crisv32-axis-linux-gnu
893 exit ;;902 exit ;;
894 frv:Linux:*:*)903 frv:Linux:*:*)
895 echo frv-unknown-linux-gnu904 echo frv-unknown-linux-gnu
896 exit ;;905 exit ;;
897 i*86:Linux:*:*)906 i*86:Linux:*:*)
898 LIBC=gnu907 LIBC=gnu
@@ -960,7 +969,7 @@
960 echo ${UNAME_MACHINE}-ibm-linux969 echo ${UNAME_MACHINE}-ibm-linux
961 exit ;;970 exit ;;
962 sh64*:Linux:*:*)971 sh64*:Linux:*:*)
963 echo ${UNAME_MACHINE}-unknown-linux-gnu972 echo ${UNAME_MACHINE}-unknown-linux-gnu
964 exit ;;973 exit ;;
965 sh*:Linux:*:*)974 sh*:Linux:*:*)
966 echo ${UNAME_MACHINE}-unknown-linux-gnu975 echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +977,9 @@
968 sparc:Linux:*:* | sparc64:Linux:*:*)977 sparc:Linux:*:* | sparc64:Linux:*:*)
969 echo ${UNAME_MACHINE}-unknown-linux-gnu978 echo ${UNAME_MACHINE}-unknown-linux-gnu
970 exit ;;979 exit ;;
980 tile*:Linux:*:*)
981 echo ${UNAME_MACHINE}-tilera-linux-gnu
982 exit ;;
971 vax:Linux:*:*)983 vax:Linux:*:*)
972 echo ${UNAME_MACHINE}-dec-linux-gnu984 echo ${UNAME_MACHINE}-dec-linux-gnu
973 exit ;;985 exit ;;
@@ -975,7 +987,7 @@
975 echo x86_64-unknown-linux-gnu987 echo x86_64-unknown-linux-gnu
976 exit ;;988 exit ;;
977 xtensa*:Linux:*:*)989 xtensa*:Linux:*:*)
978 echo ${UNAME_MACHINE}-unknown-linux-gnu990 echo ${UNAME_MACHINE}-unknown-linux-gnu
979 exit ;;991 exit ;;
980 i*86:DYNIX/ptx:4*:*)992 i*86:DYNIX/ptx:4*:*)
981 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.993 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +996,11 @@
984 echo i386-sequent-sysv4996 echo i386-sequent-sysv4
985 exit ;;997 exit ;;
986 i*86:UNIX_SV:4.2MP:2.*)998 i*86:UNIX_SV:4.2MP:2.*)
987 # Unixware is an offshoot of SVR4, but it has its own version999 # Unixware is an offshoot of SVR4, but it has its own version
988 # number series starting with 2...1000 # number series starting with 2...
989 # I am not positive that other SVR4 systems won't match this,1001 # I am not positive that other SVR4 systems won't match this,
990 # I just have to hope. -- rms.1002 # I just have to hope. -- rms.
991 # Use sysv4.2uw... so that sysv4* matches it.1003 # Use sysv4.2uw... so that sysv4* matches it.
992 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}1004 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
993 exit ;;1005 exit ;;
994 i*86:OS/2:*:*)1006 i*86:OS/2:*:*)
@@ -1020,7 +1032,7 @@
1020 fi1032 fi
1021 exit ;;1033 exit ;;
1022 i*86:*:5:[678]*)1034 i*86:*:5:[678]*)
1023 # UnixWare 7.x, OpenUNIX and OpenServer 6.1035 # UnixWare 7.x, OpenUNIX and OpenServer 6.
1024 case `/bin/uname -X | grep "^Machine"` in1036 case `/bin/uname -X | grep "^Machine"` in
1025 *486*) UNAME_MACHINE=i486 ;;1037 *486*) UNAME_MACHINE=i486 ;;
1026 *Pentium) UNAME_MACHINE=i586 ;;1038 *Pentium) UNAME_MACHINE=i586 ;;
@@ -1048,13 +1060,13 @@
1048 exit ;;1060 exit ;;
1049 pc:*:*:*)1061 pc:*:*:*)
1050 # Left here for compatibility:1062 # Left here for compatibility:
1051 # uname -m prints for DJGPP always 'pc', but it prints nothing about1063 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1052 # the processor, so we play safe by assuming i586.1064 # the processor, so we play safe by assuming i586.
1053 # Note: whatever this is, it MUST be the same as what config.sub1065 # Note: whatever this is, it MUST be the same as what config.sub
1054 # prints for the "djgpp" host, or else GDB configury will decide that1066 # prints for the "djgpp" host, or else GDB configury will decide that
1055 # this is a cross-build.1067 # this is a cross-build.
1056 echo i586-pc-msdosdjgpp1068 echo i586-pc-msdosdjgpp
1057 exit ;;1069 exit ;;
1058 Intel:Mach:3*:*)1070 Intel:Mach:3*:*)
1059 echo i386-pc-mach31071 echo i386-pc-mach3
1060 exit ;;1072 exit ;;
@@ -1089,8 +1101,8 @@
1089 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \1101 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1090 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;1102 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1091 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)1103 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1092 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \1104 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1093 && { echo i486-ncr-sysv4; exit; } ;;1105 && { echo i486-ncr-sysv4; exit; } ;;
1094 NCR*:*:4.2:* | MPRAS*:*:4.2:*)1106 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1095 OS_REL='.3'1107 OS_REL='.3'
1096 test -r /etc/.relid \1108 test -r /etc/.relid \
@@ -1133,10 +1145,10 @@
1133 echo ns32k-sni-sysv1145 echo ns32k-sni-sysv
1134 fi1146 fi
1135 exit ;;1147 exit ;;
1136 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort1148 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1137 # says <Richard.M.Bartel@ccMail.Census.GOV>1149 # says <Richard.M.Bartel@ccMail.Census.GOV>
1138 echo i586-unisys-sysv41150 echo i586-unisys-sysv4
1139 exit ;;1151 exit ;;
1140 *:UNIX_System_V:4*:FTX*)1152 *:UNIX_System_V:4*:FTX*)
1141 # From Gerald Hewes <hewes@openmarket.com>.1153 # From Gerald Hewes <hewes@openmarket.com>.
1142 # How about differentiating between stratus architectures? -djm1154 # How about differentiating between stratus architectures? -djm
@@ -1162,11 +1174,11 @@
1162 exit ;;1174 exit ;;
1163 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)1175 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1164 if [ -d /usr/nec ]; then1176 if [ -d /usr/nec ]; then
1165 echo mips-nec-sysv${UNAME_RELEASE}1177 echo mips-nec-sysv${UNAME_RELEASE}
1166 else1178 else
1167 echo mips-unknown-sysv${UNAME_RELEASE}1179 echo mips-unknown-sysv${UNAME_RELEASE}
1168 fi1180 fi
1169 exit ;;1181 exit ;;
1170 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.1182 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1171 echo powerpc-be-beos1183 echo powerpc-be-beos
1172 exit ;;1184 exit ;;
@@ -1231,6 +1243,9 @@
1231 *:QNX:*:4*)1243 *:QNX:*:4*)
1232 echo i386-pc-qnx1244 echo i386-pc-qnx
1233 exit ;;1245 exit ;;
1246 NEO-?:NONSTOP_KERNEL:*:*)
1247 echo neo-tandem-nsk${UNAME_RELEASE}
1248 exit ;;
1234 NSE-?:NONSTOP_KERNEL:*:*)1249 NSE-?:NONSTOP_KERNEL:*:*)
1235 echo nse-tandem-nsk${UNAME_RELEASE}1250 echo nse-tandem-nsk${UNAME_RELEASE}
1236 exit ;;1251 exit ;;
@@ -1276,13 +1291,13 @@
1276 echo pdp10-unknown-its1291 echo pdp10-unknown-its
1277 exit ;;1292 exit ;;
1278 SEI:*:*:SEIUX)1293 SEI:*:*:SEIUX)
1279 echo mips-sei-seiux${UNAME_RELEASE}1294 echo mips-sei-seiux${UNAME_RELEASE}
1280 exit ;;1295 exit ;;
1281 *:DragonFly:*:*)1296 *:DragonFly:*:*)
1282 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`1297 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1283 exit ;;1298 exit ;;
1284 *:*VMS:*:*)1299 *:*VMS:*:*)
1285 UNAME_MACHINE=`(uname -p) 2>/dev/null`1300 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1286 case "${UNAME_MACHINE}" in1301 case "${UNAME_MACHINE}" in
1287 A*) echo alpha-dec-vms ; exit ;;1302 A*) echo alpha-dec-vms ; exit ;;
1288 I*) echo ia64-dec-vms ; exit ;;1303 I*) echo ia64-dec-vms ; exit ;;
@@ -1322,11 +1337,11 @@
1322#include <sys/param.h>1337#include <sys/param.h>
1323 printf ("m68k-sony-newsos%s\n",1338 printf ("m68k-sony-newsos%s\n",
1324#ifdef NEWSOS41339#ifdef NEWSOS4
1325 "4"1340 "4"
1326#else1341#else
1327 ""1342 ""
1328#endif1343#endif
1329 ); exit (0);1344 ); exit (0);
1330#endif1345#endif
1331#endif1346#endif
13321347
13331348
=== modified file 'config.aux/config.sub'
--- config.aux/config.sub 2010-08-11 16:07:43 +0000
+++ config.aux/config.sub 2012-08-23 18:45:02 +0000
@@ -1,10 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Configuration validation subroutine script.2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 20104# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5# Free Software Foundation, Inc.5# 2011 Free Software Foundation, Inc.
66
7timestamp='2010-01-22'7timestamp='2011-03-23'
88
9# This file is (in principle) common to ALL GNU software.9# This file is (in principle) common to ALL GNU software.
10# The presence of a machine in this file suggests that SOME GNU software10# The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@
76GNU config.sub ($timestamp)76GNU config.sub ($timestamp)
7777
78Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,78Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
792001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free792001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
80Software Foundation, Inc.80Software Foundation, Inc.
8181
82This is free software; see the source for copying conditions. There is NO82This is free software; see the source for copying conditions. There is NO
@@ -124,8 +124,9 @@
124# Here we must recognize all the valid KERNEL-OS combinations.124# Here we must recognize all the valid KERNEL-OS combinations.
125maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`125maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
126case $maybe_os in126case $maybe_os in
127 nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \127 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
128 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \128 linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
129 knetbsd*-gnu* | netbsd*-gnu* | \
129 kopensolaris*-gnu* | \130 kopensolaris*-gnu* | \
130 storm-chaos* | os2-emx* | rtmk-nova*)131 storm-chaos* | os2-emx* | rtmk-nova*)
131 os=-$maybe_os132 os=-$maybe_os
@@ -157,8 +158,8 @@
157 os=158 os=
158 basic_machine=$1159 basic_machine=$1
159 ;;160 ;;
160 -bluegene*)161 -bluegene*)
161 os=-cnk162 os=-cnk
162 ;;163 ;;
163 -sim | -cisco | -oki | -wec | -winbond)164 -sim | -cisco | -oki | -wec | -winbond)
164 os=165 os=
@@ -174,10 +175,10 @@
174 os=-chorusos175 os=-chorusos
175 basic_machine=$1176 basic_machine=$1
176 ;;177 ;;
177 -chorusrdb)178 -chorusrdb)
178 os=-chorusrdb179 os=-chorusrdb
179 basic_machine=$1180 basic_machine=$1
180 ;;181 ;;
181 -hiux*)182 -hiux*)
182 os=-hiuxwe2183 os=-hiuxwe2
183 ;;184 ;;
@@ -282,11 +283,13 @@
282 | moxie \283 | moxie \
283 | mt \284 | mt \
284 | msp430 \285 | msp430 \
286 | nds32 | nds32le | nds32be \
285 | nios | nios2 \287 | nios | nios2 \
286 | ns16k | ns32k \288 | ns16k | ns32k \
289 | open8 \
287 | or32 \290 | or32 \
288 | pdp10 | pdp11 | pj | pjl \291 | pdp10 | pdp11 | pj | pjl \
289 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \292 | powerpc | powerpc64 | powerpc64le | powerpcle \
290 | pyramid \293 | pyramid \
291 | rx \294 | rx \
292 | score \295 | score \
@@ -294,15 +297,24 @@
294 | sh64 | sh64le \297 | sh64 | sh64le \
295 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \298 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
296 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \299 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
297 | spu | strongarm \300 | spu \
298 | tahoe | thumb | tic4x | tic80 | tron \301 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
299 | ubicom32 \302 | ubicom32 \
300 | v850 | v850e \303 | v850 | v850e \
301 | we32k \304 | we32k \
302 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \305 | x86 | xc16x | xstormy16 | xtensa \
303 | z8k | z80)306 | z8k | z80)
304 basic_machine=$basic_machine-unknown307 basic_machine=$basic_machine-unknown
305 ;;308 ;;
309 c54x)
310 basic_machine=tic54x-unknown
311 ;;
312 c55x)
313 basic_machine=tic55x-unknown
314 ;;
315 c6x)
316 basic_machine=tic6x-unknown
317 ;;
306 m6811 | m68hc11 | m6812 | m68hc12 | picochip)318 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
307 # Motorola 68HC11/12.319 # Motorola 68HC11/12.
308 basic_machine=$basic_machine-unknown320 basic_machine=$basic_machine-unknown
@@ -314,6 +326,18 @@
314 basic_machine=mt-unknown326 basic_machine=mt-unknown
315 ;;327 ;;
316328
329 strongarm | thumb | xscale)
330 basic_machine=arm-unknown
331 ;;
332
333 xscaleeb)
334 basic_machine=armeb-unknown
335 ;;
336
337 xscaleel)
338 basic_machine=armel-unknown
339 ;;
340
317 # We use `pc' rather than `unknown'341 # We use `pc' rather than `unknown'
318 # because (1) that's what they normally are, and342 # because (1) that's what they normally are, and
319 # (2) the word "unknown" tends to confuse beginning users.343 # (2) the word "unknown" tends to confuse beginning users.
@@ -334,7 +358,7 @@
334 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \358 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
335 | avr-* | avr32-* \359 | avr-* | avr32-* \
336 | bfin-* | bs2000-* \360 | bfin-* | bs2000-* \
337 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \361 | c[123]* | c30-* | [cjt]90-* | c4x-* \
338 | clipper-* | craynv-* | cydra-* \362 | clipper-* | craynv-* | cydra-* \
339 | d10v-* | d30v-* | dlx-* \363 | d10v-* | d30v-* | dlx-* \
340 | elxsi-* \364 | elxsi-* \
@@ -368,26 +392,28 @@
368 | mmix-* \392 | mmix-* \
369 | mt-* \393 | mt-* \
370 | msp430-* \394 | msp430-* \
395 | nds32-* | nds32le-* | nds32be-* \
371 | nios-* | nios2-* \396 | nios-* | nios2-* \
372 | none-* | np1-* | ns16k-* | ns32k-* \397 | none-* | np1-* | ns16k-* | ns32k-* \
398 | open8-* \
373 | orion-* \399 | orion-* \
374 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \400 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
375 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \401 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
376 | pyramid-* \402 | pyramid-* \
377 | romp-* | rs6000-* | rx-* \403 | romp-* | rs6000-* | rx-* \
378 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \404 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
379 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \405 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
380 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \406 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
381 | sparclite-* \407 | sparclite-* \
382 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \408 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
383 | tahoe-* | thumb-* \409 | tahoe-* \
384 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \410 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
385 | tile-* | tilegx-* \411 | tile-* | tilegx-* \
386 | tron-* \412 | tron-* \
387 | ubicom32-* \413 | ubicom32-* \
388 | v850-* | v850e-* | vax-* \414 | v850-* | v850e-* | vax-* \
389 | we32k-* \415 | we32k-* \
390 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \416 | x86-* | x86_64-* | xc16x-* | xps100-* \
391 | xstormy16-* | xtensa*-* \417 | xstormy16-* | xtensa*-* \
392 | ymp-* \418 | ymp-* \
393 | z8k-* | z80-*)419 | z8k-* | z80-*)
@@ -412,7 +438,7 @@
412 basic_machine=a29k-amd438 basic_machine=a29k-amd
413 os=-udi439 os=-udi
414 ;;440 ;;
415 abacus)441 abacus)
416 basic_machine=abacus-unknown442 basic_machine=abacus-unknown
417 ;;443 ;;
418 adobe68k)444 adobe68k)
@@ -482,11 +508,20 @@
482 basic_machine=powerpc-ibm508 basic_machine=powerpc-ibm
483 os=-cnk509 os=-cnk
484 ;;510 ;;
511 c54x-*)
512 basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
513 ;;
514 c55x-*)
515 basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
516 ;;
517 c6x-*)
518 basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
519 ;;
485 c90)520 c90)
486 basic_machine=c90-cray521 basic_machine=c90-cray
487 os=-unicos522 os=-unicos
488 ;;523 ;;
489 cegcc)524 cegcc)
490 basic_machine=arm-unknown525 basic_machine=arm-unknown
491 os=-cegcc526 os=-cegcc
492 ;;527 ;;
@@ -518,7 +553,7 @@
518 basic_machine=craynv-cray553 basic_machine=craynv-cray
519 os=-unicosmp554 os=-unicosmp
520 ;;555 ;;
521 cr16)556 cr16 | cr16-*)
522 basic_machine=cr16-unknown557 basic_machine=cr16-unknown
523 os=-elf558 os=-elf
524 ;;559 ;;
@@ -734,7 +769,7 @@
734 basic_machine=ns32k-utek769 basic_machine=ns32k-utek
735 os=-sysv770 os=-sysv
736 ;;771 ;;
737 microblaze)772 microblaze)
738 basic_machine=microblaze-xilinx773 basic_machine=microblaze-xilinx
739 ;;774 ;;
740 mingw32)775 mingw32)
@@ -841,6 +876,12 @@
841 np1)876 np1)
842 basic_machine=np1-gould877 basic_machine=np1-gould
843 ;;878 ;;
879 neo-tandem)
880 basic_machine=neo-tandem
881 ;;
882 nse-tandem)
883 basic_machine=nse-tandem
884 ;;
844 nsr-tandem)885 nsr-tandem)
845 basic_machine=nsr-tandem886 basic_machine=nsr-tandem
846 ;;887 ;;
@@ -923,9 +964,10 @@
923 ;;964 ;;
924 power) basic_machine=power-ibm965 power) basic_machine=power-ibm
925 ;;966 ;;
926 ppc) basic_machine=powerpc-unknown967 ppc | ppcbe) basic_machine=powerpc-unknown
927 ;;968 ;;
928 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`969 ppc-* | ppcbe-*)
970 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
929 ;;971 ;;
930 ppcle | powerpclittle | ppc-le | powerpc-little)972 ppcle | powerpclittle | ppc-le | powerpc-little)
931 basic_machine=powerpcle-unknown973 basic_machine=powerpcle-unknown
@@ -1019,6 +1061,9 @@
1019 basic_machine=i860-stratus1061 basic_machine=i860-stratus
1020 os=-sysv41062 os=-sysv4
1021 ;;1063 ;;
1064 strongarm-* | thumb-*)
1065 basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1066 ;;
1022 sun2)1067 sun2)
1023 basic_machine=m68000-sun1068 basic_machine=m68000-sun
1024 ;;1069 ;;
@@ -1075,20 +1120,8 @@
1075 basic_machine=t90-cray1120 basic_machine=t90-cray
1076 os=-unicos1121 os=-unicos
1077 ;;1122 ;;
1078 tic54x | c54x*)1123 # This must be matched before tile*.
1079 basic_machine=tic54x-unknown1124 tilegx*)
1080 os=-coff
1081 ;;
1082 tic55x | c55x*)
1083 basic_machine=tic55x-unknown
1084 os=-coff
1085 ;;
1086 tic6x | c6x*)
1087 basic_machine=tic6x-unknown
1088 os=-coff
1089 ;;
1090 # This must be matched before tile*.
1091 tilegx*)
1092 basic_machine=tilegx-unknown1125 basic_machine=tilegx-unknown
1093 os=-linux-gnu1126 os=-linux-gnu
1094 ;;1127 ;;
@@ -1163,6 +1196,9 @@
1163 xps | xps100)1196 xps | xps100)
1164 basic_machine=xps100-honeywell1197 basic_machine=xps100-honeywell
1165 ;;1198 ;;
1199 xscale-* | xscalee[bl]-*)
1200 basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1201 ;;
1166 ymp)1202 ymp)
1167 basic_machine=ymp-cray1203 basic_machine=ymp-cray
1168 os=-unicos1204 os=-unicos
@@ -1260,11 +1296,11 @@
1260if [ x"$os" != x"" ]1296if [ x"$os" != x"" ]
1261then1297then
1262case $os in1298case $os in
1263 # First match some system type aliases1299 # First match some system type aliases
1264 # that might get confused with valid system types.1300 # that might get confused with valid system types.
1265 # -solaris* is a basic system type, with this one exception.1301 # -solaris* is a basic system type, with this one exception.
1266 -auroraux)1302 -auroraux)
1267 os=-auroraux1303 os=-auroraux
1268 ;;1304 ;;
1269 -solaris1 | -solaris1.*)1305 -solaris1 | -solaris1.*)
1270 os=`echo $os | sed -e 's|solaris1|sunos4|'`1306 os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1301,7 +1337,8 @@
1301 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \1337 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1302 | -chorusos* | -chorusrdb* | -cegcc* \1338 | -chorusos* | -chorusrdb* | -cegcc* \
1303 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \1339 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1304 | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \1340 | -mingw32* | -linux-gnu* | -linux-android* \
1341 | -linux-newlib* | -linux-uclibc* \
1305 | -uxpv* | -beos* | -mpeix* | -udk* \1342 | -uxpv* | -beos* | -mpeix* | -udk* \
1306 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \1343 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1307 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \1344 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1348,7 +1385,7 @@
1348 -opened*)1385 -opened*)
1349 os=-openedition1386 os=-openedition
1350 ;;1387 ;;
1351 -os400*)1388 -os400*)
1352 os=-os4001389 os=-os400
1353 ;;1390 ;;
1354 -wince*)1391 -wince*)
@@ -1397,7 +1434,7 @@
1397 -sinix*)1434 -sinix*)
1398 os=-sysv41435 os=-sysv4
1399 ;;1436 ;;
1400 -tpf*)1437 -tpf*)
1401 os=-tpf1438 os=-tpf
1402 ;;1439 ;;
1403 -triton*)1440 -triton*)
@@ -1442,8 +1479,8 @@
1442 -dicos*)1479 -dicos*)
1443 os=-dicos1480 os=-dicos
1444 ;;1481 ;;
1445 -nacl*)1482 -nacl*)
1446 ;;1483 ;;
1447 -none)1484 -none)
1448 ;;1485 ;;
1449 *)1486 *)
@@ -1466,10 +1503,10 @@
1466# system, and we'll never get to this point.1503# system, and we'll never get to this point.
14671504
1468case $basic_machine in1505case $basic_machine in
1469 score-*)1506 score-*)
1470 os=-elf1507 os=-elf
1471 ;;1508 ;;
1472 spu-*)1509 spu-*)
1473 os=-elf1510 os=-elf
1474 ;;1511 ;;
1475 *-acorn)1512 *-acorn)
@@ -1481,8 +1518,17 @@
1481 arm*-semi)1518 arm*-semi)
1482 os=-aout1519 os=-aout
1483 ;;1520 ;;
1484 c4x-* | tic4x-*)1521 c4x-* | tic4x-*)
1485 os=-coff1522 os=-coff
1523 ;;
1524 tic54x-*)
1525 os=-coff
1526 ;;
1527 tic55x-*)
1528 os=-coff
1529 ;;
1530 tic6x-*)
1531 os=-coff
1486 ;;1532 ;;
1487 # This must come before the *-dec entry.1533 # This must come before the *-dec entry.
1488 pdp10-*)1534 pdp10-*)
@@ -1509,7 +1555,7 @@
1509 m68*-cisco)1555 m68*-cisco)
1510 os=-aout1556 os=-aout
1511 ;;1557 ;;
1512 mep-*)1558 mep-*)
1513 os=-elf1559 os=-elf
1514 ;;1560 ;;
1515 mips*-cisco)1561 mips*-cisco)
@@ -1536,7 +1582,7 @@
1536 *-ibm)1582 *-ibm)
1537 os=-aix1583 os=-aix
1538 ;;1584 ;;
1539 *-knuth)1585 *-knuth)
1540 os=-mmixware1586 os=-mmixware
1541 ;;1587 ;;
1542 *-wec)1588 *-wec)
15431589
=== modified file 'config.aux/ltmain.sh'
--- config.aux/ltmain.sh 2011-03-23 18:16:08 +0000
+++ config.aux/ltmain.sh 2012-08-23 18:45:02 +0000
@@ -1,9 +1,9 @@
1# Generated from ltmain.m4sh.
21
3# ltmain.sh (GNU libtool) 2.2.6b2# libtool (GNU libtool) 2.4
4# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 19963# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
54
6# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.5# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
6# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
7# This is free software; see the source for copying conditions. There is NO7# This is free software; see the source for copying conditions. There is NO
8# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.8# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
99
@@ -32,50 +32,56 @@
32#32#
33# Provide generalized library-building support services.33# Provide generalized library-building support services.
34#34#
35# --config show all configuration variables35# --config show all configuration variables
36# --debug enable verbose shell tracing36# --debug enable verbose shell tracing
37# -n, --dry-run display commands without modifying any files37# -n, --dry-run display commands without modifying any files
38# --features display basic configuration information and exit38# --features display basic configuration information and exit
39# --mode=MODE use operation mode MODE39# --mode=MODE use operation mode MODE
40# --preserve-dup-deps don't remove duplicate dependency libraries40# --preserve-dup-deps don't remove duplicate dependency libraries
41# --quiet, --silent don't print informational messages41# --quiet, --silent don't print informational messages
42# --tag=TAG use configuration variables from tag TAG42# --no-quiet, --no-silent
43# -v, --verbose print informational messages (default)43# print informational messages (default)
44# --version print version information44# --tag=TAG use configuration variables from tag TAG
45# -h, --help print short or long help message45# -v, --verbose print more informational messages than default
46# --no-verbose don't print the extra informational messages
47# --version print version information
48# -h, --help, --help-all print short, long, or detailed help message
46#49#
47# MODE must be one of the following:50# MODE must be one of the following:
48#51#
49# clean remove files from the build directory52# clean remove files from the build directory
50# compile compile a source file into a libtool object53# compile compile a source file into a libtool object
51# execute automatically set library path, then run a program54# execute automatically set library path, then run a program
52# finish complete the installation of libtool libraries55# finish complete the installation of libtool libraries
53# install install libraries or executables56# install install libraries or executables
54# link create a library or an executable57# link create a library or an executable
55# uninstall remove libraries from an installed directory58# uninstall remove libraries from an installed directory
56#59#
57# MODE-ARGS vary depending on the MODE.60# MODE-ARGS vary depending on the MODE. When passed as first option,
61# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
58# Try `$progname --help --mode=MODE' for a more detailed description of MODE.62# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
59#63#
60# When reporting a bug, please describe a test case to reproduce it and64# When reporting a bug, please describe a test case to reproduce it and
61# include the following information:65# include the following information:
62#66#
63# host-triplet: $host67# host-triplet: $host
64# shell: $SHELL68# shell: $SHELL
65# compiler: $LTCC69# compiler: $LTCC
66# compiler flags: $LTCFLAGS70# compiler flags: $LTCFLAGS
67# linker: $LD (gnu? $with_gnu_ld)71# linker: $LD (gnu? $with_gnu_ld)
68# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu372# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1
69# automake: $automake_version73# automake: $automake_version
70# autoconf: $autoconf_version74# autoconf: $autoconf_version
71#75#
72# Report bugs to <bug-libtool@gnu.org>.76# Report bugs to <bug-libtool@gnu.org>.
77# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
78# General help using GNU software: <http://www.gnu.org/gethelp/>.
7379
74PROGRAM=ltmain.sh80PROGRAM=libtool
75PACKAGE=libtool81PACKAGE=libtool
76VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"82VERSION="2.4 Debian-2.4-2ubuntu1"
77TIMESTAMP=""83TIMESTAMP=""
78package_revision=1.301784package_revision=1.3293
7985
80# Be Bourne compatible86# Be Bourne compatible
81if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then87if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@
91BIN_SH=xpg4; export BIN_SH # for Tru6497BIN_SH=xpg4; export BIN_SH # for Tru64
92DUALCASE=1; export DUALCASE # for MKS sh98DUALCASE=1; export DUALCASE # for MKS sh
9399
100# A function that is used when there is no print builtin or printf.
101func_fallback_echo ()
102{
103 eval 'cat <<_LTECHO_EOF
104$1
105_LTECHO_EOF'
106}
107
94# NLS nuisances: We save the old values to restore during execute mode.108# NLS nuisances: We save the old values to restore during execute mode.
95# Only set LANG and LC_ALL to C if already set.
96# These must not be set unconditionally because not all systems understand
97# e.g. LANG=C (notably SCO).
98lt_user_locale=109lt_user_locale=
99lt_safe_locale=110lt_safe_locale=
100for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES111for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,15 +118,24 @@
107 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"118 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
108 fi"119 fi"
109done120done
121LC_ALL=C
122LANGUAGE=C
123export LANGUAGE LC_ALL
110124
111$lt_unset CDPATH125$lt_unset CDPATH
112126
113127
128# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
129# is ksh but when the shell is invoked as "sh" and the current value of
130# the _XPG environment variable is not equal to 1 (one), the special
131# positional parameter $0, within a function call, is the name of the
132# function.
133progpath="$0"
114134
115135
116136
117: ${CP="cp -f"}137: ${CP="cp -f"}
118: ${ECHO="echo"}138test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
119: ${EGREP="/bin/grep -E"}139: ${EGREP="/bin/grep -E"}
120: ${FGREP="/bin/grep -F"}140: ${FGREP="/bin/grep -F"}
121: ${GREP="/bin/grep"}141: ${GREP="/bin/grep"}
@@ -144,6 +164,27 @@
144dirname="s,/[^/]*$,,"164dirname="s,/[^/]*$,,"
145basename="s,^.*/,,"165basename="s,^.*/,,"
146166
167# func_dirname file append nondir_replacement
168# Compute the dirname of FILE. If nonempty, add APPEND to the result,
169# otherwise set result to NONDIR_REPLACEMENT.
170func_dirname ()
171{
172 func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
173 if test "X$func_dirname_result" = "X${1}"; then
174 func_dirname_result="${3}"
175 else
176 func_dirname_result="$func_dirname_result${2}"
177 fi
178} # func_dirname may be replaced by extended shell implementation
179
180
181# func_basename file
182func_basename ()
183{
184 func_basename_result=`$ECHO "${1}" | $SED "$basename"`
185} # func_basename may be replaced by extended shell implementation
186
187
147# func_dirname_and_basename file append nondir_replacement188# func_dirname_and_basename file append nondir_replacement
148# perform func_basename and func_dirname in a single function189# perform func_basename and func_dirname in a single function
149# call:190# call:
@@ -158,33 +199,183 @@
158# those functions but instead duplicate the functionality here.199# those functions but instead duplicate the functionality here.
159func_dirname_and_basename ()200func_dirname_and_basename ()
160{201{
161 # Extract subdirectory from the argument.202 # Extract subdirectory from the argument.
162 func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`203 func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
163 if test "X$func_dirname_result" = "X${1}"; then204 if test "X$func_dirname_result" = "X${1}"; then
164 func_dirname_result="${3}"205 func_dirname_result="${3}"
165 else206 else
166 func_dirname_result="$func_dirname_result${2}"207 func_dirname_result="$func_dirname_result${2}"
167 fi208 fi
168 func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`209 func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
169}210} # func_dirname_and_basename may be replaced by extended shell implementation
170211
171# Generated shell functions inserted here.212
172213# func_stripname prefix suffix name
173# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh214# strip PREFIX and SUFFIX off of NAME.
174# is ksh but when the shell is invoked as "sh" and the current value of215# PREFIX and SUFFIX must not contain globbing or regex special
175# the _XPG environment variable is not equal to 1 (one), the special216# characters, hashes, percent signs, but SUFFIX may contain a leading
176# positional parameter $0, within a function call, is the name of the217# dot (in which case that matches only a dot).
177# function.218# func_strip_suffix prefix name
178progpath="$0"219func_stripname ()
220{
221 case ${2} in
222 .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
223 *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
224 esac
225} # func_stripname may be replaced by extended shell implementation
226
227
228# These SED scripts presuppose an absolute path with a trailing slash.
229pathcar='s,^/\([^/]*\).*$,\1,'
230pathcdr='s,^/[^/]*,,'
231removedotparts=':dotsl
232 s@/\./@/@g
233 t dotsl
234 s,/\.$,/,'
235collapseslashes='s@/\{1,\}@/@g'
236finalslash='s,/*$,/,'
237
238# func_normal_abspath PATH
239# Remove doubled-up and trailing slashes, "." path components,
240# and cancel out any ".." path components in PATH after making
241# it an absolute path.
242# value returned in "$func_normal_abspath_result"
243func_normal_abspath ()
244{
245 # Start from root dir and reassemble the path.
246 func_normal_abspath_result=
247 func_normal_abspath_tpath=$1
248 func_normal_abspath_altnamespace=
249 case $func_normal_abspath_tpath in
250 "")
251 # Empty path, that just means $cwd.
252 func_stripname '' '/' "`pwd`"
253 func_normal_abspath_result=$func_stripname_result
254 return
255 ;;
256 # The next three entries are used to spot a run of precisely
257 # two leading slashes without using negated character classes;
258 # we take advantage of case's first-match behaviour.
259 ///*)
260 # Unusual form of absolute path, do nothing.
261 ;;
262 //*)
263 # Not necessarily an ordinary path; POSIX reserves leading '//'
264 # and for example Cygwin uses it to access remote file shares
265 # over CIFS/SMB, so we conserve a leading double slash if found.
266 func_normal_abspath_altnamespace=/
267 ;;
268 /*)
269 # Absolute path, do nothing.
270 ;;
271 *)
272 # Relative path, prepend $cwd.
273 func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
274 ;;
275 esac
276 # Cancel out all the simple stuff to save iterations. We also want
277 # the path to end with a slash for ease of parsing, so make sure
278 # there is one (and only one) here.
279 func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
280 -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
281 while :; do
282 # Processed it all yet?
283 if test "$func_normal_abspath_tpath" = / ; then
284 # If we ascended to the root using ".." the result may be empty now.
285 if test -z "$func_normal_abspath_result" ; then
286 func_normal_abspath_result=/
287 fi
288 break
289 fi
290 func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
291 -e "$pathcar"`
292 func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
293 -e "$pathcdr"`
294 # Figure out what to do with it
295 case $func_normal_abspath_tcomponent in
296 "")
297 # Trailing empty path component, ignore it.
298 ;;
299 ..)
300 # Parent dir; strip last assembled component from result.
301 func_dirname "$func_normal_abspath_result"
302 func_normal_abspath_result=$func_dirname_result
303 ;;
304 *)
305 # Actual path component, append it.
306 func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
307 ;;
308 esac
309 done
310 # Restore leading double-slash if one was found on entry.
311 func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
312}
313
314# func_relative_path SRCDIR DSTDIR
315# generates a relative path from SRCDIR to DSTDIR, with a trailing
316# slash if non-empty, suitable for immediately appending a filename
317# without needing to append a separator.
318# value returned in "$func_relative_path_result"
319func_relative_path ()
320{
321 func_relative_path_result=
322 func_normal_abspath "$1"
323 func_relative_path_tlibdir=$func_normal_abspath_result
324 func_normal_abspath "$2"
325 func_relative_path_tbindir=$func_normal_abspath_result
326
327 # Ascend the tree starting from libdir
328 while :; do
329 # check if we have found a prefix of bindir
330 case $func_relative_path_tbindir in
331 $func_relative_path_tlibdir)
332 # found an exact match
333 func_relative_path_tcancelled=
334 break
335 ;;
336 $func_relative_path_tlibdir*)
337 # found a matching prefix
338 func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
339 func_relative_path_tcancelled=$func_stripname_result
340 if test -z "$func_relative_path_result"; then
341 func_relative_path_result=.
342 fi
343 break
344 ;;
345 *)
346 func_dirname $func_relative_path_tlibdir
347 func_relative_path_tlibdir=${func_dirname_result}
348 if test "x$func_relative_path_tlibdir" = x ; then
349 # Have to descend all the way to the root!
350 func_relative_path_result=../$func_relative_path_result
351 func_relative_path_tcancelled=$func_relative_path_tbindir
352 break
353 fi
354 func_relative_path_result=../$func_relative_path_result
355 ;;
356 esac
357 done
358
359 # Now calculate path; take care to avoid doubling-up slashes.
360 func_stripname '' '/' "$func_relative_path_result"
361 func_relative_path_result=$func_stripname_result
362 func_stripname '/' '/' "$func_relative_path_tcancelled"
363 if test "x$func_stripname_result" != x ; then
364 func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
365 fi
366
367 # Normalisation. If bindir is libdir, return empty string,
368 # else relative path ending with a slash; either way, target
369 # file name can be directly appended.
370 if test ! -z "$func_relative_path_result"; then
371 func_stripname './' '' "$func_relative_path_result/"
372 func_relative_path_result=$func_stripname_result
373 fi
374}
179375
180# The name of this program:376# The name of this program:
181# In the unlikely event $progname began with a '-', it would play havoc with
182# func_echo (imagine progname=-n), so we prepend ./ in that case:
183func_dirname_and_basename "$progpath"377func_dirname_and_basename "$progpath"
184progname=$func_basename_result378progname=$func_basename_result
185case $progname in
186 -*) progname=./$progname ;;
187esac
188379
189# Make sure we have an absolute path for reexecution:380# Make sure we have an absolute path for reexecution:
190case $progpath in381case $progpath in
@@ -215,6 +406,15 @@
215# Same as above, but do not quote variable references.406# Same as above, but do not quote variable references.
216double_quote_subst='s/\(["`\\]\)/\\\1/g'407double_quote_subst='s/\(["`\\]\)/\\\1/g'
217408
409# Sed substitution that turns a string into a regex matching for the
410# string literally.
411sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
412
413# Sed substitution that converts a w32 file name or path
414# which contains forward slashes, into one that contains
415# (escaped) backslashes. A very naive implementation.
416lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
417
218# Re-`\' parameter expansions in output of double_quote_subst that were418# Re-`\' parameter expansions in output of double_quote_subst that were
219# `\'-ed in input to the same. If an odd number of `\' preceded a '$'419# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
220# in input to double_quote_subst, that '$' was protected from expansion.420# in input to double_quote_subst, that '$' was protected from expansion.
@@ -243,7 +443,7 @@
243# name if it has been set yet.443# name if it has been set yet.
244func_echo ()444func_echo ()
245{445{
246 $ECHO "$progname${mode+: }$mode: $*"446 $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
247}447}
248448
249# func_verbose arg...449# func_verbose arg...
@@ -258,18 +458,25 @@
258 :458 :
259}459}
260460
461# func_echo_all arg...
462# Invoke $ECHO with all args, space-separated.
463func_echo_all ()
464{
465 $ECHO "$*"
466}
467
261# func_error arg...468# func_error arg...
262# Echo program name prefixed message to standard error.469# Echo program name prefixed message to standard error.
263func_error ()470func_error ()
264{471{
265 $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2472 $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
266}473}
267474
268# func_warning arg...475# func_warning arg...
269# Echo program name prefixed warning message to standard error.476# Echo program name prefixed warning message to standard error.
270func_warning ()477func_warning ()
271{478{
272 $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2479 $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
273480
274 # bash bug again:481 # bash bug again:
275 :482 :
@@ -326,9 +533,9 @@
326 case $my_directory_path in */*) ;; *) break ;; esac533 case $my_directory_path in */*) ;; *) break ;; esac
327534
328 # ...otherwise throw away the child directory and loop535 # ...otherwise throw away the child directory and loop
329 my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`536 my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
330 done537 done
331 my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`538 my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
332539
333 save_mkdir_p_IFS="$IFS"; IFS=':'540 save_mkdir_p_IFS="$IFS"; IFS=':'
334 for my_dir in $my_dir_list; do541 for my_dir in $my_dir_list; do
@@ -378,7 +585,7 @@
378 func_fatal_error "cannot create temporary directory \`$my_tmpdir'"585 func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
379 fi586 fi
380587
381 $ECHO "X$my_tmpdir" | $Xsed588 $ECHO "$my_tmpdir"
382}589}
383590
384591
@@ -392,7 +599,7 @@
392{599{
393 case $1 in600 case $1 in
394 *[\\\`\"\$]*)601 *[\\\`\"\$]*)
395 func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;602 func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
396 *)603 *)
397 func_quote_for_eval_unquoted_result="$1" ;;604 func_quote_for_eval_unquoted_result="$1" ;;
398 esac605 esac
@@ -419,7 +626,7 @@
419{626{
420 case $1 in627 case $1 in
421 *[\\\`\"]*)628 *[\\\`\"]*)
422 my_arg=`$ECHO "X$1" | $Xsed \629 my_arg=`$ECHO "$1" | $SED \
423 -e "$double_quote_subst" -e "$sed_double_backslash"` ;;630 -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
424 *)631 *)
425 my_arg="$1" ;;632 my_arg="$1" ;;
@@ -488,15 +695,39 @@
488 fi695 fi
489}696}
490697
491698# func_tr_sh
492699# Turn $1 into a string suitable for a shell variable name.
700# Result is stored in $func_tr_sh_result. All characters
701# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
702# if $1 begins with a digit, a '_' is prepended as well.
703func_tr_sh ()
704{
705 case $1 in
706 [0-9]* | *[!a-zA-Z0-9_]*)
707 func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
708 ;;
709 * )
710 func_tr_sh_result=$1
711 ;;
712 esac
713}
493714
494715
495# func_version716# func_version
496# Echo version message to standard output and exit.717# Echo version message to standard output and exit.
497func_version ()718func_version ()
498{719{
499 $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {720 $opt_debug
721
722 $SED -n '/(C)/!b go
723 :more
724 /\./!{
725 N
726 s/\n# / /
727 b more
728 }
729 :go
730 /^# '$PROGRAM' (GNU /,/# warranty; / {
500 s/^# //731 s/^# //
501 s/^# *$//732 s/^# *$//
502 s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/733 s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,22 +740,28 @@
509# Echo short help message to standard output and exit.740# Echo short help message to standard output and exit.
510func_usage ()741func_usage ()
511{742{
512 $SED -n '/^# Usage:/,/# -h/ {743 $opt_debug
744
745 $SED -n '/^# Usage:/,/^# *.*--help/ {
513 s/^# //746 s/^# //
514 s/^# *$//747 s/^# *$//
515 s/\$progname/'$progname'/748 s/\$progname/'$progname'/
516 p749 p
517 }' < "$progpath"750 }' < "$progpath"
518 $ECHO751 echo
519 $ECHO "run \`$progname --help | more' for full usage"752 $ECHO "run \`$progname --help | more' for full usage"
520 exit $?753 exit $?
521}754}
522755
523# func_help756# func_help [NOEXIT]
524# Echo long help message to standard output and exit.757# Echo long help message to standard output and exit,
758# unless 'noexit' is passed as argument.
525func_help ()759func_help ()
526{760{
761 $opt_debug
762
527 $SED -n '/^# Usage:/,/# Report bugs to/ {763 $SED -n '/^# Usage:/,/# Report bugs to/ {
764 :print
528 s/^# //765 s/^# //
529 s/^# *$//766 s/^# *$//
530 s*\$progname*'$progname'*767 s*\$progname*'$progname'*
@@ -537,8 +774,15 @@
537 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/774 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
538 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/775 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
539 p776 p
540 }' < "$progpath"777 d
541 exit $?778 }
779 /^# .* home page:/b print
780 /^# General help using/b print
781 ' < "$progpath"
782 ret=$?
783 if test -z "$1"; then
784 exit $ret
785 fi
542}786}
543787
544# func_missing_arg argname788# func_missing_arg argname
@@ -546,63 +790,106 @@
546# exit_cmd.790# exit_cmd.
547func_missing_arg ()791func_missing_arg ()
548{792{
549 func_error "missing argument for $1"793 $opt_debug
794
795 func_error "missing argument for $1."
550 exit_cmd=exit796 exit_cmd=exit
551}797}
552798
799
800# func_split_short_opt shortopt
801# Set func_split_short_opt_name and func_split_short_opt_arg shell
802# variables after splitting SHORTOPT after the 2nd character.
803func_split_short_opt ()
804{
805 my_sed_short_opt='1s/^\(..\).*$/\1/;q'
806 my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
807
808 func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
809 func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
810} # func_split_short_opt may be replaced by extended shell implementation
811
812
813# func_split_long_opt longopt
814# Set func_split_long_opt_name and func_split_long_opt_arg shell
815# variables after splitting LONGOPT at the `=' sign.
816func_split_long_opt ()
817{
818 my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
819 my_sed_long_arg='1s/^--[^=]*=//'
820
821 func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
822 func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
823} # func_split_long_opt may be replaced by extended shell implementation
824
553exit_cmd=:825exit_cmd=:
554826
555827
556828
557829
558830
559# Check that we have a working $ECHO.
560if test "X$1" = X--no-reexec; then
561 # Discard the --no-reexec flag, and continue.
562 shift
563elif test "X$1" = X--fallback-echo; then
564 # Avoid inline document here, it may be left over
565 :
566elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
567 # Yippee, $ECHO works!
568 :
569else
570 # Restart under the correct shell, and then maybe $ECHO will work.
571 exec $SHELL "$progpath" --no-reexec ${1+"$@"}
572fi
573
574if test "X$1" = X--fallback-echo; then
575 # used as fallback echo
576 shift
577 cat <<EOF
578$*
579EOF
580 exit $EXIT_SUCCESS
581fi
582
583magic="%%%MAGIC variable%%%"831magic="%%%MAGIC variable%%%"
584magic_exe="%%%MAGIC EXE variable%%%"832magic_exe="%%%MAGIC EXE variable%%%"
585833
586# Global variables.834# Global variables.
587# $mode is unset
588nonopt=835nonopt=
589execute_dlfiles=
590preserve_args=836preserve_args=
591lo2o="s/\\.lo\$/.${objext}/"837lo2o="s/\\.lo\$/.${objext}/"
592o2lo="s/\\.${objext}\$/.lo/"838o2lo="s/\\.${objext}\$/.lo/"
593extracted_archives=839extracted_archives=
594extracted_serial=0840extracted_serial=0
595841
596opt_dry_run=false
597opt_duplicate_deps=false
598opt_silent=false
599opt_debug=:
600
601# If this variable is set in any of the actions, the command in it842# If this variable is set in any of the actions, the command in it
602# will be execed at the end. This prevents here-documents from being843# will be execed at the end. This prevents here-documents from being
603# left over by shells.844# left over by shells.
604exec_cmd=845exec_cmd=
605846
847# func_append var value
848# Append VALUE to the end of shell variable VAR.
849func_append ()
850{
851 eval "${1}=\$${1}\${2}"
852} # func_append may be replaced by extended shell implementation
853
854# func_append_quoted var value
855# Quote VALUE and append to the end of shell variable VAR, separated
856# by a space.
857func_append_quoted ()
858{
859 func_quote_for_eval "${2}"
860 eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
861} # func_append_quoted may be replaced by extended shell implementation
862
863
864# func_arith arithmetic-term...
865func_arith ()
866{
867 func_arith_result=`expr "${@}"`
868} # func_arith may be replaced by extended shell implementation
869
870
871# func_len string
872# STRING may not start with a hyphen.
873func_len ()
874{
875 func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
876} # func_len may be replaced by extended shell implementation
877
878
879# func_lo2o object
880func_lo2o ()
881{
882 func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
883} # func_lo2o may be replaced by extended shell implementation
884
885
886# func_xform libobj-or-source
887func_xform ()
888{
889 func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
890} # func_xform may be replaced by extended shell implementation
891
892
606# func_fatal_configuration arg...893# func_fatal_configuration arg...
607# Echo program name prefixed message to standard error, followed by894# Echo program name prefixed message to standard error, followed by
608# a configuration failure hint, and exit.895# a configuration failure hint, and exit.
@@ -636,16 +923,16 @@
636# Display the features supported by this script.923# Display the features supported by this script.
637func_features ()924func_features ()
638{925{
639 $ECHO "host: $host"926 echo "host: $host"
640 if test "$build_libtool_libs" = yes; then927 if test "$build_libtool_libs" = yes; then
641 $ECHO "enable shared libraries"928 echo "enable shared libraries"
642 else929 else
643 $ECHO "disable shared libraries"930 echo "disable shared libraries"
644 fi931 fi
645 if test "$build_old_libs" = yes; then932 if test "$build_old_libs" = yes; then
646 $ECHO "enable static libraries"933 echo "enable static libraries"
647 else934 else
648 $ECHO "disable static libraries"935 echo "disable static libraries"
649 fi936 fi
650937
651 exit $?938 exit $?
@@ -692,133 +979,6 @@
692 esac979 esac
693}980}
694981
695# Parse options once, thoroughly. This comes as soon as possible in
696# the script to make things like `libtool --version' happen quickly.
697{
698
699 # Shorthand for --mode=foo, only valid as the first argument
700 case $1 in
701 clean|clea|cle|cl)
702 shift; set dummy --mode clean ${1+"$@"}; shift
703 ;;
704 compile|compil|compi|comp|com|co|c)
705 shift; set dummy --mode compile ${1+"$@"}; shift
706 ;;
707 execute|execut|execu|exec|exe|ex|e)
708 shift; set dummy --mode execute ${1+"$@"}; shift
709 ;;
710 finish|finis|fini|fin|fi|f)
711 shift; set dummy --mode finish ${1+"$@"}; shift
712 ;;
713 install|instal|insta|inst|ins|in|i)
714 shift; set dummy --mode install ${1+"$@"}; shift
715 ;;
716 link|lin|li|l)
717 shift; set dummy --mode link ${1+"$@"}; shift
718 ;;
719 uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
720 shift; set dummy --mode uninstall ${1+"$@"}; shift
721 ;;
722 esac
723
724 # Parse non-mode specific arguments:
725 while test "$#" -gt 0; do
726 opt="$1"
727 shift
728
729 case $opt in
730 --config) func_config ;;
731
732 --debug) preserve_args="$preserve_args $opt"
733 func_echo "enabling shell trace mode"
734 opt_debug='set -x'
735 $opt_debug
736 ;;
737
738 -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
739 execute_dlfiles="$execute_dlfiles $1"
740 shift
741 ;;
742
743 --dry-run | -n) opt_dry_run=: ;;
744 --features) func_features ;;
745 --finish) mode="finish" ;;
746
747 --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
748 case $1 in
749 # Valid mode arguments:
750 clean) ;;
751 compile) ;;
752 execute) ;;
753 finish) ;;
754 install) ;;
755 link) ;;
756 relink) ;;
757 uninstall) ;;
758
759 # Catch anything else as an error
760 *) func_error "invalid argument for $opt"
761 exit_cmd=exit
762 break
763 ;;
764 esac
765
766 mode="$1"
767 shift
768 ;;
769
770 --preserve-dup-deps)
771 opt_duplicate_deps=: ;;
772
773 --quiet|--silent) preserve_args="$preserve_args $opt"
774 opt_silent=:
775 ;;
776
777 --verbose| -v) preserve_args="$preserve_args $opt"
778 opt_silent=false
779 ;;
780
781 --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
782 preserve_args="$preserve_args $opt $1"
783 func_enable_tag "$1" # tagname is set here
784 shift
785 ;;
786
787 # Separate optargs to long options:
788 -dlopen=*|--mode=*|--tag=*)
789 func_opt_split "$opt"
790 set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
791 shift
792 ;;
793
794 -\?|-h) func_usage ;;
795 --help) opt_help=: ;;
796 --version) func_version ;;
797
798 -*) func_fatal_help "unrecognized option \`$opt'" ;;
799
800 *) nonopt="$opt"
801 break
802 ;;
803 esac
804 done
805
806
807 case $host in
808 *cygwin* | *mingw* | *pw32* | *cegcc*)
809 # don't eliminate duplications in $postdeps and $predeps
810 opt_duplicate_compiler_generated_deps=:
811 ;;
812 *)
813 opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
814 ;;
815 esac
816
817 # Having warned about all mis-specified options, bail out if
818 # anything was wrong.
819 $exit_cmd $EXIT_FAILURE
820}
821
822# func_check_version_match982# func_check_version_match
823# Ensure that we are using m4 macros, and libtool script from the same983# Ensure that we are using m4 macros, and libtool script from the same
824# release of libtool.984# release of libtool.
@@ -855,38 +1015,214 @@
855}1015}
8561016
8571017
1018# Shorthand for --mode=foo, only valid as the first argument
1019case $1 in
1020clean|clea|cle|cl)
1021 shift; set dummy --mode clean ${1+"$@"}; shift
1022 ;;
1023compile|compil|compi|comp|com|co|c)
1024 shift; set dummy --mode compile ${1+"$@"}; shift
1025 ;;
1026execute|execut|execu|exec|exe|ex|e)
1027 shift; set dummy --mode execute ${1+"$@"}; shift
1028 ;;
1029finish|finis|fini|fin|fi|f)
1030 shift; set dummy --mode finish ${1+"$@"}; shift
1031 ;;
1032install|instal|insta|inst|ins|in|i)
1033 shift; set dummy --mode install ${1+"$@"}; shift
1034 ;;
1035link|lin|li|l)
1036 shift; set dummy --mode link ${1+"$@"}; shift
1037 ;;
1038uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
1039 shift; set dummy --mode uninstall ${1+"$@"}; shift
1040 ;;
1041esac
1042
1043
1044
1045# Option defaults:
1046opt_debug=:
1047opt_dry_run=false
1048opt_config=false
1049opt_preserve_dup_deps=false
1050opt_features=false
1051opt_finish=false
1052opt_help=false
1053opt_help_all=false
1054opt_silent=:
1055opt_verbose=:
1056opt_silent=false
1057opt_verbose=false
1058
1059
1060# Parse options once, thoroughly. This comes as soon as possible in the
1061# script to make things like `--version' happen as quickly as we can.
1062{
1063 # this just eases exit handling
1064 while test $# -gt 0; do
1065 opt="$1"
1066 shift
1067 case $opt in
1068 --debug|-x) opt_debug='set -x'
1069 func_echo "enabling shell trace mode"
1070 $opt_debug
1071 ;;
1072 --dry-run|--dryrun|-n)
1073 opt_dry_run=:
1074 ;;
1075 --config)
1076 opt_config=:
1077func_config
1078 ;;
1079 --dlopen|-dlopen)
1080 optarg="$1"
1081 opt_dlopen="${opt_dlopen+$opt_dlopen
1082}$optarg"
1083 shift
1084 ;;
1085 --preserve-dup-deps)
1086 opt_preserve_dup_deps=:
1087 ;;
1088 --features)
1089 opt_features=:
1090func_features
1091 ;;
1092 --finish)
1093 opt_finish=:
1094set dummy --mode finish ${1+"$@"}; shift
1095 ;;
1096 --help)
1097 opt_help=:
1098 ;;
1099 --help-all)
1100 opt_help_all=:
1101opt_help=': help-all'
1102 ;;
1103 --mode)
1104 test $# = 0 && func_missing_arg $opt && break
1105 optarg="$1"
1106 opt_mode="$optarg"
1107case $optarg in
1108 # Valid mode arguments:
1109 clean|compile|execute|finish|install|link|relink|uninstall) ;;
1110
1111 # Catch anything else as an error
1112 *) func_error "invalid argument for $opt"
1113 exit_cmd=exit
1114 break
1115 ;;
1116esac
1117 shift
1118 ;;
1119 --no-silent|--no-quiet)
1120 opt_silent=false
1121func_append preserve_args " $opt"
1122 ;;
1123 --no-verbose)
1124 opt_verbose=false
1125func_append preserve_args " $opt"
1126 ;;
1127 --silent|--quiet)
1128 opt_silent=:
1129func_append preserve_args " $opt"
1130 opt_verbose=false
1131 ;;
1132 --verbose|-v)
1133 opt_verbose=:
1134func_append preserve_args " $opt"
1135opt_silent=false
1136 ;;
1137 --tag)
1138 test $# = 0 && func_missing_arg $opt && break
1139 optarg="$1"
1140 opt_tag="$optarg"
1141func_append preserve_args " $opt $optarg"
1142func_enable_tag "$optarg"
1143 shift
1144 ;;
1145
1146 -\?|-h) func_usage ;;
1147 --help) func_help ;;
1148 --version) func_version ;;
1149
1150 # Separate optargs to long options:
1151 --*=*)
1152 func_split_long_opt "$opt"
1153 set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
1154 shift
1155 ;;
1156
1157 # Separate non-argument short options:
1158 -\?*|-h*|-n*|-v*)
1159 func_split_short_opt "$opt"
1160 set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
1161 shift
1162 ;;
1163
1164 --) break ;;
1165 -*) func_fatal_help "unrecognized option \`$opt'" ;;
1166 *) set dummy "$opt" ${1+"$@"}; shift; break ;;
1167 esac
1168 done
1169
1170 # Validate options:
1171
1172 # save first non-option argument
1173 if test "$#" -gt 0; then
1174 nonopt="$opt"
1175 shift
1176 fi
1177
1178 # preserve --debug
1179 test "$opt_debug" = : || func_append preserve_args " --debug"
1180
1181 case $host in
1182 *cygwin* | *mingw* | *pw32* | *cegcc*)
1183 # don't eliminate duplications in $postdeps and $predeps
1184 opt_duplicate_compiler_generated_deps=:
1185 ;;
1186 *)
1187 opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
1188 ;;
1189 esac
1190
1191 $opt_help || {
1192 # Sanity checks first:
1193 func_check_version_match
1194
1195 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
1196 func_fatal_configuration "not configured to build any kind of library"
1197 fi
1198
1199 # Darwin sucks
1200 eval std_shrext=\"$shrext_cmds\"
1201
1202 # Only execute mode is allowed to have -dlopen flags.
1203 if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
1204 func_error "unrecognized option \`-dlopen'"
1205 $ECHO "$help" 1>&2
1206 exit $EXIT_FAILURE
1207 fi
1208
1209 # Change the help message to a mode-specific one.
1210 generic_help="$help"
1211 help="Try \`$progname --help --mode=$opt_mode' for more information."
1212 }
1213
1214
1215 # Bail if the options were screwed
1216 $exit_cmd $EXIT_FAILURE
1217}
1218
1219
1220
1221
858## ----------- ##1222## ----------- ##
859## Main. ##1223## Main. ##
860## ----------- ##1224## ----------- ##
8611225
862$opt_help || {
863 # Sanity checks first:
864 func_check_version_match
865
866 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
867 func_fatal_configuration "not configured to build any kind of library"
868 fi
869
870 test -z "$mode" && func_fatal_error "error: you must specify a MODE."
871
872
873 # Darwin sucks
874 eval std_shrext=\"$shrext_cmds\"
875
876
877 # Only execute mode is allowed to have -dlopen flags.
878 if test -n "$execute_dlfiles" && test "$mode" != execute; then
879 func_error "unrecognized option \`-dlopen'"
880 $ECHO "$help" 1>&2
881 exit $EXIT_FAILURE
882 fi
883
884 # Change the help message to a mode-specific one.
885 generic_help="$help"
886 help="Try \`$progname --help --mode=$mode' for more information."
887}
888
889
890# func_lalib_p file1226# func_lalib_p file
891# True iff FILE is a libtool `.la' library or `.lo' object file.1227# True iff FILE is a libtool `.la' library or `.lo' object file.
892# This function is only a basic sanity check; it will hardly flush out1228# This function is only a basic sanity check; it will hardly flush out
@@ -950,12 +1286,9 @@
950# temporary ltwrapper_script.1286# temporary ltwrapper_script.
951func_ltwrapper_scriptname ()1287func_ltwrapper_scriptname ()
952{1288{
953 func_ltwrapper_scriptname_result=""1289 func_dirname_and_basename "$1" "" "."
954 if func_ltwrapper_executable_p "$1"; then1290 func_stripname '' '.exe' "$func_basename_result"
955 func_dirname_and_basename "$1" "" "."1291 func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
956 func_stripname '' '.exe' "$func_basename_result"
957 func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
958 fi
959}1292}
9601293
961# func_ltwrapper_p file1294# func_ltwrapper_p file
@@ -1001,6 +1334,37 @@
1001}1334}
10021335
10031336
1337# func_resolve_sysroot PATH
1338# Replace a leading = in PATH with a sysroot. Store the result into
1339# func_resolve_sysroot_result
1340func_resolve_sysroot ()
1341{
1342 func_resolve_sysroot_result=$1
1343 case $func_resolve_sysroot_result in
1344 =*)
1345 func_stripname '=' '' "$func_resolve_sysroot_result"
1346 func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
1347 ;;
1348 esac
1349}
1350
1351# func_replace_sysroot PATH
1352# If PATH begins with the sysroot, replace it with = and
1353# store the result into func_replace_sysroot_result.
1354func_replace_sysroot ()
1355{
1356 case "$lt_sysroot:$1" in
1357 ?*:"$lt_sysroot"*)
1358 func_stripname "$lt_sysroot" '' "$1"
1359 func_replace_sysroot_result="=$func_stripname_result"
1360 ;;
1361 *)
1362 # Including no sysroot.
1363 func_replace_sysroot_result=$1
1364 ;;
1365 esac
1366}
1367
1004# func_infer_tag arg1368# func_infer_tag arg
1005# Infer tagged configuration to use if any are available and1369# Infer tagged configuration to use if any are available and
1006# if one wasn't chosen via the "--tag" command line option.1370# if one wasn't chosen via the "--tag" command line option.
@@ -1013,13 +1377,15 @@
1013 if test -n "$available_tags" && test -z "$tagname"; then1377 if test -n "$available_tags" && test -z "$tagname"; then
1014 CC_quoted=1378 CC_quoted=
1015 for arg in $CC; do1379 for arg in $CC; do
1016 func_quote_for_eval "$arg"1380 func_append_quoted CC_quoted "$arg"
1017 CC_quoted="$CC_quoted $func_quote_for_eval_result"
1018 done1381 done
1382 CC_expanded=`func_echo_all $CC`
1383 CC_quoted_expanded=`func_echo_all $CC_quoted`
1019 case $@ in1384 case $@ in
1020 # Blanks in the command may have been stripped by the calling shell,1385 # Blanks in the command may have been stripped by the calling shell,
1021 # but not from the CC environment variable when configure was run.1386 # but not from the CC environment variable when configure was run.
1022 " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;1387 " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
1388 " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
1023 # Blanks at the start of $base_compile will cause this to fail1389 # Blanks at the start of $base_compile will cause this to fail
1024 # if we don't check for them as well.1390 # if we don't check for them as well.
1025 *)1391 *)
@@ -1030,11 +1396,13 @@
1030 CC_quoted=1396 CC_quoted=
1031 for arg in $CC; do1397 for arg in $CC; do
1032 # Double-quote args containing other shell metacharacters.1398 # Double-quote args containing other shell metacharacters.
1033 func_quote_for_eval "$arg"1399 func_append_quoted CC_quoted "$arg"
1034 CC_quoted="$CC_quoted $func_quote_for_eval_result"
1035 done1400 done
1401 CC_expanded=`func_echo_all $CC`
1402 CC_quoted_expanded=`func_echo_all $CC_quoted`
1036 case "$@ " in1403 case "$@ " in
1037 " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)1404 " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
1405 " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
1038 # The compiler in the base compile command matches1406 # The compiler in the base compile command matches
1039 # the one in the tagged configuration.1407 # the one in the tagged configuration.
1040 # Assume this is the tagged configuration we want.1408 # Assume this is the tagged configuration we want.
@@ -1097,6 +1465,486 @@
1097 }1465 }
1098}1466}
10991467
1468
1469##################################################
1470# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
1471##################################################
1472
1473# func_convert_core_file_wine_to_w32 ARG
1474# Helper function used by file name conversion functions when $build is *nix,
1475# and $host is mingw, cygwin, or some other w32 environment. Relies on a
1476# correctly configured wine environment available, with the winepath program
1477# in $build's $PATH.
1478#
1479# ARG is the $build file name to be converted to w32 format.
1480# Result is available in $func_convert_core_file_wine_to_w32_result, and will
1481# be empty on error (or when ARG is empty)
1482func_convert_core_file_wine_to_w32 ()
1483{
1484 $opt_debug
1485 func_convert_core_file_wine_to_w32_result="$1"
1486 if test -n "$1"; then
1487 # Unfortunately, winepath does not exit with a non-zero error code, so we
1488 # are forced to check the contents of stdout. On the other hand, if the
1489 # command is not found, the shell will set an exit code of 127 and print
1490 # *an error message* to stdout. So we must check for both error code of
1491 # zero AND non-empty stdout, which explains the odd construction:
1492 func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
1493 if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
1494 func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
1495 $SED -e "$lt_sed_naive_backslashify"`
1496 else
1497 func_convert_core_file_wine_to_w32_result=
1498 fi
1499 fi
1500}
1501# end: func_convert_core_file_wine_to_w32
1502
1503
1504# func_convert_core_path_wine_to_w32 ARG
1505# Helper function used by path conversion functions when $build is *nix, and
1506# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
1507# configured wine environment available, with the winepath program in $build's
1508# $PATH. Assumes ARG has no leading or trailing path separator characters.
1509#
1510# ARG is path to be converted from $build format to win32.
1511# Result is available in $func_convert_core_path_wine_to_w32_result.
1512# Unconvertible file (directory) names in ARG are skipped; if no directory names
1513# are convertible, then the result may be empty.
1514func_convert_core_path_wine_to_w32 ()
1515{
1516 $opt_debug
1517 # unfortunately, winepath doesn't convert paths, only file names
1518 func_convert_core_path_wine_to_w32_result=""
1519 if test -n "$1"; then
1520 oldIFS=$IFS
1521 IFS=:
1522 for func_convert_core_path_wine_to_w32_f in $1; do
1523 IFS=$oldIFS
1524 func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
1525 if test -n "$func_convert_core_file_wine_to_w32_result" ; then
1526 if test -z "$func_convert_core_path_wine_to_w32_result"; then
1527 func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
1528 else
1529 func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
1530 fi
1531 fi
1532 done
1533 IFS=$oldIFS
1534 fi
1535}
1536# end: func_convert_core_path_wine_to_w32
1537
1538
1539# func_cygpath ARGS...
1540# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
1541# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
1542# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
1543# (2), returns the Cygwin file name or path in func_cygpath_result (input
1544# file name or path is assumed to be in w32 format, as previously converted
1545# from $build's *nix or MSYS format). In case (3), returns the w32 file name
1546# or path in func_cygpath_result (input file name or path is assumed to be in
1547# Cygwin format). Returns an empty string on error.
1548#
1549# ARGS are passed to cygpath, with the last one being the file name or path to
1550# be converted.
1551#
1552# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
1553# environment variable; do not put it in $PATH.
1554func_cygpath ()
1555{
1556 $opt_debug
1557 if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
1558 func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
1559 if test "$?" -ne 0; then
1560 # on failure, ensure result is empty
1561 func_cygpath_result=
1562 fi
1563 else
1564 func_cygpath_result=
1565 func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
1566 fi
1567}
1568#end: func_cygpath
1569
1570
1571# func_convert_core_msys_to_w32 ARG
1572# Convert file name or path ARG from MSYS format to w32 format. Return
1573# result in func_convert_core_msys_to_w32_result.
1574func_convert_core_msys_to_w32 ()
1575{
1576 $opt_debug
1577 # awkward: cmd appends spaces to result
1578 func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
1579 $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
1580}
1581#end: func_convert_core_msys_to_w32
1582
1583
1584# func_convert_file_check ARG1 ARG2
1585# Verify that ARG1 (a file name in $build format) was converted to $host
1586# format in ARG2. Otherwise, emit an error message, but continue (resetting
1587# func_to_host_file_result to ARG1).
1588func_convert_file_check ()
1589{
1590 $opt_debug
1591 if test -z "$2" && test -n "$1" ; then
1592 func_error "Could not determine host file name corresponding to"
1593 func_error " \`$1'"
1594 func_error "Continuing, but uninstalled executables may not work."
1595 # Fallback:
1596 func_to_host_file_result="$1"
1597 fi
1598}
1599# end func_convert_file_check
1600
1601
1602# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
1603# Verify that FROM_PATH (a path in $build format) was converted to $host
1604# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
1605# func_to_host_file_result to a simplistic fallback value (see below).
1606func_convert_path_check ()
1607{
1608 $opt_debug
1609 if test -z "$4" && test -n "$3"; then
1610 func_error "Could not determine the host path corresponding to"
1611 func_error " \`$3'"
1612 func_error "Continuing, but uninstalled executables may not work."
1613 # Fallback. This is a deliberately simplistic "conversion" and
1614 # should not be "improved". See libtool.info.
1615 if test "x$1" != "x$2"; then
1616 lt_replace_pathsep_chars="s|$1|$2|g"
1617 func_to_host_path_result=`echo "$3" |
1618 $SED -e "$lt_replace_pathsep_chars"`
1619 else
1620 func_to_host_path_result="$3"
1621 fi
1622 fi
1623}
1624# end func_convert_path_check
1625
1626
1627# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
1628# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
1629# and appending REPL if ORIG matches BACKPAT.
1630func_convert_path_front_back_pathsep ()
1631{
1632 $opt_debug
1633 case $4 in
1634 $1 ) func_to_host_path_result="$3$func_to_host_path_result"
1635 ;;
1636 esac
1637 case $4 in
1638 $2 ) func_append func_to_host_path_result "$3"
1639 ;;
1640 esac
1641}
1642# end func_convert_path_front_back_pathsep
1643
1644
1645##################################################
1646# $build to $host FILE NAME CONVERSION FUNCTIONS #
1647##################################################
1648# invoked via `$to_host_file_cmd ARG'
1649#
1650# In each case, ARG is the path to be converted from $build to $host format.
1651# Result will be available in $func_to_host_file_result.
1652
1653
1654# func_to_host_file ARG
1655# Converts the file name ARG from $build format to $host format. Return result
1656# in func_to_host_file_result.
1657func_to_host_file ()
1658{
1659 $opt_debug
1660 $to_host_file_cmd "$1"
1661}
1662# end func_to_host_file
1663
1664
1665# func_to_tool_file ARG LAZY
1666# converts the file name ARG from $build format to toolchain format. Return
1667# result in func_to_tool_file_result. If the conversion in use is listed
1668# in (the comma separated) LAZY, no conversion takes place.
1669func_to_tool_file ()
1670{
1671 $opt_debug
1672 case ,$2, in
1673 *,"$to_tool_file_cmd",*)
1674 func_to_tool_file_result=$1
1675 ;;
1676 *)
1677 $to_tool_file_cmd "$1"
1678 func_to_tool_file_result=$func_to_host_file_result
1679 ;;
1680 esac
1681}
1682# end func_to_tool_file
1683
1684
1685# func_convert_file_noop ARG
1686# Copy ARG to func_to_host_file_result.
1687func_convert_file_noop ()
1688{
1689 func_to_host_file_result="$1"
1690}
1691# end func_convert_file_noop
1692
1693
1694# func_convert_file_msys_to_w32 ARG
1695# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
1696# conversion to w32 is not available inside the cwrapper. Returns result in
1697# func_to_host_file_result.
1698func_convert_file_msys_to_w32 ()
1699{
1700 $opt_debug
1701 func_to_host_file_result="$1"
1702 if test -n "$1"; then
1703 func_convert_core_msys_to_w32 "$1"
1704 func_to_host_file_result="$func_convert_core_msys_to_w32_result"
1705 fi
1706 func_convert_file_check "$1" "$func_to_host_file_result"
1707}
1708# end func_convert_file_msys_to_w32
1709
1710
1711# func_convert_file_cygwin_to_w32 ARG
1712# Convert file name ARG from Cygwin to w32 format. Returns result in
1713# func_to_host_file_result.
1714func_convert_file_cygwin_to_w32 ()
1715{
1716 $opt_debug
1717 func_to_host_file_result="$1"
1718 if test -n "$1"; then
1719 # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
1720 # LT_CYGPATH in this case.
1721 func_to_host_file_result=`cygpath -m "$1"`
1722 fi
1723 func_convert_file_check "$1" "$func_to_host_file_result"
1724}
1725# end func_convert_file_cygwin_to_w32
1726
1727
1728# func_convert_file_nix_to_w32 ARG
1729# Convert file name ARG from *nix to w32 format. Requires a wine environment
1730# and a working winepath. Returns result in func_to_host_file_result.
1731func_convert_file_nix_to_w32 ()
1732{
1733 $opt_debug
1734 func_to_host_file_result="$1"
1735 if test -n "$1"; then
1736 func_convert_core_file_wine_to_w32 "$1"
1737 func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
1738 fi
1739 func_convert_file_check "$1" "$func_to_host_file_result"
1740}
1741# end func_convert_file_nix_to_w32
1742
1743
1744# func_convert_file_msys_to_cygwin ARG
1745# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
1746# Returns result in func_to_host_file_result.
1747func_convert_file_msys_to_cygwin ()
1748{
1749 $opt_debug
1750 func_to_host_file_result="$1"
1751 if test -n "$1"; then
1752 func_convert_core_msys_to_w32 "$1"
1753 func_cygpath -u "$func_convert_core_msys_to_w32_result"
1754 func_to_host_file_result="$func_cygpath_result"
1755 fi
1756 func_convert_file_check "$1" "$func_to_host_file_result"
1757}
1758# end func_convert_file_msys_to_cygwin
1759
1760
1761# func_convert_file_nix_to_cygwin ARG
1762# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
1763# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
1764# in func_to_host_file_result.
1765func_convert_file_nix_to_cygwin ()
1766{
1767 $opt_debug
1768 func_to_host_file_result="$1"
1769 if test -n "$1"; then
1770 # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
1771 func_convert_core_file_wine_to_w32 "$1"
1772 func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
1773 func_to_host_file_result="$func_cygpath_result"
1774 fi
1775 func_convert_file_check "$1" "$func_to_host_file_result"
1776}
1777# end func_convert_file_nix_to_cygwin
1778
1779
1780#############################################
1781# $build to $host PATH CONVERSION FUNCTIONS #
1782#############################################
1783# invoked via `$to_host_path_cmd ARG'
1784#
1785# In each case, ARG is the path to be converted from $build to $host format.
1786# The result will be available in $func_to_host_path_result.
1787#
1788# Path separators are also converted from $build format to $host format. If
1789# ARG begins or ends with a path separator character, it is preserved (but
1790# converted to $host format) on output.
1791#
1792# All path conversion functions are named using the following convention:
1793# file name conversion function : func_convert_file_X_to_Y ()
1794# path conversion function : func_convert_path_X_to_Y ()
1795# where, for any given $build/$host combination the 'X_to_Y' value is the
1796# same. If conversion functions are added for new $build/$host combinations,
1797# the two new functions must follow this pattern, or func_init_to_host_path_cmd
1798# will break.
1799
1800
1801# func_init_to_host_path_cmd
1802# Ensures that function "pointer" variable $to_host_path_cmd is set to the
1803# appropriate value, based on the value of $to_host_file_cmd.
1804to_host_path_cmd=
1805func_init_to_host_path_cmd ()
1806{
1807 $opt_debug
1808 if test -z "$to_host_path_cmd"; then
1809 func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
1810 to_host_path_cmd="func_convert_path_${func_stripname_result}"
1811 fi
1812}
1813
1814
1815# func_to_host_path ARG
1816# Converts the path ARG from $build format to $host format. Return result
1817# in func_to_host_path_result.
1818func_to_host_path ()
1819{
1820 $opt_debug
1821 func_init_to_host_path_cmd
1822 $to_host_path_cmd "$1"
1823}
1824# end func_to_host_path
1825
1826
1827# func_convert_path_noop ARG
1828# Copy ARG to func_to_host_path_result.
1829func_convert_path_noop ()
1830{
1831 func_to_host_path_result="$1"
1832}
1833# end func_convert_path_noop
1834
1835
1836# func_convert_path_msys_to_w32 ARG
1837# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
1838# conversion to w32 is not available inside the cwrapper. Returns result in
1839# func_to_host_path_result.
1840func_convert_path_msys_to_w32 ()
1841{
1842 $opt_debug
1843 func_to_host_path_result="$1"
1844 if test -n "$1"; then
1845 # Remove leading and trailing path separator characters from ARG. MSYS
1846 # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
1847 # and winepath ignores them completely.
1848 func_stripname : : "$1"
1849 func_to_host_path_tmp1=$func_stripname_result
1850 func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
1851 func_to_host_path_result="$func_convert_core_msys_to_w32_result"
1852 func_convert_path_check : ";" \
1853 "$func_to_host_path_tmp1" "$func_to_host_path_result"
1854 func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
1855 fi
1856}
1857# end func_convert_path_msys_to_w32
1858
1859
1860# func_convert_path_cygwin_to_w32 ARG
1861# Convert path ARG from Cygwin to w32 format. Returns result in
1862# func_to_host_file_result.
1863func_convert_path_cygwin_to_w32 ()
1864{
1865 $opt_debug
1866 func_to_host_path_result="$1"
1867 if test -n "$1"; then
1868 # See func_convert_path_msys_to_w32:
1869 func_stripname : : "$1"
1870 func_to_host_path_tmp1=$func_stripname_result
1871 func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
1872 func_convert_path_check : ";" \
1873 "$func_to_host_path_tmp1" "$func_to_host_path_result"
1874 func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
1875 fi
1876}
1877# end func_convert_path_cygwin_to_w32
1878
1879
1880# func_convert_path_nix_to_w32 ARG
1881# Convert path ARG from *nix to w32 format. Requires a wine environment and
1882# a working winepath. Returns result in func_to_host_file_result.
1883func_convert_path_nix_to_w32 ()
1884{
1885 $opt_debug
1886 func_to_host_path_result="$1"
1887 if test -n "$1"; then
1888 # See func_convert_path_msys_to_w32:
1889 func_stripname : : "$1"
1890 func_to_host_path_tmp1=$func_stripname_result
1891 func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
1892 func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
1893 func_convert_path_check : ";" \
1894 "$func_to_host_path_tmp1" "$func_to_host_path_result"
1895 func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
1896 fi
1897}
1898# end func_convert_path_nix_to_w32
1899
1900
1901# func_convert_path_msys_to_cygwin ARG
1902# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
1903# Returns result in func_to_host_file_result.
1904func_convert_path_msys_to_cygwin ()
1905{
1906 $opt_debug
1907 func_to_host_path_result="$1"
1908 if test -n "$1"; then
1909 # See func_convert_path_msys_to_w32:
1910 func_stripname : : "$1"
1911 func_to_host_path_tmp1=$func_stripname_result
1912 func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
1913 func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
1914 func_to_host_path_result="$func_cygpath_result"
1915 func_convert_path_check : : \
1916 "$func_to_host_path_tmp1" "$func_to_host_path_result"
1917 func_convert_path_front_back_pathsep ":*" "*:" : "$1"
1918 fi
1919}
1920# end func_convert_path_msys_to_cygwin
1921
1922
1923# func_convert_path_nix_to_cygwin ARG
1924# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
1925# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
1926# func_to_host_file_result.
1927func_convert_path_nix_to_cygwin ()
1928{
1929 $opt_debug
1930 func_to_host_path_result="$1"
1931 if test -n "$1"; then
1932 # Remove leading and trailing path separator characters from
1933 # ARG. msys behavior is inconsistent here, cygpath turns them
1934 # into '.;' and ';.', and winepath ignores them completely.
1935 func_stripname : : "$1"
1936 func_to_host_path_tmp1=$func_stripname_result
1937 func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
1938 func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
1939 func_to_host_path_result="$func_cygpath_result"
1940 func_convert_path_check : : \
1941 "$func_to_host_path_tmp1" "$func_to_host_path_result"
1942 func_convert_path_front_back_pathsep ":*" "*:" : "$1"
1943 fi
1944}
1945# end func_convert_path_nix_to_cygwin
1946
1947
1100# func_mode_compile arg...1948# func_mode_compile arg...
1101func_mode_compile ()1949func_mode_compile ()
1102{1950{
@@ -1137,12 +1985,12 @@
1137 ;;1985 ;;
11381986
1139 -pie | -fpie | -fPIE)1987 -pie | -fpie | -fPIE)
1140 pie_flag="$pie_flag $arg"1988 func_append pie_flag " $arg"
1141 continue1989 continue
1142 ;;1990 ;;
11431991
1144 -shared | -static | -prefer-pic | -prefer-non-pic)1992 -shared | -static | -prefer-pic | -prefer-non-pic)
1145 later="$later $arg"1993 func_append later " $arg"
1146 continue1994 continue
1147 ;;1995 ;;
11481996
@@ -1163,15 +2011,14 @@
1163 save_ifs="$IFS"; IFS=','2011 save_ifs="$IFS"; IFS=','
1164 for arg in $args; do2012 for arg in $args; do
1165 IFS="$save_ifs"2013 IFS="$save_ifs"
1166 func_quote_for_eval "$arg"2014 func_append_quoted lastarg "$arg"
1167 lastarg="$lastarg $func_quote_for_eval_result"
1168 done2015 done
1169 IFS="$save_ifs"2016 IFS="$save_ifs"
1170 func_stripname ' ' '' "$lastarg"2017 func_stripname ' ' '' "$lastarg"
1171 lastarg=$func_stripname_result2018 lastarg=$func_stripname_result
11722019
1173 # Add the arguments to base_compile.2020 # Add the arguments to base_compile.
1174 base_compile="$base_compile $lastarg"2021 func_append base_compile " $lastarg"
1175 continue2022 continue
1176 ;;2023 ;;
11772024
@@ -1187,8 +2034,7 @@
1187 esac # case $arg_mode2034 esac # case $arg_mode
11882035
1189 # Aesthetically quote the previous argument.2036 # Aesthetically quote the previous argument.
1190 func_quote_for_eval "$lastarg"2037 func_append_quoted base_compile "$lastarg"
1191 base_compile="$base_compile $func_quote_for_eval_result"
1192 done # for arg2038 done # for arg
11932039
1194 case $arg_mode in2040 case $arg_mode in
@@ -1213,7 +2059,7 @@
1213 *.[cCFSifmso] | \2059 *.[cCFSifmso] | \
1214 *.ada | *.adb | *.ads | *.asm | \2060 *.ada | *.adb | *.ads | *.asm | \
1215 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \2061 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
1216 *.[fF][09]? | *.for | *.java | *.obj | *.sx)2062 *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
1217 func_xform "$libobj"2063 func_xform "$libobj"
1218 libobj=$func_xform_result2064 libobj=$func_xform_result
1219 ;;2065 ;;
@@ -1288,7 +2134,7 @@
1288 # Calculate the filename of the output object if compiler does2134 # Calculate the filename of the output object if compiler does
1289 # not support -o with -c2135 # not support -o with -c
1290 if test "$compiler_c_o" = no; then2136 if test "$compiler_c_o" = no; then
1291 output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}2137 output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
1292 lockfile="$output_obj.lock"2138 lockfile="$output_obj.lock"
1293 else2139 else
1294 output_obj=2140 output_obj=
@@ -1319,17 +2165,16 @@
1319 $opt_dry_run || $RM $removelist2165 $opt_dry_run || $RM $removelist
1320 exit $EXIT_FAILURE2166 exit $EXIT_FAILURE
1321 fi2167 fi
1322 removelist="$removelist $output_obj"2168 func_append removelist " $output_obj"
1323 $ECHO "$srcfile" > "$lockfile"2169 $ECHO "$srcfile" > "$lockfile"
1324 fi2170 fi
13252171
1326 $opt_dry_run || $RM $removelist2172 $opt_dry_run || $RM $removelist
1327 removelist="$removelist $lockfile"2173 func_append removelist " $lockfile"
1328 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 152174 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
13292175
1330 if test -n "$fix_srcfile_path"; then2176 func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
1331 eval srcfile=\"$fix_srcfile_path\"2177 srcfile=$func_to_tool_file_result
1332 fi
1333 func_quote_for_eval "$srcfile"2178 func_quote_for_eval "$srcfile"
1334 qsrcfile=$func_quote_for_eval_result2179 qsrcfile=$func_quote_for_eval_result
13352180
@@ -1349,7 +2194,7 @@
13492194
1350 if test -z "$output_obj"; then2195 if test -z "$output_obj"; then
1351 # Place PIC objects in $objdir2196 # Place PIC objects in $objdir
1352 command="$command -o $lobj"2197 func_append command " -o $lobj"
1353 fi2198 fi
13542199
1355 func_show_eval_locale "$command" \2200 func_show_eval_locale "$command" \
@@ -1396,11 +2241,11 @@
1396 command="$base_compile $qsrcfile $pic_flag"2241 command="$base_compile $qsrcfile $pic_flag"
1397 fi2242 fi
1398 if test "$compiler_c_o" = yes; then2243 if test "$compiler_c_o" = yes; then
1399 command="$command -o $obj"2244 func_append command " -o $obj"
1400 fi2245 fi
14012246
1402 # Suppress compiler output if we already did a PIC compilation.2247 # Suppress compiler output if we already did a PIC compilation.
1403 command="$command$suppress_output"2248 func_append command "$suppress_output"
1404 func_show_eval_locale "$command" \2249 func_show_eval_locale "$command" \
1405 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'2250 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
14062251
@@ -1445,13 +2290,13 @@
1445}2290}
14462291
1447$opt_help || {2292$opt_help || {
1448test "$mode" = compile && func_mode_compile ${1+"$@"}2293 test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
1449}2294}
14502295
1451func_mode_help ()2296func_mode_help ()
1452{2297{
1453 # We need to display help for each of the modes.2298 # We need to display help for each of the modes.
1454 case $mode in2299 case $opt_mode in
1455 "")2300 "")
1456 # Generic help is extracted from the usage comments2301 # Generic help is extracted from the usage comments
1457 # at the start of this file.2302 # at the start of this file.
@@ -1482,10 +2327,11 @@
14822327
1483 -o OUTPUT-FILE set the output file name to OUTPUT-FILE2328 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
1484 -no-suppress do not suppress compiler output for multiple passes2329 -no-suppress do not suppress compiler output for multiple passes
1485 -prefer-pic try to building PIC objects only2330 -prefer-pic try to build PIC objects only
1486 -prefer-non-pic try to building non-PIC objects only2331 -prefer-non-pic try to build non-PIC objects only
1487 -shared do not build a \`.o' file suitable for static linking2332 -shared do not build a \`.o' file suitable for static linking
1488 -static only build a \`.o' file suitable for static linking2333 -static only build a \`.o' file suitable for static linking
2334 -Wc,FLAG pass FLAG directly to the compiler
14892335
1490COMPILE-COMMAND is a command to be used in creating a \`standard' object file2336COMPILE-COMMAND is a command to be used in creating a \`standard' object file
1491from the given SOURCEFILE.2337from the given SOURCEFILE.
@@ -1538,7 +2384,7 @@
15382384
1539The following components of INSTALL-COMMAND are treated specially:2385The following components of INSTALL-COMMAND are treated specially:
15402386
1541 -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation2387 -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
15422388
1543The rest of the components are interpreted as arguments to that command (only2389The rest of the components are interpreted as arguments to that command (only
1544BSD-compatible install options are recognized)."2390BSD-compatible install options are recognized)."
@@ -1558,6 +2404,8 @@
15582404
1559 -all-static do not do any dynamic linking at all2405 -all-static do not do any dynamic linking at all
1560 -avoid-version do not add a version suffix if possible2406 -avoid-version do not add a version suffix if possible
2407 -bindir BINDIR specify path to binaries directory (for systems where
2408 libraries must be found in the PATH setting at runtime)
1561 -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime2409 -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
1562 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols2410 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
1563 -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)2411 -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +2434,11 @@
1586 -version-info CURRENT[:REVISION[:AGE]]2434 -version-info CURRENT[:REVISION[:AGE]]
1587 specify library version info [each variable defaults to 0]2435 specify library version info [each variable defaults to 0]
1588 -weak LIBNAME declare that the target provides the LIBNAME interface2436 -weak LIBNAME declare that the target provides the LIBNAME interface
2437 -Wc,FLAG
2438 -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
2439 -Wl,FLAG
2440 -Xlinker FLAG pass linker-specific FLAG directly to the linker
2441 -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
15892442
1590All other options (arguments beginning with \`-') are ignored.2443All other options (arguments beginning with \`-') are ignored.
15912444
@@ -1619,18 +2472,44 @@
1619 ;;2472 ;;
16202473
1621 *)2474 *)
1622 func_fatal_help "invalid operation mode \`$mode'"2475 func_fatal_help "invalid operation mode \`$opt_mode'"
1623 ;;2476 ;;
1624 esac2477 esac
16252478
1626 $ECHO2479 echo
1627 $ECHO "Try \`$progname --help' for more information about other modes."2480 $ECHO "Try \`$progname --help' for more information about other modes."
1628
1629 exit $?
1630}2481}
16312482
1632 # Now that we've collected a possible --mode arg, show help if necessary2483# Now that we've collected a possible --mode arg, show help if necessary
1633 $opt_help && func_mode_help2484if $opt_help; then
2485 if test "$opt_help" = :; then
2486 func_mode_help
2487 else
2488 {
2489 func_help noexit
2490 for opt_mode in compile link execute install finish uninstall clean; do
2491 func_mode_help
2492 done
2493 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
2494 {
2495 func_help noexit
2496 for opt_mode in compile link execute install finish uninstall clean; do
2497 echo
2498 func_mode_help
2499 done
2500 } |
2501 sed '1d
2502 /^When reporting/,/^Report/{
2503 H
2504 d
2505 }
2506 $x
2507 /information about other modes/d
2508 /more detailed .*MODE/d
2509 s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
2510 fi
2511 exit $?
2512fi
16342513
16352514
1636# func_mode_execute arg...2515# func_mode_execute arg...
@@ -1643,13 +2522,16 @@
1643 func_fatal_help "you must specify a COMMAND"2522 func_fatal_help "you must specify a COMMAND"
16442523
1645 # Handle -dlopen flags immediately.2524 # Handle -dlopen flags immediately.
1646 for file in $execute_dlfiles; do2525 for file in $opt_dlopen; do
1647 test -f "$file" \2526 test -f "$file" \
1648 || func_fatal_help "\`$file' is not a file"2527 || func_fatal_help "\`$file' is not a file"
16492528
1650 dir=2529 dir=
1651 case $file in2530 case $file in
1652 *.la)2531 *.la)
2532 func_resolve_sysroot "$file"
2533 file=$func_resolve_sysroot_result
2534
1653 # Check to see that this really is a libtool archive.2535 # Check to see that this really is a libtool archive.
1654 func_lalib_unsafe_p "$file" \2536 func_lalib_unsafe_p "$file" \
1655 || func_fatal_help "\`$lib' is not a valid libtool archive"2537 || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -1671,7 +2553,7 @@
1671 dir="$func_dirname_result"2553 dir="$func_dirname_result"
16722554
1673 if test -f "$dir/$objdir/$dlname"; then2555 if test -f "$dir/$objdir/$dlname"; then
1674 dir="$dir/$objdir"2556 func_append dir "/$objdir"
1675 else2557 else
1676 if test ! -f "$dir/$dlname"; then2558 if test ! -f "$dir/$dlname"; then
1677 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"2559 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1712,7 +2594,7 @@
1712 for file2594 for file
1713 do2595 do
1714 case $file in2596 case $file in
1715 -*) ;;2597 -* | *.la | *.lo ) ;;
1716 *)2598 *)
1717 # Do a test to see if this is really a libtool program.2599 # Do a test to see if this is really a libtool program.
1718 if func_ltwrapper_script_p "$file"; then2600 if func_ltwrapper_script_p "$file"; then
@@ -1728,8 +2610,7 @@
1728 ;;2610 ;;
1729 esac2611 esac
1730 # Quote arguments (to preserve shell metacharacters).2612 # Quote arguments (to preserve shell metacharacters).
1731 func_quote_for_eval "$file"2613 func_append_quoted args "$file"
1732 args="$args $func_quote_for_eval_result"
1733 done2614 done
17342615
1735 if test "X$opt_dry_run" = Xfalse; then2616 if test "X$opt_dry_run" = Xfalse; then
@@ -1754,29 +2635,66 @@
1754 # Display what would be done.2635 # Display what would be done.
1755 if test -n "$shlibpath_var"; then2636 if test -n "$shlibpath_var"; then
1756 eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""2637 eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
1757 $ECHO "export $shlibpath_var"2638 echo "export $shlibpath_var"
1758 fi2639 fi
1759 $ECHO "$cmd$args"2640 $ECHO "$cmd$args"
1760 exit $EXIT_SUCCESS2641 exit $EXIT_SUCCESS
1761 fi2642 fi
1762}2643}
17632644
1764test "$mode" = execute && func_mode_execute ${1+"$@"}2645test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
17652646
17662647
1767# func_mode_finish arg...2648# func_mode_finish arg...
1768func_mode_finish ()2649func_mode_finish ()
1769{2650{
1770 $opt_debug2651 $opt_debug
1771 libdirs="$nonopt"2652 libs=
2653 libdirs=
1772 admincmds=2654 admincmds=
17732655
2656 for opt in "$nonopt" ${1+"$@"}
2657 do
2658 if test -d "$opt"; then
2659 func_append libdirs " $opt"
2660
2661 elif test -f "$opt"; then
2662 if func_lalib_unsafe_p "$opt"; then
2663 func_append libs " $opt"
2664 else
2665 func_warning "\`$opt' is not a valid libtool archive"
2666 fi
2667
2668 else
2669 func_fatal_error "invalid argument \`$opt'"
2670 fi
2671 done
2672
2673 if test -n "$libs"; then
2674 if test -n "$lt_sysroot"; then
2675 sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
2676 sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
2677 else
2678 sysroot_cmd=
2679 fi
2680
2681 # Remove sysroot references
2682 if $opt_dry_run; then
2683 for lib in $libs; do
2684 echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
2685 done
2686 else
2687 tmpdir=`func_mktempdir`
2688 for lib in $libs; do
2689 sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
2690 > $tmpdir/tmp-la
2691 mv -f $tmpdir/tmp-la $lib
2692 done
2693 ${RM}r "$tmpdir"
2694 fi
2695 fi
2696
1774 if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then2697 if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
1775 for dir
1776 do
1777 libdirs="$libdirs $dir"
1778 done
1779
1780 for libdir in $libdirs; do2698 for libdir in $libdirs; do
1781 if test -n "$finish_cmds"; then2699 if test -n "$finish_cmds"; then
1782 # Do each command in the finish commands.2700 # Do each command in the finish commands.
@@ -1786,7 +2704,7 @@
1786 if test -n "$finish_eval"; then2704 if test -n "$finish_eval"; then
1787 # Do the single finish_eval.2705 # Do the single finish_eval.
1788 eval cmds=\"$finish_eval\"2706 eval cmds=\"$finish_eval\"
1789 $opt_dry_run || eval "$cmds" || admincmds="$admincmds2707 $opt_dry_run || eval "$cmds" || func_append admincmds "
1790 $cmds"2708 $cmds"
1791 fi2709 fi
1792 done2710 done
@@ -1795,53 +2713,55 @@
1795 # Exit here if they wanted silent mode.2713 # Exit here if they wanted silent mode.
1796 $opt_silent && exit $EXIT_SUCCESS2714 $opt_silent && exit $EXIT_SUCCESS
17972715
1798 $ECHO "X----------------------------------------------------------------------" | $Xsed2716 if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
1799 $ECHO "Libraries have been installed in:"2717 echo "----------------------------------------------------------------------"
1800 for libdir in $libdirs; do2718 echo "Libraries have been installed in:"
1801 $ECHO " $libdir"2719 for libdir in $libdirs; do
1802 done2720 $ECHO " $libdir"
1803 $ECHO2721 done
1804 $ECHO "If you ever happen to want to link against installed libraries"2722 echo
1805 $ECHO "in a given directory, LIBDIR, you must either use libtool, and"2723 echo "If you ever happen to want to link against installed libraries"
1806 $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"2724 echo "in a given directory, LIBDIR, you must either use libtool, and"
1807 $ECHO "flag during linking and do at least one of the following:"2725 echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
1808 if test -n "$shlibpath_var"; then2726 echo "flag during linking and do at least one of the following:"
1809 $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"2727 if test -n "$shlibpath_var"; then
1810 $ECHO " during execution"2728 echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
1811 fi2729 echo " during execution"
1812 if test -n "$runpath_var"; then2730 fi
1813 $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"2731 if test -n "$runpath_var"; then
1814 $ECHO " during linking"2732 echo " - add LIBDIR to the \`$runpath_var' environment variable"
1815 fi2733 echo " during linking"
1816 if test -n "$hardcode_libdir_flag_spec"; then2734 fi
1817 libdir=LIBDIR2735 if test -n "$hardcode_libdir_flag_spec"; then
1818 eval flag=\"$hardcode_libdir_flag_spec\"2736 libdir=LIBDIR
18192737 eval flag=\"$hardcode_libdir_flag_spec\"
1820 $ECHO " - use the \`$flag' linker flag"2738
1821 fi2739 $ECHO " - use the \`$flag' linker flag"
1822 if test -n "$admincmds"; then2740 fi
1823 $ECHO " - have your system administrator run these commands:$admincmds"2741 if test -n "$admincmds"; then
1824 fi2742 $ECHO " - have your system administrator run these commands:$admincmds"
1825 if test -f /etc/ld.so.conf; then2743 fi
1826 $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"2744 if test -f /etc/ld.so.conf; then
1827 fi2745 echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
1828 $ECHO2746 fi
18292747 echo
1830 $ECHO "See any operating system documentation about shared libraries for"2748
1831 case $host in2749 echo "See any operating system documentation about shared libraries for"
1832 solaris2.[6789]|solaris2.1[0-9])2750 case $host in
1833 $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"2751 solaris2.[6789]|solaris2.1[0-9])
1834 $ECHO "pages."2752 echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
1835 ;;2753 echo "pages."
1836 *)2754 ;;
1837 $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."2755 *)
1838 ;;2756 echo "more information, such as the ld(1) and ld.so(8) manual pages."
1839 esac2757 ;;
1840 $ECHO "X----------------------------------------------------------------------" | $Xsed2758 esac
2759 echo "----------------------------------------------------------------------"
2760 fi
1841 exit $EXIT_SUCCESS2761 exit $EXIT_SUCCESS
1842}2762}
18432763
1844test "$mode" = finish && func_mode_finish ${1+"$@"}2764test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
18452765
18462766
1847# func_mode_install arg...2767# func_mode_install arg...
@@ -1852,7 +2772,7 @@
1852 # install_prog (especially on Windows NT).2772 # install_prog (especially on Windows NT).
1853 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||2773 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
1854 # Allow the use of GNU shtool's install command.2774 # Allow the use of GNU shtool's install command.
1855 $ECHO "X$nonopt" | $GREP shtool >/dev/null; then2775 case $nonopt in *shtool*) :;; *) false;; esac; then
1856 # Aesthetically quote it.2776 # Aesthetically quote it.
1857 func_quote_for_eval "$nonopt"2777 func_quote_for_eval "$nonopt"
1858 install_prog="$func_quote_for_eval_result "2778 install_prog="$func_quote_for_eval_result "
@@ -1866,7 +2786,12 @@
1866 # The real first argument should be the name of the installation program.2786 # The real first argument should be the name of the installation program.
1867 # Aesthetically quote it.2787 # Aesthetically quote it.
1868 func_quote_for_eval "$arg"2788 func_quote_for_eval "$arg"
1869 install_prog="$install_prog$func_quote_for_eval_result"2789 func_append install_prog "$func_quote_for_eval_result"
2790 install_shared_prog=$install_prog
2791 case " $install_prog " in
2792 *[\\\ /]cp\ *) install_cp=: ;;
2793 *) install_cp=false ;;
2794 esac
18702795
1871 # We need to accept at least all the BSD install flags.2796 # We need to accept at least all the BSD install flags.
1872 dest=2797 dest=
@@ -1876,10 +2801,12 @@
1876 install_type=2801 install_type=
1877 isdir=no2802 isdir=no
1878 stripme=2803 stripme=
2804 no_mode=:
1879 for arg2805 for arg
1880 do2806 do
2807 arg2=
1881 if test -n "$dest"; then2808 if test -n "$dest"; then
1882 files="$files $dest"2809 func_append files " $dest"
1883 dest=$arg2810 dest=$arg
1884 continue2811 continue
1885 fi2812 fi
@@ -1887,10 +2814,9 @@
1887 case $arg in2814 case $arg in
1888 -d) isdir=yes ;;2815 -d) isdir=yes ;;
1889 -f)2816 -f)
1890 case " $install_prog " in2817 if $install_cp; then :; else
1891 *[\\\ /]cp\ *) ;;2818 prev=$arg
1892 *) prev=$arg ;;2819 fi
1893 esac
1894 ;;2820 ;;
1895 -g | -m | -o)2821 -g | -m | -o)
1896 prev=$arg2822 prev=$arg
@@ -1904,6 +2830,10 @@
1904 *)2830 *)
1905 # If the previous option needed an argument, then skip it.2831 # If the previous option needed an argument, then skip it.
1906 if test -n "$prev"; then2832 if test -n "$prev"; then
2833 if test "x$prev" = x-m && test -n "$install_override_mode"; then
2834 arg2=$install_override_mode
2835 no_mode=false
2836 fi
1907 prev=2837 prev=
1908 else2838 else
1909 dest=$arg2839 dest=$arg
@@ -1914,7 +2844,11 @@
19142844
1915 # Aesthetically quote the argument.2845 # Aesthetically quote the argument.
1916 func_quote_for_eval "$arg"2846 func_quote_for_eval "$arg"
1917 install_prog="$install_prog $func_quote_for_eval_result"2847 func_append install_prog " $func_quote_for_eval_result"
2848 if test -n "$arg2"; then
2849 func_quote_for_eval "$arg2"
2850 fi
2851 func_append install_shared_prog " $func_quote_for_eval_result"
1918 done2852 done
19192853
1920 test -z "$install_prog" && \2854 test -z "$install_prog" && \
@@ -1923,6 +2857,13 @@
1923 test -n "$prev" && \2857 test -n "$prev" && \
1924 func_fatal_help "the \`$prev' option requires an argument"2858 func_fatal_help "the \`$prev' option requires an argument"
19252859
2860 if test -n "$install_override_mode" && $no_mode; then
2861 if $install_cp; then :; else
2862 func_quote_for_eval "$install_override_mode"
2863 func_append install_shared_prog " -m $func_quote_for_eval_result"
2864 fi
2865 fi
2866
1926 if test -z "$files"; then2867 if test -z "$files"; then
1927 if test -z "$dest"; then2868 if test -z "$dest"; then
1928 func_fatal_help "no file or destination specified"2869 func_fatal_help "no file or destination specified"
@@ -1977,10 +2918,13 @@
1977 case $file in2918 case $file in
1978 *.$libext)2919 *.$libext)
1979 # Do the static libraries later.2920 # Do the static libraries later.
1980 staticlibs="$staticlibs $file"2921 func_append staticlibs " $file"
1981 ;;2922 ;;
19822923
1983 *.la)2924 *.la)
2925 func_resolve_sysroot "$file"
2926 file=$func_resolve_sysroot_result
2927
1984 # Check to see that this really is a libtool archive.2928 # Check to see that this really is a libtool archive.
1985 func_lalib_unsafe_p "$file" \2929 func_lalib_unsafe_p "$file" \
1986 || func_fatal_help "\`$file' is not a valid libtool archive"2930 || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -1994,23 +2938,23 @@
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: