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

[Francis Ginther]

  * 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

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

[Daniel d'Andrada (dandrader)]

Looks ok. Builds fine.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-06-02 19:38:57 +0000
+++ ChangeLog	2012-08-23 18:45:02 +0000
@@ -1,1720 +0,0 @@
-2011-03-31  Stephen M. Webb  <[e-mail]>
-
-  Add initial python bindings.
-
-  * python/Makefile.am: new file
-  * python/_geis_bindings/_geis_bindings.c: new file
-  * python/geis/__init__.py: new file
-  * python/geis/geis_v2.py: new file
-  * python/pygeis: new script
-  * Makefile.am (SUBDIRS): added python
-  * configure.ac (AC_CONFIG_FILES): added new generated files
-
-2011-04-10  Stephen M. Webb  <[e-mail]>
-
-  Repaired a callback persistence problem (LP: #754135).
-
-  * testsuite/geis1/check_subscription.c: new test suite
-  * libutouch-geis/geis_v1.c: saved a copy of the callback tables
-  * testsuite/geis1/Makefile.am: included new test suite
-  * testsuite/geis1/check_geis1_api.c: ran new test suite
-
-2011-04-12  Stephen M. Webb  <[e-mail]>
-
-  Made direct use of XI2.1 optional at build time (LP: #741404).
-
-  * m4/ax_enable_xi2.m4: new autoconf macro
-  * configure.ac: invoked the new macro
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c: optioned XI2.1 code
-
-2011-04-05  Stephen M. Webb  <[e-mail]>
-
-  Fixed invalid pointer dereference on XI initialization failure in XCB back
-  end (LP: #730899).
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c
-    (geis_xcb_backend_new): cleared properly to indicate a failure.
-
-2011-03-28  Stephen M. Webb  <[e-mail]>
-
-  Changes the list of attrs received from grail for the Touch gesture.
-
-  * libutouch-geis/backend/xcb/grail_gestures.c: change Touch attrs
-
-2011-03-25  Stephen M. Webb  <[e-mail]>
-
-  Added new TOUCH gesture types (LP: #742555).
-
-  * include/geis/geis.h: added new TOUCH gesture types
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c: tweaked gesture mask size
-  * libutouch-geis/backend/xcb/grail_gestures.c: added new TOUCH gesture types
-    added proper handling of a variable-size gesture mask
-  * libutouch-geis/geis_v1.c: mapped new TOUCH gesture types to grail TOUCH
-    gesture types
-  * testsuite/geis1/check_gesture_types.c: new testsuite
-  * testsuite/geis1/Makefile.am: added new testsuite
-  * testsuite/geis1/check_geis1_api.c: invoked new testsuite
-  * testsuite/geistest/geistest.c: added new gesture types
-
-2011-03-24  Stephen M. Webb  <[e-mail]>
-
-  Fixed a bad index when translating grail touches (LP: #742002).
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
-    fixed offset calculation for grail touch properties
-
-2011-03-22  Stephen M. Webb  <[e-mail]>
-
-  Added a default back end (LP: #740311).
-
-  * examples/geis2.c (dump_gesture_event): dumped more info
-    (main): removed GEIS_INIT_UTOUCH_XCB from geis_new call
-  * libutouch-geis/geis.c (geis_new): added GEIS_INIT_UTOUCH_XCB as default
-
-2011-03-22  Stephen M. Webb  <[e-mail]>
-
-  Passed the correct gesture_id to GEIS v1 callbacks (LP: #740284).
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
-    Used the grail gesture_id as the frame_id.
-  * testsuite/geistest/geistest.c (gesture_update): reported the gesture_id
-    (gesture_start): reported the gesture_id
-    (gesture_finish): reported the gesture_id
-
-2011-03-22  Stephen M. Webb  <[e-mail]>
-
-  Corrected the number of touches on a gesture event (LP: #737745).
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
-    replaced geis_xcb_backend_touch_count() call with a calculation based on
-    the number of touch properties passed from grail
-  * libutouch-geis/backend/xcb/grail_gestures.c (geis_xcb_backend_touch_count):
-    removed
-  * libutouch-geis/backend/xcb/grail_gestures.h (geis_xcb_backend_touch_count):
-    removed
-
-2011-03-17  Stephen M. Webb  <[e-mail]>
-
-  Added definitions for GEIS v1 gesture primitive types (LP: #737230).
-
-  * include/geis/geis.h (GEIS_GESTURE_PRIMITIVE_DRAG): new symbol
-    (GEIS_GESTURE_PRIMITIVE_PINCH): new symbol
-    (GEIS_GESTURE_PRIMITIVE_ROTATE): new symbol
-    (GEIS_GESTURE_PRIMITIVE_TAP): new symbol
-  * libutouch-geis/backend/xcb/grail_gestures.c (s_grail_class_map):
-    replaced utouch-grail symbolic constants with the new GEIS symbolic
-    constants
-
-2011-03-16  Stephen M. Webb  <[e-mail]>
-
-  Refined the API documentation and added an examples directory.
-
-  * doc/api.dox: new documentation file
-  * doc/logo_x64.png: new logo image
-  * doc/using_geis_v2.dox: new documentation file
-  * examples/Makefile.am: examples subdirectory Makefile
-  * examples/geis2.c: new example program
-  * Makefile.am: added examples subdirectory
-  * configure.ac: added examples subdirectory
-  * doc/Doxyfile: tweaked Doxygen settings
-  * include/geis/geis.h: complete API docs refinement
-
-2011-03-16  Stephen M. Webb  <[e-mail]>
-
-  Replaced device class with explicit attributes.
-
-  * include/geis/geis.h (GEIS_DEVICE_CLASS_*) removed
-    (GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH): added 
-    (GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH): added 
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c:
-    (_map_xi2_mode_to_geis_device_attrs): replaced function
-    _map_xi2_mode_to_geis_device_class
-  * testsuite/geis2/check_device.c: added checks for new attributes
-
-2011-03-16  Stephen M. Webb  <[e-mail]>
-
-  Refinement of input device class handling.
-
-  * include/geis/geis.h (GEIS_DEVICE_CLASS_UNKNOWN): new device class
-    (GEIS_DEVICE_CLASS_TOUCH_MULTIFINGER): new device class
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c
-    (_map_xi2_mode_to_geis_device_class): new function
-    (_report_an_xcb_device): used it
-
-2011-03-13  Stephen M. Webb  <[e-mail]>
-
-  Initialized an uninitialized variable.
-
-  * libutouch-geis/geis_v1.c (_v1_input_callback): initialized device_id 
-
-2011-03-12  Stephen M. Webb  <[e-mail]>
-
-  Added spcifying devices to geistest.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c: added -d swicth
-  * doc/geistest.1: documented its use
-
-2011-03-12  Stephen M. Webb  <[e-mail]>
-
-  Added proper device ID filtering for GEIS v1.
-
-  * libutouch-geis/geis_v1.c (_subscribe_device): Added filter for device ID.
-
-2011-03-11  Stephen M. Webb  <[e-mail]>
-
-  Implement device enumeration (LP: #733296)
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_report_an_xcb_device): new
-    (_report_xcb_devices): imlemented
-  * libutouch-geis/geis_device.c (geis_device_new): made "id" an attr
-    (geis_device_id): same
-    (geis_device_add_attr): implemented missing function
-  * libutouch-geis/geis_v1.c (_v1_input_callback): new function
-    (geis_input_devices): implemented
-  * testsuite/geis1/check_gesture_attrs.c: removed debug message
-  * testsuite/geistest/geistest.c (input_device_added): added a dump
-
-2011-03-11  Stephen M. Webb  <[e-mail]>
-
-  Fix a lifetime issue with string attrs.
-
-  * libutouch_ges/geis_attr.c (geis_attr_new): dup all strings
-    (geis_attr_delete): free strings
-
-2011-03-11  Stephen M. Webb  <[e-mail]>
-
-  Added new device symbolic constants due to a change in the GEIS spec.
-
-  * include/geis/geis.h (GEIS_DEVICE_ATTRIBUTE_CLASS): new constant
-    (GEIS_DEVICE_ATTRIBUTE_TOUCHES): new constant
-    (GEIS_DEVICE_CLASS_TOUCH_DIRECT): new constant
-    (GEIS_DEVICE_CLASS_TOUCH_DEPENDENT): new constant
-    (GEIS_DEVICE_CLASS_TOUCH_INDEPENDENT): new constant
-    (GEIS_DEVICE_CLASS_TOUCH_PARTIAL): new constant
-  * testsuite/geis2/check_device.c: added tests for the above
-
-2011-03-11  Stephen M. Webb  <[e-mail]>
-
-  Added a required symbolic constant for device events.
-
-  * include/geis/geis.h (GEIS_EVENT_ATTRIBUTE_DEVICE): new symbol
-    (GEIS_DEVICE_ATTRIBUTE_ID): new symbol
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c: used them
-  * libutouch-geis/geis.c: used them
-  * testsuite/geis2/check_device.c (geis_device_types): checked them
-  * testsuite/geis2/check_subscription.c: used them
-
-2011-03-08  Stephen M. Webb  <[e-mail]>
-
-  Released utouch-geis v2.0.3.
-
-  * configure.ac (AC_INIT): bumped version to 2.0.3
-
-2011-03-08  Stephen M. Webb  <[e-mail]>
-
-  Added fix for LP: #732104: re-order class event pump in v1 emulation.
-
-  * libutouch-geis/geis_v1.c (_subscribe_device): added more diagnostic messages
-    (geis_subscribe): re-ordered event pump to prime the class table
-
-2011-03-08  Stephen M. Webb  <[e-mail]>
-
-  Added a unit test and related infrastructure in the mock objects to reproduce
-  LP: #732104.
-
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c:
-    moved generation of gesture events to after subscription creation, added
-    support for TOUCH filters
-  * testsuite/geis1/check_gesture_attrs.c: added check for touch count,
-    changed subscription from GEIS_ALL_GESTURES to an explicit list
-  * testsuite/geis2/check_frame.c: activated subscription
-
-2011-03-07  Stephen M. Webb  <[e-mail]>
-
-  Released GEIS v2.0.2.
-
-  * configure.ac (AC_INIT): bumped version to 2.0.2
-
-2011-03-07  Stephen M. Webb  <[e-mail]>
-
-  Renamed test case for LP: #728606
-
-  * testsuite/geis1/check_gesture_attrs.c: renamed from
-    testsuite/geis1/check_lp728606.c
-  * testsuite/geis1/Makefile.am: renamed source file
-    added -Werror to CFLAGS
-  * testsuite/geis1/check_geis1_api.c: renamed test
-
-2011-03-07  Stephen M. Webb  <[e-mail]>
-
-  Added regression test for LP: #728606
-
-  * testsuite/geis1/check_lp728606.c: new test suite
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_create_gesture_events): add some basic gesture attrs to mock events
-  * libutouch-geis/geis_v1.c (geis_init): tweaked mock object creation
-    (geis_finish): reset global Geis object
-    (geis_subscribe): relocated class event pump
-  * testsuite/geis1/Makefile.am: added new test suite source
-  * testsuite/geis1/check_geis1_api.c: ran new test suite
-
-2011-03-07  Stephen M. Webb  <[e-mail]>
-
-  Enabled GEIS v1 for basic API unit testing.
-
-  * testsuite/geis1/check_instance.c: new test suite
-  * libutouch-geis/geis_v1.c  (_generate_subscription_name): handled NULL XCB info
-    (geis_init): handled request for mock back end
-  * testsuite/geis1/Makefile.am: added new source file
-  * testsuite/geis1/check_geis1_api.c: ran new test suite
-
-2011-03-07  Stephen M. Webb  <[e-mail]>
-
-  Re-added GEIS v1 API testing.
-
-  * testsuite/geis1/check_geis_internals.c: removed
-  * testsuite/geis1/check_instance_table.c: removed
-  * testsuite/geis1/check_geis1_api.c: new file
-  * configure.ac (AC_CONFIG_FILES): added testsuite.geis1/Makefile
-  * testsuite/Makefile.am (SUBDIRS): added geis1
-  * testsuite/geis1/Makefile.am: Removed old unit tests, added check_geis1_api
-
-2011-03-03  Stephen M. Webb  <[e-mail]>
-
-  Fixed incorrect data conversion in GEIS v1 implementation (LP: #728606)
-
-  * libutouch_geis/geis_v1 (_map_frame_to_attrs): put float value in the float
-    member of the attr union to avoid unwanted coercion.
-
-2011-02-28  Stephen M. Webb  <[e-mail]>
-
-  Added a graceful exit to the geistest tool.
-
-  * testsuite/geistest/geistest.c (main): added watch on stdin for exit
-  * doc/geistest.1: mentioned how to exit gracefully
-
-2011-02-28  Stephen M. Webb  <[e-mail]>
-
-  Fixed logic in a string-to-boolean conversion.
-
-  * libutouch-geis/geis_attr.c (geis_attr_value_to_boolean): fixed logic
-
-2011-02-27  Stephen M. Webb  <[e-mail]>
-
-  Fixed memory leaks in GEIS v2 subscriptions.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_finalize): closed X display
-  * libutouch-geis/geis.c (geis_new): reffed the new geis object
-    (geis_delete): invalidated all outstanding subscriptions
-  * libutouch-geis/geis_backend.c: fixed debug message to avoid a bad dereference
-  * libutouch-geis/geis_filter.c: only unref ther geis object on destruction
-  * libutouch-geis/geis_filter_term.c: free the bag store on deletion
-  * libutouch-geis/geis_subscription.h (geis_subscription_bag_invalidate): new
-    (geis_subscription_invalidate): new
-  * libutouch-geis/geis_subscription.c: imlemented new functions
-    (_subscription_destroy): handled destruction in invalided state
-  * libutouch-geis/geis_v1.c (geis_finish): deleted window filter
-
-2011-02-23  Stephen M. Webb  <[e-mail]>
-
-  Fixed memory leaks in GEIS v2 group and touch sets.
-
-  * libutouch-geis/geis_frame.c (geis_frameset_delete): fixed loop condition
-    (geis_frame_delete): freed touches
-  * libutouch-geis/geis_group.c (geis_groupset_delete): fixed loop condition
-  * libutouch-geis/geis_touch.c (geis_touchset_delete): fixed loop condition
-
-2011-02-23  Stephen M. Webb  <[e-mail]>
-
-  Fixed a memory leak in GEIS v2 gesture events.
-
-  * libutouch-geis/geis_attr.h (GeisAttrDestructor): new type
-    (geis_attr_set_destructor): new function
-  * libutouch-geis/geis_attr.c (geis_attr_set_destructor): implemented it
-    (attr_value): named union for ISO C compatibility
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture): added
-    destructors to groupset and touchset attrs
-
-2011-02-22  Stephen M. Webb  <[e-mail]>
-
-  Released version 2.0.1.
-
-  * configure.ac (AC_INIT): bumped package version to 2.0.1
-
-2011-02-22  Stephen M. Webb  <[e-mail]>
-
-  Used standardized LGPL-v3 license text.
-
-  * COPYING: refreshed with standardized text.
-
-2011-02-22  Stephen M. Webb  <[e-mail]>
-
-  Restored missing GEIS v1 symbols and fixed a segfault in libgrip.
-
-  * libutouch-geis/geis_v1.c (struct _GeisInstance): added window_filter field
-    (geis_init): initialized window_filter field
-    (_subscribe_device): used window_filter field from instance
-    (geis_configuration_set_value): added missing GEIS v1 function
-    (geis_unsubscribe): added missing GEIS v1 function
-
-2011-02-22  Stephen M. Webb  <[e-mail]>
-
-  Release version 2.0.0
-
-  * configure.ac (AC_INIT): bumped package version to 2.0.0
-  * libutouch-geis/Makefile.am (libutouch_geis_la_LDFLAGS): bumped version-info
-    to 3:0:2 (gives .so version 1.2.0) to reflect the addition of a new interface
-
-2011-02-21  Stephen M. Webb  <[e-mail]>
-
-  Added support for setting the XCB sysflg through the GEIS v1 interface.
-
-  * include/geis/geis.h (GEIS_GESTURE_TYPE_SYSTEM): new gesture type
-  * libutouch-geis/geis_subscription.h
-    (geis_subscription_set_flags): new function
-  * libutouch-geis/geis_subscription.c: implemented it
-  * libutouch-geis/geis_v1.c (geis_subscribe): used it
-
-2011-02-20  Stephen M. Webb  <[e-mail]>
-
-  Cranked up warning level on testsuite and fixed (most of) the consequent
-  warnings.
-
-  * testsuite/geis2/check_attr.c: fxied compile-time warnings
-  * testsuite/geis2/check_class.c: same
-  * testsuite/geis2/check_device.c: same
-  * testsuite/geis2/check_event.c: same
-  * testsuite/geis2/check_filter.c: ditto
-  * testsuite/geis2/check_frame.c: same
-  * testsuite/geis2/check_geis2_api.c: same
-  * testsuite/geis2/check_geis_new.c: same
-  * testsuite/geis2/check_general_types.c: same
-  * testsuite/geis2/check_region.c: same
-  * testsuite/libutouch-geis/check_attr.c: same
-  * testsuite/libutouch-geis/check_backend_multiplexor.c: same
-  * testsuite/libutouch-geis/check_class.c: same
-  * testsuite/libutouch-geis/check_device.c: idem
-  * testsuite/libutouch-geis/check_error_reporting.c: same
-  * testsuite/libutouch-geis/check_filter.c: yep
-  * testsuite/libutouch-geis/check_geis2_internals.c: you guessed it
-  * testsuite/libutouch-geis/check_geis_private.c: uh-huh
-
-2011-02-19  Stephen M. Webb  <[e-mail]>
-
-  Fixed failed "make distcheck".
-
-  * libutouch-geis/Makefile.am: added geis_atomic.h
-  * libutouch-geis/server/Makefile.am: added geis_dbus.h
-
-2011-02-19  Stephen M. Webb  <[e-mail]>
-
-  Removed old crufty unused source code.
-
-  * libgeis-dbus: removed directory
-  * libutouch-geis-xcb: removed directory
-
-2011-02-17  Stephen M. Webb  <[e-mail]>
-
-  Added proper support for region filters in XCB.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c
-    (XcbGestureSub): added windows and window_count fields
-    (_translate_device_term_to_xcb): eliminated duplicates
-    (_translate_region_term_to_xcb): new function
-    (_subscribe): used new fields/function
-  * libutouch-geis/geis_v1.c (geis_init): added region filter for window
-
-2011-02-17  Stephen M. Webb  <[e-mail]>
-
-  Added a check for the maximum number of device terms.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c
-  (_translate_device_term_to_xcb): Added MAX_NUM_DEVICES and checked it.
-
-2011-02-17  Stephen M. Webb  <[e-mail]>
-
-  Added proper support for continuations and system gestures.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c
-    (_translate_class_term_to_xcb): fixed min/max logic
-    (_translate_filter_to_xcb): added subscription parameter,
-    called new functions,
-    ORed masks from different filters on same subscription
-    (_subscribe): removed special case for no class filters
-  * libutouch-geis/backend/xcb/grail_gestures.h
-    (geis_xcb_backend_create_gesture_bitmask): removed and replaced with...
-    (geis_xcb_backend_gesture_bitmask_filter_class): new function
-    (geis_xcb_backend_gesture_bitmask_filter_touches): new function
-    (geis_xcb_backend_gesture_bitmask_init): new function
-  * libutouch-geis/backend/xcb/grail_gestures.c: implemented the above new
-  * functions
-  * libutouch-geis/geis_subscription.h (geis_subscription_flags): new function
-  * libutouch-geis/geis_subscription.c: implemented it
-  * testsuite/geistest/geistest.c: switched from 'all' to a set of gestures
-
-2011-02-17  Stephen M. Webb  <[e-mail]>
-
-  Added the ability to fetch a filter from a subscription and clone it.
-
-  * include/geis/geis.h (geis_filter_clone): new function
-    (geis_subscription_filter_by_name): new function
-  * libutouch-geis/geis_filter.h (geis_filter_bag_filter_by_name): new function
-  * libutouch-geis/geis_filter.c (geis_filter_bag_filter_by_name): implemented
-    (_filter_new_empty): new function
-    (geis_filter_new): used it
-    (geis_filter_clone): implemented it
-    (geis_filter_delete): unreffed geis
-  * libutouch-geis/geis_filter_term.h (geis_filter_term_bag_clone): new function
-  * libutouch-geis/geis_filter_term.c (geis_filter_term_bag_clone): implemented
-  * libutouch-geis/geis_subscription.c (geis_subscription_filter_by_name): impl
-  * libutouch-geis/geis_v1.c (_subscribe): used new functions
-  * libutouch-geis/libutouch-geis.ver (geis_filter_clone): new exported symbol
-    (geis_subscription_filter_by_name): new exported symbol
-  * testsuite/geis2/Makefile.am: added -Wall -Wextra CFLAGS
-  * testsuite/geis2/check_filter.c: new test case, silenced warnings
-  * testsuite/geis2/check_subscription.c: new test case, silenced warnings
-  * testsuite/libutouch-geis/Makefile.am: added -Wall -Wextra CFLAGS
-
-2011-02-17  Stephen M. Webb  <[e-mail]>
-
-  Reference counting fixes:  added geis_atomic functions, added reference
-  counting semantics to Geis and GeisFilterTerm modules.
-
-  * libutouch-geis/geis_atomic.h: new file
-  * libutouch-geis/geis.c (_geis_destroy): new function
-    (geis_ref): new function
-    (geis_unref): new function
-    (geis_delete): used new functions
-  * libutouch-geis/geis_class.c (geis_gesture_class_ref): used new atomics
-    (geis_gesture_class_unref): same
-  * libutouch-geis/geis_device.c (geis_device_ref): used new atomics
-    (geis_device_unref): same
-  * libutouch-geis/geis_filter.c (geis_filter_ref): used new atomics
-    (geis_filter_unref): same
-    (geis_filter_bag_insert): moved ref call to after all possible errors
-  * libutouch-geis/geis_filter.h (geis_filter_ref): changed return type
-  * libutouch-geis/geis_filter_term.c (struct _GeisFilterTerm): added refcount
-    (geis_filter_term_ref): new function
-    (geis_filter_term_unref): new function
-    (geis_filter_term_new): called geis_filter_term_ref
-    (geis_filter_term_delete): made static and renamed _filter_term_destroy
-  * libutouch-geis/geis_filter_term.h: prototyped new functions
-  * libutouch-geis/geis_private.h: prototyped new functions
-  * libutouch-geis/geis_region.c: used new atomics
-  * libutouch-geis/geis_subscription.c (_subscription_ref): new static function
-    (_subscription_unref): new static function
-    (geis_subscription_bag_empty): new function
-    (geis_subscription_bag_new): used new function
-    (geis_subscription_bag_delete): used new function
-    (geis_subscription_bag_remov): used new function
-  * libutouch-geis/geis_subscription.h: prototyped new functions
-
- 2011-02-11  Stephen M. Webb  <[e-mail]>
-
-  Implemented class and device filters properly.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (struct _XcbGestureSub):
-    added new fields
-    (_translate_class_filter_to_xcb): removed function
-    (_translate_device_term_to_xcb): new function
-    (_translate_class_term_to_xcb): new function
-    (_translate_filter_to_xcb): new function
-    (_subscribe): replaced old functions with new, restructired filter loop
-  * libutouch-geis/backend/xcb/grail_gestures.c: silenced compiler warnings
-  * libutouch-geis/geis_filter.c: replace by_facility functions
-  * libutouch-geis/geis_filter.h: same
-  * libutouch-geis/geis_filter_term.c: same
-  * libutouch-geis/geis_filter_term.h: same
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c:
-    replaced filter by_facility calls.
-
- 2011-02-09  Stephen M. Webb  <[e-mail]>
-
-  Fixed a memory allocation problem during error reporting.
-
-  * libutouch-geis/geis_error.c (geis_error_stack_push): fixed realloc size
-
- 2011-02-05  Stephen M. Webb  <[e-mail]>
-
-  Fixed a memory leak in the XCB back end.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_xcb_dispatch): freed XCB
-   event
-
- 2011-02-04  Stephen M. Webb  <[e-mail]>
-
-  Reimplement GEIS v1.0 on top of GEIS v2.0, Part III (touch attrs).
-
-  * include/geis/geis.h (GEIS_TOUCH_ATTRIBUTE_ID): new symbol
-    (GEIS_TOUCH_ATTRIBUTE_X): new symbol
-    (GEIS_TOUCH_ATTRIBUTE_Y): new symbol
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
-    added touch mapping
-  * libutouch-geis/geis_v1.c (_map_frame_to_attrs): mapped touches into
-    gesture attrs
-
- 2011-02-02  Stephen M. Webb  <[e-mail]>
-
-  Reimplement GEIS v1.0 on top of GEIS v2.0, Part II (gesture attrs).
-
-  * libutouch-geis/backend/xcb/grail_gestures.h
-    (geis_xcb_backend_map_grail_attrs): new function
-  * libutouch-geis/backend/xcb/grail_gestures.c: implemented it
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
-    called it
-  * libutouch-geis/geis_attr.c: fixed a memory leak
-  * libutouch-geis/geis_v1.c (_map_frame_to_attrs): new function
-    (_v1_event_callback): called it
-
- 2011-01-31  Stephen M. Webb  <[e-mail]>
-
-  Reimplement GEIS v1.0 on top of GEIS v2.0, Part I (basic gesture events).
-
-  * libutouch-geis/geis_v1.c: new file
-  * configure.ac: removed refs to libutouch-geis-xcb and testsuite/geis1
-  * libutouch-geis/Makefile.am: removed refs to libutouch-geis-xcb
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
-    added basic group, frame, and touch attrs to gesture events
-  * testsuite/Makefile.am: removed refs to testsuite/geis1
-
- 2011-01-28  Stephen M. Webb  <[e-mail]>
-
-  Implemented basic gesture subscriptions through the XCB back end.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (struct _XcbGestureSub): new
-    (_dispatch_gesture): new function
-    (_xcb_dispatch): called it
-    (_subscribe): initialized XcbGestureSub
-    (_unsubscribe): destroyed XcbGestureSub
-  * libutouch-geis/backend/xcb/grail_gestures.h
-    (geis_xcb_backend_primitive_class): new function
-    (geis_xcb_backend_touch_count): implemented new functions
-  * libutouch-geis/geis_subscription.h (geis_subscription_pdata): new function
-    (geis_subscription_set_pdata): new function
-  * libutouch-geis/geis_subscription.c: implemented new functions
-
- 2011-01-27  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 gesture module, part V (refined frame-touch interaction)
-
-  * include/geis/geis.h (GeisTouchId) new type
-    (geis_touchset_touch_by_id(): new function
-    (geis_frame_touchid_count(): renamed from geis_frame_touch_count
-    (geis_frame_touchid): renamed from geis_frame_touch
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_create_gesture_events): called geis_frame_add_touchid
-  * libutouch-geis/geis_frame.c (struct _GeisFrame): added touch fields
-    (geis_frame_new): initialized touch fields
-    (geis_frame_delete): destroyed touch fields
-  * libutouch-geis/geis_frame.h (geis_frame_add_touchid): new fucntion
-  * libutouch-geis/geis_touch.c: implemented new function
-  * libutouch-geis/geis_touch.h (geis_touch_new): changed parameter type
-  * libutouch-geis/libutouch-geis.ver: added/renamed symbols
-  * testsuite/geis2/check_frame.c: expanded test case to include frame-touch
-
- 2011-01-27  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 gesture module, part IV (frame implementation)
-
-  * libutouch-geis/geis_frame.c: new file
-  * libutouch-geis/geis_frame.h: new file
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_create_gesture_events): added frame to injected event
-  * libutouch-geis/geis_group.c (struct _GeisGroup): added frameset field
-    (geis_groupset_delete): cleaned out container
-    (geis_group_new): initialized frameset member
-    (geis_group_delete): destroyed frameset member
-    (geis_group_insert_frame): added function implementation
-    (geis_group_frame_count): added function implementation
-    (geis_group_frame): added function implementation
-    (geis_group_reject): added function stub
-  * libutouch-geis/geis_group.h (geis_group_insert_frame): new function
-  * libutouch-geis/geis_touch.c (geis_touchset_delete): cleaned out container
-    (geis_touch_new): initialized attr_bag member
-    (geis_touch_delete): destroyed attr_bag member
-  * testsuite/geis2/check_frame.c: added new checks for frames
-
- 2011-01-27  Stephen M. Webb  <[e-mail]>
-
-  Added missing callback registration function.
-
-  * libutouch-geis/geis.c (geis_register_device_callback): implemented function
-
- 2011-01-27  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 gesture module, part III (touch/touchset implementation)
-
-  * libutouch-geis/geis_touch.c: new file
-  * libutouch-geis/geis_touch.h: new file
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_create_gesture_events): added touch set to injected event
-  * testsuite/geis2/check_frame.c: added test case
-
- 2011-01-26  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 gesture module, part II (group/groupset implementation)
-
-  * libutouch-geis/geis_group.c: new file
-  * libutouch-geis/geis_group.h: new file
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_create_gesture_events): new function
-    (geis_backend_new_test_fixture): called it
-  * testsuite/geis2/check_class.c(receive_events): allowed for multiple events
-  * testsuite/geis2/check_device.c(receive_events): allowed for multiple events
-  * testsuite/geis2/check_frame.c (receive_events): new test case
-  * testsuite/geis2/check_subscription.c (receive_events): fixed leak
-
- 2011-01-25  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 gesture module, part I (public API).
-
-  * testsuite/geis2/check_frame.c: new test suite
-  * include/geis/geis.h (GeisGroup): new type
-    (GeisGroupSet): new type
-    (GeisTouch): new type
-    (GeisTouchSet): new type
-    (GeisFrame): new type
-    (GEIS_EVENT_ATTRIBUTE_GROUPSET): new symbol
-    (GEIS_EVENT_ATTRIBUTE_TOUCHSET): new symbol
-    (geis_groupset_group_count): new function
-    (geis_groupset_group): new function
-    (geis_group_id): new function
-    (geis_group_frame_count): new function
-    (geis_group_frame): new function
-    (geis_group_reject): new function
-    (geis_touchset_touch_count): new function
-    (geis_touchset_touch): new function
-    (geis_touch_id): new function
-    (geis_touch_attr_count): new function
-    (geis_touch_attr): new function
-    (geis_touch_attr_by_name): new function
-    (geis_frame_id): new function
-    (geis_frame_is_class): new function
-    (geis_frame_attr_count): new function
-    (geis_frame_attr): new function
-    (geis_frame_attr_by_name): new function
-    (geis_frame_matrix): new function
-    (geis_frame_touch_count): new function
-    (geis_frame_touch): new function
-    (geis_gesture_reject): new function
-  * libutouch-geis/libutouch-geis.ver: added new symbols
-  * testsuite/geis2/Makefile.am: added new test suite file
-  * testsuite/geis2/check_geis2_api.c: referenced new test suite
-
- 2011-01-10  Stephen M. Webb  <[e-mail]>
- 
-  Added gesture class events to XCB back end.
-
-  * libutouch-geis/backend/xcb/grail_gestures.c: new file
-  * libutouch-geis/backend/xcb/grail_gestures.h: new file
-  * libutouch-geis/backend/xcb/Makefile.am: added new files
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_report_xcb_devices): new
-    (_report_grail_glasses): new 
-    (geis_xcb_backend_new: called new functions
-
-2011-01-07  Stephen M. Webb  <[e-mail]>
-
-  Added XCB back end convenience library.
-
-  * libutouch-geis/backend/xcb/geis_xcb_backend.c: new file
-  * libutouch-geis/backend/xcb/geis_xcb_backend.h: new file
-  * libutouch-geis/backend/xcb/Makefile.am: added rules for new library
-  * include/geis/geis.h (GEIS_INIT_UTOUCH_XCB): new init arg symbol
-  * libutouch-geis/geis.c: used it
-  * libutouch-geis/Makefile.am: added XCB protocol library
-  * libutouch-geis-xcb/Makefile.am: removed XCB protocol library
-  * testsuite/libutouch-geis/Makefile.am: added XCB runtime libraries
-
-2011-01-07  Stephen M. Webb  <[e-mail]>
-
-  Refactored XCB protocol library into a separate convenience lib.
-
-  * libs/Makefile.am: new directory
-  * libs/xcb/Makefile.am: new subproject
-  * libs/xcb/c-client.xsl: renamed from libutouch-geis-xcb/c-client.xsl
-  * libs/xcb/c_client.py: renamed from libutouch-geis-xcb/c_client.py
-  * libs/xcb/xcb_gesture.xml.in: was libutouch-geis-xcb/xcb_gesture.xml.in
-  * Makefile.am: added new subproject
-  * configure.ac: added new subproject
-  * libutouch-geis-xcb/Makefile.am: moved XCB protocol to libs/xcb subproject
-
-2011-01-07  Stephen M. Webb  <[e-mail]>
-
-  Added XCB back end subproject to libutouch-geis.
-
-  * libutouch-geis/backend/xcb: new subproject
-  * libutouch-geis/backend/xcb/Makefile.am: new file.
-  * Makefile.am: updated copyright
-  * configure.ac: added new subproject
-  * libutouch-geis/backend/Makefile.am: added new subproject
-
-2011-01-06  Stephen M. Webb  <[e-mail]>
-
-  Added Geis v2.0 gesture class implementation (part 2, utouch internals)
-
-  * testsuite/libutouch-geis/check_class.c: new test suite
-  * include/geis/geis.h: fixed GEIS_FILTER_CLASS
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_create_test_classes): new function
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.h
-    (geis_backend_new_test_fixture): added track_classes parameter
-  * libutouch-geis/geis.c (struct _Geis): added new fields
-    (_class_event_handler): implemented event handling
-    (geis_new_empty): initialized new fields
-    (_set_valist): handled GEIS_INIT_TRACK_GESTURE_CLASSES
-    (geis_get_class_attr_type): new function
-  * libutouch-geis/geis_class.h (GeisGestureClassBag): new data structure
-    (geis_gesture_class_bag_new): new function
-    (geis_gesture_class_bag_delete): new function
-    (geis_gesture_class_bag_count): new function
-    (geis_gesture_class_bag_gesture_class): new function
-    (geis_gesture_class_bag_insert): new function
-    (geis_gesture_class_bag_remove): new function
-  * libutouch-geis/geis_class.c: implemented above new functions
-  * libutouch-geis/geis_filter.c (_facility_is_valid): fixed facility name
-  * libutouch-geis/geis_private.h (geis_get_class_attr_type): new function
-  * testsuite/geis2/check_filter.c: fixed facility name
-  * testsuite/geis2/check_subscription.c: added check for class subscription
-  * testsuite/libutouch-geis/Makefile.am: added new test suite file
-  * testsuite/libutouch-geis/check_geis2_internals.c: called new test suite
-
-2011-01-06  Stephen M. Webb  <[e-mail]>
-
-  Added Geis v2.0 gesture class implementation (part 1, basic API)
-
-  * libutouch-geis/geis_class.c: new file
-  * libutouch-geis/geis_class.h: new file
-  * libutouch-geis/Makefile.am: added new source files
-  * libutouch-geis/geis.c (struct _Geis): added new class callback fields
-    (_class_event_handler): new function
-    (_input_event_handler): added case for gesture class events
-    (geis_register_class_callback): implemented function
-  * include/geis/geis.h (geis_gesture_class_ref): adjusted return type
-    (geis_gesture_class_unref): same
-
-2011-01-06  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 gesture class API
-
-  * testsuite/geis2/check_class.c: new test suite
-  * include/geis/geis.h (GEIS_INIT_TRACK_GESTURE_CLASSES): new init ath
-    (GEIS_EVENT_CLASS_AVAILABLE): new event type
-    (GEIS_EVENT_CLASS_CHANGED): new event type
-    (GEIS_EVENT_CLASS_UNAVAILABLE): new event type
-    (GeisGestureClass): new opaque type
-    (GEIS_CLASS_ATTRIBUTE_NAME): new attribute name
-    (GEIS_CLASS_ATTRIBUTE_ID): new attribute name
-    (GEIS_EVENT_ATTRIBUTE_CLASS): new attribute name
-    (geis_register_class_callback): new function
-    (geis_gesture_class_ref): new function
-    (geis_gesture_class_unref): new function
-    (geis_gesture_class_name): new function
-    (geis_gesture_class_id): new function
-    (geis_gesture_class_attr_count): new function
-    (geis_gesture_class_attr): new function
-  * libutouch-geis/libutouch-geis.ver: added new exported symbols
-  * testsuite/geis2/Makefile.am: build new test suite
-  * testsuite/geis2/check_event.c: changed event type names
-  * testsuite/geis2/check_geis2_api.c: used new test suite
-  * testsuite/geis2/check_geis_new.c: changed init constant names
-
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Minor tweaks.
-
-  * include/geis/geis.h: fixed typos in comments
-    (GEIS_DEVICE_ATTRIBUTE_NAME): new constant
-  * libutouch-geis/geis_device.c: used new constant instead of hard-coded string
-  * testsuite/geis2/check_subscription.c: same
-
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 filter implementation (part 4, device subscription)
-
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_subscription): add debug output to the test fixture
-  * libutouch-geis/geis_device.c: made name an attr for filtering on
-  * libutouch-geis/geis_filter.h
-    (geis_filter_term_by_facility_count): new function
-    (geis_filter_term_by_facility): new function
-  * libutouch-geis/geis_filter.c: implemented the above new functions
-  * libutouch-geis/geis_subscription.h
-    (geis_subscription_filter_count): new function
-    (geis_subscription_filter): new function
-  * libutouch-geis/geis_subscription.c: implemented the above new functions
-  * testsuite/geis2/check_subscription.c (device_filter): new test case
- 
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Added group test for back end device creation.
-
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
-    (_create_test_devices): new function
-    (geis_backend_new_test_fixture): used it
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.h
-    (geis_backend_new_test_fixture): added track_devices parameter
-  * libutouch-geis/geis.c (_set_valist): refactored to propagate init args
-  * testsuite/geis2/check_device.c: new test case
-
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Marked missing geis_event_* symbols as exported.
-
-  * libutouch-geis/libutouch-geis.ver (geis_event_attr): exported
-    (geis_event_attr_by_name): exported
-    (geis_event_attr_count): exported
-    (geis_event_delete): exported
-    (geis_event_type): exported
-
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Moved back end test fixture into a subproject.
-
-  * libutouch-geis/backend/test_fixture: new subproject
-  * libutouch-geis/backend/test_fixture/Makefile.am: new file
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c: renamed
-    from libutouch-geis/geis_backend_test_fixture.c
-  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.h: renamed
-    from  libutouch-geis/geis_backend_test_fixture.h 
-  * configure.ac (AC_OUTPUT): added libutouch-geis/backend/test_fixture/Makefile
-  * libutouch-geis/Makefile.am: linked in new subproject
-  * libutouch-geis/backend/Makefile.am: added new subproject
-  * libutouch-geis/geis.c: changed header qualification
-
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Added device cacheing.
-
-  * libutouch-geis/geis_private.h (geis_get_device_attr_type): new function
-  * libutouch-geis/geis.c (struct _Geis): added devices field
-    (_device_event_handler): new function
-    (_input_event_handler): dispatched BE device events
-    (geis_new_empty): initialized devices field
-    (geis_new_delete): destroyed devices field
-  * libutouch-geis/geis_filter.c (_get_attr_type_for_facility): implemented for
-    the device facility
-
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Fixed failure-mode return value from geis_filter_term_bag_new
-
-  * libutouch-geis/geis_filter_term.c (geis_filter_term_bag_new): returned
-    NULL on failure
-
-2011-01-05  Stephen M. Webb  <[e-mail]>
-
-  Added missing geis_attr_value_to_pointer.
-
-  * libutouch-geis/geis_attr.c (geis_attr_value_to_pointer): new function
-    (geis_attr_value_to_string): added case to handle GEIS_ATTR_TYPE_POINTER
-
-2011-01-03  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 filter implementation (part 3, filter terms)
-
-  * libutouch-geis/geis_filter_term.c: new file
-  * libutouch-geis/geis_filter_term.h: new file
-  * include/geis/geis.h (GeisFilterOperation): fixed typo
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/geis_filter.c (geis_filter_add_term): implemented function
-    (_facility_is_valid): new function
-    (_operation_is_valid): new function
-    (_get_attr_for_facility): new function
-
-2011-01-01  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 filter implementation (part 2)
-
-  * libutouch-geis/geis_filter.c: fixed refcounting on bag insertion
-  * libutouch-geis/geis_subscription.c
-    (geis_subscription_add_filter): implemented stubbed-out function
-    (geis_subscription_remove_filter): implemented stubbed-out function
-  * testsuite/geis2/check_subscription.c: new test case
-
-2010-12-20  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 filter implementation (part 1)
-
-  * testsuite/libutouch-geis/check_filter.c: new test suite
-  * libutouch-geis/geis_filter.h (GeisFilterBag): new data structure
-    (geis_filter_bag_new): new function
-    (geis_filter_bag_delete): new function
-    (geis_filter_bag_count): new function
-    (geis_filter_bag_filter): new function
-    (geis_filter_bag_insert): new function
-    (geis_filter_bag_remove): new function
-    (geis_filter_ref): new function
-    (geis_filter_unref): new function
-  * libutouch-geis/geis_filter.c: implemented new functions
-  * testsuite/libutouch-geis/Makefile.am: added new test suite
-  * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
-
-2010-12-29  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 filter API
-
-  * libutouch-geis/geis_filter.c: new file
-  * libutouch-geis/geis_filter.h: new file
-  * testsuite/geis2/check_filter.c: new test suite
-  * include/geis/geis.h (GeisFilter): new type
-    (GeisFilterFacility): new enumeration
-    (GeisFilterOperation): new enumeration
-    (gei_filter_new): new function
-    (geis_filter_delete): new function
-    (geis_filter_name): new function
-    (geis_filter_add_term): new function
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/libutouch-geis.ver: added new symbols
-  * testsuite/geis2/Makefile.am: added new test suite
-  * testsuite/geis2/check_geis2_api.c: added new test suite
-
-2010-12-29  Stephen M. Webb  <[e-mail]>
-
-  Added backend subdirectory to libutouch-geis.
-
-  * libutouch-geis/backend/Makefile.am: new file
-  * configure.ac (AC_OUTPUT): added libutouch-geis/backend/Makefile
-  * libutouch-geis/Makefile.am (SUBDORS): added backend
-
-2010-12-29  Stephen M. Webb  <[e-mail]>
-
-  Moved geis/geisimpl.h into GEIS v2.0 sources.
-
-  * libutouch-geis/geis/geisimple.h: renamed from libutouch-geis-xcb/geis
-  * libutouch-geis-xcb/Makefile.am: changed header search path
-  * libutouch-geis/Makefile.am: changed header search path
-  * testsuite/geis1/Makefile.am: changed header search path
-  * testsuite/geis2/Makefile.am: changed header search path
-  * testsuite/geistest/Makefile.am: changed header search path
-  * testsuite/libutouch-geis/Makefile.am: changed header search path
-
-2010-12-20  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 input device implementation.
-
-  * libutouch-geis/geis_device.h (GeisDeviceBag): new type
-    (geis_device_bag_new): new function
-    (geis_device_bag_delete): new function
-    (geis_device_bag_count): new function
-    (geis_device_bag_device): new function
-    (geis_device_bag_insert): new function
-    (geis_device_bag_remove): new function
-  * libutouch-geis/geis_device.c: implemented new functions
-  * testsuite/libutouch-geis/check_device.c: new test suite
-  * testsuite/libutouch-geis/Makefile.am: added new test suite
-  * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
-
-2010-12-20  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 input device API
-
-  * libutouch-geis/geis_device.c: new file
-  * libutouch-geis/geis_device.h: new file
-  * testsuite/geis2/check_device.c: new test suite
-  * include/geis/geis.h (GeisDevice): new type
-    (geis_register_device_callback): new function
-    (geis_device_ref): new function
-    (geis_device_unref): new function
-    (geis_device_name): new function
-    (geis_device_id): new function
-    (geis_device_attr_count): new function
-    (geis_device_attr): new function
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/libutouch-geis.ver: added new API symbols
-  * testsuite/geis2/Makefile.am: added new test suite
-  * testsuite/geis2/check_geis2_api.c: added new test suite
-
-2010-12-20  Stephen M. Webb  <[e-mail]>
-
-  Updates to match new GEIS v2.0 spec release of 2010.12.20.
-  - added a pointer type to the GEIS attr module
-  - added additional required GEIS initialization arguments
-  - event type enumarant name changes
-
-  * testsuite/geis2/check_attr.c: new test suite
-  * testsuite/geis2/check_event.c: new test suite
-  * include/geis/geis.h (GEIS_INIT_TRACK_DEVICES): new init arg
-    (GEIS_INIT_TRACK_GESTURE_TYPES): new init arg
-    (GeisAttrType): added GEIS_ATTR_TYPE_POINTER enumerant
-    (geis_attr_value_to_pointer): new function
-    (GeisEventType): added new enumerants
-  * libutouch-geis-xcb/geis/geisimpl.h: added GeisPointer type
-  * libutouch-geis/Makefile.am: added libutouch-geis-xcb to header search path
-  * libutouch-geis/libutouch-geis.ver (geis_attr_value_to_pointer): new symbol
-  * testsuite/geis2/Makefile.am: added new test suites
-  * testsuite/geis2/check_geis2_api.c: added new test suites
-  * testsuite/geis2/check_geis_new.c: added new test case for init args
-  * testsuite/geis2/check_general_types.c: added new test case fo GeisPointer
-  * testsuite/geistest/Makefile.am: added libutouch-geis-xcb to header search path
-  * testsuite/libutouch-geis/Makefile.am: same
-  * testsuite/libutouch-geis/check_event_queue.c: changed name of event types
-  * testsuite/libutouch-geis/check_geis_private.c: changed name of event types
-
-2010-12-15  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 region module.
-
-  * libutouch-geis/geis_region.c: new file
-  * libutouch-geis/geis_region.h: new file
-  * testsuite/geis2/check_region.c: new test suite
-  * testsuite/libutouch-geis/check_region.c: new test suite
-  * include/geis/geis.h (GeisRegion): new typedef
-    (GEIS_REGION_X11_ROOT): new region initialization constant
-    (GEIS_REGION_X11_WINDOWID): new region initialization constant
-    (geis_region_new): new function
-    (geis_region_delete): new function
-    (geis_region_name): new function
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/libutouch-geis.ver: added new symbols
-  * testsuite/geis2/Makefile.am: added new test suite files
-  * testsuite/geis2/check_geis2_api.c: added new test suite 
-  * testsuite/libutouch-geis/Makefile.am: added new test suite files
-  * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
-
-2010-12-12  Stephen M. Webb  <[e-mail]>
-
-  Fixed some container expansion errors.
-
-  * libutouch-geis/geis_attr.c (geis_attr_bag_insert): fixed realloc size
-  * libutouch-geis/geis_subscription.c (geis_subscription_bag_insert):
-    fixed realloc size, cleared newly realloc'd memory
-  * testsuite/libutouch-geis/check_attr.c (expansion): new check
-  * testsuite/libutouch-geis/check_subscription.c (expansion): new check
-
-2010-12-12  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 subscription activation calls.
-
-  * include/geis/geis.h (geis_subscription_activate): new function
-    (geis_subscription_deactivate): new function
-  * libutouch-geis/geis_subscription.c: implemented above new functions
-  * libutouch-geis/geis_backend.h (geis_backend_subscribe) new function
-    (geis_backend_unsubscribe): new function
-  * libutouch-geis/geis_backend.c: implemented above new functions
-  * libutouch-geis/geis_backend_protected.h (GeisBackendVtable): added new
-    subscribe and unsubscribe function pointers
-  * libutouch-geis/geis_backend_test_fixture.c (_subscribe): new vfunction
-    (_unsubscribe): new vfunction
-  * libutouch-geis/geis_private.h (geis_activate_subscription): new function
-    (geis_deactivate_subscription): new function
-  * libutouch-geis/geis.c: implemented above new functions
-  * libutouch-geis/geis_subscription.h: fixed a typo in a prototype
-  * libutouch-geis/libutouch-geis.ver: added new GEIS v2.0 symbols
-  * testsuite/geis2/check_subscription.c: new test cases
-
-2010-12-12  Stephen M. Webb  <[e-mail]>
-
-  Added forwarding functions so back ends can multiplex file descriptors through
-  the API.
-
-  * libutouch-geis/geis_private.h (geis_multiplex_fd): new function
-    (geis_demultiplex_fd): new function
-  * libutouch-geis/geis.c: implemented above new functions
-  * testsuite/libutouch-geis/check_geis_private.c:
-    renamed from check_backend_event_posting.c
-    (multiplex_fd): new test case
-  * testsuite/libutouch-geis/Makefile.am: renamed above file
-  * testsuite/libutouch-geis/check_backend_multiplexor.c: removed debug message
-    silenced build warnings
-
-2010-12-08  Stephen M. Webb  <[e-mail]>
-
-  Refactored event queue style.
-
-  * libutouch-geis/geis_event_queue.h (geis_event_queue_enqueue): renamed from
-    geis_event_queue_push
-    (geis_event_queue_dequeue): renamed from geis_event_queue_pop
-    changed event output parameter to return value
-  * libutouch-geis/geis_event_queue.c: refactored for above
-  * libutouch-geis/geis.c: refactored for above
-  * testsuite/libutouch-geis/check_event_queue.c: refactored for above
-
-
-2010-12-08  Stephen M. Webb  <[e-mail]>
-
-  Added an event queue.
-
-  * libutouch-geis/geis_event.c: new file
-  * libutouch-geis/geis_event.h: new file
-  * libutouch-geis/geis_event_queue.c: new file
-  * libutouch-geis/geis_event_queue.h: new file
-  * testsuite/libutouch-geis/check_backend_event_posting.c: new test case
-  * testsuite/libutouch-geis/check_event_queue.c: new test case
-  * include/geis/geis.h (GeisEventType): new enum type
-    (geis_event_delete): new function
-    (geis_event_type): new function
-    (geis_event_attr_count): new function
-    (geis_event_attr): new function
-    (geis_event_attr_by_name): new function
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/geis.c (struct _Geis): added input_event_queue,
-    output_event_queue, and input_signal_pipe members
-    (_default_output_event_callback): new function
-    (_input_event_handler): new function
-    (geis_new_empty): initialized new members
-    (geis_register_event_callback): used _default_output_event_callback
-    (geis_next_event): implemented stubbed-out function
-  * testsuite/libutouch-geis/Makefile.am: added new test cases
-  * testsuite/libutouch-geis/check_geis2_internals.c: added new test cases
-
-
-2010-12-02  Stephen M. Webb  <[e-mail]>
-
-  Added GEIS v2.0 event control functions.
-
-  * include/geis/geis.h (GeisEvent): new type
-    (GeisEventCallback): new type
-    (GEIS_DEFAULT_EVENT_CALLBACK): new constant
-    (geis_register_event_callback): new function
-    (geis_dispatch_events): new function
-    (geis_next_event): new function
-  * libutouch-geis/geis_private.h (geis_post_event): new function
-  * libutouch-geis/geis.c: implemented new functions
-  * libutouch-geis/libutouch-geis.ver: added new symbols
-
-2010-12-02  Stephen M. Webb  <[e-mail]>
-
-  Added a back end base and test fixture.
-
-  * libutouch-geis/geis_backend.c: new file
-  * libutouch-geis/geis_backend.h: new file
-  * libutouch-geis/geis_backend_protected.h: new file
-  * libutouch-geis/geis_backend_test_fixture.c: new file
-  * libutouch-geis/geis_backend_test_fixture.h: new file
-  * include/geis/geis.h (GEIS_INIT_SERVICE_PROVIDER): changed constant value
-    (GEIS_INIT_UTOUCH_MOCK_ENGINE): added new constant
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/geis.c (struct _Geis): replaced is_test_fixture with backend
-    (geis_set_valist): created new test fixture backend
-    (geis_delete): destroyed backend
-  * testsuite/geis2/check_config.c: used new name for test fixture back end
-  * testsuite/geis2/check_geis_new.c: same
-  * testsuite/geis2/check_subscription.c: idem
-  * testsuite/libutouch-geis/check_subscription.c: ditto
-
-2010-12-02  Stephen M. Webb  <[e-mail]>
-
-  Added a back end multiplexor.
-
-  * libutouch-geis/geis_backend_multiplexor.c: new file
-  * libutouch-geis/geis_backend_multiplexor.h: new file
-  * testsuite/libutouch-geis/check_backend_multiplexor.c: new testsuite
-  * include/geis/geis.h (GeisStatus): added new status codes
-    GEIS_STATUS_CONTINUE and GEIS_STATUS_EMPTY
-    (GEIS_CONFIG_UTOUCH_MAX_EVENTS): new configuration item
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/geis.c (struct _Geis): added backend_multiplexor field
-    (geis_new_empty): initialized it
-    (geis_delete): destroyed it
-    (geis_get_configuration): retrieved its file descriptor and config value
-    (geis_set_configuration): set its configuration value
-  * testsuite/geis2/check_error_codes.c: checked new status codes
-  * testsuite/libutouch-geis/Makefile.am
-  * testsuite/libutouch-geis/check_geis2_internals.c
-
-2010-11-29  Stephen M. Webb  <[e-mail]>
-
-  Refactored geis_private.h to provide improved data encapsulation.
-
-  * libutouch-geis/geis_private.h (struct _Geis): moved to geis.c
-    (geis_error_stack): new function
-  * libutouch-geis/geis.c: implemented new function
-  * libutouch-geis/geis_error.c: used new function
-
-2010-11-29  Stephen M. Webb  <[e-mail]>
-
-  Fixed a typo in the Doxygen comments in geis.h.
-
-  * include/geis/geis.h: fixed typo in documentation
-
-2010-11-28  Stephen M. Webb  <[e-mail]>
-
-  Added Geis Subscription creation and accessors.
-
-  * libutouch-geis/geis_subscription.c: new file
-  * libutouch-geis/geis_subscription.h: new file
-  * testsuite/geis2/check_subscription.c: new API test suite
-  * testsuite/libutouch-geis/check_subscription.c: new internals test suite
-  * include/geis/geis.h (GeisFilter): new type
-    (GeisSubscription): new type
-    (GeisSubscriptionFlags): new type
-    (geis_subscription_new): new function
-    (geis_subscription_delete): new function
-    (geis_subscription_name): new function
-    (geis_subscription_id): new function
-    (geis_subscription_add_filter): new function
-    (geis_subscription_remove_filter): new function
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/geis_private.h (geis_subscription_bag): new function
-    (struct _Geis): added subscription_bag field
-  * libutouch-geis/geis.c (geis_subscription_bag): implemented it
-    (geis_new_empty): created an empty subscription bag
-  * libutouch-geis/libutouch-geis.ver: added new geis_subscription_* symbols
-  * testsuite/geis2/Makefile.am: added new test suite source
-  * testsuite/geis2/check_geis2_api.c: added new test suite
-  * testsuite/libutouch-geis/Makefile.am: added new test suite source
-  * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
-
-
-2010-11-26  Stephen M. Webb  <[e-mail]>
-
-  Added Geis Attr functions.
-
-  * libutouch-geis/geis_attr.c: new file
-  * libutouch-geis/geis_attr.h: new file
-  * testsuite/libutouch-geis/check_attr.c: new unit test suite
-  * include/geis/geis.h (GeisAttr): new type
-    (geis_attr_name): new function
-    (geis_attr_type): new function
-    (geis_attr_value_to_boolean): new function
-    (geis_attr_value_to_float): new function
-    (geis_attr_value_to_integer): new function
-    (geis_attr_value_to_string): new function
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/libutouch-geis.ver: added new symbols
-  * testsuite/libutouch-geis/Makefile.am: added new test suite
-  * testsuite/libutouch-geis/check_error_reporting.c: renamed test suite
-  * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
-
-2010-11-24  Stephen M. Webb  <[e-mail]>
-
-  Added Geis configuration functions.
-
-  * include/geis/geis.h (geis_get_config): new function
-    (geis_set_config): new function
-  * libutouch-geis/geis.c: added stubs for new functions
-  * libutouch-geis/libutouch-geis.ver: added symbols for new functions
-  * testsuite/geis2/check_config.c: new test suite for new functions
-  * testsuite/geis2/Makefile.am: added above new file
-
-2010-11-24  Stephen M. Webb  <[e-mail]>
-
-  Added silent rules to build.
-
-  * configure.ac (AM_INIT_AUTOMAKE): required minimum version 1.11
-    (AM_SILENT_RULES): new macros to set silent build rules on by default
-
-2010-11-24  Stephen M. Webb  <[e-mail]>
-
-  Fixed a "make distcheck" problem.
-
-  * testsuite/libutouch-geis/Makefile.am (check_geis2_internals_CFLAGS): added
-    $(top_srcdir) to the header search path
-
-2010-11-24  Stephen M. Webb  <[e-mail]>
-
-  Added unit testing for uTouch GEIS v2.0 internals.
-
-  * testsuite/libutouch-geis: new subdirectory
-  * testsuite/libutouch-geis/Makefile.am: new file
-  * testsuite/libutouch-geis/check_error_reporting.c: new file
-  * testsuite/libutouch-geis/check_geis2_internals.c: new file
-  * configure.ac (AC_OUTPUT): added new Makefile
-  * testsuite/Makefile.am (SUBDIRS): added new subdirectory
-  * testsuite/geis1/check_geis_internals.c: renamed test suite
-  * testsuite/geis2/check_geis2_api.c: renamed test suite
-
-2010-11-23  Stephen M. Webb  <[e-mail]>
-
-  Added Error Reporting functions.
-
-  * libutouch-geis/geis_error.c: new file
-  * libutouch-geis/geis_error.h: new file
-  * libutouch-geis/geis_private.h: new file
-  * include/geis/geis.h (geis_error_count): new function
-    (geis_error_code): new function
-    (geis_error_message): new function
-  * libutouch-geis/Makefile.am: added new files
-  * libutouch-geis/geis.c: used new functions
-  * libutouch-geis/libutouch-geis.ver: added new function symbols
-
-2010-11-23  Stephen M. Webb  <[e-mail]>
-
-  Added diagnostics to geis_new().
-
-  * libutouch-geis/geis.c (geis_error): reported calloc failure
-    (geis_set_valist): added debug diagnostics for init args
-
-2010-11-23  Stephen M. Webb  <[e-mail]>
-
-  Moved diagnostic logging from GEIS v1.0 to GEIS v2.0 libraries.
-
-  * libutouch-geis/geis_logging.h: renamed from libutouch-geis-xcb/geis_logging.h
-  * libutouch-geis/geis_logging.c: renamed from libutouch-geis-xcb/geis_logging.c
-  * libutouch-geis-xcb/Makefile.am: removed above renamed files
-  * libutouch-geis/Makefile.am: added above renamed files
-  * testsuite/geis1/Makefile.am: changed library path
-  * testsuite/geistest/Makefile.am: changed library path
-
-2010-11-23  Stephen M. Webb  <[e-mail]>
-
-  Merged GEIS v1.0 into GEIS v2.0 library for backwards compatibility.
-
-  * libutouch-geis-xcb/libutouch-geis-xcb.ver: removed
-  * libutouch-geis-xcb/Makefile.am: converted to build a convenience lib
-  * libutouch-geis/Makefile.am: added libutouch-geis-xcb as a conveniemnce lib
-  * libutouch-geis/libutouch-geis.ver: Added GEIS v1.0 symbols
-  * testsuite/geis2/Makefile.am: fixed path to shared library in build tree
-
-2010-11-22  Stephen M. Webb  <[e-mail]>
-
-  Refactored API initialization to use variadic arguments a la spec change.
-
-  * include/geis/geis.h (geis_new): changed function prototype
-  * libutouch-geis/geis.c (geis_new_empty): new function
-    (geis_set_valist): new function
-    (geis_new): changed parameters, used new functions
-  * testsuite/geis2/check_geis_new.c (geis_new_and_delete): changed geis_new()
-    arguments
-
-2010-11-22  Stephen M. Webb  <[e-mail]>
-
-  Fixed visibility of new GEIS 2.0 symbols.
-
-  * include/geis/geis.h (geis_new): fixed visibility
-    (geis_delete): same
-
-2010-11-22  Stephen M. Webb  <[e-mail]>
-
-  Made geis2_geis_new test case pass.
-
-  * libutouch-geis/geis.c (geis_hints_find_by_id): new static function
-    (geis_hints_append): new static function
-    (geis_new): used them, malloc'd struct _Geis
-    (geis_delete): free'd struct _Geis
-
-2010-11-22  Stephen M. Webb  <[e-mail]>
-
-  Added test case for GEIS v2.0 geis_new() and geis_delete() functions, together
-  with a skeletal implementation of the libutouch-geis v2.0 library.
-  
-  * libutouch-geis: new source directory
-  * libutouch-geis/Makefile.am: new build recipe for libutouch-geis v2.0
-  * libutouch-geis/geis.c: new source file
-  * libutouch-geis/libutouch-geis.ver: new library version map
-  * testsuite/geis2/check_geis_new.c: new test suite
-  * Makefile.am (SUBDIRS): added libutouch-geis
-  * configure.ac (AC_OUTPUT): added libutouch-geis/Makefile
-  * include/geis/geis.h (GeisHints): new data structure
-    (Geis): new opaque data structure
-    (geis_new): new function
-    (geis_delete): new function
-  * testsuite/geis2/Makefile.am (check_geis2_api_SOURCES): added check_geis_new
-  * testsuite/geis2/check_geis2_api.c (main): added geis_new_suite
-
-2010-11-21  Stephen M. Webb  <[e-mail]>
-
-  Added test case for geis v2.0 error codes.
-
-  * include/geis/geis.h: added required v2.0 error codes
-  * testsuite/geis2/check_error_codes.c: new test case
-  * testsuite/geis2/Makefile.am: added new test case
-  * testsuite/geis2/check_geis2_api.c: same
-
-2010-11-20  Stephen M. Webb  <[e-mail]>
-
-  Added test case for geis v2.0 basic types.
-
-  * testsuite/geis2/check_general_types.c: new file
-  * testsuite/geis2/Makefile.am: added above new file
-  * testsuite/geis2/check_geis2_api.c (geis2_general_types_suite_new): added new
-    unit test
-
-2010-11-19  Stephen M. Webb  <[e-mail]>
-
-  Added geis v2.0 test hardness and version macro test.
-
-  * include/geis/geis.h (GEIS_VERSION_2_0): added macro
-  * testsuite/geis2/check_geis_api.c: new testsuite.
-  * testsuite/geis2/check_version_macro.c: added unit test for geis 2.0 version
-    macro
-  * testsuite/geis2/Makefile: new file
-  * configure.ac (AC_OUTPUT): added above enw file
-  * testsuite/Makefile: added new testsuite directory geis2
-
-2010-11-12  Stephen M. Webb  <[e-mail]>
-
-  Made existing unit test directory specific to geis v1.0.
-
-  * testsuite/geis1: renamed from testsuite/check
-  * configure.ac: renamed testsuite/check
-  * testsuite/Makefile.am: same
-  * testsuite/geis1/Makefile.am: same
-
-2010-10-20  Stephen M. Webb  <[e-mail]>
-
-  Added unit tests for internal geis_instance_table.
-
-  * testsuite/check/check_instance_table.c: new file
-  * testsuite/check/Makefile.am (check_geis_internals_SOURCES): added it
-    (MOSTLYCLEANFILES): new target to clean up unit test logs
-  * testsuite/check/check_geis_internals.c (main): added unit test suite
-
-2010-10-20  Stephen M. Webb  <[e-mail]>
-
-  Added unit test infrastructure based on 'check'.
-
-  * testsuite/check/Makefile.am: new file
-  * testsuite/check/check_geis_internals.c: new file
-  * testsuite/Makefile.am (SUBDIRS): added check target
-  * configure.ac: added new stanza for detecting check package
-    (AC_CONFIG_FILES): added testsuite/check/Makefile
-
-2010-10-18  Stephen M. Webb  <[e-mail]>
-
-  Added configury check for xcb-proto package >= 1.6 (LP: #661946).
-
-  * configure.ac: added PKG_CHECK_MODULES for xcb-proto >= 1.6
-
-2010-10-14  Stephen M. Webb  <[e-mail]>
-
-  Release version 1.0.13.
-
-  * configure.ac (AC_INIT): bumped package version to 1.0.13
-
-2010-10-12  Stephen M. Webb  <[e-mail]>
-
-  Removed extra newlines from diagnostic messages
-
-  * libutouch-geis-xcb/geis_xcb.c: removed newline from several diagnostic
-    messages.
-
-2010-10-07  Stephen M. Webb  <[e-mail]>
-
-  Fixed LP: #656503 - event dispatch can hang under some circumstances
-
-  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_dispatch): changed loop condition
-  * libutouch-geis-xcb/Makefile.am (libutouch_geis_la_LDFLAGS): bumped library
-    revision
-
-2010-09-28  Stephen M. Webb  <[e-mail]>
-
-  Version bump to 1.0.12.
-
-  * configure.ac (AC_INIT): bumped package version to 1.0.12
-
-2010-09-28  Stephen M. Webb  <[e-mail]>
-
-  Made lib compatible with C++.
-
-  * geis/geis.h: forced C linkage
-
-2010-09-14  Stephen M. Webb  <[e-mail]>
-
-  Version bump tp 1.0.11
-
-  * configure.ac: bumped package version to 1.0.11
-  * libutouch-geis-xcb/Makefile.am: bumped shlib version to reflect changes
-
-2010-09-01  Stephen M. Webb  <[e-mail]>
-
-  Fixed typos in manpage.
-
-  * doc/geistest.1: fixed several typographical errors
-
-2010-09-01  Stephen M. Webb  <[e-mail]>
-
-  Fixed a memory leak when logging messages.
-
-  * libutouch-geis-xcb/geis_logging.c (_geis_message): fixed memory leak
-
-2010-08-31  Stephen M. Webb  <[e-mail]>
-
-  Fixed prefix string used in diagnostics.
-
-  * libutouch-geis-xcb/geis_logging.c (_geis_message): fixed which prefix string
-    gets used for which diagnostic level
-
-2010-08-31  Stephen M. Webb  <[e-mail]>
-
-  Removed input device enumeration handling until later.
-
-  * libutouch-geis-xcb/geis.c (geis_input_devices): removed #if 0 block
-  * libutouch-geis-xcb/geis_instance.h (geis_instance_input_devices): removed 
-  * libutouch-geis-xcb/geis_instance.c (geis_instance_input_devices): removed 
-  * libutouch-geis-xcb/geis_xcb.h (geis_xcb_input_devices):  added funcs and
-    cookie parameters
-  * libutouch-geis-xcb/geis_xcb.c (_GeisXcb): added input_funcs and input_cookie
-    (geis_xcb_new): removed #if 0 blocks
-    (geis_xcb_input_devices): removed XInput handling until later
-
-2010-08-30  Stephen M. Webb  <[e-mail]>
-
-  Removed some debug code and fixed pasto.
-
-  * libutouch-geis-xcb/geis_instance.c: fixed a pasto
-  * testsuite/geistest/geistest.c: removed debug code
-
-2010-08-30  Stephen M. Webb  <[e-mail]>
-
-  Fixed so multiple windows will work.
-
-  Altered geistest to work with a single window or all windows, had to fix geis
-  implementation so this was possible.
-
-  * libutouch-geis-xcb/geis_instance_table.c: new file
-  * libutouch-geis-xcb/geis_instance_table.h: new file
-  * configure.ac: added package checks for x11-xcb and xi
-  * doc/geistest.1: documented new CLI switches
-  * geis/geis.h (geis_input_devices): fixed argument type
-  * libutouch-geis-xcb/Makefile.am (libutouch_geis_la_SOURCES): added new files
-    (libutouch_geis_la_CFLAGS): aded X11XCB_CFLAGS and XI2_CFLAGS
-    (libutouch_geis_la_LIBADD): aded X11XCB_LIBS and XI2LIBS_
-  * libutouch-geis-xcb/geis.c (s_geis_xcb): new static global
-    (geis_init): used it
-  * libutouch-geis-xcb/geis_instance.h (_GeisInstance): added window_id
-    (geis_instance_new): renamed from geis_instance_get
-    (geis_instance_input_devices): new function
-    (geis_instance_subscribe): added GeisXcb parameter
-    (geis_instance_get_window_id): new function
-    (geis_instance_fd): removed function
-    (geis_instance_event_dispatch): removed function
-  * libutouch-geis-xcb/geis_instance.c: implemented new functions
-  * libutouch-geis-xcb/geis_xcb.h (geis_xcb_new): renamed from geis_xcb_get
-    (geis_xcb_create_instance): new function
-    (geis_xcb_input_devices): new function
-    (geis_xcb_subscribe): added GeisInstance parameter
-    (geis_xcb_dispatch): changed parameter type to GeisXcb
-  * libutouch-geis-xcb/geis_xcb.c: Implemeneted new functions
-  * testsuite/geistest/geistest.c (parse_opts): added -w switch
-    (subscribe_window): new function
-    (subscribe_windows_preorder): new function
-    (subscribe_all_windows): new function
-    (main): used the new functions
-
-2010-08-30  Stephen M. Webb  <[e-mail]>
-
-  Added runtime diagnostic facility.
-
-  * libutouch-geis-xcb/geis_debug.h: replaced with
-  * libutouch-geis-xcb/geis_logging.h: mew file
-  * libutouch-geis-xcb/geis_logging.c: new file
-  * libutouch-geis-xcb/Makefile.am: replaced above files
-  * libutouch-geis-xcb/geis_xcb.c: replaced geis_debug calls with
-    geis_warning or geis_error as appropriate
-
-2010-08-27  Stephen M. Webb  <[e-mail]>
-
-  Fixed checking of gesture masks for multiple input devices.
-
-  * libutouch-geis-xcb/geis_instance.c (geis_instance_subscribe):
-    added missing index increment
-  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_verify_event_selection):
-    added logic for iterating through multiple input devices
-
-2010-08-27  Stephen M. Webb  <[e-mail]>
-
-  Move gesture-type-added callback until later in the subscription  sequence.
-
-  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_subscribe): move call to
-    geis_xcb_dispatch_gesture_type until later in sequence
-
-2010-08-27  Stephen M. Webb  <[e-mail]>
-
-  Removed "Grab" gestire entirely from the list of known gestures.
-
-  * libutouch-geis-xcb/geis_xcb.c (s_grail_type_map): removed GRAIL_TYPE_SYSFLAG1
-    (geis_xcb_dispatch_gesture_type): removed references to GRAIL_TYPE_SYSFLAG1
-
-2010-08-26  Stephen M. Webb  <[e-mail]>
-
-  Prevented "Grab" gesture from being propagated.
-
-  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_dispatch_gesture_type): skipped
-    notification of the availability of the "Grab" gesture type.
-
-2010-08-26  Stephen M. Webb  <[e-mail]>
-
-  Fixed an allocation size issue.
-
-  * libutouch-geis-xcb/geis_instance.c (geis_instance_get): fixed allocation
-    size issue
-
-2010-08-26  Stephen M. Webb  <[e-mail]>
-
-  Minor style adjustments.  Adjusted whitespace for consistency.
-
-  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_verify_event_selection):
-    renamed function from geis_xcb_select_events
-    (geis_xcb_determine_primitive_type): renamed from
-    geis_xcb_determine_fundamental_gesture_type
-    (geis_xcb_get_gesture_type_primitive_name): renamed form
-    geis_xcb_get_gesture_type_fundamental_name
-
-2010-08-25  Stephen M. Webb  <[e-mail]>
-
-  Reverted version bump.
-
-  * configure,.ac (AC_INIT): reverted to version 1.0.10
-
-2010-08-23  Stephen M. Webb  <[e-mail]>
-
-  Implemented gesture and input device selection.
-
-  * geis/geis.h: new gesture definitions
-  * libutouch-geis-xcb/geis_xcb.h (geis_xcb_subscribe):
-    added device_id parameter
-  * libutouch-geis-xcb/geis_xcb.c (s_grail_type_map): new gesture definitions
-    (geis_xcb_map_gestures_to_mask): new function
-    (geis_xcb_select_events): new function
-    (geis_xcb_subscribe): used them
-    added device_id parameter
-    (geis_xcb_determine_gesture_type): renamed to
-    geis_xcb_determine_fundamental_gesture_type
-    (geis_xcb_get_gesture_type_fundamental_name): new function
-    (geis_xcb_dispatch_gesture_type): mapped public gesture definitions to
-    fundamental gesture types
-  * libutouch-geis-xcb/geis_instance.c (geis_instance_subscribe):
-    handled input_list argument
-  * testsuite/geistest/geistest.c: included an example of selecting gestures
-
-2010-08-22  Chase Douglas <[e-mail]>
-
-  Bumped to version 1.0.10 for various fixes
-
-  * geisimple.h: Define the correct number of attributes for each gesture
-  * geis.h: Sync up with latest grail ABI for gesture attributes
-  * geis_xcb.c: Sync up with latest grail ABI for gesture attributes
-  * geisspec-1.0.asc: Sync up with latest grail ABI for gesture attributes
-  * geis_instance.h: Fix header include macro typo
-  * geisimple.h: Use int32_t instead of long for integer values
-  * geis.h: Make win_type unsigned to match usage in code
-  * geis_xcb.c: Fix missing initializer value issue
-  * geis_xcb.c: Fix unused variable warning
-
-2010-08-20  Stephen M. Webb  <[e-mail]>
-
-  Removed spec build from packaged files.
-
-  * doc/Makefile.am (doc-html): removed doc-html-asciidoc
-
-2010-08-16  Stephen M. Webb  <[e-mail]>
-
-  Conformed to GNU strictness for consistency.
-
-  * AUTHORS: New file.
-  * COPYING: new file renamed from COPYING.LGPL.
-  * INSTALL: New file.
-  * NEWS: New file.
-  * README: New file.
-  * Makefile.am: distributed the new files.
-  * configure.ac: Swicthed from foreign to gnu conformance level.
-  * libutouch-geis-xcb/Makefile.am: Fixed relative paths.
-
-2010-08-16  Stephen M. Webb  <[e-mail]>
-
-  Bumped version to 1.0.9 to replect API change.
-
-  * configure.ac: bumped package version.
-
-2010-08-16  Stephen M. Webb  <[e-mail]>
-
-  Added standard fundamental gesture constants.
-
-  * doc/geisspec-1.0.asc: Added section on fundamental gestures.
-  * geis/geis.h: Added fundamental gestures and attributes.
-  * libutouch-geis-xcb/geis_xcb.c: Used them.
-

=== 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 @@
 #
 # Copyright 2010, 2011 Canonical, Ltd.
 #
-# This file is part of the utouch-geis library. This library is free software;
+# This file is part of the geis library. This library is free software;
 # you can redistribute it and/or modify it under the terms of the GNU Lesser
 # General Public License as published by the Free Software Foundation; either
 # version 3 of the License, or (at your option) any later version.
@@ -21,14 +21,14 @@
 
 ACLOCAL_MFLAGS = -I m4
 
-SUBDIRS = include libs libutouch-geis testsuite python tools examples doc
+SUBDIRS = include libs libgeis testsuite python tools examples doc
 
 doc-%:
 	$(MAKE) -C doc $@
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = libutouch-geis.pc
+pkgconfig_DATA = libgeis.pc
 
 EXTRA_DIST = \
 	AUTHORS \

=== 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 @@
 #
 # Copyright 2010, 2011 Canonical, Ltd.
 #
-# This file is part of the utouch-geis library. This library is free software;
+# This file is part of the geis library. This library is free software;
 # you can redistribute it and/or modify it under the terms of the GNU Lesser
 # General Public License as published by the Free Software Foundation; either
 # version 3 of the License, or (at your option) any later version.
@@ -57,7 +57,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/geis_config.h.in \
-	$(srcdir)/libutouch-geis.pc.in $(top_srcdir)/configure AUTHORS \
+	$(srcdir)/libgeis.pc.in $(top_srcdir)/configure AUTHORS \
 	COPYING ChangeLog INSTALL NEWS config.aux/compile \
 	config.aux/config.guess config.aux/config.sub \
 	config.aux/depcomp config.aux/install-sh config.aux/ltmain.sh \
@@ -73,7 +73,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = geis_config.h
-CONFIG_CLEAN_FILES = libutouch-geis.pc
+CONFIG_CLEAN_FILES = libgeis.pc
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -177,6 +177,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -202,6 +203,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -250,6 +252,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -282,7 +285,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -303,9 +305,9 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_MFLAGS = -I m4
-SUBDIRS = include libs libutouch-geis testsuite python tools examples doc
+SUBDIRS = include libs libgeis testsuite python tools examples doc
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libutouch-geis.pc
+pkgconfig_DATA = libgeis.pc
 EXTRA_DIST = \
 	AUTHORS \
 	COPYING \
@@ -369,7 +371,7 @@
 
 distclean-hdr:
 	-rm -f geis_config.h stamp-h1
-libutouch-geis.pc: $(top_builddir)/config.status $(srcdir)/libutouch-geis.pc.in
+libgeis.pc: $(top_builddir)/config.status $(srcdir)/libgeis.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:

=== modified file 'NEWS'
--- NEWS	2011-02-21 16:08:50 +0000
+++ NEWS	2012-08-23 18:45:02 +0000
@@ -1,4 +1,4 @@
-uTouch-geis NEWS -- a history of user-visible changes
+geis NEWS -- a history of user-visible changes
 
 Copyright 2010, 2011 Canonical Ltd.
 

=== 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 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -47,7 +47,8 @@
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -93,7 +94,8 @@
     pkg_cv_[]$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -141,9 +143,9 @@
    	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

=== 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 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2011-05-11'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -181,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -552,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -595,52 +598,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -770,14 +773,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -867,7 +870,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
@@ -892,7 +901,7 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -960,7 +969,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +977,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -975,7 +987,7 @@
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +996,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1020,7 +1032,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1048,13 +1060,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1089,8 +1101,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1133,10 +1145,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <[e-mail]>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <[e-mail]>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <[e-mail]>.
 	# How about differentiating between stratus architectures? -djm
@@ -1162,11 +1174,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1231,6 +1243,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1276,13 +1291,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1322,11 +1337,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 

=== 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 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2010-01-22'
+timestamp='2011-03-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -124,8 +124,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -157,8 +158,8 @@
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -174,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -282,11 +283,13 @@
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
 	| rx \
 	| score \
@@ -294,15 +297,24 @@
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -314,6 +326,18 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -334,7 +358,7 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -368,26 +392,28 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
 	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -412,7 +438,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -482,11 +508,20 @@
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -518,7 +553,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -734,7 +769,7 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -841,6 +876,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -923,9 +964,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1019,6 +1061,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1075,20 +1120,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-        # This must be matched before tile*.
-        tilegx*)
+	# This must be matched before tile*.
+	tilegx*)
 		basic_machine=tilegx-unknown
 		os=-linux-gnu
 		;;
@@ -1163,6 +1196,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1260,11 +1296,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1301,7 +1337,8 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1348,7 +1385,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1397,7 +1434,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1442,8 +1479,8 @@
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1466,10 +1503,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1481,8 +1518,17 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1509,7 +1555,7 @@
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1536,7 +1582,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)

=== 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 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4
 # Written by Gordon Matzigkeit <[e-mail]>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -32,50 +32,56 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:
 #
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4 Debian-2.4-2ubuntu1
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <[e-mail]>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
+VERSION="2.4 Debian-2.4-2ubuntu1"
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3293
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,15 +118,24 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 : ${EGREP="/bin/grep -E"}
 : ${FGREP="/bin/grep -F"}
 : ${GREP="/bin/grep"}
@@ -144,6 +164,27 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +199,183 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-# Generated shell functions inserted here.
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
 
 # The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
 func_dirname_and_basename "$progpath"
 progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
 
 # Make sure we have an absolute path for reexecution:
 case $progpath in
@@ -215,6 +406,15 @@
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 # in input to double_quote_subst, that '$' was protected from expansion.
@@ -243,7 +443,7 @@
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 }
 
 # func_verbose arg...
@@ -258,18 +458,25 @@
     :
 }
 
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
 # func_error arg...
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 }
 
 # func_warning arg...
 # Echo program name prefixed warning message to standard error.
 func_warning ()
 {
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
@@ -326,9 +533,9 @@
         case $my_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
       done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
 
       save_mkdir_p_IFS="$IFS"; IFS=':'
       for my_dir in $my_dir_list; do
@@ -378,7 +585,7 @@
         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $ECHO "X$my_tmpdir" | $Xsed
+    $ECHO "$my_tmpdir"
 }
 
 
@@ -392,7 +599,7 @@
 {
     case $1 in
       *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
       *)
         func_quote_for_eval_unquoted_result="$1" ;;
     esac
@@ -419,7 +626,7 @@
 {
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
+	my_arg=`$ECHO "$1" | $SED \
 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
         my_arg="$1" ;;
@@ -488,15 +695,39 @@
     fi
 }
 
-
-
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
 
 
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
         s/^# //
 	s/^# *$//
         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,22 +740,28 @@
 # Echo short help message to standard output and exit.
 func_usage ()
 {
-    $SED -n '/^# Usage:/,/# -h/ {
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
 	s/\$progname/'$progname'/
 	p
     }' < "$progpath"
-    $ECHO
+    echo
     $ECHO "run \`$progname --help | more' for full usage"
     exit $?
 }
 
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
 func_help ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -537,8 +774,15 @@
 	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
 	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
 	p
-     }' < "$progpath"
-    exit $?
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
 }
 
 # func_missing_arg argname
@@ -546,63 +790,106 @@
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1"
+    $opt_debug
+
+    func_error "missing argument for $1."
     exit_cmd=exit
 }
 
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
 exit_cmd=:
 
 
 
 
 
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
 magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
-execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
 exec_cmd=
 
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -636,16 +923,16 @@
 # Display the features supported by this script.
 func_features ()
 {
-    $ECHO "host: $host"
+    echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
+      echo "enable shared libraries"
     else
-      $ECHO "disable shared libraries"
+      echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
+      echo "enable static libraries"
     else
-      $ECHO "disable static libraries"
+      echo "disable static libraries"
     fi
 
     exit $?
@@ -692,133 +979,6 @@
   esac
 }
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
-
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
-			;;
-    esac
-  done
-
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-      ;;
-  esac
-
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
-
 # func_check_version_match
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
@@ -855,38 +1015,214 @@
 }
 
 
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
+    opt="$1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug='set -x'
+			func_echo "enabling shell trace mode"
+			$opt_debug
+			;;
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
+			;;
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
+			shift
+			;;
+      --preserve-dup-deps)
+			opt_preserve_dup_deps=:
+			;;
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
+			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
+			shift
+			;;
+
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+    esac
+  done
+
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
+
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
+
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
+
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
+
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+
+
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+
+
+
+
 ## ----------- ##
 ##    Main.    ##
 ## ----------- ##
 
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
-
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-
-
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
-
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
-
-
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
@@ -950,12 +1286,9 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file
@@ -1001,6 +1334,37 @@
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1013,13 +1377,15 @@
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -1030,11 +1396,13 @@
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1097,6 +1465,486 @@
     }
 }
 
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
@@ -1137,12 +1985,12 @@
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
+          func_append pie_flag " $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -1163,15 +2011,14 @@
 	  save_ifs="$IFS"; IFS=','
 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+	    func_append_quoted lastarg "$arg"
 	  done
 	  IFS="$save_ifs"
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
@@ -1187,8 +2034,7 @@
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
@@ -1213,7 +2059,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -1288,7 +2134,7 @@
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
     else
       output_obj=
@@ -1319,17 +2165,16 @@
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
+      func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
@@ -1349,7 +2194,7 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -1396,11 +2241,11 @@
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -1445,13 +2290,13 @@
 }
 
 $opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1482,10 +2327,11 @@
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
   -shared           do not build a \`.o' file suitable for static linking
   -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 from the given SOURCEFILE.
@@ -1538,7 +2384,7 @@
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -1558,6 +2404,8 @@
 
   -all-static       do not do any dynamic linking at all
   -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +2434,11 @@
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -1619,18 +2472,44 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode \`$opt_mode'"
         ;;
     esac
 
-    $ECHO
+    echo
     $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
 }
 
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
 
 
 # func_mode_execute arg...
@@ -1643,13 +2522,16 @@
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -1671,7 +2553,7 @@
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1712,7 +2594,7 @@
     for file
     do
       case $file in
-      -*) ;;
+      -* | *.la | *.lo ) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
@@ -1728,8 +2610,7 @@
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -1754,29 +2635,66 @@
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
+	echo "export $shlibpath_var"
       fi
       $ECHO "$cmd$args"
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
     $opt_debug
-    libdirs="$nonopt"
+    libs=
+    libdirs=
     admincmds=
 
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1786,7 +2704,7 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
@@ -1795,53 +2713,55 @@
     # Exit here if they wanted silent mode.
     $opt_silent && exit $EXIT_SUCCESS
 
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
-
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -1852,7 +2772,7 @@
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+       case $nonopt in *shtool*) :;; *) false;; esac; then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -1866,7 +2786,12 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1876,10 +2801,12 @@
     install_type=
     isdir=no
     stripme=
+    no_mode=:
     for arg
     do
+      arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
@@ -1887,10 +2814,9 @@
       case $arg in
       -d) isdir=yes ;;
       -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -1904,6 +2830,10 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
 	  prev=
 	else
 	  dest=$arg
@@ -1914,7 +2844,11 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -1923,6 +2857,13 @@
     test -n "$prev" && \
       func_fatal_help "the \`$prev' option requires an argument"
 
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
     if test -z "$files"; then
       if test -z "$dest"; then
 	func_fatal_help "no file or destination specified"
@@ -1977,10 +2918,13 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -1994,23 +2938,23 @@