r25190 - in /desktop/experimental/gtk+2.0/debian: ./ patches/

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Thu Sep 23 18:32:21 UTC 2010


Author: slomo
Date: Thu Sep 23 18:32:15 2010
New Revision: 25190

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25190
Log:
* New upstream stable release:
  + debian/rules,
    debian/libgtk2.0-0.symbols:
    - Update for new API symbols.
  + debian/patches/070_mandatory-relibtoolize.patch:
    - Refreshed.
  + debian/patches/062_udeb-no-composite.patch:
    - Dropped, merged upstream.

Removed:
    desktop/experimental/gtk+2.0/debian/patches/062_udeb-no-composite.patch
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
    desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
    desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch
    desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
    desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
    desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
    desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
    desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch
    desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
    desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
    desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch
    desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch
    desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch
    desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
    desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
    desktop/experimental/gtk+2.0/debian/patches/series
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,6 +1,13 @@
 gtk+2.0 (2.22.0-1) experimental; urgency=low
 
-  * New upstream stable release.
+  * New upstream stable release:
+    + debian/rules,
+      debian/libgtk2.0-0.symbols:
+      - Update for new API symbols.
+    + debian/patches/070_mandatory-relibtoolize.patch:
+      - Refreshed.
+    + debian/patches/062_udeb-no-composite.patch:
+      - Dropped, merged upstream.
 
  -- Sebastian Dröge <slomo at debian.org>  Thu, 23 Sep 2010 18:10:46 +0200
 

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.symbols?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] Thu Sep 23 18:32:15 2010
@@ -57,7 +57,7 @@
  gdk_colors_free at Base 2.8.0
  gdk_colors_store at Base 2.8.0
  gdk_crossing_mode_get_type at Base 2.8.0
- gdk_cursor_get_cursor_type at Base 2.21.8
+ gdk_cursor_get_cursor_type at Base 2.22.0
  gdk_cursor_get_display at Base 2.8.0
  gdk_cursor_get_image at Base 2.8.0
  gdk_cursor_get_type at Base 2.8.0
@@ -71,15 +71,15 @@
  gdk_cursor_unref at Base 2.8.0
  gdk_device_free_history at Base 2.8.0
  gdk_device_get_axis at Base 2.8.0
- gdk_device_get_axis_use at Base 2.21.8
+ gdk_device_get_axis_use at Base 2.22.0
  gdk_device_get_core_pointer at Base 2.8.0
- gdk_device_get_has_cursor at Base 2.21.8
+ gdk_device_get_has_cursor at Base 2.22.0
  gdk_device_get_history at Base 2.8.0
- gdk_device_get_key at Base 2.21.8
- gdk_device_get_mode at Base 2.21.8
- gdk_device_get_n_axes at Base 2.21.8
- gdk_device_get_name at Base 2.21.8
- gdk_device_get_source at Base 2.21.8
+ gdk_device_get_key at Base 2.22.0
+ gdk_device_get_mode at Base 2.22.0
+ gdk_device_get_n_axes at Base 2.22.0
+ gdk_device_get_name at Base 2.22.0
+ gdk_device_get_source at Base 2.22.0
  gdk_device_get_state at Base 2.8.0
  gdk_device_get_type at Base 2.8.0
  gdk_device_set_axis_use at Base 2.8.0
@@ -105,7 +105,7 @@
  gdk_display_get_screen at Base 2.8.0
  gdk_display_get_type at Base 2.8.0
  gdk_display_get_window_at_pointer at Base 2.8.0
- gdk_display_is_closed at Base 2.21.8
+ gdk_display_is_closed at Base 2.22.0
  gdk_display_keyboard_ungrab at Base 2.8.0
  gdk_display_list_devices at Base 2.8.0
  gdk_display_manager_get at Base 2.8.0
@@ -136,12 +136,12 @@
  gdk_drag_abort at Base 2.8.0
  gdk_drag_action_get_type at Base 2.8.0
  gdk_drag_begin at Base 2.8.0
- gdk_drag_context_get_actions at Base 2.21.8
- gdk_drag_context_get_selected_action at Base 2.21.8
- gdk_drag_context_get_source_window at Base 2.21.8
- gdk_drag_context_get_suggested_action at Base 2.21.8
+ gdk_drag_context_get_actions at Base 2.22.0
+ gdk_drag_context_get_selected_action at Base 2.22.0
+ gdk_drag_context_get_source_window at Base 2.22.0
+ gdk_drag_context_get_suggested_action at Base 2.22.0
  gdk_drag_context_get_type at Base 2.8.0
- gdk_drag_context_list_targets at Base 2.21.8
+ gdk_drag_context_list_targets at Base 2.22.0
  gdk_drag_context_new at Base 2.8.0
  gdk_drag_context_ref at Base 2.8.0
  gdk_drag_context_unref at Base 2.8.0
@@ -287,19 +287,19 @@
  gdk_grab_status_get_type at Base 2.8.0
  gdk_gravity_get_type at Base 2.8.0
  gdk_image_get at Base 2.8.0
- gdk_image_get_bits_per_pixel at Base 2.21.8
- gdk_image_get_byte_order at Base 2.21.8
- gdk_image_get_bytes_per_line at Base 2.21.8
- gdk_image_get_bytes_per_pixel at Base 2.21.8
+ gdk_image_get_bits_per_pixel at Base 2.22.0
+ gdk_image_get_byte_order at Base 2.22.0
+ gdk_image_get_bytes_per_line at Base 2.22.0
+ gdk_image_get_bytes_per_pixel at Base 2.22.0
  gdk_image_get_colormap at Base 2.8.0
- gdk_image_get_depth at Base 2.21.8
- gdk_image_get_height at Base 2.21.8
- gdk_image_get_image_type at Base 2.21.8
+ gdk_image_get_depth at Base 2.22.0
+ gdk_image_get_height at Base 2.22.0
+ gdk_image_get_image_type at Base 2.22.0
  gdk_image_get_pixel at Base 2.8.0
- gdk_image_get_pixels at Base 2.21.8
+ gdk_image_get_pixels at Base 2.22.0
  gdk_image_get_type at Base 2.8.0
- gdk_image_get_visual at Base 2.21.8
- gdk_image_get_width at Base 2.21.8
+ gdk_image_get_visual at Base 2.22.0
+ gdk_image_get_width at Base 2.22.0
  gdk_image_new at Base 2.8.0
  gdk_image_new_bitmap at Base 2.8.0
  gdk_image_put_pixel at Base 2.8.0
@@ -548,17 +548,17 @@
  gdk_visual_get_best_with_both at Base 2.8.0
  gdk_visual_get_best_with_depth at Base 2.8.0
  gdk_visual_get_best_with_type at Base 2.8.0
- gdk_visual_get_bits_per_rgb at Base 2.21.8
- gdk_visual_get_blue_pixel_details at Base 2.21.8
- gdk_visual_get_byte_order at Base 2.21.8
- gdk_visual_get_colormap_size at Base 2.21.8
- gdk_visual_get_depth at Base 2.21.8
- gdk_visual_get_green_pixel_details at Base 2.21.8
- gdk_visual_get_red_pixel_details at Base 2.21.8
+ gdk_visual_get_bits_per_rgb at Base 2.22.0
+ gdk_visual_get_blue_pixel_details at Base 2.22.0
+ gdk_visual_get_byte_order at Base 2.22.0
+ gdk_visual_get_colormap_size at Base 2.22.0
+ gdk_visual_get_depth at Base 2.22.0
+ gdk_visual_get_green_pixel_details at Base 2.22.0
+ gdk_visual_get_red_pixel_details at Base 2.22.0
  gdk_visual_get_screen at Base 2.8.0
  gdk_visual_get_system at Base 2.8.0
  gdk_visual_get_type at Base 2.8.0
- gdk_visual_get_visual_type at Base 2.21.8
+ gdk_visual_get_visual_type at Base 2.22.0
  gdk_visual_type_get_type at Base 2.8.0
  gdk_wcstombs at Base 2.8.0
  gdk_window_add_filter at Base 2.8.0
@@ -575,9 +575,9 @@
  gdk_window_clear_area_e at Base 2.8.0
  gdk_window_configure_finished at Base 2.8.0
  gdk_window_constrain_size at Base 2.8.0
- gdk_window_coords_from_parent at Base 2.21.8
- gdk_window_coords_to_parent at Base 2.21.8
- gdk_window_create_similar_surface at Base 2.21.8
+ gdk_window_coords_from_parent at Base 2.22.0
+ gdk_window_coords_to_parent at Base 2.22.0
+ gdk_window_create_similar_surface at Base 2.22.0
  gdk_window_deiconify at Base 2.8.0
  gdk_window_destroy at Base 2.8.0
  gdk_window_destroy_notify at Base 2.8.0
@@ -593,22 +593,22 @@
  gdk_window_freeze_updates at Base 2.8.0
  gdk_window_fullscreen at Base 2.8.0
  gdk_window_geometry_changed at Base 2.18.0
- gdk_window_get_accept_focus at Base 2.21.8
- gdk_window_get_background_pattern at Base 2.21.8
+ gdk_window_get_accept_focus at Base 2.22.0
+ gdk_window_get_background_pattern at Base 2.22.0
  gdk_window_get_children at Base 2.8.0
- gdk_window_get_composited at Base 2.21.8
+ gdk_window_get_composited at Base 2.22.0
  gdk_window_get_cursor at Base 2.18.0
  gdk_window_get_decorations at Base 2.8.0
  gdk_window_get_deskrelative_origin at Base 2.8.0
- gdk_window_get_effective_parent at Base 2.21.8
- gdk_window_get_effective_toplevel at Base 2.21.8
+ gdk_window_get_effective_parent at Base 2.22.0
+ gdk_window_get_effective_toplevel at Base 2.22.0
  gdk_window_get_events at Base 2.8.0
- gdk_window_get_focus_on_map at Base 2.21.8
+ gdk_window_get_focus_on_map at Base 2.22.0
  gdk_window_get_frame_extents at Base 2.8.0
  gdk_window_get_geometry at Base 2.8.0
  gdk_window_get_group at Base 2.8.0
  gdk_window_get_internal_paint_info at Base 2.8.0
- gdk_window_get_modal_hint at Base 2.21.8
+ gdk_window_get_modal_hint at Base 2.22.0
  gdk_window_get_origin at Base 2.8.0
  gdk_window_get_parent at Base 2.8.0
  gdk_window_get_pointer at Base 2.8.0
@@ -622,7 +622,7 @@
  gdk_window_get_update_area at Base 2.8.0
  gdk_window_get_user_data at Base 2.8.0
  gdk_window_get_window_type at Base 2.8.0
- gdk_window_has_native at Base 2.21.8
+ gdk_window_has_native at Base 2.22.0
  gdk_window_hide at Base 2.8.0
  gdk_window_hints_get_type at Base 2.8.0
  gdk_window_iconify at Base 2.8.0
@@ -634,8 +634,8 @@
  gdk_window_invalidate_rect at Base 2.8.0
  gdk_window_invalidate_region at Base 2.8.0
  gdk_window_is_destroyed at Base 2.18.0
- gdk_window_is_input_only at Base 2.21.8
- gdk_window_is_shaped at Base 2.21.8
+ gdk_window_is_input_only at Base 2.22.0
+ gdk_window_is_shaped at Base 2.22.0
  gdk_window_is_viewable at Base 2.8.0
  gdk_window_is_visible at Base 2.8.0
  gdk_window_lookup at Base 2.8.0
@@ -846,8 +846,8 @@
  gtk_accelerator_valid at Base 2.8.0
  gtk_accessible_connect_widget_destroyed at Base 2.8.0
  gtk_accessible_get_type at Base 2.8.0
- gtk_accessible_get_widget at Base 2.21.8
- gtk_accessible_set_widget at Base 2.21.8
+ gtk_accessible_get_widget at Base 2.22.0
+ gtk_accessible_set_widget at Base 2.22.0
  gtk_action_activate at Base 2.8.0
  gtk_action_block_activate at Base 2.16.0
  gtk_action_block_activate_from at Base 2.8.0
@@ -959,7 +959,7 @@
  gtk_aspect_frame_set at Base 2.8.0
  gtk_assistant_add_action_widget at Base 2.10.0
  gtk_assistant_append_page at Base 2.10.0
- gtk_assistant_commit at Base 2.21.8
+ gtk_assistant_commit at Base 2.22.0
  gtk_assistant_get_current_page at Base 2.10.0
  gtk_assistant_get_n_pages at Base 2.10.0
  gtk_assistant_get_nth_page at Base 2.10.0
@@ -1057,7 +1057,7 @@
  gtk_button_clicked at Base 2.8.0
  gtk_button_enter at Base 2.8.0
  gtk_button_get_alignment at Base 2.8.0
- gtk_button_get_event_window at Base 2.21.8
+ gtk_button_get_event_window at Base 2.22.0
  gtk_button_get_focus_on_click at Base 2.8.0
  gtk_button_get_image at Base 2.8.0
  gtk_button_get_image_position at Base 2.10.0
@@ -1672,14 +1672,14 @@
  gtk_entry_get_visibility at Base 2.8.0
  gtk_entry_get_width_chars at Base 2.8.0
  gtk_entry_icon_position_get_type at Base 2.16.0
- gtk_entry_im_context_filter_keypress at Base 2.21.8
+ gtk_entry_im_context_filter_keypress at Base 2.22.0
  gtk_entry_layout_index_to_text_index at Base 2.8.0
  gtk_entry_new at Base 2.8.0
  gtk_entry_new_with_buffer at Base 2.18.0
  gtk_entry_new_with_max_length at Base 2.8.0
  gtk_entry_prepend_text at Base 2.8.0
  gtk_entry_progress_pulse at Base 2.16.0
- gtk_entry_reset_im_context at Base 2.21.8
+ gtk_entry_reset_im_context at Base 2.22.0
  gtk_entry_select_region at Base 2.8.0
  gtk_entry_set_activates_default at Base 2.8.0
  gtk_entry_set_alignment at Base 2.8.0
@@ -1720,7 +1720,7 @@
  gtk_exit at Base 2.8.0
  gtk_expander_get_expanded at Base 2.8.0
  gtk_expander_get_label at Base 2.8.0
- gtk_expander_get_label_fill at Base 2.21.8
+ gtk_expander_get_label_fill at Base 2.22.0
  gtk_expander_get_label_widget at Base 2.8.0
  gtk_expander_get_spacing at Base 2.8.0
  gtk_expander_get_type at Base 2.8.0
@@ -1730,7 +1730,7 @@
  gtk_expander_new_with_mnemonic at Base 2.8.0
  gtk_expander_set_expanded at Base 2.8.0
  gtk_expander_set_label at Base 2.8.0
- gtk_expander_set_label_fill at Base 2.21.8
+ gtk_expander_set_label_fill at Base 2.22.0
  gtk_expander_set_label_widget at Base 2.8.0
  gtk_expander_set_spacing at Base 2.8.0
  gtk_expander_set_use_markup at Base 2.8.0
@@ -1862,7 +1862,7 @@
  gtk_font_selection_dialog_get_cancel_button at Base 2.14.0
  gtk_font_selection_dialog_get_font at Base 2.8.0
  gtk_font_selection_dialog_get_font_name at Base 2.8.0
- gtk_font_selection_dialog_get_font_selection at Base 2.21.8
+ gtk_font_selection_dialog_get_font_selection at Base 2.22.0
  gtk_font_selection_dialog_get_ok_button at Base 2.14.0
  gtk_font_selection_dialog_get_preview_text at Base 2.8.0
  gtk_font_selection_dialog_get_type at Base 2.8.0
@@ -2035,10 +2035,10 @@
  gtk_icon_view_get_dest_item_at_pos at Base 2.8.0
  gtk_icon_view_get_drag_dest_item at Base 2.8.0
  gtk_icon_view_get_item_at_pos at Base 2.8.0
- gtk_icon_view_get_item_column at Base 2.21.8
- gtk_icon_view_get_item_orientation at Base 2.21.8
+ gtk_icon_view_get_item_column at Base 2.22.0
+ gtk_icon_view_get_item_orientation at Base 2.22.0
  gtk_icon_view_get_item_padding at Base 2.18.0
- gtk_icon_view_get_item_row at Base 2.21.8
+ gtk_icon_view_get_item_row at Base 2.22.0
  gtk_icon_view_get_item_width at Base 2.8.0
  gtk_icon_view_get_margin at Base 2.8.0
  gtk_icon_view_get_markup_column at Base 2.8.0
@@ -2068,7 +2068,7 @@
  gtk_icon_view_set_columns at Base 2.8.0
  gtk_icon_view_set_cursor at Base 2.8.0
  gtk_icon_view_set_drag_dest_item at Base 2.8.0
- gtk_icon_view_set_item_orientation at Base 2.21.8
+ gtk_icon_view_set_item_orientation at Base 2.22.0
  gtk_icon_view_set_item_padding at Base 2.18.0
  gtk_icon_view_set_item_width at Base 2.8.0
  gtk_icon_view_set_margin at Base 2.8.0
@@ -2452,7 +2452,7 @@
  gtk_message_dialog_format_secondary_markup at Base 2.8.0
  gtk_message_dialog_format_secondary_text at Base 2.8.0
  gtk_message_dialog_get_image at Base 2.14.0
- gtk_message_dialog_get_message_area at Base 2.21.8
+ gtk_message_dialog_get_message_area at Base 2.22.0
  gtk_message_dialog_get_type at Base 2.8.0
  gtk_message_dialog_new at Base 2.8.0
  gtk_message_dialog_new_with_markup at Base 2.8.0
@@ -2489,8 +2489,8 @@
  gtk_notebook_get_show_border at Base 2.8.0
  gtk_notebook_get_show_tabs at Base 2.8.0
  gtk_notebook_get_tab_detachable at Base 2.10.0
- gtk_notebook_get_tab_hborder at Base 2.21.8
- gtk_notebook_get_tab_vborder at Base 2.21.8
+ gtk_notebook_get_tab_hborder at Base 2.22.0
+ gtk_notebook_get_tab_vborder at Base 2.22.0
  gtk_notebook_get_tab_label at Base 2.8.0
  gtk_notebook_get_tab_label_text at Base 2.8.0
  gtk_notebook_get_tab_pos at Base 2.8.0
@@ -3399,7 +3399,7 @@
  gtk_statusbar_pop at Base 2.8.0
  gtk_statusbar_push at Base 2.8.0
  gtk_statusbar_remove at Base 2.8.0
- gtk_statusbar_remove_all at Base 2.21.8
+ gtk_statusbar_remove_all at Base 2.22.0
  gtk_statusbar_set_has_resize_grip at Base 2.8.0
  gtk_stock_add at Base 2.8.0
  gtk_stock_add_static at Base 2.8.0
@@ -3434,7 +3434,7 @@
  gtk_table_get_default_row_spacing at Base 2.8.0
  gtk_table_get_homogeneous at Base 2.8.0
  gtk_table_get_row_spacing at Base 2.8.0
- gtk_table_get_size at Base 2.21.8
+ gtk_table_get_size at Base 2.22.0
  gtk_table_get_type at Base 2.8.0
  gtk_table_new at Base 2.8.0
  gtk_table_resize at Base 2.8.0
@@ -3765,7 +3765,7 @@
  gtk_text_view_get_cursor_visible at Base 2.8.0
  gtk_text_view_get_default_attributes at Base 2.8.0
  gtk_text_view_get_editable at Base 2.8.0
- gtk_text_view_get_hadjustment at Base 2.21.8
+ gtk_text_view_get_hadjustment at Base 2.22.0
  gtk_text_view_get_indent at Base 2.8.0
  gtk_text_view_get_iter_at_location at Base 2.8.0
  gtk_text_view_get_iter_at_position at Base 2.8.0
@@ -3781,18 +3781,18 @@
  gtk_text_view_get_right_margin at Base 2.8.0
  gtk_text_view_get_tabs at Base 2.8.0
  gtk_text_view_get_type at Base 2.8.0
- gtk_text_view_get_vadjustment at Base 2.21.8
+ gtk_text_view_get_vadjustment at Base 2.22.0
  gtk_text_view_get_visible_rect at Base 2.8.0
  gtk_text_view_get_window at Base 2.8.0
  gtk_text_view_get_window_type at Base 2.8.0
  gtk_text_view_get_wrap_mode at Base 2.8.0
- gtk_text_view_im_context_filter_keypress at Base 2.21.8
+ gtk_text_view_im_context_filter_keypress at Base 2.22.0
  gtk_text_view_move_child at Base 2.8.0
  gtk_text_view_move_mark_onscreen at Base 2.8.0
  gtk_text_view_move_visually at Base 2.8.0
  gtk_text_view_new at Base 2.8.0
  gtk_text_view_new_with_buffer at Base 2.8.0
- gtk_text_view_reset_im_context at Base 2.21.8
+ gtk_text_view_reset_im_context at Base 2.22.0
  gtk_text_view_place_cursor_onscreen at Base 2.8.0
  gtk_text_view_scroll_mark_onscreen at Base 2.8.0
  gtk_text_view_scroll_to_iter at Base 2.8.0
@@ -4087,7 +4087,7 @@
  gtk_tree_path_free at Base 2.8.0
  gtk_tree_path_get_depth at Base 2.8.0
  gtk_tree_path_get_indices at Base 2.8.0
- gtk_tree_path_get_indices_with_depth at Base 2.21.8
+ gtk_tree_path_get_indices_with_depth at Base 2.22.0
  gtk_tree_path_get_type at Base 2.8.0
  gtk_tree_path_is_ancestor at Base 2.8.0
  gtk_tree_path_is_descendant at Base 2.8.0
@@ -4373,7 +4373,7 @@
  gtk_viewport_get_shadow_type at Base 2.8.0
  gtk_viewport_get_type at Base 2.8.0
  gtk_viewport_get_vadjustment at Base 2.8.0
- gtk_viewport_get_view_window at Base 2.21.8
+ gtk_viewport_get_view_window at Base 2.22.0
  gtk_viewport_new at Base 2.8.0
  gtk_viewport_set_hadjustment at Base 2.8.0
  gtk_viewport_set_shadow_type at Base 2.8.0
@@ -4517,7 +4517,7 @@
  gtk_widget_reset_rc_styles at Base 2.8.0
  gtk_widget_reset_shapes at Base 2.8.0
  gtk_widget_send_expose at Base 2.8.0
- gtk_widget_send_focus_change at Base 2.21.8
+ gtk_widget_send_focus_change at Base 2.22.0
  gtk_widget_set at Base 2.8.0
  gtk_widget_set_accel_path at Base 2.8.0
  gtk_widget_set_allocation at Base 2.18.0
@@ -4617,12 +4617,12 @@
  gtk_window_get_urgency_hint at Base 2.8.0
  gtk_window_get_window_type at Base 2.20.0
  gtk_window_group_add_window at Base 2.8.0
- gtk_window_group_get_current_grab at Base 2.21.8
+ gtk_window_group_get_current_grab at Base 2.22.0
  gtk_window_group_get_type at Base 2.8.0
  gtk_window_group_list_windows at Base 2.14.0
  gtk_window_group_new at Base 2.8.0
  gtk_window_group_remove_window at Base 2.8.0
- gtk_window_has_group at Base 2.21.8
+ gtk_window_has_group at Base 2.22.0
  gtk_window_has_toplevel_focus at Base 2.8.0
  gtk_window_iconify at Base 2.8.0
  gtk_window_is_active at Base 2.8.0

Modified: desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -2,10 +2,10 @@
              when --disable-shared was given
 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
 
-Index: gtk+2.0-2.21.8/configure.in
+Index: gtk+2.0-2.22.0/configure.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/configure.in	2010-09-14 20:23:04.641693387 +0200
-+++ gtk+2.0-2.21.8/configure.in	2010-09-14 20:23:07.760689508 +0200
+--- gtk+2.0-2.22.0.orig/configure.in	2010-09-23 05:00:45.000000000 +0200
++++ gtk+2.0-2.22.0/configure.in	2010-09-23 20:29:21.069589516 +0200
 @@ -150,6 +150,7 @@
  dnl Initialize libtool
  AC_PROG_CC
@@ -14,10 +14,10 @@
  
  dnl 
  dnl Check for a working C++ compiler, but do not bail out, if none is found.
-Index: gtk+2.0-2.21.8/modules/input/Makefile.am
+Index: gtk+2.0-2.22.0/modules/input/Makefile.am
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/input/Makefile.am	2010-09-14 20:23:04.669680600 +0200
-+++ gtk+2.0-2.21.8/modules/input/Makefile.am	2010-09-14 20:23:07.760689508 +0200
+--- gtk+2.0-2.22.0.orig/modules/input/Makefile.am	2010-09-23 05:00:38.000000000 +0200
++++ gtk+2.0-2.22.0/modules/input/Makefile.am	2010-09-23 20:29:21.069589516 +0200
 @@ -176,8 +176,12 @@
  if CROSS_COMPILING
  RUN_QUERY_IMMODULES_TEST=false

Modified: desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/002_static-linking-dont-build-perf.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,10 +1,10 @@
 Description: don't build perf measurement tools in static builds
 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559
 
-Index: gtk+2.0-2.21.8/Makefile.am
+Index: gtk+2.0-2.22.0/Makefile.am
 ===================================================================
---- gtk+2.0-2.21.8.orig/Makefile.am	2010-09-14 20:23:04.525694292 +0200
-+++ gtk+2.0-2.21.8/Makefile.am	2010-09-14 20:23:08.565678839 +0200
+--- gtk+2.0-2.22.0.orig/Makefile.am	2010-09-23 05:00:34.000000000 +0200
++++ gtk+2.0-2.22.0/Makefile.am	2010-09-23 20:29:24.497578749 +0200
 @@ -1,7 +1,12 @@
  ## Makefile.am for GTK+
  include $(top_srcdir)/Makefile.decl

Modified: desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/003_gdk.pc_privates.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/configure.in
+Index: gtk+2.0-2.22.0/configure.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/configure.in	2010-09-14 20:23:07.760689508 +0200
-+++ gtk+2.0-2.21.8/configure.in	2010-09-14 20:23:09.365678553 +0200
+--- gtk+2.0-2.22.0.orig/configure.in	2010-09-23 20:29:21.069589516 +0200
++++ gtk+2.0-2.22.0/configure.in	2010-09-23 20:29:25.890579526 +0200
 @@ -1310,23 +1310,27 @@
  
  # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
@@ -35,10 +35,10 @@
  AC_SUBST(GDK_EXTRA_LIBS)
  AC_SUBST(GDK_EXTRA_CFLAGS)
  AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+2.0-2.21.8/gdk-2.0.pc.in
+Index: gtk+2.0-2.22.0/gdk-2.0.pc.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gdk-2.0.pc.in	2010-09-14 20:23:04.429680966 +0200
-+++ gtk+2.0-2.21.8/gdk-2.0.pc.in	2010-09-14 20:23:09.365678553 +0200
+--- gtk+2.0-2.22.0.orig/gdk-2.0.pc.in	2010-09-23 05:00:35.000000000 +0200
++++ gtk+2.0-2.22.0/gdk-2.0.pc.in	2010-09-23 20:29:25.890579526 +0200
 @@ -8,5 +8,6 @@
  Description: GTK+ Drawing Kit (${target} target)
  Version: @VERSION@

Modified: desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/004_gtk%2B-ximian-gtk2-filesel-navbutton-5.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/gtk/gtkfilesel.c
+Index: gtk+2.0-2.22.0/gtk/gtkfilesel.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkfilesel.c	2010-09-14 20:23:04.297687927 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkfilesel.c	2010-09-14 20:23:10.121678552 +0200
+--- gtk+2.0-2.22.0.orig/gtk/gtkfilesel.c	2010-09-23 05:00:36.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtkfilesel.c	2010-09-23 20:29:26.590578775 +0200
 @@ -80,9 +80,13 @@
  #include "gtkeventbox.h"
  #include "gtkoptionmenu.h"
@@ -388,10 +388,10 @@
  static gint
  gtk_file_selection_key_press (GtkWidget   *widget,
  			      GdkEventKey *event,
-Index: gtk+2.0-2.21.8/gtk/stock-icons/ximian-icons.h
+Index: gtk+2.0-2.22.0/gtk/stock-icons/ximian-icons.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/gtk/stock-icons/ximian-icons.h	2010-09-14 20:23:10.121678552 +0200
++++ gtk+2.0-2.22.0/gtk/stock-icons/ximian-icons.h	2010-09-23 20:29:26.817579822 +0200
 @@ -0,0 +1,825 @@
 +/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
 +

Modified: desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/005_support_disabling_x11_extensions.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -3,10 +3,10 @@
 
 Support disabling X11 extensions
 
-Index: gtk+2.0-2.21.8/configure.in
+Index: gtk+2.0-2.22.0/configure.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/configure.in	2010-09-14 20:23:09.365678553 +0200
-+++ gtk+2.0-2.21.8/configure.in	2010-09-14 20:23:11.693678754 +0200
+--- gtk+2.0-2.22.0.orig/configure.in	2010-09-23 20:29:25.890579526 +0200
++++ gtk+2.0-2.22.0/configure.in	2010-09-23 20:29:29.405590870 +0200
 @@ -241,6 +241,18 @@
                [AC_HELP_STRING([--enable-xinerama],
  	                      [support xinerama extension if available [default=yes]])],,

Modified: desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/009_gtk-export-filechooser.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -34,10 +34,10 @@
     
     	* tests/autotestfilechooser.c: build with
     	GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: gtk+2.0-2.21.8/gtk/Makefile.am
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/Makefile.am	2010-09-14 20:23:04.181679679 +0200
-+++ gtk+2.0-2.21.8/gtk/Makefile.am	2010-09-14 20:23:12.837689795 +0200
+Index: gtk+2.0-2.22.0/gtk/Makefile.am
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/Makefile.am	2010-09-23 05:00:36.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/Makefile.am	2010-09-23 20:29:30.374578271 +0200
 @@ -49,6 +49,8 @@
  	-I$(top_srcdir) -I../gdk			\
  	-I$(top_srcdir)/gdk				\
@@ -79,10 +79,10 @@
  	gtkiconcache.h		\
  	gtkintl.h		\
  	gtkkeyhash.h		\
-Index: gtk+2.0-2.21.8/gtk/gtk.symbols
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtk.symbols	2010-09-14 20:23:04.097681162 +0200
-+++ gtk+2.0-2.21.8/gtk/gtk.symbols	2010-09-14 20:23:12.837689795 +0200
+Index: gtk+2.0-2.22.0/gtk/gtk.symbols
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/gtk.symbols	2010-09-23 05:00:36.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtk.symbols	2010-09-23 20:29:30.394609867 +0200
 @@ -1645,6 +1645,12 @@
  #endif
  #endif
@@ -96,10 +96,10 @@
  #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
  #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
  gtk_file_chooser_widget_get_type G_GNUC_CONST
-Index: gtk+2.0-2.21.8/gtk/gtkfilechooserprivate.h
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkfilechooserprivate.h	2010-09-14 20:23:04.117710382 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkfilechooserprivate.h	2010-09-14 20:23:12.837689795 +0200
+Index: gtk+2.0-2.22.0/gtk/gtkfilechooserprivate.h
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/gtkfilechooserprivate.h	2010-09-23 05:00:36.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtkfilechooserprivate.h	2010-09-23 20:29:30.611141025 +0200
 @@ -21,6 +21,14 @@
  #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
  #define __GTK_FILE_CHOOSER_PRIVATE_H__
@@ -115,10 +115,10 @@
  #include "gtkfilechooser.h"
  #include "gtkfilesystem.h"
  #include "gtkfilesystemmodel.h"
-Index: gtk+2.0-2.21.8/gtk/gtkfilechooserutils.c
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkfilechooserutils.c	2010-09-14 20:23:04.173686904 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkfilechooserutils.c	2010-09-14 20:23:12.841688278 +0200
+Index: gtk+2.0-2.22.0/gtk/gtkfilechooserutils.c
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/gtkfilechooserutils.c	2010-09-23 05:00:36.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtkfilechooserutils.c	2010-09-23 20:29:32.426395678 +0200
 @@ -122,6 +122,22 @@
  				    "create-folders");
  }
@@ -149,10 +149,10 @@
 +
 +#define __GTK_FILE_CHOOSER_UTILS_C__
 +#include "gtkaliasdef.c"
-Index: gtk+2.0-2.21.8/gtk/gtkfilechooserutils.h
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkfilechooserutils.h	2010-09-14 20:23:04.081681434 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkfilechooserutils.h	2010-09-14 20:23:12.841688278 +0200
+Index: gtk+2.0-2.22.0/gtk/gtkfilechooserutils.h
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/gtkfilechooserutils.h	2010-09-23 05:00:36.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtkfilechooserutils.h	2010-09-23 20:29:32.889580102 +0200
 @@ -22,6 +22,14 @@
  #ifndef __GTK_FILE_CHOOSER_UTILS_H__
  #define __GTK_FILE_CHOOSER_UTILS_H__
@@ -178,10 +178,10 @@
  
  void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
  void _gtk_file_chooser_set_delegate        (GtkFileChooser *receiver,
-Index: gtk+2.0-2.21.8/gtk/gtkfilesystemmodel.h
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkfilesystemmodel.h	2010-09-14 20:23:04.141681234 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkfilesystemmodel.h	2010-09-14 20:23:12.841688278 +0200
+Index: gtk+2.0-2.22.0/gtk/gtkfilesystemmodel.h
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/gtkfilesystemmodel.h	2010-06-16 17:27:02.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtkfilesystemmodel.h	2010-09-23 20:29:33.062222653 +0200
 @@ -21,6 +21,10 @@
  #ifndef __GTK_FILE_SYSTEM_MODEL_H__
  #define __GTK_FILE_SYSTEM_MODEL_H__
@@ -193,10 +193,10 @@
  #include <gio/gio.h>
  #include <gtk/gtkfilefilter.h>
  #include <gtk/gtktreemodel.h>
-Index: gtk+2.0-2.21.8/gtk/gtkquery.h
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkquery.h	2010-09-14 20:23:04.161680910 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkquery.h	2010-09-14 20:23:12.841688278 +0200
+Index: gtk+2.0-2.22.0/gtk/gtkquery.h
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/gtkquery.h	2009-04-02 15:54:56.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtkquery.h	2010-09-23 20:29:33.329580998 +0200
 @@ -23,6 +23,14 @@
  #ifndef __GTK_QUERY_H__
  #define __GTK_QUERY_H__
@@ -212,10 +212,10 @@
  #include <glib-object.h>
  
  G_BEGIN_DECLS
-Index: gtk+2.0-2.21.8/gtk/gtksearchengine.h
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtksearchengine.h	2010-09-14 20:23:04.057680060 +0200
-+++ gtk+2.0-2.21.8/gtk/gtksearchengine.h	2010-09-14 20:23:12.841688278 +0200
+Index: gtk+2.0-2.22.0/gtk/gtksearchengine.h
+===================================================================
+--- gtk+2.0-2.22.0.orig/gtk/gtksearchengine.h	2010-04-09 04:29:58.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtksearchengine.h	2010-09-23 20:29:33.833580807 +0200
 @@ -23,6 +23,14 @@
  #ifndef __GTK_SEARCH_ENGINE_H__
  #define __GTK_SEARCH_ENGINE_H__

Modified: desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/011_immodule-cache-dir.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/gtk/gtkrc.c
+Index: gtk+2.0-2.22.0/gtk/gtkrc.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkrc.c	2010-09-14 20:23:03.980681096 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkrc.c	2010-09-14 20:23:18.000677910 +0200
+--- gtk+2.0-2.22.0.orig/gtk/gtkrc.c	2010-09-23 05:00:37.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtkrc.c	2010-09-23 20:29:35.145600147 +0200
 @@ -450,7 +450,7 @@
        if (im_module_file)
  	result = g_strdup (im_module_file);

Modified: desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/015_default-fallback-icon-theme.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/gtk/gtksettings.c
+Index: gtk+2.0-2.22.0/gtk/gtksettings.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtksettings.c	2010-09-10 15:07:08.000000000 +0200
-+++ gtk+2.0-2.21.8/gtk/gtksettings.c	2010-09-14 20:23:21.044678545 +0200
+--- gtk+2.0-2.22.0.orig/gtk/gtksettings.c	2010-09-23 05:00:37.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtksettings.c	2010-09-23 20:29:36.498588163 +0200
 @@ -310,7 +310,7 @@
                                               g_param_spec_string ("gtk-fallback-icon-theme",
  								  P_("Fallback Icon Theme Name"),

Modified: desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/modules/input/imviqr.c
+Index: gtk+2.0-2.22.0/modules/input/imviqr.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/input/imviqr.c	2010-09-10 15:07:09.000000000 +0200
-+++ gtk+2.0-2.21.8/modules/input/imviqr.c	2010-09-14 20:23:22.764687568 +0200
+--- gtk+2.0-2.22.0.orig/modules/input/imviqr.c	2010-09-23 05:00:38.000000000 +0200
++++ gtk+2.0-2.22.0/modules/input/imviqr.c	2010-09-23 20:29:37.333633329 +0200
 @@ -244,7 +244,7 @@
    N_("Vietnamese (VIQR)"), /* Human readable name */
    GETTEXT_PACKAGE,	   /* Translation domain */

Modified: desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/041_ia32-libs.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/gtk/gtkrc.c
+Index: gtk+2.0-2.22.0/gtk/gtkrc.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtkrc.c	2010-09-14 20:23:18.000677910 +0200
-+++ gtk+2.0-2.21.8/gtk/gtkrc.c	2010-09-14 20:23:23.844678255 +0200
+--- gtk+2.0-2.22.0.orig/gtk/gtkrc.c	2010-09-23 20:29:35.145600147 +0200
++++ gtk+2.0-2.22.0/gtk/gtkrc.c	2010-09-23 20:29:38.037580272 +0200
 @@ -450,7 +450,20 @@
        if (im_module_file)
  	result = g_strdup (im_module_file);

Modified: desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/042_treeview_single-focus.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/gtk/gtktreeview.c
+Index: gtk+2.0-2.22.0/gtk/gtktreeview.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/gtktreeview.c	2010-09-10 15:07:08.000000000 +0200
-+++ gtk+2.0-2.21.8/gtk/gtktreeview.c	2010-09-14 20:23:25.116679103 +0200
+--- gtk+2.0-2.22.0.orig/gtk/gtktreeview.c	2010-09-23 05:00:37.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/gtktreeview.c	2010-09-23 20:29:38.869590760 +0200
 @@ -9623,7 +9623,8 @@
  
        if (cursor_path)

Modified: desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/060_ignore-random-icons.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/gtk/updateiconcache.c
+Index: gtk+2.0-2.22.0/gtk/updateiconcache.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/updateiconcache.c	2010-09-10 15:06:45.000000000 +0200
-+++ gtk+2.0-2.21.8/gtk/updateiconcache.c	2010-09-14 20:23:28.581689463 +0200
+--- gtk+2.0-2.22.0.orig/gtk/updateiconcache.c	2010-05-08 06:39:07.000000000 +0200
++++ gtk+2.0-2.22.0/gtk/updateiconcache.c	2010-09-23 20:29:39.562578706 +0200
 @@ -660,7 +660,7 @@
  		      directories = g_list_append (directories, g_strdup (subdir));
  		    }

Modified: desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.8/modules/printbackends/cups/gtkprintbackendcups.c
+Index: gtk+2.0-2.22.0/modules/printbackends/cups/gtkprintbackendcups.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/cups/gtkprintbackendcups.c	2010-09-10 15:07:09.000000000 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/cups/gtkprintbackendcups.c	2010-09-14 20:23:36.404706698 +0200
+--- gtk+2.0-2.22.0.orig/modules/printbackends/cups/gtkprintbackendcups.c	2010-09-23 05:00:38.000000000 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/cups/gtkprintbackendcups.c	2010-09-23 20:29:40.273580788 +0200
 @@ -344,8 +344,9 @@
   
    /* TODO: check if it is a ps or pdf printer */
@@ -21,10 +21,10 @@
  
    cairo_surface_set_fallback_resolution (surface,
                                           2.0 * gtk_print_settings_get_printer_lpi (settings),
-Index: gtk+2.0-2.21.8/modules/printbackends/lpr/gtkprintbackendlpr.c
+Index: gtk+2.0-2.22.0/modules/printbackends/lpr/gtkprintbackendlpr.c
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/lpr/gtkprintbackendlpr.c	2010-09-10 15:07:09.000000000 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/lpr/gtkprintbackendlpr.c	2010-09-14 20:23:36.408721804 +0200
+--- gtk+2.0-2.22.0.orig/modules/printbackends/lpr/gtkprintbackendlpr.c	2010-09-23 05:00:38.000000000 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/lpr/gtkprintbackendlpr.c	2010-09-23 20:29:40.277579969 +0200
 @@ -31,6 +31,8 @@
  #include <cairo.h>
  #include <cairo-ps.h>

Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Thu Sep 23 18:32:15 2010
@@ -1,7 +1,67 @@
-Index: gtk+2.0-2.21.8/aclocal.m4
+Index: gtk+2.0-2.22.0/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/aclocal.m4	2010-09-14 20:24:50.284678314 +0200
-+++ gtk+2.0-2.21.8/aclocal.m4	2010-09-14 20:24:10.385689968 +0200
+--- gtk+2.0-2.22.0.orig/Makefile.in	2010-09-23 20:31:17.046587575 +0200
++++ gtk+2.0-2.22.0/Makefile.in	2010-09-23 20:30:33.193579499 +0200
+@@ -45,7 +45,7 @@
+ 	$(srcdir)/gtk-zip.sh.in $(top_srcdir)/Makefile.decl \
+ 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ 	compile config.guess config.sub depcomp install-sh ltmain.sh \
+-	missing
++	missing mkinstalldirs
+ @OS_UNIX_TRUE at am__append_1 = gtk+-unix-print-2.0.pc
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -58,7 +58,7 @@
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno config.status.lineno
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-2.0.pc gtk+-2.0.pc \
+ 	gtk+-unix-print-2.0.pc gail.pc gdk-2.0-uninstalled.pc \
+@@ -109,7 +109,8 @@
+ 	distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = po po-properties gdk gtk modules demos tests perf docs \
++	m4macros build
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -207,6 +208,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -357,6 +359,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+@@ -458,7 +461,10 @@
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++
++# don't build perf measurement tools in static builds
++ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
++SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+ 
+ # require automake 1.4
+Index: gtk+2.0-2.22.0/aclocal.m4
+===================================================================
+--- gtk+2.0-2.22.0.orig/aclocal.m4	2010-09-23 20:31:13.189579271 +0200
++++ gtk+2.0-2.22.0/aclocal.m4	2010-09-23 20:30:25.630609353 +0200
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -13,8113 +73,7 @@
  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'.])])
-@@ -664,8105 +664,6 @@
- fi])
- 
- 
--dnl -*- mode: autoconf -*-
--
--# serial 1
--
--dnl Usage:
--dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
--AC_DEFUN([GTK_DOC_CHECK],
--[
--  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
--  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
--
--  dnl check for tools we added during development
--  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
--  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
--  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
--
--  dnl for overriding the documentation installation directory
--  AC_ARG_WITH([html-dir],
--    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
--    [with_html_dir='${datadir}/gtk-doc/html'])
--  HTML_DIR="$with_html_dir"
--  AC_SUBST([HTML_DIR])
--
--  dnl enable/disable documentation building
--  AC_ARG_ENABLE([gtk-doc],
--    AS_HELP_STRING([--enable-gtk-doc],
--                   [use gtk-doc to build documentation [[default=no]]]),,
--    [enable_gtk_doc=no])
--
--  if test x$enable_gtk_doc = xyes; then
--    ifelse([$1],[],
--      [PKG_CHECK_EXISTS([gtk-doc],,
--                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
--      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
--                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
--  fi
--
--  AC_MSG_CHECKING([whether to build gtk-doc documentation])
--  AC_MSG_RESULT($enable_gtk_doc)
--
--  dnl enable/disable output formats
--  AC_ARG_ENABLE([gtk-doc-html],
--    AS_HELP_STRING([--enable-gtk-doc-html],
--                   [build documentation in html format [[default=yes]]]),,
--    [enable_gtk_doc_html=yes])
--    AC_ARG_ENABLE([gtk-doc-pdf],
--      AS_HELP_STRING([--enable-gtk-doc-pdf],
--                     [build documentation in pdf format [[default=no]]]),,
--      [enable_gtk_doc_pdf=no])
--
--  if test -z "$GTKDOC_MKPDF"; then
--    enable_gtk_doc_pdf=no
--  fi
--
--
--  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
--  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
--  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
--  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
--  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
--])
--
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--#
--#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
--#                 Inc.
--#   Written by Gordon Matzigkeit, 1996
--#
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
--
--m4_define([_LT_COPYING], [dnl
--#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
--#                 Inc.
--#   Written by Gordon Matzigkeit, 1996
--#
--#   This file is part of GNU Libtool.
--#
--# GNU Libtool is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License as
--# published by the Free Software Foundation; either version 2 of
--# the License, or (at your option) any later version.
--#
--# As a special exception to the GNU General Public License,
--# if you distribute this file as part of a program or library that
--# is built using GNU Libtool, you may include this file under the
--# same distribution terms that you use for the rest of that program.
--#
--# GNU Libtool is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with GNU Libtool; see the file COPYING.  If not, a copy
--# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
--# obtained by writing to the Free Software Foundation, Inc.,
--# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--])
--
--# serial 57 LT_INIT
--
--
--# LT_PREREQ(VERSION)
--# ------------------
--# Complain and exit if this libtool version is less that VERSION.
--m4_defun([LT_PREREQ],
--[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
--       [m4_default([$3],
--		   [m4_fatal([Libtool version $1 or higher is required],
--		             63)])],
--       [$2])])
--
--
--# _LT_CHECK_BUILDDIR
--# ------------------
--# Complain if the absolute build directory name contains unusual characters
--m4_defun([_LT_CHECK_BUILDDIR],
--[case `pwd` in
--  *\ * | *\	*)
--    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
--esac
--])
--
--
--# LT_INIT([OPTIONS])
--# ------------------
--AC_DEFUN([LT_INIT],
--[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
--AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
--AC_BEFORE([$0], [LT_LANG])dnl
--AC_BEFORE([$0], [LT_OUTPUT])dnl
--AC_BEFORE([$0], [LTDL_INIT])dnl
--m4_require([_LT_CHECK_BUILDDIR])dnl
--
--dnl Autoconf doesn't catch unexpanded LT_ macros by default:
--m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
--m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
--dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
--dnl unless we require an AC_DEFUNed macro:
--AC_REQUIRE([LTOPTIONS_VERSION])dnl
--AC_REQUIRE([LTSUGAR_VERSION])dnl
--AC_REQUIRE([LTVERSION_VERSION])dnl
--AC_REQUIRE([LTOBSOLETE_VERSION])dnl
--m4_require([_LT_PROG_LTMAIN])dnl
--
--_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
--
--dnl Parse OPTIONS
--_LT_SET_OPTIONS([$0], [$1])
--
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ltmain"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
--
--_LT_SETUP
--
--# Only expand once:
--m4_define([LT_INIT])
--])# LT_INIT
--
--# Old names:
--AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
--AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
--dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
--
--
--# _LT_CC_BASENAME(CC)
--# -------------------
--# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
--m4_defun([_LT_CC_BASENAME],
--[for cc_temp in $1""; do
--  case $cc_temp in
--    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
--    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
--    \-*) ;;
--    *) break;;
--  esac
--done
--cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
--])
--
--
--# _LT_FILEUTILS_DEFAULTS
--# ----------------------
--# It is okay to use these file commands and assume they have been set
--# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
--m4_defun([_LT_FILEUTILS_DEFAULTS],
--[: ${CP="cp -f"}
--: ${MV="mv -f"}
--: ${RM="rm -f"}
--])# _LT_FILEUTILS_DEFAULTS
--
--
--# _LT_SETUP
--# ---------
--m4_defun([_LT_SETUP],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
--AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
--
--_LT_DECL([], [host_alias], [0], [The host system])dnl
--_LT_DECL([], [host], [0])dnl
--_LT_DECL([], [host_os], [0])dnl
--dnl
--_LT_DECL([], [build_alias], [0], [The build system])dnl
--_LT_DECL([], [build], [0])dnl
--_LT_DECL([], [build_os], [0])dnl
--dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([LT_PATH_LD])dnl
--AC_REQUIRE([LT_PATH_NM])dnl
--dnl
--AC_REQUIRE([AC_PROG_LN_S])dnl
--test -z "$LN_S" && LN_S="ln -s"
--_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
--dnl
--AC_REQUIRE([LT_CMD_MAX_LEN])dnl
--_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
--_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
--dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_CHECK_SHELL_FEATURES])dnl
--m4_require([_LT_CMD_RELOAD])dnl
--m4_require([_LT_CHECK_MAGIC_METHOD])dnl
--m4_require([_LT_CMD_OLD_ARCHIVE])dnl
--m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
--
--_LT_CONFIG_LIBTOOL_INIT([
--# See if we are running on zsh, and set the options which allow our
--# commands through without removal of \ escapes INIT.
--if test -n "\${ZSH_VERSION+set}" ; then
--   setopt NO_GLOB_SUBST
--fi
--])
--if test -n "${ZSH_VERSION+set}" ; then
--   setopt NO_GLOB_SUBST
--fi
--
--_LT_CHECK_OBJDIR
--
--m4_require([_LT_TAG_COMPILER])dnl
--
--case $host_os in
--aix3*)
--  # AIX sometimes has problems with the GCC collect2 program.  For some
--  # reason, if we set the COLLECT_NAMES environment variable, the problems
--  # vanish in a puff of smoke.
--  if test "X${COLLECT_NAMES+set}" != Xset; then
--    COLLECT_NAMES=
--    export COLLECT_NAMES
--  fi
--  ;;
--esac
--
--# Global variables:
--ofile=libtool
--can_build_shared=yes
--
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
--
--with_gnu_ld="$lt_cv_prog_gnu_ld"
--
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
--
--# Set sane defaults for various variables
--test -z "$CC" && CC=cc
--test -z "$LTCC" && LTCC=$CC
--test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
--test -z "$LD" && LD=ld
--test -z "$ac_objext" && ac_objext=o
--
--_LT_CC_BASENAME([$compiler])
--
--# Only perform the check for file, if the check method requires it
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    _LT_PATH_MAGIC
--  fi
--  ;;
--esac
--
--# Use C for the default configuration in the libtool script
--LT_SUPPORTED_TAG([CC])
--_LT_LANG_C_CONFIG
--_LT_LANG_DEFAULT_CONFIG
--_LT_CONFIG_COMMANDS
--])# _LT_SETUP
--
--
--# _LT_PREPARE_SED_QUOTE_VARS
--# --------------------------
--# Define a few sed substitution that help us do robust quoting.
--m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
--[# Backslashify metacharacters that are still active within
--# double-quoted strings.
--sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([["`\\]]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to delay expansion of an escaped single quote.
--delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--])
--
--# _LT_PROG_LTMAIN
--# ---------------
--# Note that this code is called both from `configure', and `config.status'
--# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
--# `config.status' has no value for ac_aux_dir unless we are using Automake,
--# so we pass a copy along to make sure it has a sensible value anyway.
--m4_defun([_LT_PROG_LTMAIN],
--[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
--_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
--ltmain="$ac_aux_dir/ltmain.sh"
--])# _LT_PROG_LTMAIN
--
--
--
--# So that we can recreate a full libtool script including additional
--# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
--# in macros and then make a single call at the end using the `libtool'
--# label.
--
--
--# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
--# ----------------------------------------
--# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
--m4_define([_LT_CONFIG_LIBTOOL_INIT],
--[m4_ifval([$1],
--          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
--                     [$1
--])])])
--
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_INIT])
--
--
--# _LT_CONFIG_LIBTOOL([COMMANDS])
--# ------------------------------
--# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
--m4_define([_LT_CONFIG_LIBTOOL],
--[m4_ifval([$1],
--          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
--                     [$1
--])])])
--
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
--
--
--# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
--# -----------------------------------------------------
--m4_defun([_LT_CONFIG_SAVE_COMMANDS],
--[_LT_CONFIG_LIBTOOL([$1])
--_LT_CONFIG_LIBTOOL_INIT([$2])
--])
--
--
--# _LT_FORMAT_COMMENT([COMMENT])
--# -----------------------------
--# Add leading comment marks to the start of each line, and a trailing
--# full-stop to the whole comment if one is not present already.
--m4_define([_LT_FORMAT_COMMENT],
--[m4_ifval([$1], [
--m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
--              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
--)])
--
--
--
--
--
--# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
--# -------------------------------------------------------------------
--# CONFIGNAME is the name given to the value in the libtool script.
--# VARNAME is the (base) name used in the configure script.
--# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
--# VARNAME.  Any other value will be used directly.
--m4_define([_LT_DECL],
--[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
--    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
--	[m4_ifval([$1], [$1], [$2])])
--    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
--    m4_ifval([$4],
--	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
--    lt_dict_add_subkey([lt_decl_dict], [$2],
--	[tagged?], [m4_ifval([$5], [yes], [no])])])
--])
--
--
--# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
--# --------------------------------------------------------
--m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
--
--
--# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
--# ------------------------------------------------
--m4_define([lt_decl_tag_varnames],
--[_lt_decl_filter([tagged?], [yes], $@)])
--
--
--# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
--# ---------------------------------------------------------
--m4_define([_lt_decl_filter],
--[m4_case([$#],
--  [0], [m4_fatal([$0: too few arguments: $#])],
--  [1], [m4_fatal([$0: too few arguments: $#: $1])],
--  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
--  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
--  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
--])
--
--
--# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
--# --------------------------------------------------
--m4_define([lt_decl_quote_varnames],
--[_lt_decl_filter([value], [1], $@)])
--
--
--# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
--# ---------------------------------------------------
--m4_define([lt_decl_dquote_varnames],
--[_lt_decl_filter([value], [2], $@)])
--
--
--# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
--# ---------------------------------------------------
--m4_define([lt_decl_varnames_tagged],
--[m4_assert([$# <= 2])dnl
--_$0(m4_quote(m4_default([$1], [[, ]])),
--    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
--    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
--m4_define([_lt_decl_varnames_tagged],
--[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
--
--
--# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
--# ------------------------------------------------
--m4_define([lt_decl_all_varnames],
--[_$0(m4_quote(m4_default([$1], [[, ]])),
--     m4_if([$2], [],
--	   m4_quote(lt_decl_varnames),
--	m4_quote(m4_shift($@))))[]dnl
--])
--m4_define([_lt_decl_all_varnames],
--[lt_join($@, lt_decl_varnames_tagged([$1],
--			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
--])
--
--
--# _LT_CONFIG_STATUS_DECLARE([VARNAME])
--# ------------------------------------
--# Quote a variable value, and forward it to `config.status' so that its
--# declaration there will have the same value as in `configure'.  VARNAME
--# must have a single quote delimited value for this to work.
--m4_define([_LT_CONFIG_STATUS_DECLARE],
--[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
--
--
--# _LT_CONFIG_STATUS_DECLARATIONS
--# ------------------------------
--# We delimit libtool config variables with single quotes, so when
--# we write them to config.status, we have to be sure to quote all
--# embedded single quotes properly.  In configure, this macro expands
--# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
--#
--#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
--m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
--[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
--    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
--
--
--# _LT_LIBTOOL_TAGS
--# ----------------
--# Output comment and list of tags supported by the script
--m4_defun([_LT_LIBTOOL_TAGS],
--[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
--available_tags="_LT_TAGS"dnl
--])
--
--
--# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
--# -----------------------------------
--# Extract the dictionary values for VARNAME (optionally with TAG) and
--# expand to a commented shell variable setting:
--#
--#    # Some comment about what VAR is for.
--#    visible_name=$lt_internal_name
--m4_define([_LT_LIBTOOL_DECLARE],
--[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
--					   [description])))[]dnl
--m4_pushdef([_libtool_name],
--    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
--m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
--    [0], [_libtool_name=[$]$1],
--    [1], [_libtool_name=$lt_[]$1],
--    [2], [_libtool_name=$lt_[]$1],
--    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
--m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
--])
--
--
--# _LT_LIBTOOL_CONFIG_VARS
--# -----------------------
--# Produce commented declarations of non-tagged libtool config variables
--# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
--# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
--# section) are produced by _LT_LIBTOOL_TAG_VARS.
--m4_defun([_LT_LIBTOOL_CONFIG_VARS],
--[m4_foreach([_lt_var],
--    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
--    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
--
--
--# _LT_LIBTOOL_TAG_VARS(TAG)
--# -------------------------
--m4_define([_LT_LIBTOOL_TAG_VARS],
--[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
--    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
--
--
--# _LT_TAGVAR(VARNAME, [TAGNAME])
--# ------------------------------
--m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
--
--
--# _LT_CONFIG_COMMANDS
--# -------------------
--# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
--# variables for single and double quote escaping we saved from calls
--# to _LT_DECL, we can put quote escaped variables declarations
--# into `config.status', and then the shell code to quote escape them in
--# for loops in `config.status'.  Finally, any additional code accumulated
--# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
--m4_defun([_LT_CONFIG_COMMANDS],
--[AC_PROVIDE_IFELSE([LT_OUTPUT],
--	dnl If the libtool generation code has been placed in $CONFIG_LT,
--	dnl instead of duplicating it all over again into config.status,
--	dnl then we will have config.status run $CONFIG_LT later, so it
--	dnl needs to know what name is stored there:
--        [AC_CONFIG_COMMANDS([libtool],
--            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
--    dnl If the libtool generation code is destined for config.status,
--    dnl expand the accumulated commands and init code now:
--    [AC_CONFIG_COMMANDS([libtool],
--        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
--])#_LT_CONFIG_COMMANDS
--
--
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
--[
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
--sed_quote_subst='$sed_quote_subst'
--double_quote_subst='$double_quote_subst'
--delay_variable_subst='$delay_variable_subst'
--_LT_CONFIG_STATUS_DECLARATIONS
--LTCC='$LTCC'
--LTCFLAGS='$LTCFLAGS'
--compiler='$compiler_DEFAULT'
--
--# A function that is used when there is no print builtin or printf.
--func_fallback_echo ()
--{
--  eval 'cat <<_LTECHO_EOF
--\$[]1
--_LTECHO_EOF'
--}
--
--# Quote evaled strings.
--for var in lt_decl_all_varnames([[ \
--]], lt_decl_quote_varnames); do
--    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
--    *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
--      ;;
--    *)
--      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
--      ;;
--    esac
--done
--
--# Double-quote double-evaled strings.
--for var in lt_decl_all_varnames([[ \
--]], lt_decl_dquote_varnames); do
--    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
--    *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
--      ;;
--    *)
--      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
--      ;;
--    esac
--done
--
--_LT_OUTPUT_LIBTOOL_INIT
--])
--
--# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
--# ------------------------------------
--# Generate a child script FILE with all initialization necessary to
--# reuse the environment learned by the parent script, and make the
--# file executable.  If COMMENT is supplied, it is inserted after the
--# `#!' sequence but before initialization text begins.  After this
--# macro, additional text can be appended to FILE to form the body of
--# the child script.  The macro ends with non-zero status if the
--# file could not be fully written (such as if the disk is full).
--m4_ifdef([AS_INIT_GENERATED],
--[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
--[m4_defun([_LT_GENERATED_FILE_INIT],
--[m4_require([AS_PREPARE])]dnl
--[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
--[lt_write_fail=0
--cat >$1 <<_ASEOF || lt_write_fail=1
--#! $SHELL
--# Generated by $as_me.
--$2
--SHELL=\${CONFIG_SHELL-$SHELL}
--export SHELL
--_ASEOF
--cat >>$1 <<\_ASEOF || lt_write_fail=1
--AS_SHELL_SANITIZE
--_AS_PREPARE
--exec AS_MESSAGE_FD>&1
--_ASEOF
--test $lt_write_fail = 0 && chmod +x $1[]dnl
--m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
--
--# LT_OUTPUT
--# ---------
--# This macro allows early generation of the libtool script (before
--# AC_OUTPUT is called), incase it is used in configure for compilation
--# tests.
--AC_DEFUN([LT_OUTPUT],
--[: ${CONFIG_LT=./config.lt}
--AC_MSG_NOTICE([creating $CONFIG_LT])
--_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
--[# Run this file to recreate a libtool stub with the current configuration.])
--
--cat >>"$CONFIG_LT" <<\_LTEOF
--lt_cl_silent=false
--exec AS_MESSAGE_LOG_FD>>config.log
--{
--  echo
--  AS_BOX([Running $as_me.])
--} >&AS_MESSAGE_LOG_FD
--
--lt_cl_help="\
--\`$as_me' creates a local libtool stub from the current configuration,
--for use in further configure time tests before the real libtool is
--generated.
--
--Usage: $[0] [[OPTIONS]]
--
--  -h, --help      print this help, then exit
--  -V, --version   print version number, then exit
--  -q, --quiet     do not print progress messages
--  -d, --debug     don't remove temporary files
--
--Report bugs to <bug-libtool at gnu.org>."
--
--lt_cl_version="\
--m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
--m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
--configured by $[0], generated by m4_PACKAGE_STRING.
--
--Copyright (C) 2010 Free Software Foundation, Inc.
--This config.lt script is free software; the Free Software Foundation
--gives unlimited permision to copy, distribute and modify it."
--
--while test $[#] != 0
--do
--  case $[1] in
--    --version | --v* | -V )
--      echo "$lt_cl_version"; exit 0 ;;
--    --help | --h* | -h )
--      echo "$lt_cl_help"; exit 0 ;;
--    --debug | --d* | -d )
--      debug=: ;;
--    --quiet | --q* | --silent | --s* | -q )
--      lt_cl_silent=: ;;
--
--    -*) AC_MSG_ERROR([unrecognized option: $[1]
--Try \`$[0] --help' for more information.]) ;;
--
--    *) AC_MSG_ERROR([unrecognized argument: $[1]
--Try \`$[0] --help' for more information.]) ;;
--  esac
--  shift
--done
--
--if $lt_cl_silent; then
--  exec AS_MESSAGE_FD>/dev/null
--fi
--_LTEOF
--
--cat >>"$CONFIG_LT" <<_LTEOF
--_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
--_LTEOF
--
--cat >>"$CONFIG_LT" <<\_LTEOF
--AC_MSG_NOTICE([creating $ofile])
--_LT_OUTPUT_LIBTOOL_COMMANDS
--AS_EXIT(0)
--_LTEOF
--chmod +x "$CONFIG_LT"
--
--# configure is writing to config.log, but config.lt does its own redirection,
--# appending to config.log, which fails on DOS, as config.log is still kept
--# open by configure.  Here we exec the FD to /dev/null, effectively closing
--# config.log, so it can be properly (re)opened and appended to by config.lt.
--lt_cl_success=:
--test "$silent" = yes &&
--  lt_config_lt_args="$lt_config_lt_args --quiet"
--exec AS_MESSAGE_LOG_FD>/dev/null
--$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
--exec AS_MESSAGE_LOG_FD>>config.log
--$lt_cl_success || AS_EXIT(1)
--])# LT_OUTPUT
--
--
--# _LT_CONFIG(TAG)
--# ---------------
--# If TAG is the built-in tag, create an initial libtool script with a
--# default configuration from the untagged config vars.  Otherwise add code
--# to config.status for appending the configuration named by TAG from the
--# matching tagged config vars.
--m4_defun([_LT_CONFIG],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--_LT_CONFIG_SAVE_COMMANDS([
--  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
--  m4_if(_LT_TAG, [C], [
--    # See if we are running on zsh, and set the options which allow our
--    # commands through without removal of \ escapes.
--    if test -n "${ZSH_VERSION+set}" ; then
--      setopt NO_GLOB_SUBST
--    fi
--
--    cfgfile="${ofile}T"
--    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
--    $RM "$cfgfile"
--
--    cat <<_LT_EOF >> "$cfgfile"
--#! $SHELL
--
--# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--_LT_COPYING
--_LT_LIBTOOL_TAGS
--
--# ### BEGIN LIBTOOL CONFIG
--_LT_LIBTOOL_CONFIG_VARS
--_LT_LIBTOOL_TAG_VARS
--# ### END LIBTOOL CONFIG
--
--_LT_EOF
--
--  case $host_os in
--  aix3*)
--    cat <<\_LT_EOF >> "$cfgfile"
--# AIX sometimes has problems with the GCC collect2 program.  For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
--fi
--_LT_EOF
--    ;;
--  esac
--
--  _LT_PROG_LTMAIN
--
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
--
--  _LT_PROG_XSI_SHELLFNS
--
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
--
--  mv -f "$cfgfile" "$ofile" ||
--    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
--  chmod +x "$ofile"
--],
--[cat <<_LT_EOF >> "$ofile"
--
--dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
--dnl in a comment (ie after a #).
--# ### BEGIN LIBTOOL TAG CONFIG: $1
--_LT_LIBTOOL_TAG_VARS(_LT_TAG)
--# ### END LIBTOOL TAG CONFIG: $1
--_LT_EOF
--])dnl /m4_if
--],
--[m4_if([$1], [], [
--    PACKAGE='$PACKAGE'
--    VERSION='$VERSION'
--    TIMESTAMP='$TIMESTAMP'
--    RM='$RM'
--    ofile='$ofile'], [])
--])dnl /_LT_CONFIG_SAVE_COMMANDS
--])# _LT_CONFIG
--
--
--# LT_SUPPORTED_TAG(TAG)
--# ---------------------
--# Trace this macro to discover what tags are supported by the libtool
--# --tag option, using:
--#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
--AC_DEFUN([LT_SUPPORTED_TAG], [])
--
--
--# C support is built-in for now
--m4_define([_LT_LANG_C_enabled], [])
--m4_define([_LT_TAGS], [])
--
--
--# LT_LANG(LANG)
--# -------------
--# Enable libtool support for the given language if not already enabled.
--AC_DEFUN([LT_LANG],
--[AC_BEFORE([$0], [LT_OUTPUT])dnl
--m4_case([$1],
--  [C],			[_LT_LANG(C)],
--  [C++],		[_LT_LANG(CXX)],
--  [Java],		[_LT_LANG(GCJ)],
--  [Fortran 77],		[_LT_LANG(F77)],
--  [Fortran],		[_LT_LANG(FC)],
--  [Windows Resource],	[_LT_LANG(RC)],
--  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
--    [_LT_LANG($1)],
--    [m4_fatal([$0: unsupported language: "$1"])])])dnl
--])# LT_LANG
--
--
--# _LT_LANG(LANGNAME)
--# ------------------
--m4_defun([_LT_LANG],
--[m4_ifdef([_LT_LANG_]$1[_enabled], [],
--  [LT_SUPPORTED_TAG([$1])dnl
--  m4_append([_LT_TAGS], [$1 ])dnl
--  m4_define([_LT_LANG_]$1[_enabled], [])dnl
--  _LT_LANG_$1_CONFIG($1)])dnl
--])# _LT_LANG
--
--
--# _LT_LANG_DEFAULT_CONFIG
--# -----------------------
--m4_defun([_LT_LANG_DEFAULT_CONFIG],
--[AC_PROVIDE_IFELSE([AC_PROG_CXX],
--  [LT_LANG(CXX)],
--  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
--
--AC_PROVIDE_IFELSE([AC_PROG_F77],
--  [LT_LANG(F77)],
--  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
--
--AC_PROVIDE_IFELSE([AC_PROG_FC],
--  [LT_LANG(FC)],
--  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
--
--dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
--dnl pulling things in needlessly.
--AC_PROVIDE_IFELSE([AC_PROG_GCJ],
--  [LT_LANG(GCJ)],
--  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
--    [LT_LANG(GCJ)],
--    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
--      [LT_LANG(GCJ)],
--      [m4_ifdef([AC_PROG_GCJ],
--	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
--       m4_ifdef([A][M_PROG_GCJ],
--	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
--       m4_ifdef([LT_PROG_GCJ],
--	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
--
--AC_PROVIDE_IFELSE([LT_PROG_RC],
--  [LT_LANG(RC)],
--  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
--])# _LT_LANG_DEFAULT_CONFIG
--
--# Obsolete macros:
--AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
--AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
--AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
--AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
--AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
--dnl AC_DEFUN([AC_LIBTOOL_F77], [])
--dnl AC_DEFUN([AC_LIBTOOL_FC], [])
--dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
--dnl AC_DEFUN([AC_LIBTOOL_RC], [])
--
--
--# _LT_TAG_COMPILER
--# ----------------
--m4_defun([_LT_TAG_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])dnl
--
--_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
--_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
--_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
--_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
--
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
--
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
--
--# Allow CC to be a program name with arguments.
--compiler=$CC
--])# _LT_TAG_COMPILER
--
--
--# _LT_COMPILER_BOILERPLATE
--# ------------------------
--# Check for compiler boilerplate output or warnings with
--# the simple compiler test code.
--m4_defun([_LT_COMPILER_BOILERPLATE],
--[m4_require([_LT_DECL_SED])dnl
--ac_outfile=conftest.$ac_objext
--echo "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_compiler_boilerplate=`cat conftest.err`
--$RM conftest*
--])# _LT_COMPILER_BOILERPLATE
--
--
--# _LT_LINKER_BOILERPLATE
--# ----------------------
--# Check for linker boilerplate output or warnings with
--# the simple link test code.
--m4_defun([_LT_LINKER_BOILERPLATE],
--[m4_require([_LT_DECL_SED])dnl
--ac_outfile=conftest.$ac_objext
--echo "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$RM -r conftest*
--])# _LT_LINKER_BOILERPLATE
--
--# _LT_REQUIRED_DARWIN_CHECKS
--# -------------------------
--m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
--  case $host_os in
--    rhapsody* | darwin*)
--    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
--    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
--    AC_CHECK_TOOL([LIPO], [lipo], [:])
--    AC_CHECK_TOOL([OTOOL], [otool], [:])
--    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
--    _LT_DECL([], [DSYMUTIL], [1],
--      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
--    _LT_DECL([], [NMEDIT], [1],
--      [Tool to change global to local symbols on Mac OS X])
--    _LT_DECL([], [LIPO], [1],
--      [Tool to manipulate fat objects and archives on Mac OS X])
--    _LT_DECL([], [OTOOL], [1],
--      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
--    _LT_DECL([], [OTOOL64], [1],
--      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
--
--    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
--      [lt_cv_apple_cc_single_mod=no
--      if test -z "${LT_MULTI_MODULE}"; then
--	# By default we will add the -single_module flag. You can override
--	# by either setting the environment variable LT_MULTI_MODULE
--	# non-empty at configure time, or by adding -multi_module to the
--	# link flags.
--	rm -rf libconftest.dylib*
--	echo "int foo(void){return 1;}" > conftest.c
--	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
---dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
--	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
--        _lt_result=$?
--	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
--	  lt_cv_apple_cc_single_mod=yes
--	else
--	  cat conftest.err >&AS_MESSAGE_LOG_FD
--	fi
--	rm -rf libconftest.dylib*
--	rm -f conftest.*
--      fi])
--    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
--      [lt_cv_ld_exported_symbols_list],
--      [lt_cv_ld_exported_symbols_list=no
--      save_LDFLAGS=$LDFLAGS
--      echo "_main" > conftest.sym
--      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
--      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
--	[lt_cv_ld_exported_symbols_list=yes],
--	[lt_cv_ld_exported_symbols_list=no])
--	LDFLAGS="$save_LDFLAGS"
--    ])
--    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
--      [lt_cv_ld_force_load=no
--      cat > conftest.c << _LT_EOF
--int forced_loaded() { return 2;}
--_LT_EOF
--      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
--      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
--      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
--      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
--      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
--      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
--      cat > conftest.c << _LT_EOF
--int main() { return 0;}
--_LT_EOF
--      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
--      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
--      _lt_result=$?
--      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
--	lt_cv_ld_force_load=yes
--      else
--	cat conftest.err >&AS_MESSAGE_LOG_FD
--      fi
--        rm -f conftest.err libconftest.a conftest conftest.c
--        rm -rf conftest.dSYM
--    ])
--    case $host_os in
--    rhapsody* | darwin1.[[012]])
--      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
--    darwin1.*)
--      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--    darwin*) # darwin 5.x on
--      # if running on 10.5 or later, the deployment target defaults
--      # to the OS version, if on x86, and 10.4, the deployment
--      # target defaults to 10.4. Don't you love it?
--      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
--	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
--	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--	10.[[012]]*)
--	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--	10.*)
--	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--      esac
--    ;;
--  esac
--    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
--      _lt_dar_single_mod='$single_module'
--    fi
--    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
--      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
--    else
--      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
--      _lt_dsymutil='~$DSYMUTIL $lib || :'
--    else
--      _lt_dsymutil=
--    fi
--    ;;
--  esac
--])
--
--
--# _LT_DARWIN_LINKER_FEATURES
--# --------------------------
--# Checks for linker and compiler features on darwin
--m4_defun([_LT_DARWIN_LINKER_FEATURES],
--[
--  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
--  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--  _LT_TAGVAR(hardcode_direct, $1)=no
--  _LT_TAGVAR(hardcode_automatic, $1)=yes
--  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--  if test "$lt_cv_ld_force_load" = "yes"; then
--    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
--  else
--    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
--  fi
--  _LT_TAGVAR(link_all_deplibs, $1)=yes
--  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
--  case $cc_basename in
--     ifort*) _lt_dar_can_shared=yes ;;
--     *) _lt_dar_can_shared=$GCC ;;
--  esac
--  if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=func_echo_all
--    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
--    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
--    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
--    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
--    m4_if([$1], [CXX],
--[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
--      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
--      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
--    fi
--],[])
--  else
--  _LT_TAGVAR(ld_shlibs, $1)=no
--  fi
--])
--
--# _LT_SYS_MODULE_PATH_AIX
--# -----------------------
--# Links a minimal program and checks the executable
--# for the system default hardcoded library path. In most cases,
--# this is /usr/lib:/lib, but when the MPI compilers are used
--# the location of the communication and MPI libs are included too.
--# If we don't find anything, use the default library path according
--# to the aix ld manual.
--m4_defun([_LT_SYS_MODULE_PATH_AIX],
--[m4_require([_LT_DECL_SED])dnl
--AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--	/^0/ {
--	    s/^0  *\(.*\)$/\1/
--	    p
--	}
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi],[])
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--])# _LT_SYS_MODULE_PATH_AIX
--
--
--# _LT_SHELL_INIT(ARG)
--# -------------------
--m4_define([_LT_SHELL_INIT],
--[m4_divert_text([M4SH-INIT], [$1
--])])# _LT_SHELL_INIT
--
--
--
--# _LT_PROG_ECHO_BACKSLASH
--# -----------------------
--# Find how we can fake an echo command that does not interpret backslash.
--# In particular, with Autoconf 2.60 or later we add some code to the start
--# of the generated configure script which will find a shell with a builtin
--# printf (which we can use as an echo command).
--m4_defun([_LT_PROG_ECHO_BACKSLASH],
--[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
--ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
--
--AC_MSG_CHECKING([how to print strings])
--# Test print first, because it will be a builtin if present.
--if test "X`print -r -- -n 2>/dev/null`" = X-n && \
--   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
--  ECHO='print -r --'
--elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
--  ECHO='printf %s\n'
--else
--  # Use this function as a fallback that always works.
--  func_fallback_echo ()
--  {
--    eval 'cat <<_LTECHO_EOF
--$[]1
--_LTECHO_EOF'
--  }
--  ECHO='func_fallback_echo'
--fi
--
--# func_echo_all arg...
--# Invoke $ECHO with all args, space-separated.
--func_echo_all ()
--{
--    $ECHO "$*" 
--}
--
--case "$ECHO" in
--  printf*) AC_MSG_RESULT([printf]) ;;
--  print*) AC_MSG_RESULT([print -r]) ;;
--  *) AC_MSG_RESULT([cat]) ;;
--esac
--
--m4_ifdef([_AS_DETECT_SUGGESTED],
--[_AS_DETECT_SUGGESTED([
--  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
--    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
--    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
--    PATH=/empty FPATH=/empty; export PATH FPATH
--    test "X`printf %s $ECHO`" = "X$ECHO" \
--      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
--
--_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
--_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
--])# _LT_PROG_ECHO_BACKSLASH
--
--
--# _LT_ENABLE_LOCK
--# ---------------
--m4_defun([_LT_ENABLE_LOCK],
--[AC_ARG_ENABLE([libtool-lock],
--  [AS_HELP_STRING([--disable-libtool-lock],
--    [avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
--
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case $host in
--ia64-*-hpux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.$ac_objext` in
--      *ELF-32*)
--	HPUX_IA64_MODE="32"
--	;;
--      *ELF-64*)
--	HPUX_IA64_MODE="64"
--	;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    if test "$lt_cv_prog_gnu_ld" = yes; then
--      case `/usr/bin/file conftest.$ac_objext` in
--	*32-bit*)
--	  LD="${LD-ld} -melf32bsmip"
--	  ;;
--	*N32*)
--	  LD="${LD-ld} -melf32bmipn32"
--	  ;;
--	*64-bit*)
--	  LD="${LD-ld} -melf64bmip"
--	;;
--      esac
--    else
--      case `/usr/bin/file conftest.$ac_objext` in
--	*32-bit*)
--	  LD="${LD-ld} -32"
--	  ;;
--	*N32*)
--	  LD="${LD-ld} -n32"
--	  ;;
--	*64-bit*)
--	  LD="${LD-ld} -64"
--	  ;;
--      esac
--    fi
--  fi
--  rm -rf conftest*
--  ;;
--
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
--s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.o` in
--      *32-bit*)
--	case $host in
--	  x86_64-*kfreebsd*-gnu)
--	    LD="${LD-ld} -m elf_i386_fbsd"
--	    ;;
--	  x86_64-*linux*)
--	    LD="${LD-ld} -m elf_i386"
--	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
--	    LD="${LD-ld} -m elf32ppclinux"
--	    ;;
--	  s390x-*linux*)
--	    LD="${LD-ld} -m elf_s390"
--	    ;;
--	  sparc64-*linux*)
--	    LD="${LD-ld} -m elf32_sparc"
--	    ;;
--	esac
--	;;
--      *64-bit*)
--	case $host in
--	  x86_64-*kfreebsd*-gnu)
--	    LD="${LD-ld} -m elf_x86_64_fbsd"
--	    ;;
--	  x86_64-*linux*)
--	    LD="${LD-ld} -m elf_x86_64"
--	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
--	    LD="${LD-ld} -m elf64ppc"
--	    ;;
--	  s390*-*linux*|s390*-*tpf*)
--	    LD="${LD-ld} -m elf64_s390"
--	    ;;
--	  sparc*-*linux*)
--	    LD="${LD-ld} -m elf64_sparc"
--	    ;;
--	esac
--	;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
--    [AC_LANG_PUSH(C)
--     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
--     AC_LANG_POP])
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
--sparc*-*solaris*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.o` in
--    *64-bit*)
--      case $lt_cv_prog_gnu_ld in
--      yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)
--	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
--	  LD="${LD-ld} -64"
--	fi
--	;;
--      esac
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--esac
--
--need_locks="$enable_libtool_lock"
--])# _LT_ENABLE_LOCK
--
--
--# _LT_CMD_OLD_ARCHIVE
--# -------------------
--m4_defun([_LT_CMD_OLD_ARCHIVE],
--[AC_CHECK_TOOL(AR, ar, false)
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--_LT_DECL([], [AR], [1], [The archiver])
--_LT_DECL([], [AR_FLAGS], [1])
--
--AC_CHECK_TOOL(STRIP, strip, :)
--test -z "$STRIP" && STRIP=:
--_LT_DECL([], [STRIP], [1], [A symbol stripping program])
--
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--test -z "$RANLIB" && RANLIB=:
--_LT_DECL([], [RANLIB], [1],
--    [Commands used to install an old-style archive])
--
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
--
--if test -n "$RANLIB"; then
--  case $host_os in
--  openbsd*)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
--    ;;
--  *)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
--    ;;
--  esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--fi
--
--case $host_os in
--  darwin*)
--    lock_old_archive_extraction=yes ;;
--  *)
--    lock_old_archive_extraction=no ;;
--esac
--_LT_DECL([], [old_postinstall_cmds], [2])
--_LT_DECL([], [old_postuninstall_cmds], [2])
--_LT_TAGDECL([], [old_archive_cmds], [2],
--    [Commands used to build an old-style archive])
--_LT_DECL([], [lock_old_archive_extraction], [0],
--    [Whether to use a lock for old archive extraction])
--])# _LT_CMD_OLD_ARCHIVE
--
--
--# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
--# ----------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([_LT_COMPILER_OPTION],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_SED])dnl
--AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
--   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$3"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   # The option is referenced via a variable to avoid confusing sed.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       $2=yes
--     fi
--   fi
--   $RM conftest*
--])
--
--if test x"[$]$2" = xyes; then
--    m4_if([$5], , :, [$5])
--else
--    m4_if([$6], , :, [$6])
--fi
--])# _LT_COMPILER_OPTION
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
--
--
--# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#                  [ACTION-SUCCESS], [ACTION-FAILURE])
--# ----------------------------------------------------
--# Check whether the given linker option works
--AC_DEFUN([_LT_LINKER_OPTION],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_SED])dnl
--AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $3"
--   echo "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&AS_MESSAGE_LOG_FD
--       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         $2=yes
--       fi
--     else
--       $2=yes
--     fi
--   fi
--   $RM -r conftest*
--   LDFLAGS="$save_LDFLAGS"
--])
--
--if test x"[$]$2" = xyes; then
--    m4_if([$4], , :, [$4])
--else
--    m4_if([$5], , :, [$5])
--fi
--])# _LT_LINKER_OPTION
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
--
--
--# LT_CMD_MAX_LEN
--#---------------
--AC_DEFUN([LT_CMD_MAX_LEN],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--# find the maximum length of command line arguments
--AC_MSG_CHECKING([the maximum length of command line arguments])
--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
--  i=0
--  teststring="ABCD"
--
--  case $build_os in
--  msdosdjgpp*)
--    # On DJGPP, this test can blow up pretty badly due to problems in libc
--    # (any single argument exceeding 2000 bytes causes a buffer overrun
--    # during glob expansion).  Even if it were fixed, the result of this
--    # check would be larger than it should be.
--    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
--    ;;
--
--  gnu*)
--    # Under GNU Hurd, this test is not required because there is
--    # no limit to the length of command line arguments.
--    # Libtool will interpret -1 as no limit whatsoever
--    lt_cv_sys_max_cmd_len=-1;
--    ;;
--
--  cygwin* | mingw* | cegcc*)
--    # On Win9x/ME, this test blows up -- it succeeds, but takes
--    # about 5 minutes as the teststring grows exponentially.
--    # Worse, since 9x/ME are not pre-emptively multitasking,
--    # you end up with a "frozen" computer, even though with patience
--    # the test eventually succeeds (with a max line length of 256k).
--    # Instead, let's just punt: use the minimum linelength reported by
--    # all of the supported platforms: 8192 (on NT/2K/XP).
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
--  mint*)
--    # On MiNT this can take a long time and run out of memory.
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
--  amigaos*)
--    # On AmigaOS with pdksh, this test takes hours, literally.
--    # So we just punt and use a minimum line length of 8192.
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
--  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
--    # This has been around since 386BSD, at least.  Likely further.
--    if test -x /sbin/sysctl; then
--      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
--    elif test -x /usr/sbin/sysctl; then
--      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
--    else
--      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
--    fi
--    # And add a safety zone
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
--    ;;
--
--  interix*)
--    # We know the value 262144 and hardcode it with a safety zone (like BSD)
--    lt_cv_sys_max_cmd_len=196608
--    ;;
--
--  osf*)
--    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
--    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
--    # nice to cause kernel panics so lets avoid the loop below.
--    # First set a reasonable default.
--    lt_cv_sys_max_cmd_len=16384
--    #
--    if test -x /sbin/sysconfig; then
--      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
--        *1*) lt_cv_sys_max_cmd_len=-1 ;;
--      esac
--    fi
--    ;;
--  sco3.2v5*)
--    lt_cv_sys_max_cmd_len=102400
--    ;;
--  sysv5* | sco5v6* | sysv4.2uw2*)
--    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
--    if test -n "$kargmax"; then
--      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
--    else
--      lt_cv_sys_max_cmd_len=32768
--    fi
--    ;;
--  *)
--    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
--    if test -n "$lt_cv_sys_max_cmd_len"; then
--      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
--      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
--    else
--      # Make teststring a little bigger before we do anything with it.
--      # a 1K string should be a reasonable start.
--      for i in 1 2 3 4 5 6 7 8 ; do
--        teststring=$teststring$teststring
--      done
--      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
--      # If test is not a shell built-in, we'll probably end up computing a
--      # maximum length that is only half of the actual maximum length, but
--      # we can't tell.
--      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
--	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
--	      test $i != 17 # 1/2 MB should be enough
--      do
--        i=`expr $i + 1`
--        teststring=$teststring$teststring
--      done
--      # Only check the string length outside the loop.
--      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
--      teststring=
--      # Add a significant safety factor because C++ compilers can tack on
--      # massive amounts of additional arguments before passing them to the
--      # linker.  It appears as though 1/2 is a usable value.
--      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
--    fi
--    ;;
--  esac
--])
--if test -n $lt_cv_sys_max_cmd_len ; then
--  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
--else
--  AC_MSG_RESULT(none)
--fi
--max_cmd_len=$lt_cv_sys_max_cmd_len
--_LT_DECL([], [max_cmd_len], [0],
--    [What is the maximum length of a command?])
--])# LT_CMD_MAX_LEN
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
--
--
--# _LT_HEADER_DLFCN
--# ----------------
--m4_defun([_LT_HEADER_DLFCN],
--[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
--])# _LT_HEADER_DLFCN
--
--
--# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
--#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ----------------------------------------------------------------
--m4_defun([_LT_TRY_DLOPEN_SELF],
--[m4_require([_LT_HEADER_DLFCN])dnl
--if test "$cross_compiling" = yes; then :
--  [$4]
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<_LT_EOF
--[#line $LINENO "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--/* When -fvisbility=hidden is used, assume the code has been annotated
--   correspondingly for the symbols needed.  */
--#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
--#endif
--
--void fnord () { int i=42; }
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
--
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else
--        {
--	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
--          else puts (dlerror ());
--	}
--      /* dlclose (self); */
--    }
--  else
--    puts (dlerror ());
--
--  return status;
--}]
--_LT_EOF
--  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) $1 ;;
--      x$lt_dlneed_uscore) $2 ;;
--      x$lt_dlunknown|x*) $3 ;;
--    esac
--  else :
--    # compilation failed
--    $3
--  fi
--fi
--rm -fr conftest*
--])# _LT_TRY_DLOPEN_SELF
--
--
--# LT_SYS_DLOPEN_SELF
--# ------------------
--AC_DEFUN([LT_SYS_DLOPEN_SELF],
--[m4_require([_LT_HEADER_DLFCN])dnl
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
--
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
--
--  mingw* | pw32* | cegcc*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--    ;;
--
--  cygwin*)
--    lt_cv_dlopen="dlopen"
--    lt_cv_dlopen_libs=
--    ;;
--
--  darwin*)
--  # if libdl is installed we need to link against it
--    AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
--    lt_cv_dlopen="dyld"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ])
--    ;;
--
--  *)
--    AC_CHECK_FUNC([shl_load],
--	  [lt_cv_dlopen="shl_load"],
--      [AC_CHECK_LIB([dld], [shl_load],
--	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
--	[AC_CHECK_FUNC([dlopen],
--	      [lt_cv_dlopen="dlopen"],
--	  [AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
--	    [AC_CHECK_LIB([svld], [dlopen],
--		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
--	      [AC_CHECK_LIB([dld], [dld_link],
--		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
--	      ])
--	    ])
--	  ])
--	])
--      ])
--    ;;
--  esac
--
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
--
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
--    save_LDFLAGS="$LDFLAGS"
--    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
--
--    AC_CACHE_CHECK([whether a program can dlopen itself],
--	  lt_cv_dlopen_self, [dnl
--	  _LT_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
--	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
--    ])
--
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
--	  lt_cv_dlopen_self_static, [dnl
--	  _LT_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
--	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
--      ])
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
--
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
--
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
--  esac
--fi
--_LT_DECL([dlopen_support], [enable_dlopen], [0],
--	 [Whether dlopen is supported])
--_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
--	 [Whether dlopen of programs is supported])
--_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
--	 [Whether dlopen of statically linked programs is supported])
--])# LT_SYS_DLOPEN_SELF
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
--
--
--# _LT_COMPILER_C_O([TAGNAME])
--# ---------------------------
--# Check to see if options -c and -o are simultaneously supported by compiler.
--# This macro does not hard code the compiler like AC_PROG_CC_C_O.
--m4_defun([_LT_COMPILER_C_O],
--[m4_require([_LT_DECL_SED])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_TAG_COMPILER])dnl
--AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
--  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
--  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
--   $RM -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s out/conftest2.$ac_objext
--   then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
--     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
--     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
--       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--     fi
--   fi
--   chmod u+w . 2>&AS_MESSAGE_LOG_FD
--   $RM conftest*
--   # SGI C++ compiler will create directory out/ii_files/ for
--   # template instantiation
--   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
--   $RM out/* && rmdir out
--   cd ..
--   $RM -r conftest
--   $RM conftest*
--])
--_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
--	[Does compiler simultaneously support -c and -o options?])
--])# _LT_COMPILER_C_O
--
--
--# _LT_COMPILER_FILE_LOCKS([TAGNAME])
--# ----------------------------------
--# Check to see if we can do hard links to lock some files if needed
--m4_defun([_LT_COMPILER_FILE_LOCKS],
--[m4_require([_LT_ENABLE_LOCK])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--_LT_COMPILER_C_O([$1])
--
--hard_links="nottested"
--if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  AC_MSG_CHECKING([if we can lock with hard links])
--  hard_links=yes
--  $RM conftest*
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  touch conftest.a
--  ln conftest.a conftest.b 2>&5 || hard_links=no
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  AC_MSG_RESULT([$hard_links])
--  if test "$hard_links" = no; then
--    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
--_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
--])# _LT_COMPILER_FILE_LOCKS
--
--
--# _LT_CHECK_OBJDIR
--# ----------------
--m4_defun([_LT_CHECK_OBJDIR],
--[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
--[rm -f .libs 2>/dev/null
--mkdir .libs 2>/dev/null
--if test -d .libs; then
--  lt_cv_objdir=.libs
--else
--  # MS-DOS does not allow filenames that begin with a dot.
--  lt_cv_objdir=_libs
--fi
--rmdir .libs 2>/dev/null])
--objdir=$lt_cv_objdir
--_LT_DECL([], [objdir], [0],
--         [The name of the directory that contains temporary libtool files])dnl
--m4_pattern_allow([LT_OBJDIR])dnl
--AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
--  [Define to the sub-directory in which libtool stores uninstalled libraries.])
--])# _LT_CHECK_OBJDIR
--
--
--# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
--# --------------------------------------
--# Check hardcoding attributes.
--m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
--[AC_MSG_CHECKING([how to hardcode library paths into programs])
--_LT_TAGVAR(hardcode_action, $1)=
--if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
--   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
--   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
--
--  # We can hardcode non-existent directories.
--  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
--     # If the only mechanism to avoid hardcoding is shlibpath_var, we
--     # have to relink, otherwise we might link with an installed library
--     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
--     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
--    # Linking always hardcodes the temporary library directory.
--    _LT_TAGVAR(hardcode_action, $1)=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    _LT_TAGVAR(hardcode_action, $1)=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  _LT_TAGVAR(hardcode_action, $1)=unsupported
--fi
--AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
--
--if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
--   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
--  # Fast installation is not supported
--  enable_fast_install=no
--elif test "$shlibpath_overrides_runpath" = yes ||
--     test "$enable_shared" = no; then
--  # Fast installation is not necessary
--  enable_fast_install=needless
--fi
--_LT_TAGDECL([], [hardcode_action], [0],
--    [How to hardcode a shared library path into an executable])
--])# _LT_LINKER_HARDCODE_LIBPATH
--
--
--# _LT_CMD_STRIPLIB
--# ----------------
--m4_defun([_LT_CMD_STRIPLIB],
--[m4_require([_LT_DECL_EGREP])
--striplib=
--old_striplib=
--AC_MSG_CHECKING([whether stripping libraries is possible])
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  AC_MSG_RESULT([yes])
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--  darwin*)
--    if test -n "$STRIP" ; then
--      striplib="$STRIP -x"
--      old_striplib="$STRIP -S"
--      AC_MSG_RESULT([yes])
--    else
--      AC_MSG_RESULT([no])
--    fi
--    ;;
--  *)
--    AC_MSG_RESULT([no])
--    ;;
--  esac
--fi
--_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
--_LT_DECL([], [striplib], [1])
--])# _LT_CMD_STRIPLIB
--
--
--# _LT_SYS_DYNAMIC_LINKER([TAG])
--# -----------------------------
--# PORTME Fill in your ld.so characteristics
--m4_defun([_LT_SYS_DYNAMIC_LINKER],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--m4_require([_LT_DECL_EGREP])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_OBJDUMP])dnl
--m4_require([_LT_DECL_SED])dnl
--m4_require([_LT_CHECK_SHELL_FEATURES])dnl
--AC_MSG_CHECKING([dynamic linker characteristics])
--m4_if([$1],
--	[], [
--if test "$GCC" = yes; then
--  case $host_os in
--    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
--    *) lt_awk_arg="/^libraries:/" ;;
--  esac
--  case $host_os in
--    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
--    *) lt_sed_strip_eq="s,=/,/,g" ;;
--  esac
--  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
--  case $lt_search_path_spec in
--  *\;*)
--    # if the path contains ";" then we assume it to be the separator
--    # otherwise default to the standard path separator (i.e. ":") - it is
--    # assumed that no part of a normal pathname contains ";" but that should
--    # okay in the real world where ";" in dirpaths is itself problematic.
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
--    ;;
--  *)
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
--    ;;
--  esac
--  # Ok, now we have the path, separated by spaces, we can step through it
--  # and add multilib dir if necessary.
--  lt_tmp_lt_search_path_spec=
--  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
--  for lt_sys_path in $lt_search_path_spec; do
--    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
--      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
--    else
--      test -d "$lt_sys_path" && \
--	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
--    fi
--  done
--  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
--BEGIN {RS=" "; FS="/|\n";} {
--  lt_foo="";
--  lt_count=0;
--  for (lt_i = NF; lt_i > 0; lt_i--) {
--    if ($lt_i != "" && $lt_i != ".") {
--      if ($lt_i == "..") {
--        lt_count++;
--      } else {
--        if (lt_count == 0) {
--          lt_foo="/" $lt_i lt_foo;
--        } else {
--          lt_count--;
--        }
--      }
--    }
--  }
--  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
--  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
--}'`
--  # AWK program above erroneously prepends '/' to C:/dos/paths
--  # for these hosts.
--  case $host_os in
--    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
--      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
--  esac
--  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi])
--library_names_spec=
--libname_spec='lib$name'
--soname_spec=
--shrext_cmds=".so"
--postinstall_cmds=
--postuninstall_cmds=
--finish_cmds=
--finish_eval=
--shlibpath_var=
--shlibpath_overrides_runpath=unknown
--version_type=none
--dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
--need_lib_prefix=unknown
--hardcode_into_libs=no
--
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
--
--case $host_os in
--aix3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
--  shlibpath_var=LIBPATH
--
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
--
--aix[[4-9]]*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  hardcode_into_libs=yes
--  if test "$host_cpu" = ia64; then
--    # AIX 5 supports IA64
--    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
--    shlibpath_var=LD_LIBRARY_PATH
--  else
--    # With GCC up to 2.95.x, collect2 would create an import file
--    # for dependence libraries.  The import file would start with
--    # the line `#! .'.  This would cause the generated library to
--    # depend on `.', always an invalid library.  This was fixed in
--    # development snapshots of GCC prior to 3.0.
--    case $host_os in
--      aix4 | aix4.[[01]] | aix4.[[01]].*)
--      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	   echo ' yes '
--	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
--	:
--      else
--	can_build_shared=no
--      fi
--      ;;
--    esac
--    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
--    # soname into executable. Probably we can add versioning support to
--    # collect2, so additional links can be useful in future.
--    if test "$aix_use_runtimelinking" = yes; then
--      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
--      # instead of lib<name>.a to let people know that these are not
--      # typical AIX shared libraries.
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    else
--      # We preserve .a as extension for shared libraries through AIX4.2
--      # and later when we are not doing run time linking.
--      library_names_spec='${libname}${release}.a $libname.a'
--      soname_spec='${libname}${release}${shared_ext}$major'
--    fi
--    shlibpath_var=LIBPATH
--  fi
--  ;;
--
--amigaos*)
--  case $host_cpu in
--  powerpc)
--    # Since July 2007 AmigaOS4 officially supports .so libraries.
--    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    ;;
--  m68k)
--    library_names_spec='$libname.ixlibrary $libname.a'
--    # Create ${libname}_ixlibrary.a entries in /sys/libs.
--    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
--    ;;
--  esac
--  ;;
--
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
--
--bsdi[[45]]*)
--  version_type=linux
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
--  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
--  # the default ld.so.conf also contains /usr/contrib/lib and
--  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
--  # libtool to hard-code these into programs
--  ;;
--
--cygwin* | mingw* | pw32* | cegcc*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
--
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
--    library_names_spec='$libname.dll.a'
--    # DLL is installed to $(libdir)/../bin by postinstall_cmds
--    postinstall_cmds='base_file=`basename \${file}`~
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
--      dldir=$destdir/`dirname \$dlpath`~
--      test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname~
--      chmod a+x \$dldir/$dlname~
--      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
--        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
--      fi'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
--      dlpath=$dir/\$dldll~
--       $RM \$dlpath'
--    shlibpath_overrides_runpath=yes
--
--    case $host_os in
--    cygwin*)
--      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
--      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--m4_if([$1], [],[
--      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
--      ;;
--    mingw* | cegcc*)
--      # MinGW DLLs use traditional 'lib' prefix
--      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      ;;
--    pw32*)
--      # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      ;;
--    esac
--    ;;
--
--  *)
--    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
--    ;;
--  esac
--  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=PATH
--  ;;
--
--darwin* | rhapsody*)
--  dynamic_linker="$host_os dyld"
--  version_type=darwin
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
--  soname_spec='${libname}${release}${major}$shared_ext'
--  shlibpath_overrides_runpath=yes
--  shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
--m4_if([$1], [],[
--  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
--
--dgux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
--freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
--  if test -x /usr/bin/objformat; then
--    objformat=`/usr/bin/objformat`
--  else
--    case $host_os in
--    freebsd[[123]]*) objformat=aout ;;
--    *) objformat=elf ;;
--    esac
--  fi
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
--      need_version=yes
--      ;;
--  esac
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
--  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
--  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
--    ;;
--  *) # from 4.6 on, and DragonFly
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  esac
--  ;;
--
--gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
--  ;;
--
--haiku*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  dynamic_linker="$host_os runtime_loader"
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
--  hardcode_into_libs=yes
--  ;;
--
--hpux9* | hpux10* | hpux11*)
--  # Give a soname corresponding to the major version so that dld.sl refuses to
--  # link against other versions.
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  case $host_cpu in
--  ia64*)
--    shrext_cmds='.so'
--    hardcode_into_libs=yes
--    dynamic_linker="$host_os dld.so"
--    shlibpath_var=LD_LIBRARY_PATH
--    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    if test "X$HPUX_IA64_MODE" = X32; then
--      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
--    else
--      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
--    fi
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--    ;;
--  hppa*64*)
--    shrext_cmds='.sl'
--    hardcode_into_libs=yes
--    dynamic_linker="$host_os dld.sl"
--    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
--    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--    ;;
--  *)
--    shrext_cmds='.sl'
--    dynamic_linker="$host_os dld.sl"
--    shlibpath_var=SHLIB_PATH
--    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    ;;
--  esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
--  postinstall_cmds='chmod 555 $lib'
--  # or fails outright, so override atomically:
--  install_override_mode=555
--  ;;
--
--interix[[3-9]]*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  ;;
--
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
--  esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
--    ;;
--  *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
--    ;;
--  esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  hardcode_into_libs=yes
--  ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
--  dynamic_linker=no
--  ;;
--
--# This must be Linux ELF.
--linux* | k*bsd*-gnu | kopensolaris*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--
--  # Some binutils ld are patched to set DT_RUNPATH
--  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
--    [lt_cv_shlibpath_overrides_runpath=no
--    save_LDFLAGS=$LDFLAGS
--    save_libdir=$libdir
--    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
--	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
--    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
--      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
--	 [lt_cv_shlibpath_overrides_runpath=yes])])
--    LDFLAGS=$save_LDFLAGS
--    libdir=$save_libdir
--    ])
--  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
--
--  # This implies no fast_install, which is unacceptable.
--  # Some rework will be needed to allow for fast_install
--  # before this can be enabled.
--  hardcode_into_libs=yes
--
--  # Add ABI-specific directories to the system library path.
--  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
--  # Append ld.so.conf contents to the search path
--  if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
--  fi
--
--  # We used to test for /lib/ld.so.1 and disable shared libraries on
--  # powerpc, because MkLinux only supported shared libraries with the
--  # GNU dynamic linker.  Since this was broken with cross compilers,
--  # most powerpc-linux boxes support dynamic linking these days and
--  # people can always --disable-shared, the test was removed, and we
--  # assume the GNU/Linux dynamic linker is in use.
--  dynamic_linker='GNU/Linux ld.so'
--  ;;
--
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  ;;
--
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
--*nto* | *qnx*)
--  version_type=qnx
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='ldqnx.so'
--  ;;
--
--openbsd*)
--  version_type=sunos
--  sys_lib_dlsearch_path_spec="/usr/lib"
--  need_lib_prefix=no
--  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
--  case $host_os in
--    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
--    *)				need_version=no  ;;
--  esac
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case $host_os in
--      openbsd2.[[89]] | openbsd2.[[89]].*)
--	shlibpath_overrides_runpath=no
--	;;
--      *)
--	shlibpath_overrides_runpath=yes
--	;;
--      esac
--  else
--    shlibpath_overrides_runpath=yes
--  fi
--  ;;
--
--os2*)
--  libname_spec='$name'
--  shrext_cmds=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
--  ;;
--
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
--  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
--  ;;
--
--rdos*)
--  dynamic_linker=no
--  ;;
--
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
--
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
--  ;;
--
--sysv4 | sysv4.3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
--  esac
--  ;;
--
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
--    soname_spec='$libname${shared_ext}.$major'
--    shlibpath_var=LD_LIBRARY_PATH
--  fi
--  ;;
--
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  version_type=freebsd-elf
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  if test "$with_gnu_ld" = yes; then
--    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
--  else
--    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    case $host_os in
--      sco3.2v5*)
--        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
--	;;
--    esac
--  fi
--  sys_lib_dlsearch_path_spec='/usr/lib'
--  ;;
--
--tpf*)
--  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  ;;
--
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--*)
--  dynamic_linker=no
--  ;;
--esac
--AC_MSG_RESULT([$dynamic_linker])
--test "$dynamic_linker" = no && can_build_shared=no
--
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--
--if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
--  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
--fi
--if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
--fi
--
--_LT_DECL([], [variables_saved_for_relink], [1],
--    [Variables whose values should be saved in libtool wrapper scripts and
--    restored at link time])
--_LT_DECL([], [need_lib_prefix], [0],
--    [Do we need the "lib" prefix for modules?])
--_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
--_LT_DECL([], [version_type], [0], [Library versioning type])
--_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
--_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
--_LT_DECL([], [shlibpath_overrides_runpath], [0],
--    [Is shlibpath searched before the hard-coded library search path?])
--_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
--_LT_DECL([], [library_names_spec], [1],
--    [[List of archive names.  First name is the real one, the rest are links.
--    The last name is the one that the linker finds with -lNAME]])
--_LT_DECL([], [soname_spec], [1],
--    [[The coded name of the library, if different from the real name]])
--_LT_DECL([], [install_override_mode], [1],
--    [Permission mode override for installation of shared libraries])
--_LT_DECL([], [postinstall_cmds], [2],
--    [Command to use after installation of a shared archive])
--_LT_DECL([], [postuninstall_cmds], [2],
--    [Command to use after uninstallation of a shared archive])
--_LT_DECL([], [finish_cmds], [2],
--    [Commands used to finish a libtool library installation in a directory])
--_LT_DECL([], [finish_eval], [1],
--    [[As "finish_cmds", except a single script fragment to be evaled but
--    not shown]])
--_LT_DECL([], [hardcode_into_libs], [0],
--    [Whether we should hardcode library paths into libraries])
--_LT_DECL([], [sys_lib_search_path_spec], [2],
--    [Compile-time system search path for libraries])
--_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
--    [Run-time system search path for libraries])
--])# _LT_SYS_DYNAMIC_LINKER
--
--
--# _LT_PATH_TOOL_PREFIX(TOOL)
--# --------------------------
--# find a file program which can recognize shared library
--AC_DEFUN([_LT_PATH_TOOL_PREFIX],
--[m4_require([_LT_DECL_EGREP])dnl
--AC_MSG_CHECKING([for $1])
--AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
--[case $MAGIC_CMD in
--[[\\/*] |  ?:[\\/]*])
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
--  ;;
--*)
--  lt_save_MAGIC_CMD="$MAGIC_CMD"
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--dnl $ac_dummy forces splitting on constant user-supplied paths.
--dnl POSIX.2 word splitting is done only on the output of word expansions,
--dnl not every word.  This closes a longstanding sh security hole.
--  ac_dummy="m4_if([$2], , $PATH, [$2])"
--  for ac_dir in $ac_dummy; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$1; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
--      if test -n "$file_magic_test_file"; then
--	case $deplibs_check_method in
--	"file_magic "*)
--	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
--	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
--	    $EGREP "$file_magic_regex" > /dev/null; then
--	    :
--	  else
--	    cat <<_LT_EOF 1>&2
--
--*** Warning: the command libtool uses to detect shared libraries,
--*** $file_magic_cmd, produces output that libtool cannot recognize.
--*** The result is that libtool may fail to recognize shared libraries
--*** as such.  This will affect the creation of libtool libraries that
--*** depend on shared libraries, but programs linked with such libtool
--*** libraries will work regardless of this problem.  Nevertheless, you
--*** may want to report the problem to your system manager and/or to
--*** bug-libtool at gnu.org
--
--_LT_EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
--  done
--  IFS="$lt_save_ifs"
--  MAGIC_CMD="$lt_save_MAGIC_CMD"
--  ;;
--esac])
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  AC_MSG_RESULT($MAGIC_CMD)
--else
--  AC_MSG_RESULT(no)
--fi
--_LT_DECL([], [MAGIC_CMD], [0],
--	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
--])# _LT_PATH_TOOL_PREFIX
--
--# Old name:
--AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
--
--
--# _LT_PATH_MAGIC
--# --------------
--# find a file program which can recognize a shared library
--m4_defun([_LT_PATH_MAGIC],
--[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
--if test -z "$lt_cv_path_MAGIC_CMD"; then
--  if test -n "$ac_tool_prefix"; then
--    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
--  else
--    MAGIC_CMD=:
--  fi
--fi
--])# _LT_PATH_MAGIC
--
--
--# LT_PATH_LD
--# ----------
--# find the pathname to the GNU or non-GNU linker
--AC_DEFUN([LT_PATH_LD],
--[AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--m4_require([_LT_DECL_SED])dnl
--m4_require([_LT_DECL_EGREP])dnl
--m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
--
--AC_ARG_WITH([gnu-ld],
--    [AS_HELP_STRING([--with-gnu-ld],
--	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
--    [test "$withval" = no || with_gnu_ld=yes],
--    [with_gnu_ld=no])dnl
--
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by $CC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]]* | ?:[[\\/]]*)
--      re_direlt='/[[^/]][[^/]]*/\.\./'
--      # Canonicalize the pathname of ld
--      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
--      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(lt_cv_path_LD,
--[if test -z "$LD"; then
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      lt_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some variants of GNU ld only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
--      *GNU* | *'with BFD'*)
--	test "$with_gnu_ld" != no && break
--	;;
--      *)
--	test "$with_gnu_ld" != yes && break
--	;;
--      esac
--    fi
--  done
--  IFS="$lt_save_ifs"
--else
--  lt_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--_LT_PATH_LD_GNU
--AC_SUBST([LD])
--
--_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
--])# LT_PATH_LD
--
--# Old names:
--AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
--AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_PROG_LD], [])
--dnl AC_DEFUN([AC_PROG_LD], [])
--
--
--# _LT_PATH_LD_GNU
--#- --------------
--m4_defun([_LT_PATH_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  lt_cv_prog_gnu_ld=yes
--  ;;
--*)
--  lt_cv_prog_gnu_ld=no
--  ;;
--esac])
--with_gnu_ld=$lt_cv_prog_gnu_ld
--])# _LT_PATH_LD_GNU
--
--
--# _LT_CMD_RELOAD
--# --------------
--# find reload flag for linker
--#   -- PORTME Some linkers may need a different reload flag.
--m4_defun([_LT_CMD_RELOAD],
--[AC_CACHE_CHECK([for $LD option to reload object files],
--  lt_cv_ld_reload_flag,
--  [lt_cv_ld_reload_flag='-r'])
--reload_flag=$lt_cv_ld_reload_flag
--case $reload_flag in
--"" | " "*) ;;
--*) reload_flag=" $reload_flag" ;;
--esac
--reload_cmds='$LD$reload_flag -o $output$reload_objs'
--case $host_os in
--  darwin*)
--    if test "$GCC" = yes; then
--      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
--    else
--      reload_cmds='$LD$reload_flag -o $output$reload_objs'
--    fi
--    ;;
--esac
--_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
--_LT_TAGDECL([], [reload_cmds], [2])dnl
--])# _LT_CMD_RELOAD
--
--
--# _LT_CHECK_MAGIC_METHOD
--# ----------------------
--# how to check for library dependencies
--#  -- PORTME fill in with the dynamic library characteristics
--m4_defun([_LT_CHECK_MAGIC_METHOD],
--[m4_require([_LT_DECL_EGREP])
--m4_require([_LT_DECL_OBJDUMP])
--AC_CACHE_CHECK([how to recognize dependent libraries],
--lt_cv_deplibs_check_method,
--[lt_cv_file_magic_cmd='$MAGIC_CMD'
--lt_cv_file_magic_test_file=
--lt_cv_deplibs_check_method='unknown'
--# Need to set the preceding variable on all platforms that support
--# interlibrary dependencies.
--# 'none' -- dependencies not supported.
--# `unknown' -- same as none, but documents that we really don't know.
--# 'pass_all' -- all dependencies passed with no checks.
--# 'test_compile' -- check by making test program.
--# 'file_magic [[regex]]' -- check by looking for files in library path
--# which responds to the $file_magic_cmd with a given extended regex.
--# If you have `file' or equivalent on your system and you're not sure
--# whether `pass_all' will *always* work, you probably want this one.
--
--case $host_os in
--aix[[4-9]]*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--beos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--bsdi[[45]]*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
--  ;;
--
--cygwin*)
--  # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--  lt_cv_file_magic_cmd='func_win32_libid'
--  ;;
--
--mingw* | pw32*)
--  # Base MSYS/MinGW do not provide the 'file' command needed by
--  # func_win32_libid shell function, so use a weaker test based on 'objdump',
--  # unless we find 'file', for example because we are cross-compiling.
--  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
--  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
--    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--    lt_cv_file_magic_cmd='func_win32_libid'
--  else
--    # Keep this pattern in sync with the one in func_win32_libid.
--    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
--    lt_cv_file_magic_cmd='$OBJDUMP -f'
--  fi
--  ;;
--
--cegcc*)
--  # use the weaker test based on 'objdump'. See mingw*.
--  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
--  lt_cv_file_magic_cmd='$OBJDUMP -f'
--  ;;
--
--darwin* | rhapsody*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--freebsd* | dragonfly*)
--  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
--    case $host_cpu in
--    i*86 )
--      # Not sure whether the presence of OpenBSD here was a mistake.
--      # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
--      lt_cv_file_magic_cmd=/usr/bin/file
--      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
--      ;;
--    esac
--  else
--    lt_cv_deplibs_check_method=pass_all
--  fi
--  ;;
--
--gnu*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--haiku*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--hpux10.20* | hpux11*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  case $host_cpu in
--  ia64*)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
--    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
--    ;;
--  hppa*64*)
--    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
--    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
--    ;;
--  *)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
--    lt_cv_file_magic_test_file=/usr/lib/libc.sl
--    ;;
--  esac
--  ;;
--
--interix[[3-9]]*)
--  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
--  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
--  ;;
--
--irix5* | irix6* | nonstopux*)
--  case $LD in
--  *-32|*"-32 ") libmagic=32-bit;;
--  *-n32|*"-n32 ") libmagic=N32;;
--  *-64|*"-64 ") libmagic=64-bit;;
--  *) libmagic=never-match;;
--  esac
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--# This must be Linux ELF.
--linux* | k*bsd*-gnu | kopensolaris*-gnu)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--netbsd*)
--  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
--  fi
--  ;;
--
--newos6*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=/usr/lib/libnls.so
--  ;;
--
--*nto* | *qnx*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--openbsd*)
--  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
--  fi
--  ;;
--
--osf3* | osf4* | osf5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--rdos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--solaris*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--sysv4 | sysv4.3*)
--  case $host_vendor in
--  motorola)
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
--    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
--    ;;
--  ncr)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  sequent)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
--    ;;
--  sni)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
--    lt_cv_file_magic_test_file=/lib/libc.so
--    ;;
--  siemens)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  pc)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  esac
--  ;;
--
--tpf*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--esac
--])
--file_magic_cmd=$lt_cv_file_magic_cmd
--deplibs_check_method=$lt_cv_deplibs_check_method
--test -z "$deplibs_check_method" && deplibs_check_method=unknown
--
--_LT_DECL([], [deplibs_check_method], [1],
--    [Method to check whether dependent libraries are shared objects])
--_LT_DECL([], [file_magic_cmd], [1],
--    [Command to use when deplibs_check_method == "file_magic"])
--])# _LT_CHECK_MAGIC_METHOD
--
--
--# LT_PATH_NM
--# ----------
--# find the pathname to a BSD- or MS-compatible name lister
--AC_DEFUN([LT_PATH_NM],
--[AC_REQUIRE([AC_PROG_CC])dnl
--AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
--[if test -n "$NM"; then
--  # Let the user override the test.
--  lt_cv_path_NM="$NM"
--else
--  lt_nm_to_check="${ac_tool_prefix}nm"
--  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
--    lt_nm_to_check="$lt_nm_to_check nm"
--  fi
--  for lt_tmp_nm in $lt_nm_to_check; do
--    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
--      IFS="$lt_save_ifs"
--      test -z "$ac_dir" && ac_dir=.
--      tmp_nm="$ac_dir/$lt_tmp_nm"
--      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
--	# Check to see if the nm accepts a BSD-compat flag.
--	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
--	#   nm: unknown option "B" ignored
--	# Tru64's nm complains that /dev/null is an invalid object file
--	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
--	*/dev/null* | *'Invalid file or object type'*)
--	  lt_cv_path_NM="$tmp_nm -B"
--	  break
--	  ;;
--	*)
--	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
--	  */dev/null*)
--	    lt_cv_path_NM="$tmp_nm -p"
--	    break
--	    ;;
--	  *)
--	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
--	    continue # so that we can try to find one that supports BSD flags
--	    ;;
--	  esac
--	  ;;
--	esac
--      fi
--    done
--    IFS="$lt_save_ifs"
--  done
--  : ${lt_cv_path_NM=no}
--fi])
--if test "$lt_cv_path_NM" != "no"; then
--  NM="$lt_cv_path_NM"
--else
--  # Didn't find any BSD compatible name lister, look for dumpbin.
--  if test -n "$DUMPBIN"; then :
--    # Let the user override the test.
--  else
--    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
--    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
--    *COFF*)
--      DUMPBIN="$DUMPBIN -symbols"
--      ;;
--    *)
--      DUMPBIN=:
--      ;;
--    esac
--  fi
--  AC_SUBST([DUMPBIN])
--  if test "$DUMPBIN" != ":"; then
--    NM="$DUMPBIN"
--  fi
--fi
--test -z "$NM" && NM=nm
--AC_SUBST([NM])
--_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
--
--AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
--  [lt_cv_nm_interface="BSD nm"
--  echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
--  (eval "$ac_compile" 2>conftest.err)
--  cat conftest.err >&AS_MESSAGE_LOG_FD
--  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
--  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
--  cat conftest.err >&AS_MESSAGE_LOG_FD
--  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
--  cat conftest.out >&AS_MESSAGE_LOG_FD
--  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
--    lt_cv_nm_interface="MS dumpbin"
--  fi
--  rm -f conftest*])
--])# LT_PATH_NM
--
--# Old names:
--AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
--AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_PROG_NM], [])
--dnl AC_DEFUN([AC_PROG_NM], [])
--
--
--# LT_LIB_M
--# --------
--# check for math library
--AC_DEFUN([LT_LIB_M],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case $host in
--*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
--  # These system don't have libm, or don't need it
--  ;;
--*-ncr-sysv4.3*)
--  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
--  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
--  ;;
--*)
--  AC_CHECK_LIB(m, cos, LIBM="-lm")
--  ;;
--esac
--AC_SUBST([LIBM])
--])# LT_LIB_M
--
--# Old name:
--AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_CHECK_LIBM], [])
--
--
--# _LT_COMPILER_NO_RTTI([TAGNAME])
--# -------------------------------
--m4_defun([_LT_COMPILER_NO_RTTI],
--[m4_require([_LT_TAG_COMPILER])dnl
--
--_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--
--if test "$GCC" = yes; then
--  case $cc_basename in
--  nvcc*)
--    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
--  *)
--    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
--  esac
--
--  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
--    lt_cv_prog_compiler_rtti_exceptions,
--    [-fno-rtti -fno-exceptions], [],
--    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
--fi
--_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
--	[Compiler flag to turn off builtin functions])
--])# _LT_COMPILER_NO_RTTI
--
--
--# _LT_CMD_GLOBAL_SYMBOLS
--# ----------------------
--m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([LT_PATH_NM])dnl
--AC_REQUIRE([LT_PATH_LD])dnl
--m4_require([_LT_DECL_SED])dnl
--m4_require([_LT_DECL_EGREP])dnl
--m4_require([_LT_TAG_COMPILER])dnl
--
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--AC_MSG_CHECKING([command to parse $NM output from $compiler object])
--AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
--[
--# These are sane defaults that work on at least a few old systems.
--# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
--
--# Character class describing NM global symbol codes.
--symcode='[[BCDEGRST]]'
--
--# Regexp to match symbols that can be accessed directly from C.
--sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
--
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[[BCDT]]'
--  ;;
--cygwin* | mingw* | pw32* | cegcc*)
--  symcode='[[ABCDGISTW]]'
--  ;;
--hpux*)
--  if test "$host_cpu" = ia64; then
--    symcode='[[ABCDEGRST]]'
--  fi
--  ;;
--irix* | nonstopux*)
--  symcode='[[BCDEGRST]]'
--  ;;
--osf*)
--  symcode='[[BCDEGQRST]]'
--  ;;
--solaris*)
--  symcode='[[BDRT]]'
--  ;;
--sco3.2v5*)
--  symcode='[[DT]]'
--  ;;
--sysv4.2uw2*)
--  symcode='[[DT]]'
--  ;;
--sysv5* | sco5v6* | unixware* | OpenUNIX*)
--  symcode='[[ABDT]]'
--  ;;
--sysv4)
--  symcode='[[DFNSTU]]'
--  ;;
--esac
--
--# If we're using GNU nm, then use its standard symbol codes.
--case `$NM -V 2>&1` in
--*GNU* | *'with BFD'*)
--  symcode='[[ABCDGIRSTW]]' ;;
--esac
--
--# Transform an extracted symbol line into a proper C declaration.
--# Some systems (esp. on ia64) link data and code symbols differently,
--# so use this general approach.
--lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--
--# Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
--lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
--
--# Handle CRLF in mingw tool chain
--opt_cr=
--case $build_os in
--mingw*)
--  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
--  ;;
--esac
--
--# Try without a prefix underscore, then with it.
--for ac_symprfx in "" "_"; do
--
--  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
--  symxfrm="\\1 $ac_symprfx\\2 \\2"
--
--  # Write the raw and C identifiers.
--  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
--    # Fake it for dumpbin and say T for any non-static function
--    # and D for any global variable.
--    # Also find C++ and __fastcall symbols from MSVC++,
--    # which start with @ or ?.
--    lt_cv_sys_global_symbol_pipe="$AWK ['"\
--"     {last_section=section; section=\$ 3};"\
--"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
--"     \$ 0!~/External *\|/{next};"\
--"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
--"     {if(hide[section]) next};"\
--"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
--"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
--"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
--"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
--"     ' prfx=^$ac_symprfx]"
--  else
--    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
--  fi
--
--  # Check to see that the pipe works correctly.
--  pipe_works=no
--
--  rm -f conftest*
--  cat > conftest.$ac_ext <<_LT_EOF
--#ifdef __cplusplus
--extern "C" {
--#endif
--char nm_test_var;
--void nm_test_func(void);
--void nm_test_func(void){}
--#ifdef __cplusplus
--}
--#endif
--int main(){nm_test_var='a';nm_test_func();return(0);}
--_LT_EOF
--
--  if AC_TRY_EVAL(ac_compile); then
--    # Now try to grab the symbols.
--    nlist=conftest.nm
--    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
--      # Try sorting and uniquifying the output.
--      if sort "$nlist" | uniq > "$nlist"T; then
--	mv -f "$nlist"T "$nlist"
--      else
--	rm -f "$nlist"T
--      fi
--
--      # Make sure that we snagged all the symbols we need.
--      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
--	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
--	  cat <<_LT_EOF > conftest.$ac_ext
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--_LT_EOF
--	  # Now generate the symbol file.
--	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
--
--	  cat <<_LT_EOF >> conftest.$ac_ext
--
--/* The mapping between symbol names and symbols.  */
--const struct {
--  const char *name;
--  void       *address;
--}
--lt__PROGRAM__LTX_preloaded_symbols[[]] =
--{
--  { "@PROGRAM@", (void *) 0 },
--_LT_EOF
--	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
--	  cat <<\_LT_EOF >> conftest.$ac_ext
--  {0, (void *) 0}
--};
--
--/* This works around a problem in FreeBSD linker */
--#ifdef FREEBSD_WORKAROUND
--static const void *lt_preloaded_setup() {
--  return lt__PROGRAM__LTX_preloaded_symbols;
--}
--#endif
--
--#ifdef __cplusplus
--}
--#endif
--_LT_EOF
--	  # Now try linking the two files.
--	  mv conftest.$ac_objext conftstm.$ac_objext
--	  lt_save_LIBS="$LIBS"
--	  lt_save_CFLAGS="$CFLAGS"
--	  LIBS="conftstm.$ac_objext"
--	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
--	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
--	    pipe_works=yes
--	  fi
--	  LIBS="$lt_save_LIBS"
--	  CFLAGS="$lt_save_CFLAGS"
--	else
--	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
--	fi
--      else
--	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
--      fi
--    else
--      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
--    fi
--  else
--    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
--    cat conftest.$ac_ext >&5
--  fi
--  rm -rf conftest* conftst*
--
--  # Do not use the global_symbol_pipe unless it works.
--  if test "$pipe_works" = yes; then
--    break
--  else
--    lt_cv_sys_global_symbol_pipe=
--  fi
--done
--])
--if test -z "$lt_cv_sys_global_symbol_pipe"; then
--  lt_cv_sys_global_symbol_to_cdecl=
--fi
--if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
--  AC_MSG_RESULT(failed)
--else
--  AC_MSG_RESULT(ok)
--fi
--
--_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
--    [Take the output of nm and produce a listing of raw symbols and C names])
--_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
--    [Transform the output of nm in a proper C declaration])
--_LT_DECL([global_symbol_to_c_name_address],
--    [lt_cv_sys_global_symbol_to_c_name_address], [1],
--    [Transform the output of nm in a C name address pair])
--_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
--    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
--    [Transform the output of nm in a C name address pair when lib prefix is needed])
--]) # _LT_CMD_GLOBAL_SYMBOLS
--
--
--# _LT_COMPILER_PIC([TAGNAME])
--# ---------------------------
--m4_defun([_LT_COMPILER_PIC],
--[m4_require([_LT_TAG_COMPILER])dnl
--_LT_TAGVAR(lt_prog_compiler_wl, $1)=
--_LT_TAGVAR(lt_prog_compiler_pic, $1)=
--_LT_TAGVAR(lt_prog_compiler_static, $1)=
--
--AC_MSG_CHECKING([for $compiler option to produce PIC])
--m4_if([$1], [CXX], [
--  # C++ specific cases for pic, static, wl, etc.
--  if test "$GXX" = yes; then
--    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
--
--    case $host_os in
--    aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--
--    amigaos*)
--      case $host_cpu in
--      powerpc)
--            # see comment about AmigaOS4 .so support
--            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--        ;;
--      m68k)
--            # FIXME: we need at least 68020 code to build shared libraries, but
--            # adding the `-m68020' flag to GCC prevents building anything better,
--            # like `-m68040'.
--            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--        ;;
--      esac
--      ;;
--
--    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--    mingw* | cygwin* | os2* | pw32* | cegcc*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      # Although the cygwin gcc ignores -fPIC, still need this for old-style
--      # (--disable-auto-import) libraries
--      m4_if([$1], [GCJ], [],
--	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
--      ;;
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
--      ;;
--    *djgpp*)
--      # DJGPP does not support shared libraries at all
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
--      ;;
--    haiku*)
--      # PIC is the default for Haiku.
--      # The "-static" flag exists, but is broken.
--      _LT_TAGVAR(lt_prog_compiler_static, $1)=
--      ;;
--    interix[[3-9]]*)
--      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
--      # Instead, we relocate shared libraries at runtime.
--      ;;
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
--      ;;
--    hpux*)
--      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
--      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
--      # sets the default TLS model and affects inlining.
--      case $host_cpu in
--      hppa*64*)
--	;;
--      *)
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
--      esac
--      ;;
--    *qnx* | *nto*)
--      # QNX uses GNU C++, but need to define -shared option too, otherwise
--      # it will coredump.
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
--      ;;
--    *)
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--      ;;
--    esac
--  else
--    case $host_os in
--      aix[[4-9]]*)
--	# All AIX code is PIC.
--	if test "$host_cpu" = ia64; then
--	  # AIX 5 now supports IA64 processor
--	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	else
--	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--	fi
--	;;
--      chorus*)
--	case $cc_basename in
--	cxch68*)
--	  # Green Hills C++ Compiler
--	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
--	  ;;
--	esac
--	;;
--      dgux*)
--	case $cc_basename in
--	  ec++*)
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    ;;
--	  ghcx*)
--	    # Green Hills C++ Compiler
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      freebsd* | dragonfly*)
--	# FreeBSD uses GNU C++
--	;;
--      hpux9* | hpux10* | hpux11*)
--	case $cc_basename in
--	  CC*)
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--	    if test "$host_cpu" != ia64; then
--	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	    fi
--	    ;;
--	  aCC*)
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--	    case $host_cpu in
--	    hppa*64*|ia64*)
--	      # +Z the default
--	      ;;
--	    *)
--	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	      ;;
--	    esac
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      interix*)
--	# This is c89, which is MS Visual C++ (no shared libs)
--	# Anyone wants to do a port?
--	;;
--      irix5* | irix6* | nonstopux*)
--	case $cc_basename in
--	  CC*)
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    # CC pic flag -KPIC is the default.
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      linux* | k*bsd*-gnu | kopensolaris*-gnu)
--	case $cc_basename in
--	  KCC*)
--	    # KAI C++ Compiler
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	    ;;
--	  ecpc* )
--	    # old Intel C++ for x86_64 which still supported -KPIC.
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
--	    ;;
--	  icpc* )
--	    # Intel C++, used to be incompatible with GCC.
--	    # ICC 10 doesn't accept -KPIC any more.
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
--	    ;;
--	  pgCC* | pgcpp*)
--	    # Portland Group C++ compiler
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	  cxx*)
--	    # Compaq C++
--	    # Make sure the PIC flag is empty.  It appears that all Alpha
--	    # Linux and Compaq Tru64 Unix objects are PIC.
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    ;;
--	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
--	    # IBM XL 8.0, 9.0 on PPC and BlueGene
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
--	    ;;
--	  *)
--	    case `$CC -V 2>&1 | sed 5q` in
--	    *Sun\ C*)
--	      # Sun C++ 5.9
--	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
--	      ;;
--	    esac
--	    ;;
--	esac
--	;;
--      lynxos*)
--	;;
--      m88k*)
--	;;
--      mvs*)
--	case $cc_basename in
--	  cxx*)
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      netbsd*)
--	;;
--      *qnx* | *nto*)
--        # QNX uses GNU C++, but need to define -shared option too, otherwise
--        # it will coredump.
--        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
--        ;;
--      osf3* | osf4* | osf5*)
--	case $cc_basename in
--	  KCC*)
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
--	    ;;
--	  RCC*)
--	    # Rational C++ 2.4.1
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  cxx*)
--	    # Digital/Compaq C++
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    # Make sure the PIC flag is empty.  It appears that all Alpha
--	    # Linux and Compaq Tru64 Unix objects are PIC.
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      psos*)
--	;;
--      solaris*)
--	case $cc_basename in
--	  CC* | sunCC*)
--	    # Sun C++ 4.2, 5.x and Centerline C++
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
--	    ;;
--	  gcx*)
--	    # Green Hills C++ Compiler
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sunos4*)
--	case $cc_basename in
--	  CC*)
--	    # Sun C++ 4.x
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	  lcc*)
--	    # Lucid
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--	case $cc_basename in
--	  CC*)
--	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	esac
--	;;
--      tandem*)
--	case $cc_basename in
--	  NCC*)
--	    # NonStop-UX NCC 3.20
--	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      vxworks*)
--	;;
--      *)
--	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--	;;
--    esac
--  fi
--],
--[
--  if test "$GCC" = yes; then
--    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
--
--    case $host_os in
--      aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--
--    amigaos*)
--      case $host_cpu in
--      powerpc)
--            # see comment about AmigaOS4 .so support
--            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--        ;;
--      m68k)
--            # FIXME: we need at least 68020 code to build shared libraries, but
--            # adding the `-m68020' flag to GCC prevents building anything better,
--            # like `-m68040'.
--            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--        ;;
--      esac
--      ;;
--
--    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      # Although the cygwin gcc ignores -fPIC, still need this for old-style
--      # (--disable-auto-import) libraries
--      m4_if([$1], [GCJ], [],
--	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
--      ;;
--
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
--      ;;
--
--    haiku*)
--      # PIC is the default for Haiku.
--      # The "-static" flag exists, but is broken.
--      _LT_TAGVAR(lt_prog_compiler_static, $1)=
--      ;;
--
--    hpux*)
--      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
--      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
--      # sets the default TLS model and affects inlining.
--      case $host_cpu in
--      hppa*64*)
--	# +Z the default
--	;;
--      *)
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
--      esac
--      ;;
--
--    interix[[3-9]]*)
--      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
--      # Instead, we relocate shared libraries at runtime.
--      ;;
--
--    msdosdjgpp*)
--      # Just because we use GCC doesn't mean we suddenly get shared libraries
--      # on systems that don't support them.
--      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      enable_shared=no
--      ;;
--
--    *nto* | *qnx*)
--      # QNX uses GNU C++, but need to define -shared option too, otherwise
--      # it will coredump.
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
--      ;;
--
--    *)
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--      ;;
--    esac
--
--    case $cc_basename in
--    nvcc*) # Cuda Compiler Driver 2.2
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for flag to pass linker flags through the system compiler.
--    case $host_os in
--    aix*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      else
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
--
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      m4_if([$1], [GCJ], [],
--	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
--      ;;
--
--    hpux9* | hpux10* | hpux11*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case $host_cpu in
--      hppa*64*|ia64*)
--	# +Z the default
--	;;
--      *)
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--      ;;
--
--    irix5* | irix6* | nonstopux*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # PIC (with -KPIC) is the default.
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
--
--    linux* | k*bsd*-gnu | kopensolaris*-gnu)
--      case $cc_basename in
--      # old Intel for x86_64 which still supported -KPIC.
--      ecc*)
--	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
--        ;;
--      # icc used to be incompatible with GCC.
--      # ICC 10 doesn't accept -KPIC any more.
--      icc* | ifort*)
--	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
--        ;;
--      # Lahey Fortran 8.1.
--      lf95*)
--	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
--	;;
--      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
--        # Portland Group compilers (*not* the Pentium gcc compiler,
--	# which looks to be a dead project)
--	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--        ;;
--      ccc*)
--        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--        # All Alpha code is PIC.
--        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--        ;;
--      xl* | bgxl* | bgf* | mpixl*)
--	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
--	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
--	;;
--      *)
--	case `$CC -V 2>&1 | sed 5q` in
--	*Sun\ F* | *Sun*Fortran*)
--	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
--	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
--	  ;;
--	*Sun\ C*)
--	  # Sun C 5.9
--	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	  ;;
--	esac
--	;;
--      esac
--      ;;
--
--    newsos6)
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    *nto* | *qnx*)
--      # QNX uses GNU C++, but need to define -shared option too, otherwise
--      # it will coredump.
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
--      ;;
--
--    osf3* | osf4* | osf5*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # All OSF/1 code is PIC.
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
--
--    rdos*)
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
--
--    solaris*)
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      case $cc_basename in
--      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
--	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
--      *)
--	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
--      esac
--      ;;
--
--    sunos4*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    sysv4 | sysv4.2uw2* | sysv4.3*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--
--    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    unicos*)
--      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      ;;
--
--    uts4*)
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    *)
--      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      ;;
--    esac
--  fi
--])
--case $host_os in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
--    ;;
--  *)
--    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
--    ;;
--esac
--AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
--_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
--	[How to pass a linker flag through the compiler])
--
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
--  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
--    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
--    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
--    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
--     "" | " "*) ;;
--     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
--     esac],
--    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
--     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
--fi
--_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
--	[Additional compiler flags for building library objects])
--
--#
--# Check to make sure the static flag actually works.
--#
--wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
--_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
--  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
--  $lt_tmp_static_flag,
--  [],
--  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
--_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
--	[Compiler flag to prevent dynamic linking])
--])# _LT_COMPILER_PIC
--
--
--# _LT_LINKER_SHLIBS([TAGNAME])
--# ----------------------------
--# See if the linker supports building shared libraries.
--m4_defun([_LT_LINKER_SHLIBS],
--[AC_REQUIRE([LT_PATH_LD])dnl
--AC_REQUIRE([LT_PATH_NM])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_EGREP])dnl
--m4_require([_LT_DECL_SED])dnl
--m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
--m4_require([_LT_TAG_COMPILER])dnl
--AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--m4_if([$1], [CXX], [
--  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  case $host_os in
--  aix[[4-9]]*)
--    # If we're using GNU nm, then we don't want the "-C" option.
--    # -C means demangle to AIX nm, but means don't demangle with GNU nm
--    # Also, AIX nm treats weak defined symbols like other global defined
--    # symbols, whereas GNU nm marks them as "W".
--    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
--    else
--      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
--    fi
--    ;;
--  pw32*)
--    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
--  ;;
--  cygwin* | mingw* | cegcc*)
--    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  *)
--    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  esac
--  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
--], [
--  runpath_var=
--  _LT_TAGVAR(allow_undefined_flag, $1)=
--  _LT_TAGVAR(always_export_symbols, $1)=no
--  _LT_TAGVAR(archive_cmds, $1)=
--  _LT_TAGVAR(archive_expsym_cmds, $1)=
--  _LT_TAGVAR(compiler_needs_object, $1)=no
--  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
--  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  _LT_TAGVAR(hardcode_automatic, $1)=no
--  _LT_TAGVAR(hardcode_direct, $1)=no
--  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
--  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--  _LT_TAGVAR(hardcode_libdir_separator, $1)=
--  _LT_TAGVAR(hardcode_minus_L, $1)=no
--  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--  _LT_TAGVAR(inherit_rpath, $1)=no
--  _LT_TAGVAR(link_all_deplibs, $1)=unknown
--  _LT_TAGVAR(module_cmds, $1)=
--  _LT_TAGVAR(module_expsym_cmds, $1)=
--  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
--  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
--  _LT_TAGVAR(thread_safe_flag_spec, $1)=
--  _LT_TAGVAR(whole_archive_flag_spec, $1)=
--  # include_expsyms should be a list of space-separated symbols to be *always*
--  # included in the symbol list
--  _LT_TAGVAR(include_expsyms, $1)=
--  # exclude_expsyms can be an extended regexp of symbols to exclude
--  # it will be wrapped by ` (' and `)$', so one must not match beginning or
--  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
--  # as well as any symbol that contains `d'.
--  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
--  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
--  # platforms (ab)use it in PIC code, but their linkers get confused if
--  # the symbol is explicitly referenced.  Since portable code cannot
--  # rely on this symbol name, it's probably fine to never include it in
--  # preloaded symbol tables.
--  # Exclude shared library initialization/finalization symbols.
--dnl Note also adjust exclude_expsyms for C++ above.
--  extract_expsyms_cmds=
--
--  case $host_os in
--  cygwin* | mingw* | pw32* | cegcc*)
--    # FIXME: the MSVC++ port hasn't been tested in a loooong time
--    # When not using gcc, we currently assume that we are using
--    # Microsoft Visual C++.
--    if test "$GCC" != yes; then
--      with_gnu_ld=no
--    fi
--    ;;
--  interix*)
--    # we just hope/assume this is gcc and not c89 (= MSVC++)
--    with_gnu_ld=yes
--    ;;
--  openbsd*)
--    with_gnu_ld=no
--    ;;
--  esac
--
--  _LT_TAGVAR(ld_shlibs, $1)=yes
--
--  # On some targets, GNU ld is compatible enough with the native linker
--  # that we're better off using the native interface for both.
--  lt_use_gnu_ld_interface=no
--  if test "$with_gnu_ld" = yes; then
--    case $host_os in
--      aix*)
--	# The AIX port of GNU ld has always aspired to compatibility
--	# with the native linker.  However, as the warning in the GNU ld
--	# block says, versions before 2.19.5* couldn't really create working
--	# shared libraries, regardless of the interface used.
--	case `$LD -v 2>&1` in
--	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
--	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
--	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
--	  *)
--	    lt_use_gnu_ld_interface=yes
--	    ;;
--	esac
--	;;
--      *)
--	lt_use_gnu_ld_interface=yes
--	;;
--    esac
--  fi
--
--  if test "$lt_use_gnu_ld_interface" = yes; then
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    wlarc='${wl}'
--
--    # Set some defaults for GNU ld with shared library support. These
--    # are reset later if shared libraries are not supported. Putting them
--    # here allows them to be overridden if necessary.
--    runpath_var=LD_RUN_PATH
--    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
--      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    else
--      _LT_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--    supports_anon_versioning=no
--    case `$LD -v 2>&1` in
--      *GNU\ gold*) supports_anon_versioning=yes ;;
--      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--      *\ 2.11.*) ;; # other 2.11 versions
--      *) supports_anon_versioning=yes ;;
--    esac
--
--    # See if GNU ld supports shared libraries.
--    case $host_os in
--    aix[[3-9]]*)
--      # On AIX/PPC, the GNU linker is very broken
--      if test "$host_cpu" != ia64; then
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	cat <<_LT_EOF 1>&2
--
--*** Warning: the GNU linker, at least up to release 2.19, is reported
--*** to be unable to reliably create shared libraries on AIX.
--*** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to install binutils
--*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
--*** You will then need to restart the configuration process.
--
--_LT_EOF
--      fi
--      ;;
--
--    amigaos*)
--      case $host_cpu in
--      powerpc)
--            # see comment about AmigaOS4 .so support
--            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--            _LT_TAGVAR(archive_expsym_cmds, $1)=''
--        ;;
--      m68k)
--            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--            _LT_TAGVAR(hardcode_minus_L, $1)=yes
--        ;;
--      esac
--      ;;
--
--    beos*)
--      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--	# support --undefined.  This deserves some investigation.  FIXME
--	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    cygwin* | mingw* | pw32* | cegcc*)
--      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--      # as there is no search path for DLLs.
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(always_export_symbols, $1)=no
--      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
--
--      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--	# If the export-symbols file already is a .def file (1st line
--	# is EXPORTS), use it as is; otherwise, prepend...
--	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	  cp $export_symbols $output_objdir/$soname.def;
--	else
--	  echo EXPORTS > $output_objdir/$soname.def;
--	  cat $export_symbols >> $output_objdir/$soname.def;
--	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    haiku*)
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
--
--    interix[[3-9]]*)
--      _LT_TAGVAR(hardcode_direct, $1)=no
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--      # Instead, shared libraries are loaded at an image base (0x10000000 by
--      # default) and relocated if they conflict, which is a slow very memory
--      # consuming and fragmenting process.  To avoid this, we pick a random,
--      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      ;;
--
--    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
--      tmp_diet=no
--      if test "$host_os" = linux-dietlibc; then
--	case $cc_basename in
--	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
--	esac
--      fi
--      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
--	 && test "$tmp_diet" = no
--      then
--	tmp_addflag=
--	tmp_sharedflag='-shared'
--	case $cc_basename,$host_cpu in
--        pgcc*)				# Portland Group C compiler
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag'
--	  ;;
--	pgf77* | pgf90* | pgf95* | pgfortran*)
--					# Portland Group f77 and f90 compilers
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag -Mnomain' ;;
--	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
--	  tmp_addflag=' -i_dynamic' ;;
--	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
--	  tmp_addflag=' -i_dynamic -nofor_main' ;;
--	ifc* | ifort*)			# Intel Fortran compiler
--	  tmp_addflag=' -nofor_main' ;;
--	lf95*)				# Lahey Fortran 8.1
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
--	  tmp_sharedflag='--shared' ;;
--	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
--	  tmp_sharedflag='-qmkshrobj'
--	  tmp_addflag= ;;
--	nvcc*)	# Cuda Compiler Driver 2.2
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--	  _LT_TAGVAR(compiler_needs_object, $1)=yes
--	  ;;
--	esac
--	case `$CC -V 2>&1 | sed 5q` in
--	*Sun\ C*)			# Sun C 5.9
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--	  _LT_TAGVAR(compiler_needs_object, $1)=yes
--	  tmp_sharedflag='-G' ;;
--	*Sun\ F*)			# Sun Fortran 8.3
--	  tmp_sharedflag='-G' ;;
--	esac
--	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--
--        if test "x$supports_anon_versioning" = xyes; then
--          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
--	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--	    echo "local: *; };" >> $output_objdir/$libname.ver~
--	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--        fi
--
--	case $cc_basename in
--	xlf* | bgf* | bgxlf* | mpixlf*)
--	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
--	  if test "x$supports_anon_versioning" = xyes; then
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
--	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--	      echo "local: *; };" >> $output_objdir/$libname.ver~
--	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
--	  fi
--	  ;;
--	esac
--      else
--        _LT_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    netbsd*)
--      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      fi
--      ;;
--
--    solaris*)
--      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	cat <<_LT_EOF 1>&2
--
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
--
--_LT_EOF
--      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
--      case `$LD -v 2>&1` in
--        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	cat <<_LT_EOF 1>&2
--
--*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
--*** reliably create shared libraries on SCO systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
--
--_LT_EOF
--	;;
--	*)
--	  # For security reasons, it is highly recommended that you always
--	  # use absolute paths for naming shared libraries, and exclude the
--	  # DT_RUNPATH tag from executables and libraries.  But doing so
--	  # requires that you compile everything twice, which is a pain.
--	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--	  else
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	  fi
--	;;
--      esac
--      ;;
--
--    sunos4*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    *)
--      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--    esac
--
--    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
--      runpath_var=
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
--      _LT_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--  else
--    # PORTME fill in a description of your system's linker (not GNU ld)
--    case $host_os in
--    aix3*)
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(always_export_symbols, $1)=yes
--      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
--      # Note: this linker hardcodes the directories in LIBPATH if there
--      # are no directories specified by -L.
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
--	# Neither direct hardcoding nor static linking is supported with a
--	# broken collect2.
--	_LT_TAGVAR(hardcode_direct, $1)=unsupported
--      fi
--      ;;
--
--    aix[[4-9]]*)
--      if test "$host_cpu" = ia64; then
--	# On IA64, the linker does run time linking by default, so we don't
--	# have to do anything special.
--	aix_use_runtimelinking=no
--	exp_sym_flag='-Bexport'
--	no_entry_flag=""
--      else
--	# If we're using GNU nm, then we don't want the "-C" option.
--	# -C means demangle to AIX nm, but means don't demangle with GNU nm
--	# Also, AIX nm treats weak defined symbols like other global
--	# defined symbols, whereas GNU nm marks them as "W".
--	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
--	else
--	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
--	fi
--	aix_use_runtimelinking=no
--
--	# Test if we are trying to use run time linking or normal
--	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
--	# need to do runtime linking.
--	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
--	  for ld_flag in $LDFLAGS; do
--	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
--	    aix_use_runtimelinking=yes
--	    break
--	  fi
--	  done
--	  ;;
--	esac
--
--	exp_sym_flag='-bexport'
--	no_entry_flag='-bnoentry'
--      fi
--
--      # When large executables or shared objects are built, AIX ld can
--      # have problems creating the table of contents.  If linking a library
--      # or program results in "error TOC overflow" add -mminimal-toc to
--      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--
--      _LT_TAGVAR(archive_cmds, $1)=''
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
--
--      if test "$GCC" = yes; then
--	case $host_os in aix4.[[012]]|aix4.[[012]].*)
--	# We only want to do this on AIX 4.2 and lower, the check
--	# below for broken collect2 doesn't work under 4.3+
--	  collect2name=`${CC} -print-prog-name=collect2`
--	  if test -f "$collect2name" &&
--	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
--	  then
--	  # We have reworked collect2
--	  :
--	  else
--	  # We have old collect2
--	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
--	  # It fails to find uninstalled libraries when the uninstalled
--	  # path is not listed in the libpath.  Setting hardcode_minus_L
--	  # to unsupported forces relinking
--	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
--	  fi
--	  ;;
--	esac
--	shared_flag='-shared'
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag="$shared_flag "'${wl}-G'
--	fi
--      else
--	# not using gcc
--	if test "$host_cpu" = ia64; then
--	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--	# chokes on -Wl,-G. The following line is correct:
--	  shared_flag='-G'
--	else
--	  if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag='${wl}-G'
--	  else
--	    shared_flag='${wl}-bM:SRE'
--	  fi
--	fi
--      fi
--
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
--      # It seems that -bexpall does not export symbols beginning with
--      # underscore (_), so it is better to generate a list of symbols to export.
--      _LT_TAGVAR(always_export_symbols, $1)=yes
--      if test "$aix_use_runtimelinking" = yes; then
--	# Warning - without using the other runtime loading flags (-brtl),
--	# -berok will link without error, but may produce a broken library.
--	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
--        # Determine the default libpath from the value encoded in an
--        # empty executable.
--        _LT_SYS_MODULE_PATH_AIX
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--      else
--	if test "$host_cpu" = ia64; then
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
--	else
--	 # Determine the default libpath from the value encoded in an
--	 # empty executable.
--	 _LT_SYS_MODULE_PATH_AIX
--	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	  # Warning - without using the other run time loading flags,
--	  # -berok will link without error, but may produce a broken library.
--	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	  if test "$with_gnu_ld" = yes; then
--	    # We only use this code for GNU lds that support --whole-archive.
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	  else
--	    # Exported symbols can be pulled into shared objects from archives
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	  fi
--	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds its shared libraries.
--	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--	fi
--      fi
--      ;;
--
--    amigaos*)
--      case $host_cpu in
--      powerpc)
--            # see comment about AmigaOS4 .so support
--            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--            _LT_TAGVAR(archive_expsym_cmds, $1)=''
--        ;;
--      m68k)
--            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--            _LT_TAGVAR(hardcode_minus_L, $1)=yes
--        ;;
--      esac
--      ;;
--
--    bsdi[[45]]*)
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
--      ;;
--
--    cygwin* | mingw* | pw32* | cegcc*)
--      # When not using gcc, we currently assume that we are using
--      # Microsoft Visual C++.
--      # hardcode_libdir_flag_spec is actually meaningless, as there is
--      # no search path for DLLs.
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      # Tell ltmain to make .lib files, not .a files.
--      libext=lib
--      # Tell ltmain to make .dll files, not .so files.
--      shrext_cmds=".dll"
--      # FIXME: Setting linknames here is a bad hack.
--      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
--      # FIXME: Should let the user specify the lib program.
--      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
--      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
--      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      ;;
--
--    darwin* | rhapsody*)
--      _LT_DARWIN_LINKER_FEATURES($1)
--      ;;
--
--    dgux*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    freebsd1*)
--      _LT_TAGVAR(ld_shlibs, $1)=no
--      ;;
--
--    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
--    # support.  Future versions do this automatically, but an explicit c++rt0.o
--    # does not break anything, and helps significantly (at the cost of a little
--    # extra space).
--    freebsd2.2*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | dragonfly*)
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    hpux9*)
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--
--      # hardcode_minus_L: Not really in the search PATH,
--      # but as the default location of the library.
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      ;;
--
--    hpux10*)
--      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      if test "$with_gnu_ld" = no; then
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
--	_LT_TAGVAR(hardcode_direct, $1)=yes
--	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	# hardcode_minus_L: Not really in the search PATH,
--	# but as the default location of the library.
--	_LT_TAGVAR(hardcode_minus_L, $1)=yes
--      fi
--      ;;
--
--    hpux11*)
--      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
--	case $host_cpu in
--	hppa*64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	esac
--      else
--	case $host_cpu in
--	hppa*64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	m4_if($1, [], [
--	  # Older versions of the 11.00 compiler do not understand -b yet
--	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
--	  _LT_LINKER_OPTION([if $CC understands -b],
--	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
--	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
--	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
--	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
--	  ;;
--	esac
--      fi
--      if test "$with_gnu_ld" = no; then
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	case $host_cpu in
--	hppa*64*|ia64*)
--	  _LT_TAGVAR(hardcode_direct, $1)=no
--	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	  ;;
--	*)
--	  _LT_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
--	  ;;
--	esac
--      fi
--      ;;
--
--    irix5* | irix6* | nonstopux*)
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	# Try to use the -exported_symbol ld option, if it does not
--	# work, assume that -exports_file does not work either and
--	# implicitly export all symbols.
--        save_LDFLAGS="$LDFLAGS"
--        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
--        AC_LINK_IFELSE(int foo(void) {},
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
--        )
--        LDFLAGS="$save_LDFLAGS"
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
--      fi
--      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_TAGVAR(inherit_rpath, $1)=yes
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
--
--    netbsd*)
--      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    newsos6)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    *nto* | *qnx*)
--      ;;
--
--    openbsd*)
--      if test -f /usr/libexec/ld.so; then
--	_LT_TAGVAR(hardcode_direct, $1)=yes
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	else
--	  case $host_os in
--	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
--	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	     ;;
--	   *)
--	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	     ;;
--	  esac
--	fi
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    os2*)
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--      ;;
--
--    osf3*)
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--      fi
--      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
--
--    osf4* | osf5*)	# as osf3* with the addition of -msym flag
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      else
--	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
--	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
--
--	# Both c and cxx compiler support -rpath directly
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--      fi
--      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
--
--    solaris*)
--      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
--      else
--	case `$CC -V 2>&1` in
--	*"Compilers 5.0"*)
--	  wlarc=''
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
--	  ;;
--	*)
--	  wlarc='${wl}'
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
--	  ;;
--	esac
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      case $host_os in
--      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *)
--	# The compiler driver will combine and reorder linker options,
--	# but understands `-z linker_flag'.  GCC discards it without `$wl',
--	# but is careful enough not to reorder.
--	# Supported since Solaris 2.6 (maybe 2.5.1?)
--	if test "$GCC" = yes; then
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
--	else
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
--	fi
--	;;
--      esac
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
--
--    sunos4*)
--      if test "x$host_vendor" = xsequent; then
--	# Use $CC to link under sequent, because it throws in some extra .o
--	# files that make .init and .fini sections work.
--	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    sysv4)
--      case $host_vendor in
--	sni)
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
--	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
--	  _LT_TAGVAR(hardcode_direct, $1)=no
--        ;;
--	motorola)
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
--	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    sysv4.3*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	_LT_TAGVAR(ld_shlibs, $1)=yes
--      fi
--      ;;
--
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
--      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
--
--    sysv5* | sco3.2v5* | sco5v6*)
--      # Note: We can NOT use -z defs as we might desire, because we do not
--      # link with -lc, and that would cause any symbols used from libc to
--      # always be unresolved, which means just about no library would
--      # ever link correctly.  If we're not using GNU ld we use -z text
--      # though, which does catch some bad symbols but isn't as heavy-handed
--      # as -z defs.
--      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
--
--    uts4*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    *)
--      _LT_TAGVAR(ld_shlibs, $1)=no
--      ;;
--    esac
--
--    if test x$host_vendor = xsni; then
--      case $host in
--      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
--	;;
--      esac
--    fi
--  fi
--])
--AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
--test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
--
--_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
--_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
--_LT_DECL([], [extract_expsyms_cmds], [2],
--    [The commands to extract the exported symbol list from a shared archive])
--
--#
--# Do we need to explicitly link libc?
--#
--case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
--x|xyes)
--  # Assume -lc should be added
--  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $_LT_TAGVAR(archive_cmds, $1) in
--    *'~'*)
--      # FIXME: we may have to deal with multi-command sequences.
--      ;;
--    '$CC '*)
--      # Test whether the compiler implicitly links with -lc since on some
--      # systems, -lgcc has to come before -lc. If gcc already passes -lc
--      # to ld, don't add -lc before -lgcc.
--      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
--	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
--	[$RM conftest*
--	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
--	  soname=conftest
--	  lib=conftest
--	  libobjs=conftest.$ac_objext
--	  deplibs=
--	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
--	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
--	  compiler_flags=-v
--	  linker_flags=-v
--	  verstring=
--	  output_objdir=.
--	  libname=conftest
--	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
--	  _LT_TAGVAR(allow_undefined_flag, $1)=
--	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
--	  then
--	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--	  else
--	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  fi
--	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
--	else
--	  cat conftest.err 1>&5
--	fi
--	$RM conftest*
--	])
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
--      ;;
--    esac
--  fi
--  ;;
--esac
--
--_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
--    [Whether or not to add -lc for building shared libraries])
--_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
--    [enable_shared_with_static_runtimes], [0],
--    [Whether or not to disallow shared libs when runtime libs are static])
--_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
--    [Compiler flag to allow reflexive dlopens])
--_LT_TAGDECL([], [whole_archive_flag_spec], [1],
--    [Compiler flag to generate shared objects directly from archives])
--_LT_TAGDECL([], [compiler_needs_object], [1],
--    [Whether the compiler copes with passing no objects directly])
--_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
--    [Create an old-style archive from a shared archive])
--_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
--    [Create a temporary old-style archive to link instead of a shared archive])
--_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
--_LT_TAGDECL([], [archive_expsym_cmds], [2])
--_LT_TAGDECL([], [module_cmds], [2],
--    [Commands used to build a loadable module if different from building
--    a shared archive.])
--_LT_TAGDECL([], [module_expsym_cmds], [2])
--_LT_TAGDECL([], [with_gnu_ld], [1],
--    [Whether we are building with GNU ld or not])
--_LT_TAGDECL([], [allow_undefined_flag], [1],
--    [Flag that allows shared libraries with undefined symbols to be built])
--_LT_TAGDECL([], [no_undefined_flag], [1],
--    [Flag that enforces no undefined symbols])
--_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
--    [Flag to hardcode $libdir into a binary during linking.
--    This must work even if $libdir does not exist])
--_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
--    [[If ld is used when linking, flag to hardcode $libdir into a binary
--    during linking.  This must work even if $libdir does not exist]])
--_LT_TAGDECL([], [hardcode_libdir_separator], [1],
--    [Whether we need a single "-rpath" flag with a separated argument])
--_LT_TAGDECL([], [hardcode_direct], [0],
--    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--    DIR into the resulting binary])
--_LT_TAGDECL([], [hardcode_direct_absolute], [0],
--    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--    DIR into the resulting binary and the resulting library dependency is
--    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
--    library is relocated])
--_LT_TAGDECL([], [hardcode_minus_L], [0],
--    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--    into the resulting binary])
--_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
--    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--    into the resulting binary])
--_LT_TAGDECL([], [hardcode_automatic], [0],
--    [Set to "yes" if building a shared library automatically hardcodes DIR
--    into the library and all subsequent libraries and executables linked
--    against it])
--_LT_TAGDECL([], [inherit_rpath], [0],
--    [Set to yes if linker adds runtime paths of dependent libraries
--    to runtime path list])
--_LT_TAGDECL([], [link_all_deplibs], [0],
--    [Whether libtool must link a program against all its dependency libraries])
--_LT_TAGDECL([], [fix_srcfile_path], [1],
--    [Fix the shell variable $srcfile for the compiler])
--_LT_TAGDECL([], [always_export_symbols], [0],
--    [Set to "yes" if exported symbols are required])
--_LT_TAGDECL([], [export_symbols_cmds], [2],
--    [The commands to list exported symbols])
--_LT_TAGDECL([], [exclude_expsyms], [1],
--    [Symbols that should not be listed in the preloaded symbols])
--_LT_TAGDECL([], [include_expsyms], [1],
--    [Symbols that must always be exported])
--_LT_TAGDECL([], [prelink_cmds], [2],
--    [Commands necessary for linking programs (against libraries) with templates])
--_LT_TAGDECL([], [file_list_spec], [1],
--    [Specify filename containing input files])
--dnl FIXME: Not yet implemented
--dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
--dnl    [Compiler flag to generate thread safe objects])
--])# _LT_LINKER_SHLIBS
--
--
--# _LT_LANG_C_CONFIG([TAG])
--# ------------------------
--# Ensure that the configuration variables for a C compiler are suitably
--# defined.  These variables are subsequently used by _LT_CONFIG to write
--# the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_C_CONFIG],
--[m4_require([_LT_DECL_EGREP])dnl
--lt_save_CC="$CC"
--AC_LANG_PUSH(C)
--
--# Source file extension for C test sources.
--ac_ext=c
--
--# Object file extension for compiled C test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}'
--
--_LT_TAG_COMPILER
--# Save the default compiler, since it gets overwritten when the other
--# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
--compiler_DEFAULT=$CC
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--if test -n "$compiler"; then
--  _LT_COMPILER_NO_RTTI($1)
--  _LT_COMPILER_PIC($1)
--  _LT_COMPILER_C_O($1)
--  _LT_COMPILER_FILE_LOCKS($1)
--  _LT_LINKER_SHLIBS($1)
--  _LT_SYS_DYNAMIC_LINKER($1)
--  _LT_LINKER_HARDCODE_LIBPATH($1)
--  LT_SYS_DLOPEN_SELF
--  _LT_CMD_STRIPLIB
--
--  # Report which library types will actually be built
--  AC_MSG_CHECKING([if libtool supports shared libraries])
--  AC_MSG_RESULT([$can_build_shared])
--
--  AC_MSG_CHECKING([whether to build shared libraries])
--  test "$can_build_shared" = "no" && enable_shared=no
--
--  # On AIX, shared libraries and static libraries use the same namespace, and
--  # are all built from PIC.
--  case $host_os in
--  aix3*)
--    test "$enable_shared" = yes && enable_static=no
--    if test -n "$RANLIB"; then
--      archive_cmds="$archive_cmds~\$RANLIB \$lib"
--      postinstall_cmds='$RANLIB $lib'
--    fi
--    ;;
--
--  aix[[4-9]]*)
--    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--      test "$enable_shared" = yes && enable_static=no
--    fi
--    ;;
--  esac
--  AC_MSG_RESULT([$enable_shared])
--
--  AC_MSG_CHECKING([whether to build static libraries])
--  # Make sure either enable_shared or enable_static is yes.
--  test "$enable_shared" = yes || enable_static=yes
--  AC_MSG_RESULT([$enable_static])
--
--  _LT_CONFIG($1)
--fi
--AC_LANG_POP
--CC="$lt_save_CC"
--])# _LT_LANG_C_CONFIG
--
--
--# _LT_LANG_CXX_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for a C++ compiler are suitably
--# defined.  These variables are subsequently used by _LT_CONFIG to write
--# the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_CXX_CONFIG],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_EGREP])dnl
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--    (test "X$CXX" != "Xg++"))) ; then
--  AC_PROG_CXXCPP
--else
--  _lt_caught_CXX_error=yes
--fi
--
--AC_LANG_PUSH(C++)
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_TAGVAR(allow_undefined_flag, $1)=
--_LT_TAGVAR(always_export_symbols, $1)=no
--_LT_TAGVAR(archive_expsym_cmds, $1)=
--_LT_TAGVAR(compiler_needs_object, $1)=no
--_LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
--_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_TAGVAR(hardcode_minus_L, $1)=no
--_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--_LT_TAGVAR(hardcode_automatic, $1)=no
--_LT_TAGVAR(inherit_rpath, $1)=no
--_LT_TAGVAR(module_cmds, $1)=
--_LT_TAGVAR(module_expsym_cmds, $1)=
--_LT_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
--_LT_TAGVAR(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Source file extension for C++ test sources.
--ac_ext=cpp
--
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
--
--# No sense in running all these tests if we already determined that
--# the CXX compiler isn't working.  Some variables (like enable_shared)
--# are currently assumed to apply to all compilers on this platform,
--# and will be corrupted by setting them based on a non-working compiler.
--if test "$_lt_caught_CXX_error" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="int some_variable = 0;"
--
--  # Code to be used in simple link tests
--  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
--
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
--
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
--
--  # Allow CC to be a program name with arguments.
--  lt_save_CC=$CC
--  lt_save_LD=$LD
--  lt_save_GCC=$GCC
--  GCC=$GXX
--  lt_save_with_gnu_ld=$with_gnu_ld
--  lt_save_path_LD=$lt_cv_path_LD
--  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
--    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
--  else
--    $as_unset lt_cv_prog_gnu_ld
--  fi
--  if test -n "${lt_cv_path_LDCXX+set}"; then
--    lt_cv_path_LD=$lt_cv_path_LDCXX
--  else
--    $as_unset lt_cv_path_LD
--  fi
--  test -z "${LDCXX+set}" || LD=$LDCXX
--  CC=${CXX-"c++"}
--  compiler=$CC
--  _LT_TAGVAR(compiler, $1)=$CC
--  _LT_CC_BASENAME([$compiler])
--
--  if test -n "$compiler"; then
--    # We don't want -fno-exception when compiling C++ code, so set the
--    # no_builtin_flag separately
--    if test "$GXX" = yes; then
--      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--    else
--      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--    fi
--
--    if test "$GXX" = yes; then
--      # Set up default GNU C++ configuration
--
--      LT_PATH_LD
--
--      # Check if GNU C++ uses GNU ld as the underlying linker, since the
--      # archiving commands below assume that GNU ld is being used.
--      if test "$with_gnu_ld" = yes; then
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--
--        # If archive_cmds runs LD, not CC, wlarc should be empty
--        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
--        #     investigate it a little bit more. (MM)
--        wlarc='${wl}'
--
--        # ancient GNU ld didn't support --whole-archive et. al.
--        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
--	  $GREP 'no-whole-archive' > /dev/null; then
--          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--        else
--          _LT_TAGVAR(whole_archive_flag_spec, $1)=
--        fi
--      else
--        with_gnu_ld=no
--        wlarc=
--
--        # A generic and very simple default shared library creation
--        # command for GNU C++ for the case where it uses the native
--        # linker, instead of GNU ld.  If possible, this setting should
--        # overridden to take advantage of the native linker features on
--        # the platform it is being used on.
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--      fi
--
--      # Commands to make compiler produce verbose output that lists
--      # what "hidden" libraries, object files and flags are used when
--      # linking a shared library.
--      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--
--    else
--      GXX=no
--      with_gnu_ld=no
--      wlarc=
--    fi
--
--    # PORTME: fill in a description of your system's C++ link characteristics
--    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--    _LT_TAGVAR(ld_shlibs, $1)=yes
--    case $host_os in
--      aix3*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
--      aix[[4-9]]*)
--        if test "$host_cpu" = ia64; then
--          # On IA64, the linker does run time linking by default, so we don't
--          # have to do anything special.
--          aix_use_runtimelinking=no
--          exp_sym_flag='-Bexport'
--          no_entry_flag=""
--        else
--          aix_use_runtimelinking=no
--
--          # Test if we are trying to use run time linking or normal
--          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--          # need to do runtime linking.
--          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
--	    for ld_flag in $LDFLAGS; do
--	      case $ld_flag in
--	      *-brtl*)
--	        aix_use_runtimelinking=yes
--	        break
--	        ;;
--	      esac
--	    done
--	    ;;
--          esac
--
--          exp_sym_flag='-bexport'
--          no_entry_flag='-bnoentry'
--        fi
--
--        # When large executables or shared objects are built, AIX ld can
--        # have problems creating the table of contents.  If linking a library
--        # or program results in "error TOC overflow" add -mminimal-toc to
--        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--
--        _LT_TAGVAR(archive_cmds, $1)=''
--        _LT_TAGVAR(hardcode_direct, $1)=yes
--        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
--        _LT_TAGVAR(link_all_deplibs, $1)=yes
--        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
--
--        if test "$GXX" = yes; then
--          case $host_os in aix4.[[012]]|aix4.[[012]].*)
--          # We only want to do this on AIX 4.2 and lower, the check
--          # below for broken collect2 doesn't work under 4.3+
--	  collect2name=`${CC} -print-prog-name=collect2`
--	  if test -f "$collect2name" &&
--	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
--	  then
--	    # We have reworked collect2
--	    :
--	  else
--	    # We have old collect2
--	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
--	    # It fails to find uninstalled libraries when the uninstalled
--	    # path is not listed in the libpath.  Setting hardcode_minus_L
--	    # to unsupported forces relinking
--	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
--	  fi
--          esac
--          shared_flag='-shared'
--	  if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag="$shared_flag "'${wl}-G'
--	  fi
--        else
--          # not using gcc
--          if test "$host_cpu" = ia64; then
--	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--	  # chokes on -Wl,-G. The following line is correct:
--	  shared_flag='-G'
--          else
--	    if test "$aix_use_runtimelinking" = yes; then
--	      shared_flag='${wl}-G'
--	    else
--	      shared_flag='${wl}-bM:SRE'
--	    fi
--          fi
--        fi
--
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
--        # It seems that -bexpall does not export symbols beginning with
--        # underscore (_), so it is better to generate a list of symbols to
--	# export.
--        _LT_TAGVAR(always_export_symbols, $1)=yes
--        if test "$aix_use_runtimelinking" = yes; then
--          # Warning - without using the other runtime loading flags (-brtl),
--          # -berok will link without error, but may produce a broken library.
--          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
--          # Determine the default libpath from the value encoded in an empty
--          # executable.
--          _LT_SYS_MODULE_PATH_AIX
--          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--        else
--          if test "$host_cpu" = ia64; then
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
--          else
--	    # Determine the default libpath from the value encoded in an
--	    # empty executable.
--	    _LT_SYS_MODULE_PATH_AIX
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	    # Warning - without using the other run time loading flags,
--	    # -berok will link without error, but may produce a broken library.
--	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	    if test "$with_gnu_ld" = yes; then
--	      # We only use this code for GNU lds that support --whole-archive.
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	    else
--	      # Exported symbols can be pulled into shared objects from archives
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	    fi
--	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--	    # This is similar to how AIX traditionally builds its shared
--	    # libraries.
--	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--          fi
--        fi
--        ;;
--
--      beos*)
--	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--	  # support --undefined.  This deserves some investigation.  FIXME
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	else
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--
--      chorus*)
--        case $cc_basename in
--          *)
--	  # FIXME: insert proper C++ library support
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	  ;;
--        esac
--        ;;
--
--      cygwin* | mingw* | pw32* | cegcc*)
--        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--        # as there is no search path for DLLs.
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
--        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--        _LT_TAGVAR(always_export_symbols, $1)=no
--        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--
--        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--          # If the export-symbols file already is a .def file (1st line
--          # is EXPORTS), use it as is; otherwise, prepend...
--          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	    cp $export_symbols $output_objdir/$soname.def;
--          else
--	    echo EXPORTS > $output_objdir/$soname.def;
--	    cat $export_symbols >> $output_objdir/$soname.def;
--          fi~
--          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--        else
--          _LT_TAGVAR(ld_shlibs, $1)=no
--        fi
--        ;;
--      darwin* | rhapsody*)
--        _LT_DARWIN_LINKER_FEATURES($1)
--	;;
--
--      dgux*)
--        case $cc_basename in
--          ec++*)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          ghcx*)
--	    # Green Hills C++ Compiler
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          *)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--        esac
--        ;;
--
--      freebsd[[12]]*)
--        # C++ shared libraries reported to be fairly broken before
--	# switch to ELF
--        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
--
--      freebsd-elf*)
--        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--        ;;
--
--      freebsd* | dragonfly*)
--        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
--        # conventions
--        _LT_TAGVAR(ld_shlibs, $1)=yes
--        ;;
--
--      gnu*)
--        ;;
--
--      haiku*)
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        _LT_TAGVAR(link_all_deplibs, $1)=yes
--        ;;
--
--      hpux9*)
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--        _LT_TAGVAR(hardcode_direct, $1)=yes
--        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--				             # but as the default
--				             # location of the library.
--
--        case $cc_basename in
--          CC*)
--            # FIXME: insert proper C++ library support
--            _LT_TAGVAR(ld_shlibs, $1)=no
--            ;;
--          aCC*)
--            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--            # Commands to make compiler produce verbose output that lists
--            # what "hidden" libraries, object files and flags are used when
--            # linking a shared library.
--            #
--            # There doesn't appear to be a way to prevent this compiler from
--            # explicitly linking system object files so we need to strip them
--            # from the output so that they don't get included in the library
--            # dependencies.
--            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
--            ;;
--          *)
--            if test "$GXX" = yes; then
--              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--            else
--              # FIXME: insert proper C++ library support
--              _LT_TAGVAR(ld_shlibs, $1)=no
--            fi
--            ;;
--        esac
--        ;;
--
--      hpux10*|hpux11*)
--        if test $with_gnu_ld = no; then
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--
--          case $host_cpu in
--            hppa*64*|ia64*)
--              ;;
--            *)
--	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--              ;;
--          esac
--        fi
--        case $host_cpu in
--          hppa*64*|ia64*)
--            _LT_TAGVAR(hardcode_direct, $1)=no
--            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--            ;;
--          *)
--            _LT_TAGVAR(hardcode_direct, $1)=yes
--            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--					         # but as the default
--					         # location of the library.
--            ;;
--        esac
--
--        case $cc_basename in
--          CC*)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          aCC*)
--	    case $host_cpu in
--	      hppa*64*)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	        ;;
--	      ia64*)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	        ;;
--	      *)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	        ;;
--	    esac
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
--	    ;;
--          *)
--	    if test "$GXX" = yes; then
--	      if test $with_gnu_ld = no; then
--	        case $host_cpu in
--	          hppa*64*)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	          ia64*)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	          *)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	        esac
--	      fi
--	    else
--	      # FIXME: insert proper C++ library support
--	      _LT_TAGVAR(ld_shlibs, $1)=no
--	    fi
--	    ;;
--        esac
--        ;;
--
--      interix[[3-9]]*)
--	_LT_TAGVAR(hardcode_direct, $1)=no
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--	# Instead, shared libraries are loaded at an image base (0x10000000 by
--	# default) and relocated if they conflict, which is a slow very memory
--	# consuming and fragmenting process.  To avoid this, we pick a random,
--	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--	;;
--      irix5* | irix6*)
--        case $cc_basename in
--          CC*)
--	    # SGI C++
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--
--	    # Archives containing C++ object files must be created using
--	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
--	    # necessary to make sure instantiated templates are included
--	    # in the archive.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
--	    ;;
--          *)
--	    if test "$GXX" = yes; then
--	      if test "$with_gnu_ld" = no; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	      else
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
--	      fi
--	    fi
--	    _LT_TAGVAR(link_all_deplibs, $1)=yes
--	    ;;
--        esac
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--        _LT_TAGVAR(inherit_rpath, $1)=yes
--        ;;
--
--      linux* | k*bsd*-gnu | kopensolaris*-gnu)
--        case $cc_basename in
--          KCC*)
--	    # Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	    # KCC will only create a shared library if the output file
--	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
--	    # to its proper name (with version) after linking.
--	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
--
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--
--	    # Archives containing C++ object files must be created using
--	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--	    ;;
--	  icpc* | ecpc* )
--	    # Intel C++
--	    with_gnu_ld=yes
--	    # version 8.0 and above of icpc choke on multiply defined symbols
--	    # if we add $predep_objects and $postdep_objects, however 7.1 and
--	    # earlier do not add the objects themselves.
--	    case `$CC -V 2>&1` in
--	      *"Version 7."*)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--		;;
--	      *)  # Version 8.0 or newer
--	        tmp_idyn=
--	        case $host_cpu in
--		  ia64*) tmp_idyn=' -i_dynamic';;
--		esac
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--		;;
--	    esac
--	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	    ;;
--          pgCC* | pgcpp*)
--            # Portland Group C++ compiler
--	    case `$CC -V` in
--	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
--	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
--	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
--		$RANLIB $oldlib'
--	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--	      ;;
--	    *) # Version 6 and above use weak symbols
--	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--	      ;;
--	    esac
--
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--            ;;
--	  cxx*)
--	    # Compaq C++
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--
--	    runpath_var=LD_RUN_PATH
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
--	    ;;
--	  xl* | mpixl* | bgxl*)
--	    # IBM XL 8.0 on PPC, with GNU ld
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	    if test "x$supports_anon_versioning" = xyes; then
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
--		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--		echo "local: *; };" >> $output_objdir/$libname.ver~
--		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--	    fi
--	    ;;
--	  *)
--	    case `$CC -V 2>&1 | sed 5q` in
--	    *Sun\ C*)
--	      # Sun C++ 5.9
--	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
--	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
--	      _LT_TAGVAR(compiler_needs_object, $1)=yes
--
--	      # Not sure whether something based on
--	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
--	      # would be better.
--	      output_verbose_link_cmd='func_echo_all'
--
--	      # Archives containing C++ object files must be created using
--	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
--	      # necessary to make sure instantiated templates are included
--	      # in the archive.
--	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
--	      ;;
--	    esac
--	    ;;
--	esac
--	;;
--
--      lynxos*)
--        # FIXME: insert proper C++ library support
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	;;
--
--      m88k*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--	;;
--
--      mvs*)
--        case $cc_basename in
--          cxx*)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--	  *)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--	esac
--	;;
--
--      netbsd*)
--        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
--	  wlarc=
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	  _LT_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	fi
--	# Workaround some broken pre-1.5 toolchains
--	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
--	;;
--
--      *nto* | *qnx*)
--        _LT_TAGVAR(ld_shlibs, $1)=yes
--	;;
--
--      openbsd2*)
--        # C++ shared libraries are fairly broken
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	;;
--
--      openbsd*)
--	if test -f /usr/libexec/ld.so; then
--	  _LT_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--	  fi
--	  output_verbose_link_cmd=func_echo_all
--	else
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--
--      osf3* | osf4* | osf5*)
--        case $cc_basename in
--          KCC*)
--	    # Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	    # KCC will only create a shared library if the output file
--	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
--	    # to its proper name (with version) after linking.
--	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	    # Archives containing C++ object files must be created using
--	    # the KAI C++ compiler.
--	    case $host in
--	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
--	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
--	    esac
--	    ;;
--          RCC*)
--	    # Rational C++ 2.4.1
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          cxx*)
--	    case $host in
--	      osf3*)
--	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--		;;
--	      *)
--	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
--	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
--	          echo "-hidden">> $lib.exp~
--	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
--	          $RM $lib.exp'
--	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--		;;
--	    esac
--
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
--	    ;;
--	  *)
--	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	      case $host in
--	        osf3*)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--		  ;;
--	        *)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--		  ;;
--	      esac
--
--	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	      # Commands to make compiler produce verbose output that lists
--	      # what "hidden" libraries, object files and flags are used when
--	      # linking a shared library.
--	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--
--	    else
--	      # FIXME: insert proper C++ library support
--	      _LT_TAGVAR(ld_shlibs, $1)=no
--	    fi
--	    ;;
--        esac
--        ;;
--
--      psos*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
--
--      sunos4*)
--        case $cc_basename in
--          CC*)
--	    # Sun C++ 4.x
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          lcc*)
--	    # Lucid
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          *)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--        esac
--        ;;
--
--      solaris*)
--        case $cc_basename in
--          CC* | sunCC*)
--	    # Sun C++ 4.2, 5.x and Centerline C++
--            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
--	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
--
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	    case $host_os in
--	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--	      *)
--		# The compiler driver will combine and reorder linker options,
--		# but understands `-z linker_flag'.
--	        # Supported since Solaris 2.6 (maybe 2.5.1?)
--		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
--	        ;;
--	    esac
--	    _LT_TAGVAR(link_all_deplibs, $1)=yes
--
--	    output_verbose_link_cmd='func_echo_all'
--
--	    # Archives containing C++ object files must be created using
--	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
--	    # necessary to make sure instantiated templates are included
--	    # in the archive.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
--	    ;;
--          gcx*)
--	    # Green Hills C++ Compiler
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--
--	    # The C++ compiler must be used to create the archive.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
--	    ;;
--          *)
--	    # GNU C++ compiler with Solaris linker
--	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
--	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
--
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--	      else
--	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
--	        # platform.
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
--
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--	      fi
--
--	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
--	      case $host_os in
--		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--		*)
--		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
--		  ;;
--	      esac
--	    fi
--	    ;;
--        esac
--        ;;
--
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
--      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      runpath_var='LD_RUN_PATH'
--
--      case $cc_basename in
--        CC*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--      esac
--      ;;
--
--      sysv5* | sco3.2v5* | sco5v6*)
--	# Note: We can NOT use -z defs as we might desire, because we do not
--	# link with -lc, and that would cause any symbols used from libc to
--	# always be unresolved, which means just about no library would
--	# ever link correctly.  If we're not using GNU ld we use -z text
--	# though, which does catch some bad symbols but isn't as heavy-handed
--	# as -z defs.
--	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
--	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
--	_LT_TAGVAR(link_all_deplibs, $1)=yes
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--	runpath_var='LD_RUN_PATH'
--
--	case $cc_basename in
--          CC*)
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
--	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
--	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
--	      '"$_LT_TAGVAR(reload_cmds, $1)"
--	    ;;
--	  *)
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    ;;
--	esac
--      ;;
--
--      tandem*)
--        case $cc_basename in
--          NCC*)
--	    # NonStop-UX NCC 3.20
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          *)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--        esac
--        ;;
--
--      vxworks*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
--
--      *)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
--    esac
--
--    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
--    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--    _LT_TAGVAR(GCC, $1)="$GXX"
--    _LT_TAGVAR(LD, $1)="$LD"
--
--    ## CAVEAT EMPTOR:
--    ## There is no encapsulation within the following macros, do not change
--    ## the running order or otherwise move them around unless you know exactly
--    ## what you are doing...
--    _LT_SYS_HIDDEN_LIBDEPS($1)
--    _LT_COMPILER_PIC($1)
--    _LT_COMPILER_C_O($1)
--    _LT_COMPILER_FILE_LOCKS($1)
--    _LT_LINKER_SHLIBS($1)
--    _LT_SYS_DYNAMIC_LINKER($1)
--    _LT_LINKER_HARDCODE_LIBPATH($1)
--
--    _LT_CONFIG($1)
--  fi # test -n "$compiler"
--
--  CC=$lt_save_CC
--  LDCXX=$LD
--  LD=$lt_save_LD
--  GCC=$lt_save_GCC
--  with_gnu_ld=$lt_save_with_gnu_ld
--  lt_cv_path_LDCXX=$lt_cv_path_LD
--  lt_cv_path_LD=$lt_save_path_LD
--  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--fi # test "$_lt_caught_CXX_error" != yes
--
--AC_LANG_POP
--])# _LT_LANG_CXX_CONFIG
--
--
--# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
--# ---------------------------------
--# Figure out "hidden" library dependencies from verbose
--# compiler output when linking a shared library.
--# Parse the compiler output and extract the necessary
--# objects, libraries and library flags.
--m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--# Dependencies to place before and after the object being linked:
--_LT_TAGVAR(predep_objects, $1)=
--_LT_TAGVAR(postdep_objects, $1)=
--_LT_TAGVAR(predeps, $1)=
--_LT_TAGVAR(postdeps, $1)=
--_LT_TAGVAR(compiler_lib_search_path, $1)=
--
--dnl we can't use the lt_simple_compile_test_code here,
--dnl because it contains code intended for an executable,
--dnl not a library.  It's possible we should let each
--dnl tag define a new lt_????_link_test_code variable,
--dnl but it's only used here...
--m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
--int a;
--void foo (void) { a = 0; }
--_LT_EOF
--], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
--class Foo
--{
--public:
--  Foo (void) { a = 0; }
--private:
--  int a;
--};
--_LT_EOF
--], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
--      subroutine foo
--      implicit none
--      integer*4 a
--      a=0
--      return
--      end
--_LT_EOF
--], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
--      subroutine foo
--      implicit none
--      integer a
--      a=0
--      return
--      end
--_LT_EOF
--], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
--public class foo {
--  private int a;
--  public void bar (void) {
--    a = 0;
--  }
--};
--_LT_EOF
--])
--dnl Parse the compiler output and extract the necessary
--dnl objects, libraries and library flags.
--if AC_TRY_EVAL(ac_compile); then
--  # Parse the compiler output and extract the necessary
--  # objects, libraries and library flags.
--
--  # Sentinel used to keep track of whether or not we are before
--  # the conftest object file.
--  pre_test_object_deps_done=no
--
--  for p in `eval "$output_verbose_link_cmd"`; do
--    case $p in
--
--    -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" ||
--          test $p = "-R"; then
--	 prev=$p
--	 continue
--       else
--	 prev=
--       fi
--
--       if test "$pre_test_object_deps_done" = no; then
--	 case $p in
--	 -L* | -R*)
--	   # Internal compiler library paths should come after those
--	   # provided the user.  The postdeps already come after the
--	   # user supplied libs so there is no need to process them.
--	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
--	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
--	   else
--	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
--	   fi
--	   ;;
--	 # The "-l" case would never come before the object being
--	 # linked, so don't bother handling this case.
--	 esac
--       else
--	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
--	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
--	 else
--	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
--	 fi
--       fi
--       ;;
--
--    *.$objext)
--       # This assumes that the test object file only shows up
--       # once in the compiler output.
--       if test "$p" = "conftest.$objext"; then
--	 pre_test_object_deps_done=yes
--	 continue
--       fi
--
--       if test "$pre_test_object_deps_done" = no; then
--	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
--	   _LT_TAGVAR(predep_objects, $1)="$p"
--	 else
--	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
--	 fi
--       else
--	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
--	   _LT_TAGVAR(postdep_objects, $1)="$p"
--	 else
--	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
--	 fi
--       fi
--       ;;
--
--    *) ;; # Ignore the rest.
--
--    esac
--  done
--
--  # Clean up.
--  rm -f a.out a.exe
--else
--  echo "libtool.m4: error: problem compiling $1 test program"
--fi
--
--$RM -f confest.$objext
--
--# PORTME: override above test on systems where it is broken
--m4_if([$1], [CXX],
--[case $host_os in
--interix[[3-9]]*)
--  # Interix 3.5 installs completely hosed .la files for C++, so rather than
--  # hack all around it, let's just trust "g++" to DTRT.
--  _LT_TAGVAR(predep_objects,$1)=
--  _LT_TAGVAR(postdep_objects,$1)=
--  _LT_TAGVAR(postdeps,$1)=
--  ;;
--
--linux*)
--  case `$CC -V 2>&1 | sed 5q` in
--  *Sun\ C*)
--    # Sun C++ 5.9
--
--    # The more standards-conforming stlport4 library is
--    # incompatible with the Cstd library. Avoid specifying
--    # it if it's in CXXFLAGS. Ignore libCrun as
--    # -library=stlport4 depends on it.
--    case " $CXX $CXXFLAGS " in
--    *" -library=stlport4 "*)
--      solaris_use_stlport4=yes
--      ;;
--    esac
--
--    if test "$solaris_use_stlport4" != yes; then
--      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
--    fi
--    ;;
--  esac
--  ;;
--
--solaris*)
--  case $cc_basename in
--  CC* | sunCC*)
--    # The more standards-conforming stlport4 library is
--    # incompatible with the Cstd library. Avoid specifying
--    # it if it's in CXXFLAGS. Ignore libCrun as
--    # -library=stlport4 depends on it.
--    case " $CXX $CXXFLAGS " in
--    *" -library=stlport4 "*)
--      solaris_use_stlport4=yes
--      ;;
--    esac
--
--    # Adding this requires a known-good setup of shared libraries for
--    # Sun compiler versions before 5.6, else PIC objects from an old
--    # archive will be linked into the output, leading to subtle bugs.
--    if test "$solaris_use_stlport4" != yes; then
--      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
--    fi
--    ;;
--  esac
--  ;;
--esac
--])
--
--case " $_LT_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
--esac
-- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
--if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
--fi
--_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
--    [The directories searched by this compiler when creating a shared library])
--_LT_TAGDECL([], [predep_objects], [1],
--    [Dependencies to place before and after the objects being linked to
--    create a shared library])
--_LT_TAGDECL([], [postdep_objects], [1])
--_LT_TAGDECL([], [predeps], [1])
--_LT_TAGDECL([], [postdeps], [1])
--_LT_TAGDECL([], [compiler_lib_search_path], [1],
--    [The library search path used internally by the compiler when linking
--    a shared library])
--])# _LT_SYS_HIDDEN_LIBDEPS
--
--
--# _LT_LANG_F77_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for a Fortran 77 compiler are
--# suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_F77_CONFIG],
--[AC_LANG_PUSH(Fortran 77)
--if test -z "$F77" || test "X$F77" = "Xno"; then
--  _lt_disable_F77=yes
--fi
--
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_TAGVAR(allow_undefined_flag, $1)=
--_LT_TAGVAR(always_export_symbols, $1)=no
--_LT_TAGVAR(archive_expsym_cmds, $1)=
--_LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
--_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_TAGVAR(hardcode_minus_L, $1)=no
--_LT_TAGVAR(hardcode_automatic, $1)=no
--_LT_TAGVAR(inherit_rpath, $1)=no
--_LT_TAGVAR(module_cmds, $1)=
--_LT_TAGVAR(module_expsym_cmds, $1)=
--_LT_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
--_LT_TAGVAR(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Source file extension for f77 test sources.
--ac_ext=f
--
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
--
--# No sense in running all these tests if we already determined that
--# the F77 compiler isn't working.  Some variables (like enable_shared)
--# are currently assumed to apply to all compilers on this platform,
--# and will be corrupted by setting them based on a non-working compiler.
--if test "$_lt_disable_F77" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="\
--      subroutine t
--      return
--      end
--"
--
--  # Code to be used in simple link tests
--  lt_simple_link_test_code="\
--      program t
--      end
--"
--
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
--
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
--
--  # Allow CC to be a program name with arguments.
--  lt_save_CC="$CC"
--  lt_save_GCC=$GCC
--  CC=${F77-"f77"}
--  compiler=$CC
--  _LT_TAGVAR(compiler, $1)=$CC
--  _LT_CC_BASENAME([$compiler])
--  GCC=$G77
--  if test -n "$compiler"; then
--    AC_MSG_CHECKING([if libtool supports shared libraries])
--    AC_MSG_RESULT([$can_build_shared])
--
--    AC_MSG_CHECKING([whether to build shared libraries])
--    test "$can_build_shared" = "no" && enable_shared=no
--
--    # On AIX, shared libraries and static libraries use the same namespace, and
--    # are all built from PIC.
--    case $host_os in
--      aix3*)
--        test "$enable_shared" = yes && enable_static=no
--        if test -n "$RANLIB"; then
--          archive_cmds="$archive_cmds~\$RANLIB \$lib"
--          postinstall_cmds='$RANLIB $lib'
--        fi
--        ;;
--      aix[[4-9]]*)
--	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--	  test "$enable_shared" = yes && enable_static=no
--	fi
--        ;;
--    esac
--    AC_MSG_RESULT([$enable_shared])
--
--    AC_MSG_CHECKING([whether to build static libraries])
--    # Make sure either enable_shared or enable_static is yes.
--    test "$enable_shared" = yes || enable_static=yes
--    AC_MSG_RESULT([$enable_static])
--
--    _LT_TAGVAR(GCC, $1)="$G77"
--    _LT_TAGVAR(LD, $1)="$LD"
--
--    ## CAVEAT EMPTOR:
--    ## There is no encapsulation within the following macros, do not change
--    ## the running order or otherwise move them around unless you know exactly
--    ## what you are doing...
--    _LT_COMPILER_PIC($1)
--    _LT_COMPILER_C_O($1)
--    _LT_COMPILER_FILE_LOCKS($1)
--    _LT_LINKER_SHLIBS($1)
--    _LT_SYS_DYNAMIC_LINKER($1)
--    _LT_LINKER_HARDCODE_LIBPATH($1)
--
--    _LT_CONFIG($1)
--  fi # test -n "$compiler"
--
--  GCC=$lt_save_GCC
--  CC="$lt_save_CC"
--fi # test "$_lt_disable_F77" != yes
--
--AC_LANG_POP
--])# _LT_LANG_F77_CONFIG
--
--
--# _LT_LANG_FC_CONFIG([TAG])
--# -------------------------
--# Ensure that the configuration variables for a Fortran compiler are
--# suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_FC_CONFIG],
--[AC_LANG_PUSH(Fortran)
--
--if test -z "$FC" || test "X$FC" = "Xno"; then
--  _lt_disable_FC=yes
--fi
--
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_TAGVAR(allow_undefined_flag, $1)=
--_LT_TAGVAR(always_export_symbols, $1)=no
--_LT_TAGVAR(archive_expsym_cmds, $1)=
--_LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
--_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_TAGVAR(hardcode_minus_L, $1)=no
--_LT_TAGVAR(hardcode_automatic, $1)=no
--_LT_TAGVAR(inherit_rpath, $1)=no
--_LT_TAGVAR(module_cmds, $1)=
--_LT_TAGVAR(module_expsym_cmds, $1)=
--_LT_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
--_LT_TAGVAR(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Source file extension for fc test sources.
--ac_ext=${ac_fc_srcext-f}
--
--# Object file extension for compiled fc test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
--
--# No sense in running all these tests if we already determined that
--# the FC compiler isn't working.  Some variables (like enable_shared)
--# are currently assumed to apply to all compilers on this platform,
--# and will be corrupted by setting them based on a non-working compiler.
--if test "$_lt_disable_FC" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="\
--      subroutine t
--      return
--      end
--"
--
--  # Code to be used in simple link tests
--  lt_simple_link_test_code="\
--      program t
--      end
--"
--
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
--
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
--
--  # Allow CC to be a program name with arguments.
--  lt_save_CC="$CC"
--  lt_save_GCC=$GCC
--  CC=${FC-"f95"}
--  compiler=$CC
--  GCC=$ac_cv_fc_compiler_gnu
--
--  _LT_TAGVAR(compiler, $1)=$CC
--  _LT_CC_BASENAME([$compiler])
--
--  if test -n "$compiler"; then
--    AC_MSG_CHECKING([if libtool supports shared libraries])
--    AC_MSG_RESULT([$can_build_shared])
--
--    AC_MSG_CHECKING([whether to build shared libraries])
--    test "$can_build_shared" = "no" && enable_shared=no
--
--    # On AIX, shared libraries and static libraries use the same namespace, and
--    # are all built from PIC.
--    case $host_os in
--      aix3*)
--        test "$enable_shared" = yes && enable_static=no
--        if test -n "$RANLIB"; then
--          archive_cmds="$archive_cmds~\$RANLIB \$lib"
--          postinstall_cmds='$RANLIB $lib'
--        fi
--        ;;
--      aix[[4-9]]*)
--	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--	  test "$enable_shared" = yes && enable_static=no
--	fi
--        ;;
--    esac
--    AC_MSG_RESULT([$enable_shared])
--
--    AC_MSG_CHECKING([whether to build static libraries])
--    # Make sure either enable_shared or enable_static is yes.
--    test "$enable_shared" = yes || enable_static=yes
--    AC_MSG_RESULT([$enable_static])
--
--    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
--    _LT_TAGVAR(LD, $1)="$LD"
--
--    ## CAVEAT EMPTOR:
--    ## There is no encapsulation within the following macros, do not change
--    ## the running order or otherwise move them around unless you know exactly
--    ## what you are doing...
--    _LT_SYS_HIDDEN_LIBDEPS($1)
--    _LT_COMPILER_PIC($1)
--    _LT_COMPILER_C_O($1)
--    _LT_COMPILER_FILE_LOCKS($1)
--    _LT_LINKER_SHLIBS($1)
--    _LT_SYS_DYNAMIC_LINKER($1)
--    _LT_LINKER_HARDCODE_LIBPATH($1)
--
--    _LT_CONFIG($1)
--  fi # test -n "$compiler"
--
--  GCC=$lt_save_GCC
--  CC="$lt_save_CC"
--fi # test "$_lt_disable_FC" != yes
--
--AC_LANG_POP
--])# _LT_LANG_FC_CONFIG
--
--
--# _LT_LANG_GCJ_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for the GNU Java Compiler compiler
--# are suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_GCJ_CONFIG],
--[AC_REQUIRE([LT_PROG_GCJ])dnl
--AC_LANG_SAVE
--
--# Source file extension for Java test sources.
--ac_ext=java
--
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=yes
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_TAGVAR(LD, $1)="$LD"
--_LT_CC_BASENAME([$compiler])
--
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(reload_flag, $1)=$reload_flag
--_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
--
--if test -n "$compiler"; then
--  _LT_COMPILER_NO_RTTI($1)
--  _LT_COMPILER_PIC($1)
--  _LT_COMPILER_C_O($1)
--  _LT_COMPILER_FILE_LOCKS($1)
--  _LT_LINKER_SHLIBS($1)
--  _LT_LINKER_HARDCODE_LIBPATH($1)
--
--  _LT_CONFIG($1)
--fi
--
--AC_LANG_RESTORE
--
--GCC=$lt_save_GCC
--CC="$lt_save_CC"
--])# _LT_LANG_GCJ_CONFIG
--
--
--# _LT_LANG_RC_CONFIG([TAG])
--# -------------------------
--# Ensure that the configuration variables for the Windows resource compiler
--# are suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_RC_CONFIG],
--[AC_REQUIRE([LT_PROG_RC])dnl
--AC_LANG_SAVE
--
--# Source file extension for RC test sources.
--ac_ext=rc
--
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=
--CC=${RC-"windres"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--
--if test -n "$compiler"; then
--  :
--  _LT_CONFIG($1)
--fi
--
--GCC=$lt_save_GCC
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# _LT_LANG_RC_CONFIG
--
--
--# LT_PROG_GCJ
--# -----------
--AC_DEFUN([LT_PROG_GCJ],
--[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
--  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
--    [AC_CHECK_TOOL(GCJ, gcj,)
--      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
--      AC_SUBST(GCJFLAGS)])])[]dnl
--])
--
--# Old name:
--AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
--
--
--# LT_PROG_RC
--# ----------
--AC_DEFUN([LT_PROG_RC],
--[AC_CHECK_TOOL(RC, windres,)
--])
--
--# Old name:
--AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_RC], [])
--
--
--# _LT_DECL_EGREP
--# --------------
--# If we don't have a new enough Autoconf to choose the best grep
--# available, choose the one first in the user's PATH.
--m4_defun([_LT_DECL_EGREP],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_REQUIRE([AC_PROG_FGREP])dnl
--test -z "$GREP" && GREP=grep
--_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
--_LT_DECL([], [EGREP], [1], [An ERE matcher])
--_LT_DECL([], [FGREP], [1], [A literal string matcher])
--dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
--AC_SUBST([GREP])
--])
--
--
--# _LT_DECL_OBJDUMP
--# --------------
--# If we don't have a new enough Autoconf to choose the best objdump
--# available, choose the one first in the user's PATH.
--m4_defun([_LT_DECL_OBJDUMP],
--[AC_CHECK_TOOL(OBJDUMP, objdump, false)
--test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
--AC_SUBST([OBJDUMP])
--])
--
--
--# _LT_DECL_SED
--# ------------
--# Check for a fully-functional sed program, that truncates
--# as few characters as possible.  Prefer GNU sed if found.
--m4_defun([_LT_DECL_SED],
--[AC_PROG_SED
--test -z "$SED" && SED=sed
--Xsed="$SED -e 1s/^X//"
--_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
--_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
--    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
--])# _LT_DECL_SED
--
--m4_ifndef([AC_PROG_SED], [
--# NOTE: This macro has been submitted for inclusion into   #
--#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
--#  a released version of Autoconf we should remove this    #
--#  macro and use it instead.                               #
--
--m4_defun([AC_PROG_SED],
--[AC_MSG_CHECKING([for a sed that does not truncate output])
--AC_CACHE_VAL(lt_cv_path_SED,
--[# Loop through the user's path and test for sed and gsed.
--# Then use that list of sed's as ones to test for truncation.
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for lt_ac_prog in sed gsed; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
--        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
--      fi
--    done
--  done
--done
--IFS=$as_save_IFS
--lt_ac_max=0
--lt_ac_count=0
--# Add /usr/xpg4/bin/sed as it is typically found on Solaris
--# along with /bin/sed that truncates output.
--for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && continue
--  cat /dev/null > conftest.in
--  lt_ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--  # Check for GNU sed and select it if it is found.
--  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
--    lt_cv_path_SED=$lt_ac_sed
--    break
--  fi
--  while true; do
--    cat conftest.in conftest.in >conftest.tmp
--    mv conftest.tmp conftest.in
--    cp conftest.in conftest.nl
--    echo >>conftest.nl
--    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
--    cmp -s conftest.out conftest.nl || break
--    # 10000 chars as input seems more than enough
--    test $lt_ac_count -gt 10 && break
--    lt_ac_count=`expr $lt_ac_count + 1`
--    if test $lt_ac_count -gt $lt_ac_max; then
--      lt_ac_max=$lt_ac_count
--      lt_cv_path_SED=$lt_ac_sed
--    fi
--  done
--done
--])
--SED=$lt_cv_path_SED
--AC_SUBST([SED])
--AC_MSG_RESULT([$SED])
--])#AC_PROG_SED
--])#m4_ifndef
--
--# Old name:
--AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_SED], [])
--
--
--# _LT_CHECK_SHELL_FEATURES
--# ------------------------
--# Find out whether the shell is Bourne or XSI compatible,
--# or has some other useful features.
--m4_defun([_LT_CHECK_SHELL_FEATURES],
--[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
--# Try some XSI features
--xsi_shell=no
--( _lt_dummy="a/b/c"
--  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
--      = c,a/b,, \
--    && eval 'test $(( 1 + 1 )) -eq 2 \
--    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
--  && xsi_shell=yes
--AC_MSG_RESULT([$xsi_shell])
--_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
--
--AC_MSG_CHECKING([whether the shell understands "+="])
--lt_shell_append=no
--( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
--    >/dev/null 2>&1 \
--  && lt_shell_append=yes
--AC_MSG_RESULT([$lt_shell_append])
--_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
--
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  lt_unset=unset
--else
--  lt_unset=false
--fi
--_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
--
--# test EBCDIC or ASCII
--case `echo X|tr X '\101'` in
-- A) # ASCII based system
--    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
--  lt_SP2NL='tr \040 \012'
--  lt_NL2SP='tr \015\012 \040\040'
--  ;;
-- *) # EBCDIC based system
--  lt_SP2NL='tr \100 \n'
--  lt_NL2SP='tr \r\n \100\100'
--  ;;
--esac
--_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
--_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
--])# _LT_CHECK_SHELL_FEATURES
--
--
--# _LT_PROG_XSI_SHELLFNS
--# ---------------------
--# Bourne and XSI compatible variants of some useful shell functions.
--m4_defun([_LT_PROG_XSI_SHELLFNS],
--[case $xsi_shell in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# 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 ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--}
--
--# func_basename file
--func_basename ()
--{
--  func_basename_result="${1##*/}"
--}
--
--# func_dirname_and_basename file append nondir_replacement
--# perform func_basename and func_dirname in a single function
--# call:
--#   dirname:  Compute the dirname of FILE.  If nonempty,
--#             add APPEND to the result, otherwise set result
--#             to NONDIR_REPLACEMENT.
--#             value returned in "$func_dirname_result"
--#   basename: Compute filename of FILE.
--#             value retuned in "$func_basename_result"
--# Implementation must be kept synchronized with func_dirname
--# and func_basename. For efficiency, we do not delegate to
--# those functions but instead duplicate the functionality here.
--func_dirname_and_basename ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--  func_basename_result="${1##*/}"
--}
--
--# 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_stripname ()
--{
--  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
--  # positional parameters, so assign one to ordinary parameter first.
--  func_stripname_result=${3}
--  func_stripname_result=${func_stripname_result#"${1}"}
--  func_stripname_result=${func_stripname_result%"${2}"}
--}
--
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=${1%%=*}
--  func_opt_split_arg=${1#*=}
--}
--
--# func_lo2o object
--func_lo2o ()
--{
--  case ${1} in
--    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
--    *)    func_lo2o_result=${1} ;;
--  esac
--}
--
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=${1%.*}.lo
--}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=$(( $[*] ))
--}
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=${#1}
--}
--
--_LT_EOF
--    ;;
--  *) # Bourne compatible functions.
--    cat << \_LT_EOF >> "$cfgfile"
--
--# 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 ()
--{
--  # Extract subdirectory from the argument.
--  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_basename file
--func_basename ()
--{
--  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
--}
--
--dnl func_dirname_and_basename
--dnl A portable version of this function is already defined in general.m4sh
--dnl so there is no need for it here.
--
--# 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
--}
--
--# sed scripts:
--my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
--my_sed_long_arg='1s/^-[[^=]]*=//'
--
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
--}
--
--# func_lo2o object
--func_lo2o ()
--{
--  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
--}
--
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
--}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=`expr "$[@]"`
--}
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
--}
--
--_LT_EOF
--esac
--
--case $lt_shell_append in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]+=\$[2]"
--}
--_LT_EOF
--    ;;
--  *)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]=\$$[1]\$[2]"
--}
--
--_LT_EOF
--    ;;
--  esac
--])
--
--# Helper functions for option handling.                    -*- Autoconf -*-
--#
--#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
--#   Inc.
--#   Written by Gary V. Vaughan, 2004
--#
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
--
--# serial 7 ltoptions.m4
--
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
--
--
--# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
--# ------------------------------------------
--m4_define([_LT_MANGLE_OPTION],
--[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
--
--
--# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
--# ---------------------------------------
--# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
--# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
--# saved as a flag.
--m4_define([_LT_SET_OPTION],
--[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
--m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
--        _LT_MANGLE_DEFUN([$1], [$2]),
--    [m4_warning([Unknown $1 option `$2'])])[]dnl
--])
--
--
--# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
--# ------------------------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--m4_define([_LT_IF_OPTION],
--[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
--
--
--# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
--# -------------------------------------------------------
--# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
--# are set.
--m4_define([_LT_UNLESS_OPTIONS],
--[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
--	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
--		      [m4_define([$0_found])])])[]dnl
--m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
--])[]dnl
--])
--
--
--# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
--# ----------------------------------------
--# OPTION-LIST is a space-separated list of Libtool options associated
--# with MACRO-NAME.  If any OPTION has a matching handler declared with
--# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
--# the unknown option and exit.
--m4_defun([_LT_SET_OPTIONS],
--[# Set options
--m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
--    [_LT_SET_OPTION([$1], _LT_Option)])
--
--m4_if([$1],[LT_INIT],[
--  dnl
--  dnl Simply set some default values (i.e off) if boolean options were not
--  dnl specified:
--  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
--  ])
--  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
--  ])
--  dnl
--  dnl If no reference was made to various pairs of opposing options, then
--  dnl we run the default mode handler for the pair.  For example, if neither
--  dnl `shared' nor `disable-shared' was passed, we enable building of shared
--  dnl archives by default:
--  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
--  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
--  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
--  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
--  		   [_LT_ENABLE_FAST_INSTALL])
--  ])
--])# _LT_SET_OPTIONS
--
--
--
--# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
--# -----------------------------------------
--m4_define([_LT_MANGLE_DEFUN],
--[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
--
--
--# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
--# -----------------------------------------------
--m4_define([LT_OPTION_DEFINE],
--[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
--])# LT_OPTION_DEFINE
--
--
--# dlopen
--# ------
--LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
--])
--
--AU_DEFUN([AC_LIBTOOL_DLOPEN],
--[_LT_SET_OPTION([LT_INIT], [dlopen])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `dlopen' option into LT_INIT's first parameter.])
--])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
--
--
--# win32-dll
--# ---------
--# Declare package support for building win32 dll's.
--LT_OPTION_DEFINE([LT_INIT], [win32-dll],
--[enable_win32_dll=yes
--
--case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
--  AC_CHECK_TOOL(AS, as, false)
--  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
--  AC_CHECK_TOOL(OBJDUMP, objdump, false)
--  ;;
--esac
--
--test -z "$AS" && AS=as
--_LT_DECL([], [AS],      [1], [Assembler program])dnl
--
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
--
--test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
--])# win32-dll
--
--AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--_LT_SET_OPTION([LT_INIT], [win32-dll])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `win32-dll' option into LT_INIT's first parameter.])
--])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
--
--
--# _LT_ENABLE_SHARED([DEFAULT])
--# ----------------------------
--# implement the --enable-shared flag, and supports the `shared' and
--# `disable-shared' LT_INIT options.
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_SHARED],
--[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([shared],
--    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
--	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
--
--    _LT_DECL([build_libtool_libs], [enable_shared], [0],
--	[Whether or not to build shared libraries])
--])# _LT_ENABLE_SHARED
--
--LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
--
--# Old names:
--AC_DEFUN([AC_ENABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
--])
--
--AC_DEFUN([AC_DISABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], [disable-shared])
--])
--
--AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
--AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_SHARED], [])
--dnl AC_DEFUN([AM_DISABLE_SHARED], [])
--
--
--
--# _LT_ENABLE_STATIC([DEFAULT])
--# ----------------------------
--# implement the --enable-static flag, and support the `static' and
--# `disable-static' LT_INIT options.
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_STATIC],
--[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([static],
--    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
--	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_static=yes ;;
--    no) enable_static=no ;;
--    *)
--     enable_static=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_static=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
--
--    _LT_DECL([build_old_libs], [enable_static], [0],
--	[Whether or not to build static libraries])
--])# _LT_ENABLE_STATIC
--
--LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
--
--# Old names:
--AC_DEFUN([AC_ENABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
--])
--
--AC_DEFUN([AC_DISABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], [disable-static])
--])
--
--AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
--AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_STATIC], [])
--dnl AC_DEFUN([AM_DISABLE_STATIC], [])
--
--
--
--# _LT_ENABLE_FAST_INSTALL([DEFAULT])
--# ----------------------------------
--# implement the --enable-fast-install flag, and support the `fast-install'
--# and `disable-fast-install' LT_INIT options.
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_FAST_INSTALL],
--[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([fast-install],
--    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
--    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_fast_install=yes ;;
--    no) enable_fast_install=no ;;
--    *)
--      enable_fast_install=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_fast_install=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
--
--_LT_DECL([fast_install], [enable_fast_install], [0],
--	 [Whether or not to optimize for fast installation])dnl
--])# _LT_ENABLE_FAST_INSTALL
--
--LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
--
--# Old names:
--AU_DEFUN([AC_ENABLE_FAST_INSTALL],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you put
--the `fast-install' option into LT_INIT's first parameter.])
--])
--
--AU_DEFUN([AC_DISABLE_FAST_INSTALL],
--[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you put
--the `disable-fast-install' option into LT_INIT's first parameter.])
--])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
--dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
--
--
--# _LT_WITH_PIC([MODE])
--# --------------------
--# implement the --with-pic flag, and support the `pic-only' and `no-pic'
--# LT_INIT options.
--# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
--m4_define([_LT_WITH_PIC],
--[AC_ARG_WITH([pic],
--    [AS_HELP_STRING([--with-pic],
--	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
--    [pic_mode="$withval"],
--    [pic_mode=default])
--
--test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
--
--_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
--])# _LT_WITH_PIC
--
--LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
--
--# Old name:
--AU_DEFUN([AC_LIBTOOL_PICMODE],
--[_LT_SET_OPTION([LT_INIT], [pic-only])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `pic-only' option into LT_INIT's first parameter.])
--])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
--
--
--m4_define([_LTDL_MODE], [])
--LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
--		 [m4_define([_LTDL_MODE], [nonrecursive])])
--LT_OPTION_DEFINE([LTDL_INIT], [recursive],
--		 [m4_define([_LTDL_MODE], [recursive])])
--LT_OPTION_DEFINE([LTDL_INIT], [subproject],
--		 [m4_define([_LTDL_MODE], [subproject])])
--
--m4_define([_LTDL_TYPE], [])
--LT_OPTION_DEFINE([LTDL_INIT], [installable],
--		 [m4_define([_LTDL_TYPE], [installable])])
--LT_OPTION_DEFINE([LTDL_INIT], [convenience],
--		 [m4_define([_LTDL_TYPE], [convenience])])
--
--# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
--#
--# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
--# Written by Gary V. Vaughan, 2004
--#
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
--
--# serial 6 ltsugar.m4
--
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
--
--
--# lt_join(SEP, ARG1, [ARG2...])
--# -----------------------------
--# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
--# associated separator.
--# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
--# versions in m4sugar had bugs.
--m4_define([lt_join],
--[m4_if([$#], [1], [],
--       [$#], [2], [[$2]],
--       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
--m4_define([_lt_join],
--[m4_if([$#$2], [2], [],
--       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
--
--
--# lt_car(LIST)
--# lt_cdr(LIST)
--# ------------
--# Manipulate m4 lists.
--# These macros are necessary as long as will still need to support
--# Autoconf-2.59 which quotes differently.
--m4_define([lt_car], [[$1]])
--m4_define([lt_cdr],
--[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
--       [$#], 1, [],
--       [m4_dquote(m4_shift($@))])])
--m4_define([lt_unquote], $1)
--
--
--# lt_append(MACRO-NAME, STRING, [SEPARATOR])
--# ------------------------------------------
--# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
--# Note that neither SEPARATOR nor STRING are expanded; they are appended
--# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
--# No SEPARATOR is output if MACRO-NAME was previously undefined (different
--# than defined and empty).
--#
--# This macro is needed until we can rely on Autoconf 2.62, since earlier
--# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
--m4_define([lt_append],
--[m4_define([$1],
--	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
--
--
--
--# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
--# ----------------------------------------------------------
--# Produce a SEP delimited list of all paired combinations of elements of
--# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
--# has the form PREFIXmINFIXSUFFIXn.
--# Needed until we can rely on m4_combine added in Autoconf 2.62.
--m4_define([lt_combine],
--[m4_if(m4_eval([$# > 3]), [1],
--       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
--[[m4_foreach([_Lt_prefix], [$2],
--	     [m4_foreach([_Lt_suffix],
--		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
--	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
--
--
--# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
--# -----------------------------------------------------------------------
--# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
--# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
--m4_define([lt_if_append_uniq],
--[m4_ifdef([$1],
--	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
--		 [lt_append([$1], [$2], [$3])$4],
--		 [$5])],
--	  [lt_append([$1], [$2], [$3])$4])])
--
--
--# lt_dict_add(DICT, KEY, VALUE)
--# -----------------------------
--m4_define([lt_dict_add],
--[m4_define([$1($2)], [$3])])
--
--
--# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
--# --------------------------------------------
--m4_define([lt_dict_add_subkey],
--[m4_define([$1($2:$3)], [$4])])
--
--
--# lt_dict_fetch(DICT, KEY, [SUBKEY])
--# ----------------------------------
--m4_define([lt_dict_fetch],
--[m4_ifval([$3],
--	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
--    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
--
--
--# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
--# -----------------------------------------------------------------
--m4_define([lt_if_dict_fetch],
--[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
--	[$5],
--    [$6])])
--
--
--# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
--# --------------------------------------------------------------
--m4_define([lt_dict_filter],
--[m4_if([$5], [], [],
--  [lt_join(m4_quote(m4_default([$4], [[, ]])),
--           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
--		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
--])
--
--# ltversion.m4 -- version numbers			-*- Autoconf -*-
--#
--#   Copyright (C) 2004 Free Software Foundation, Inc.
--#   Written by Scott James Remnant, 2004
--#
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
--
--# Generated from ltversion.in.
--
--# serial 3175 ltversion.m4
--# This file is part of GNU Libtool
--
--m4_define([LT_PACKAGE_VERSION], [2.2.10])
--m4_define([LT_PACKAGE_REVISION], [1.3175])
--
--AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.10'
--macro_revision='1.3175'
--_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
--_LT_DECL(, macro_revision, 0)
--])
--
--# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
--#
--#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
--#   Written by Scott James Remnant, 2004.
--#
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
--
--# serial 5 lt~obsolete.m4
--
--# These exist entirely to fool aclocal when bootstrapping libtool.
--#
--# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
--# which have later been changed to m4_define as they aren't part of the
--# exported API, or moved to Autoconf or Automake where they belong.
--#
--# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
--# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
--# using a macro with the same name in our local m4/libtool.m4 it'll
--# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
--# and doesn't know about Autoconf macros at all.)
--#
--# So we provide this file, which has a silly filename so it's always
--# included after everything else.  This provides aclocal with the
--# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
--# because those macros already exist, or will be overwritten later.
--# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
--#
--# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
--# Yes, that means every name once taken will need to remain here until
--# we give up compatibility with versions before 1.7, at which point
--# we need to keep only those names which we still refer to.
--
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
--
--m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
--m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
--m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
--m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
--m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
--m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
--m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
--m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
--m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
--m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
--m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
--m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
--m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
--m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
--m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
--m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
--m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
--m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
--m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
--m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
--m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
--m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
--m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
--m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
--m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
--m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
--m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
--m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
--m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
--m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
--m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
--m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
--m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
--m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
--m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
--m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
--m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
--m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
--m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
--m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
--m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
--m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
--m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
--m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
--m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
--m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
--m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
--m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
--m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
--m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
--m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
--m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
--m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
--m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
--m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
--m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
--m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
--
- # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
- # serial 1 (pkg-config-0.24)
- # 
-@@ -8900,7 +801,7 @@
+@@ -801,7 +801,7 @@
  Consider adjusting the PKG_CONFIG_PATH environment variable if you
  installed software in a non-standard prefix.
  
@@ -8128,7 +82,7 @@
          ])
  elif test $pkg_failed = untried; then
       	AC_MSG_RESULT([no])
-@@ -8911,7 +812,7 @@
+@@ -812,7 +812,7 @@
  
  _PKG_TEXT
  
@@ -8137,31 +91,11 @@
          ])
  else
  	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -10010,5 +1911,11 @@
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
-+m4_include([m4/gtk-doc.m4])
- m4_include([m4/introspection.m4])
-+m4_include([m4/libtool.m4])
-+m4_include([m4/ltoptions.m4])
-+m4_include([m4/ltsugar.m4])
-+m4_include([m4/ltversion.m4])
-+m4_include([m4/lt~obsolete.m4])
- m4_include([acinclude.m4])
-Index: gtk+2.0-2.21.8/build/Makefile.in
+Index: gtk+2.0-2.22.0/build/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/build/Makefile.in	2010-09-14 20:24:49.204678760 +0200
-+++ gtk+2.0-2.21.8/build/Makefile.in	2010-09-14 20:24:13.445678391 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = build
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/build/Makefile.in	2010-09-23 20:31:11.974581004 +0200
++++ gtk+2.0-2.22.0/build/Makefile.in	2010-09-23 20:30:28.397579311 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -8170,7 +104,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -160,6 +160,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -8178,7 +112,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -310,6 +311,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -8186,19 +120,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/build/win32/Makefile.in
+Index: gtk+2.0-2.22.0/build/win32/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/build/win32/Makefile.in	2010-09-14 20:24:49.152679838 +0200
-+++ gtk+2.0-2.21.8/build/win32/Makefile.in	2010-09-14 20:24:13.517678957 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = build/win32
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/build/win32/Makefile.in	2010-09-23 20:31:11.902605718 +0200
++++ gtk+2.0-2.22.0/build/win32/Makefile.in	2010-09-23 20:30:28.473604484 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -8207,7 +133,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -160,6 +160,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -8215,7 +141,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -310,6 +311,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -8223,19 +149,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/build/win32/vs9/Makefile.in
+Index: gtk+2.0-2.22.0/build/win32/vs9/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/build/win32/vs9/Makefile.in	2010-09-14 20:24:49.080678095 +0200
-+++ gtk+2.0-2.21.8/build/win32/vs9/Makefile.in	2010-09-14 20:24:13.589679587 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = build/win32/vs9
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/build/win32/vs9/Makefile.in	2010-09-23 20:31:11.849586688 +0200
++++ gtk+2.0-2.22.0/build/win32/vs9/Makefile.in	2010-09-23 20:30:28.538579434 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -8244,7 +162,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -117,6 +120,7 @@
+@@ -120,6 +120,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -8252,7 +170,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -267,6 +271,7 @@
+@@ -270,6 +271,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -8260,15 +178,15 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/configure
+Index: gtk+2.0-2.22.0/configure
 ===================================================================
---- gtk+2.0-2.21.8.orig/configure	2010-09-14 20:24:49.012680557 +0200
-+++ gtk+2.0-2.21.8/configure	2010-09-14 20:24:11.845677690 +0200
+--- gtk+2.0-2.22.0.orig/configure	2010-09-23 20:31:11.686579169 +0200
++++ gtk+2.0-2.22.0/configure	2010-09-23 20:30:27.078578721 +0200
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.66 for gtk+ 2.21.8.
-+# Generated by GNU Autoconf 2.67 for gtk+ 2.21.8.
+-# Generated by GNU Autoconf 2.66 for gtk+ 2.22.0.
++# Generated by GNU Autoconf 2.67 for gtk+ 2.22.0.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
  #
@@ -8468,7 +386,14 @@
  am__fastdepCC_FALSE
  am__fastdepCC_TRUE
  CCDEPMODE
-@@ -941,6 +1084,10 @@
+@@ -935,13 +1078,16 @@
+ enable_fast_install
+ with_gnu_ld
+ enable_libtool_lock
+-with_gnu_ld
+ enable_largefile
+ enable_maintainer_mode
+ enable_debug
  enable_shm
  enable_xkb
  enable_xinerama
@@ -8479,7 +404,35 @@
  enable_rebuilds
  enable_visibility
  with_xinput
-@@ -1048,8 +1195,9 @@
+@@ -972,17 +1118,11 @@
+ CPPFLAGS
+ CXX
+ CXXFLAGS
+-LDFLAGS
+-LIBS
+-CPPFLAGS
+ CCC
+ CPP
+ CXXCPP
+ CCAS
+ CCASFLAGS
+-CC
+-LDFLAGS
+-LIBS
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+@@ -990,9 +1130,6 @@
+ BASE_DEPENDENCIES_LIBS
+ CAIRO_BACKEND_CFLAGS
+ CAIRO_BACKEND_LIBS
+-PKG_CONFIG
+-PKG_CONFIG_PATH
+-PKG_CONFIG_LIBDIR
+ XMKMF
+ DIRECTFB_CFLAGS
+ DIRECTFB_LIBS'
+@@ -1058,8 +1195,9 @@
    fi
  
    case $ac_option in
@@ -8491,7 +444,7 @@
    esac
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1627,6 +1775,12 @@
+@@ -1637,6 +1775,12 @@
    --enable-xkb            support XKB [default=maybe]
    --enable-xinerama       support xinerama extension if available
                            [default=yes]
@@ -8504,16 +457,16 @@
    --disable-rebuilds      disable all source autogeneration rules
    --disable-visibility    don't use ELF visibility attributes
    --enable-explicit-deps=[yes/no/auto]
-@@ -1764,7 +1918,7 @@
+@@ -1774,7 +1918,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- gtk+ configure 2.21.8
+ gtk+ configure 2.22.0
 -generated by GNU Autoconf 2.66
 +generated by GNU Autoconf 2.67
  
  Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
-@@ -1951,7 +2105,7 @@
+@@ -1961,7 +2105,7 @@
      mv -f conftest.er1 conftest.err
    fi
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8522,7 +475,7 @@
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then :
-@@ -2097,7 +2251,7 @@
+@@ -2107,7 +2251,7 @@
      mv -f conftest.er1 conftest.err
    fi
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8531,7 +484,7 @@
  	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
         }; then :
-@@ -2206,7 +2360,7 @@
+@@ -2216,7 +2360,7 @@
  else
    ac_header_preproc=no
  fi
@@ -8540,16 +493,16 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  $as_echo "$ac_header_preproc" >&6; }
  
-@@ -2311,7 +2465,7 @@
+@@ -2321,7 +2465,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by gtk+ $as_me 2.21.8, which was
+ It was created by gtk+ $as_me 2.22.0, which was
 -generated by GNU Autoconf 2.66.  Invocation command line was
 +generated by GNU Autoconf 2.67.  Invocation command line was
  
    $ $0 $@
  
-@@ -2569,7 +2723,7 @@
+@@ -2579,7 +2723,7 @@
        || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error $? "failed to load site script $ac_site_file
@@ -8558,7 +511,7 @@
    fi
  done
  
-@@ -2804,11 +2958,11 @@
+@@ -2814,11 +2958,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -8572,7 +525,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -3270,7 +3424,7 @@
+@@ -3280,7 +3424,7 @@
  $as_echo "$ac_cv_build" >&6; }
  case $ac_cv_build in
  *-*-*) ;;
@@ -8581,7 +534,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -3303,7 +3457,7 @@
+@@ -3313,7 +3457,7 @@
  $as_echo "$ac_cv_host" >&6; }
  case $ac_cv_host in
  *-*-*) ;;
@@ -8590,7 +543,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -3654,7 +3808,7 @@
+@@ -3664,7 +3808,7 @@
  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error $? "no acceptable C compiler found in \$PATH
@@ -8599,7 +552,7 @@
  
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3769,7 +3923,7 @@
+@@ -3779,7 +3923,7 @@
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error 77 "C compiler cannot create executables
@@ -8608,7 +561,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-@@ -3812,7 +3966,7 @@
+@@ -3822,7 +3966,7 @@
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error $? "cannot compute suffix of executables: cannot compile and link
@@ -8617,7 +570,7 @@
  fi
  rm -f conftest conftest$ac_cv_exeext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3871,7 +4025,7 @@
+@@ -3881,7 +4025,7 @@
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error $? "cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
@@ -8626,7 +579,7 @@
      fi
    fi
  fi
-@@ -3923,7 +4077,7 @@
+@@ -3933,7 +4077,7 @@
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error $? "cannot compute suffix of object files: cannot compile
@@ -8635,7 +588,7 @@
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
-@@ -4363,6 +4517,14 @@
+@@ -4373,6 +4517,14 @@
  
  
  
@@ -8650,7 +603,7 @@
  
  if test -n "$ac_tool_prefix"; then
    for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-@@ -4934,7 +5096,7 @@
+@@ -4944,7 +5096,7 @@
  enable_win32_dll=yes
  
  case $host in
@@ -8659,7 +612,7 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  set dummy ${ac_tool_prefix}as; ac_word=$2
-@@ -5242,8 +5404,8 @@
+@@ -5252,8 +5404,8 @@
  
  
  
@@ -8670,7 +623,7 @@
  
  
  
-@@ -5259,75 +5421,6 @@
+@@ -5269,75 +5421,6 @@
  
  ltmain="$ac_aux_dir/ltmain.sh"
  
@@ -8746,7 +699,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
  if test "${ac_cv_path_SED+set}" = set; then :
-@@ -5793,11 +5886,8 @@
+@@ -5803,11 +5886,8 @@
    NM="$lt_cv_path_NM"
  else
    # Didn't find any BSD compatible name lister, look for dumpbin.
@@ -8760,7 +713,7 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -5841,7 +5931,7 @@
+@@ -5851,7 +5931,7 @@
  fi
  if test -z "$DUMPBIN"; then
    ac_ct_DUMPBIN=$DUMPBIN
@@ -8769,7 +722,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -5896,15 +5986,6 @@
+@@ -5906,15 +5986,6 @@
    fi
  fi
  
@@ -8785,7 +738,7 @@
  
    if test "$DUMPBIN" != ":"; then
      NM="$DUMPBIN"
-@@ -5924,13 +6005,13 @@
+@@ -5934,13 +6005,13 @@
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
@@ -8802,7 +755,7 @@
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
-@@ -5987,11 +6068,6 @@
+@@ -5997,11 +6068,6 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -8814,7 +767,7 @@
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-@@ -6056,8 +6132,8 @@
+@@ -6066,8 +6132,8 @@
        # If test is not a shell built-in, we'll probably end up computing a
        # maximum length that is only half of the actual maximum length, but
        # we can't tell.
@@ -8825,7 +778,7 @@
  	      test $i != 17 # 1/2 MB should be enough
        do
          i=`expr $i + 1`
-@@ -6325,18 +6401,16 @@
+@@ -6335,18 +6401,16 @@
    # Base MSYS/MinGW do not provide the 'file' command needed by
    # func_win32_libid shell function, so use a weaker test based on 'objdump',
    # unless we find 'file', for example because we are cross-compiling.
@@ -8847,7 +800,7 @@
    # use the weaker test based on 'objdump'. See mingw*.
    lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
    lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -6366,10 +6440,6 @@
+@@ -6376,10 +6440,6 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -8858,7 +811,7 @@
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
    case $host_cpu in
-@@ -6378,11 +6448,11 @@
+@@ -6388,11 +6448,11 @@
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
      ;;
    hppa*64*)
@@ -8872,7 +825,7 @@
      lt_cv_file_magic_test_file=/usr/lib/libc.sl
      ;;
    esac
-@@ -6408,7 +6478,7 @@
+@@ -6418,7 +6478,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -8881,7 +834,7 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -6820,18 +6890,6 @@
+@@ -6830,18 +6890,6 @@
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -8900,7 +853,7 @@
  
  
  
-@@ -7001,8 +7059,8 @@
+@@ -7011,8 +7059,8 @@
    test $ac_status = 0; }; then
      # Now try to grab the symbols.
      nlist=conftest.nm
@@ -8911,7 +864,7 @@
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7156,7 +7214,7 @@
+@@ -7166,7 +7214,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -8920,7 +873,7 @@
    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7868,38 +7926,6 @@
+@@ -7878,38 +7926,6 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -8959,7 +912,7 @@
      case $host_os in
      rhapsody* | darwin1.[012])
        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -7927,7 +7953,7 @@
+@@ -7937,7 +7953,7 @@
      else
        _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
      fi
@@ -8968,7 +921,7 @@
        _lt_dsymutil='~$DSYMUTIL $lib || :'
      else
        _lt_dsymutil=
-@@ -7977,7 +8003,7 @@
+@@ -7987,7 +8003,7 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8977,7 +930,7 @@
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -7993,11 +8019,11 @@
+@@ -8003,11 +8019,11 @@
  ac_preproc_ok=:
  break
  fi
@@ -8991,7 +944,7 @@
  if $ac_preproc_ok; then :
    break
  fi
-@@ -8036,7 +8062,7 @@
+@@ -8046,7 +8062,7 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -9000,7 +953,7 @@
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -8052,18 +8078,18 @@
+@@ -8062,18 +8078,18 @@
  ac_preproc_ok=:
  break
  fi
@@ -9022,7 +975,7 @@
  fi
  
  ac_ext=c
-@@ -8217,51 +8243,575 @@
+@@ -8227,37 +8243,561 @@
  
  
  
@@ -9069,39 +1022,16 @@
 -
 -
 -        enable_dlopen=no
--
--
--
--            # Check whether --enable-shared was given.
--if test "${enable_shared+set}" = set; then :
--  enableval=$enable_shared; p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac
 +fi
 +fi
 +CXX=$ac_cv_prog_CXX
 +if test -n "$CXX"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
 +$as_echo "$CXX" >&6; }
- else
--  enable_shared=yes
++else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
- fi
++fi
  
  
 +    test -n "$CXX" && break
@@ -9136,28 +1066,41 @@
 +  done
 +IFS=$as_save_IFS
  
+-            # Check whether --enable-shared was given.
+-if test "${enable_shared+set}" = set; then :
+-  enableval=$enable_shared; p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
 +fi
 +fi
 +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 +if test -n "$ac_ct_CXX"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
 +$as_echo "$ac_ct_CXX" >&6; }
-+else
+ else
+-  enable_shared=yes
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
- 
- 
++
++
 +  test -n "$ac_ct_CXX" && break
 +done
- 
--
--
--
--
--
--# Check whether --with-pic was given.
--if test "${with_pic+set}" = set; then :
++
 +  if test "x$ac_ct_CXX" = x; then
 +    CXX="g++"
 +  else
@@ -9617,24 +1560,10 @@
 +    esac
 +else
 +  enable_shared=yes
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then :
-   withval=$with_pic; pic_mode="$withval"
- else
-   pic_mode=default
-@@ -8339,7 +8889,6 @@
+ fi
+ 
+ 
+@@ -8349,7 +8889,6 @@
  
  
  
@@ -9642,7 +1571,7 @@
  test -z "$LN_S" && LN_S="ln -s"
  
  
-@@ -8389,6 +8938,19 @@
+@@ -8399,6 +8938,19 @@
  
  
  
@@ -9662,7 +1591,7 @@
  case $host_os in
  aix3*)
    # AIX sometimes has problems with the GCC collect2 program.  For some
-@@ -8401,6 +8963,23 @@
+@@ -8411,6 +8963,23 @@
    ;;
  esac
  
@@ -9686,7 +1615,7 @@
  # Global variables:
  ofile=libtool
  can_build_shared=yes
-@@ -8429,7 +9008,7 @@
+@@ -8439,7 +9008,7 @@
      *) break;;
    esac
  done
@@ -9695,16 +1624,7 @@
  
  
  # Only perform the check for file, if the check method requires it
-@@ -8629,17 +9208,16 @@
- $RM -r conftest*
- 
- 
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
- if test -n "$compiler"; then
- 
+@@ -8648,12 +9217,7 @@
  lt_prog_compiler_no_builtin_flag=
  
  if test "$GCC" = yes; then
@@ -9718,7 +1638,7 @@
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-@@ -8659,15 +9237,15 @@
+@@ -8673,15 +9237,15 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -9737,7 +1657,7 @@
       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
       if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8745,12 +9323,6 @@
+@@ -8759,12 +9323,6 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -9750,7 +1670,7 @@
      hpux*)
        # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
        # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8793,13 +9365,6 @@
+@@ -8807,13 +9365,6 @@
        lt_prog_compiler_pic='-fPIC'
        ;;
      esac
@@ -9764,7 +1684,7 @@
    else
      # PORTME Check for flag to pass linker flags through the system compiler.
      case $host_os in
-@@ -8862,7 +9427,7 @@
+@@ -8876,7 +9427,7 @@
  	lt_prog_compiler_pic='--shared'
  	lt_prog_compiler_static='--static'
  	;;
@@ -9773,7 +1693,7 @@
          # Portland Group compilers (*not* the Pentium gcc compiler,
  	# which looks to be a dead project)
  	lt_prog_compiler_wl='-Wl,'
-@@ -8874,26 +9439,26 @@
+@@ -8888,26 +9439,26 @@
          # All Alpha code is PIC.
          lt_prog_compiler_static='-non_shared'
          ;;
@@ -9808,7 +1728,7 @@
  	esac
  	;;
        esac
-@@ -8924,7 +9489,7 @@
+@@ -8938,7 +9489,7 @@
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -9817,7 +1737,7 @@
  	lt_prog_compiler_wl='-Qoption ld ';;
        *)
  	lt_prog_compiler_wl='-Wl,';;
-@@ -9011,15 +9576,15 @@
+@@ -9025,15 +9576,15 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -9836,7 +1756,7 @@
       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
       if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_pic_works=yes
-@@ -9067,7 +9632,7 @@
+@@ -9081,7 +9632,7 @@
       if test -s conftest.err; then
         # Append any errors to the config.log.
         cat conftest.err 1>&5
@@ -9845,7 +1765,7 @@
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
           lt_cv_prog_compiler_static_works=yes
-@@ -9116,16 +9681,16 @@
+@@ -9130,16 +9681,16 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -9865,7 +1785,7 @@
       $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
       if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o=yes
-@@ -9171,16 +9736,16 @@
+@@ -9185,16 +9736,16 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -9885,7 +1805,7 @@
       $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
       if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o=yes
-@@ -9290,36 +9855,13 @@
+@@ -9304,36 +9855,13 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -9925,7 +1845,7 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
-@@ -9353,12 +9895,11 @@
+@@ -9367,12 +9895,11 @@
  	ld_shlibs=no
  	cat <<_LT_EOF 1>&2
  
@@ -9941,7 +1861,7 @@
  
  _LT_EOF
        fi
-@@ -9394,7 +9935,6 @@
+@@ -9408,7 +9935,6 @@
        # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec='-L$libdir'
@@ -9949,7 +1869,7 @@
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
-@@ -9416,11 +9956,6 @@
+@@ -9430,11 +9956,6 @@
        fi
        ;;
  
@@ -9961,7 +1881,7 @@
      interix[3-9]*)
        hardcode_direct=no
        hardcode_shlibpath_var=no
-@@ -9450,12 +9985,11 @@
+@@ -9464,12 +9985,11 @@
  	tmp_sharedflag='-shared'
  	case $cc_basename,$host_cpu in
          pgcc*)				# Portland Group C compiler
@@ -9977,7 +1897,7 @@
  	  tmp_addflag=' $pic_flag -Mnomain' ;;
  	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
  	  tmp_addflag=' -i_dynamic' ;;
-@@ -9466,17 +10000,13 @@
+@@ -9480,17 +10000,13 @@
  	lf95*)				# Lahey Fortran 8.1
  	  whole_archive_flag_spec=
  	  tmp_sharedflag='--shared' ;;
@@ -9997,7 +1917,7 @@
  	  compiler_needs_object=yes
  	  tmp_sharedflag='-G' ;;
  	*Sun\ F*)			# Sun Fortran 8.3
-@@ -9492,17 +10022,17 @@
+@@ -9506,17 +10022,17 @@
          fi
  
  	case $cc_basename in
@@ -10018,7 +1938,7 @@
  	  fi
  	  ;;
  	esac
-@@ -9511,7 +10041,7 @@
+@@ -9525,7 +10041,7 @@
        fi
        ;;
  
@@ -10027,7 +1947,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -9623,10 +10153,8 @@
+@@ -9637,10 +10153,8 @@
        else
  	# If we're using GNU nm, then we don't want the "-C" option.
  	# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -10039,7 +1959,7 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
  	fi
-@@ -9688,6 +10216,7 @@
+@@ -9702,6 +10216,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -10047,7 +1967,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9744,7 +10273,7 @@
+@@ -9758,7 +10273,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10056,7 +1976,7 @@
        else
  	if test "$host_cpu" = ia64; then
  	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9788,13 +10317,8 @@
+@@ -9802,13 +10317,8 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -10072,7 +1992,7 @@
  	  archive_cmds_need_lc=yes
  	  # This is similar to how AIX traditionally builds its shared libraries.
  	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9833,7 +10357,7 @@
+@@ -9847,7 +10357,7 @@
        # Tell ltmain to make .dll files, not .so files.
        shrext_cmds=".dll"
        # FIXME: Setting linknames here is a bad hack.
@@ -10081,7 +2001,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_from_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -9849,11 +10373,7 @@
+@@ -9863,11 +10373,7 @@
    hardcode_direct=no
    hardcode_automatic=yes
    hardcode_shlibpath_var=unsupported
@@ -10094,7 +2014,7 @@
    link_all_deplibs=yes
    allow_undefined_flag="$_lt_dar_allow_undefined"
    case $cc_basename in
-@@ -9861,7 +10381,7 @@
+@@ -9875,7 +10381,7 @@
       *) _lt_dar_can_shared=$GCC ;;
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
@@ -10103,7 +2023,7 @@
      archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
      module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
      archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9927,7 +10447,7 @@
+@@ -9941,7 +10447,7 @@
        ;;
  
      hpux10*)
@@ -10112,7 +2032,7 @@
  	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
        else
  	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -9946,7 +10466,7 @@
+@@ -9960,7 +10466,7 @@
        ;;
  
      hpux11*)
@@ -10121,7 +2041,7 @@
  	case $host_cpu in
  	hppa*64*)
  	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -9967,46 +10487,7 @@
+@@ -9981,46 +10487,7 @@
  	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  	  ;;
  	*)
@@ -10169,7 +2089,7 @@
  	  ;;
  	esac
        fi
-@@ -10034,7 +10515,7 @@
+@@ -10048,7 +10515,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -10178,7 +2098,7 @@
  	# Try to use the -exported_symbol ld option, if it does not
  	# work, assume that -exports_file does not work either and
  	# implicitly export all symbols.
-@@ -10045,15 +10526,15 @@
+@@ -10059,15 +10526,15 @@
  int foo(void) {}
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
@@ -10197,7 +2117,7 @@
        fi
        archive_cmds_need_lc='no'
        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10062,7 +10543,7 @@
+@@ -10076,7 +10543,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -10206,7 +2126,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10115,17 +10596,17 @@
+@@ -10129,17 +10596,17 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -10227,7 +2147,7 @@
        fi
        archive_cmds_need_lc='no'
        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10135,13 +10616,13 @@
+@@ -10149,13 +10616,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -10244,7 +2164,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10344,50 +10825,44 @@
+@@ -10358,50 +10825,44 @@
        # to ld, don't add -lc before -lgcc.
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
  $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -10324,7 +2244,7 @@
        ;;
      esac
    fi
-@@ -10558,23 +11033,16 @@
+@@ -10572,23 +11033,16 @@
      darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
      *) lt_awk_arg="/^libraries:/" ;;
    esac
@@ -10354,7 +2274,7 @@
    # Ok, now we have the path, separated by spaces, we can step through it
    # and add multilib dir if necessary.
    lt_tmp_lt_search_path_spec=
-@@ -10587,7 +11055,7 @@
+@@ -10601,7 +11055,7 @@
  	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
      fi
    done
@@ -10363,7 +2283,7 @@
  BEGIN {RS=" "; FS="/|\n";} {
    lt_foo="";
    lt_count=0;
-@@ -10607,13 +11075,7 @@
+@@ -10621,13 +11075,7 @@
    if (lt_foo != "") { lt_freq[lt_foo]++; }
    if (lt_freq[lt_foo] == 1) { print lt_foo; }
  }'`
@@ -10378,7 +2298,7 @@
  else
    sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  fi
-@@ -10701,7 +11163,7 @@
+@@ -10715,7 +11163,7 @@
    m68k)
      library_names_spec='$libname.ixlibrary $libname.a'
      # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -10387,7 +2307,7 @@
      ;;
    esac
    ;;
-@@ -10754,12 +11216,23 @@
+@@ -10768,12 +11216,23 @@
      cygwin*)
        # Cygwin DLLs use 'cyg' prefix rather than 'lib'
        soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -10413,7 +2333,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -10859,19 +11332,6 @@
+@@ -10873,19 +11332,6 @@
    hardcode_into_libs=yes
    ;;
  
@@ -10433,7 +2353,7 @@
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -10914,10 +11374,8 @@
+@@ -10928,10 +11374,8 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      ;;
    esac
@@ -10445,7 +2365,7 @@
    ;;
  
  interix[3-9]*)
-@@ -10984,17 +11442,12 @@
+@@ -10998,17 +11442,12 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -10468,7 +2388,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -11007,31 +11460,23 @@
+@@ -11021,31 +11460,23 @@
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
    if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -10505,7 +2425,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11043,6 +11488,18 @@
+@@ -11057,6 +11488,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -10524,7 +2444,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -11333,11 +11790,6 @@
+@@ -11347,11 +11790,6 @@
  
  
  
@@ -10536,7 +2456,7 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action=
-@@ -11668,7 +12120,7 @@
+@@ -11682,7 +12120,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
@@ -10545,7 +2465,7 @@
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11709,13 +12161,7 @@
+@@ -11723,13 +12161,7 @@
  #  endif
  #endif
  
@@ -10560,7 +2480,7 @@
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11724,11 +12170,7 @@
+@@ -11738,11 +12170,7 @@
    if (self)
      {
        if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -10573,7 +2493,7 @@
        /* dlclose (self); */
      }
    else
-@@ -11774,7 +12216,7 @@
+@@ -11788,7 +12216,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
@@ -10582,7 +2502,7 @@
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11815,13 +12257,7 @@
+@@ -11829,13 +12257,7 @@
  #  endif
  #endif
  
@@ -10597,7 +2517,7 @@
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11830,11 +12266,7 @@
+@@ -11844,11 +12266,7 @@
    if (self)
      {
        if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -10610,7 +2530,7 @@
        /* dlclose (self); */
      }
    else
-@@ -11952,184 +12384,45 @@
+@@ -11966,184 +12384,45 @@
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
@@ -10822,7 +2742,7 @@
  
  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -12156,8 +12449,6 @@
+@@ -12170,8 +12449,6 @@
  module_expsym_cmds_CXX=
  link_all_deplibs_CXX=unknown
  old_archive_cmds_CXX=$old_archive_cmds
@@ -10831,7 +2751,7 @@
  no_undefined_flag_CXX=
  whole_archive_flag_spec_CXX=
  enable_shared_with_static_runtimes_CXX=no
-@@ -12240,7 +12531,7 @@
+@@ -12254,7 +12531,7 @@
      *) break;;
    esac
  done
@@ -10840,7 +2760,7 @@
  
  
    if test -n "$compiler"; then
-@@ -12402,7 +12693,7 @@
+@@ -12416,7 +12693,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
@@ -10849,7 +2769,7 @@
  
      else
        GXX=no
-@@ -12544,7 +12835,7 @@
+@@ -12558,7 +12835,7 @@
  
            hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -10858,7 +2778,7 @@
          else
            if test "$host_cpu" = ia64; then
  	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -12588,13 +12879,8 @@
+@@ -12602,13 +12879,8 @@
  	    # -berok will link without error, but may produce a broken library.
  	    no_undefined_flag_CXX=' ${wl}-bernotok'
  	    allow_undefined_flag_CXX=' ${wl}-berok'
@@ -10874,7 +2794,7 @@
  	    archive_cmds_need_lc_CXX=yes
  	    # This is similar to how AIX traditionally builds its shared
  	    # libraries.
-@@ -12627,7 +12913,6 @@
+@@ -12641,7 +12913,6 @@
          # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
          # as there is no search path for DLLs.
          hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -10882,7 +2802,7 @@
          allow_undefined_flag_CXX=unsupported
          always_export_symbols_CXX=no
          enable_shared_with_static_runtimes_CXX=yes
-@@ -12654,11 +12939,7 @@
+@@ -12668,11 +12939,7 @@
    hardcode_direct_CXX=no
    hardcode_automatic_CXX=yes
    hardcode_shlibpath_var_CXX=unsupported
@@ -10895,7 +2815,7 @@
    link_all_deplibs_CXX=yes
    allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
    case $cc_basename in
-@@ -12666,7 +12947,7 @@
+@@ -12680,7 +12947,7 @@
       *) _lt_dar_can_shared=$GCC ;;
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
@@ -10904,7 +2824,7 @@
      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -12719,11 +13000,6 @@
+@@ -12733,11 +13000,6 @@
        gnu*)
          ;;
  
@@ -10916,7 +2836,7 @@
        hpux9*)
          hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
          hardcode_libdir_separator_CXX=:
-@@ -12748,7 +13024,7 @@
+@@ -12762,7 +13024,7 @@
              # explicitly linking system object files so we need to strip them
              # from the output so that they don't get included in the library
              # dependencies.
@@ -10925,7 +2845,7 @@
              ;;
            *)
              if test "$GXX" = yes; then
-@@ -12813,7 +13089,7 @@
+@@ -12827,7 +13089,7 @@
  	    # explicitly linking system object files so we need to strip them
  	    # from the output so that they don't get included in the library
  	    # dependencies.
@@ -10934,7 +2854,7 @@
  	    ;;
            *)
  	    if test "$GXX" = yes; then
-@@ -12856,7 +13132,7 @@
+@@ -12870,7 +13132,7 @@
          case $cc_basename in
            CC*)
  	    # SGI C++
@@ -10943,7 +2863,7 @@
  
  	    # Archives containing C++ object files must be created using
  	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -12867,9 +13143,9 @@
+@@ -12881,9 +13143,9 @@
            *)
  	    if test "$GXX" = yes; then
  	      if test "$with_gnu_ld" = no; then
@@ -10955,7 +2875,7 @@
  	      fi
  	    fi
  	    link_all_deplibs_CXX=yes
-@@ -12898,7 +13174,7 @@
+@@ -12912,7 +13174,7 @@
  	    # explicitly linking system object files so we need to strip them
  	    # from the output so that they don't get included in the library
  	    # dependencies.
@@ -10964,7 +2884,7 @@
  
  	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12935,26 +13211,26 @@
+@@ -12949,26 +13211,26 @@
            pgCC* | pgcpp*)
              # Portland Group C++ compiler
  	    case `$CC -V` in
@@ -10997,7 +2917,7 @@
  	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  	      ;;
-@@ -12962,7 +13238,7 @@
+@@ -12976,7 +13238,7 @@
  
  	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
  	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -11006,7 +2926,7 @@
              ;;
  	  cxx*)
  	    # Compaq C++
-@@ -12981,9 +13257,9 @@
+@@ -12995,9 +13257,9 @@
  	    # explicitly linking system object files so we need to strip them
  	    # from the output so that they don't get included in the library
  	    # dependencies.
@@ -11018,7 +2938,7 @@
  	    # IBM XL 8.0 on PPC, with GNU ld
  	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -13003,13 +13279,13 @@
+@@ -13017,13 +13279,13 @@
  	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
  	      hardcode_libdir_flag_spec_CXX='-R$libdir'
@@ -11034,7 +2954,7 @@
  
  	      # Archives containing C++ object files must be created using
  	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13078,7 +13354,7 @@
+@@ -13092,7 +13354,7 @@
  	    export_dynamic_flag_spec_CXX='${wl}-E'
  	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
  	  fi
@@ -11043,7 +2963,7 @@
  	else
  	  ld_shlibs_CXX=no
  	fi
-@@ -13113,15 +13389,15 @@
+@@ -13127,15 +13389,15 @@
  	    case $host in
  	      osf3*)
  	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -11062,7 +2982,7 @@
  	          $RM $lib.exp'
  	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
  		;;
-@@ -13137,17 +13413,17 @@
+@@ -13151,17 +13413,17 @@
  	    # explicitly linking system object files so we need to strip them
  	    # from the output so that they don't get included in the library
  	    # dependencies.
@@ -11083,7 +3003,7 @@
  		  ;;
  	      esac
  
-@@ -13157,7 +13433,7 @@
+@@ -13171,7 +13433,7 @@
  	      # Commands to make compiler produce verbose output that lists
  	      # what "hidden" libraries, object files and flags are used when
  	      # linking a shared library.
@@ -11092,7 +3012,7 @@
  
  	    else
  	      # FIXME: insert proper C++ library support
-@@ -13193,7 +13469,7 @@
+@@ -13207,7 +13469,7 @@
  
        solaris*)
          case $cc_basename in
@@ -11101,7 +3021,7 @@
  	    # Sun C++ 4.2, 5.x and Centerline C++
              archive_cmds_need_lc_CXX=yes
  	    no_undefined_flag_CXX=' -zdefs'
-@@ -13214,7 +13490,7 @@
+@@ -13228,7 +13490,7 @@
  	    esac
  	    link_all_deplibs_CXX=yes
  
@@ -11110,7 +3030,7 @@
  
  	    # Archives containing C++ object files must be created using
  	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13241,7 +13517,7 @@
+@@ -13255,7 +13517,7 @@
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
  	        # linking a shared library.
@@ -11119,7 +3039,7 @@
  	      else
  	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	        # platform.
-@@ -13252,7 +13528,7 @@
+@@ -13266,7 +13528,7 @@
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
  	        # linking a shared library.
@@ -11128,7 +3048,7 @@
  	      fi
  
  	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -13306,10 +13582,6 @@
+@@ -13320,10 +13582,6 @@
            CC*)
  	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
  	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -11139,7 +3059,7 @@
  	    ;;
  	  *)
  	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -13491,7 +13763,7 @@
+@@ -13505,7 +13763,7 @@
  
  solaris*)
    case $cc_basename in
@@ -11148,7 +3068,7 @@
      # The more standards-conforming stlport4 library is
      # incompatible with the Cstd library. Avoid specifying
      # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -13607,11 +13879,6 @@
+@@ -13621,11 +13879,6 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -11160,7 +3080,7 @@
      interix[3-9]*)
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
-@@ -13750,8 +14017,8 @@
+@@ -13764,8 +14017,8 @@
  	    lt_prog_compiler_pic_CXX=
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    ;;
@@ -11171,7 +3091,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_pic_CXX='-qpic'
  	    lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -13781,7 +14048,7 @@
+@@ -13795,7 +14048,7 @@
  	    ;;
  	esac
  	;;
@@ -11180,7 +3100,7 @@
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -13813,7 +14080,7 @@
+@@ -13827,7 +14080,7 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -11189,7 +3109,7 @@
  	    # Sun C++ 4.2, 5.x and Centerline C++
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    lt_prog_compiler_static_CXX='-Bstatic'
-@@ -13905,15 +14172,15 @@
+@@ -13919,15 +14172,15 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -11208,7 +3128,7 @@
       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
       if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_pic_works_CXX=yes
-@@ -13958,7 +14225,7 @@
+@@ -13972,7 +14225,7 @@
       if test -s conftest.err; then
         # Append any errors to the config.log.
         cat conftest.err 1>&5
@@ -11217,7 +3137,7 @@
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
           lt_cv_prog_compiler_static_works_CXX=yes
-@@ -14004,16 +14271,16 @@
+@@ -14018,16 +14271,16 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -11237,7 +3157,7 @@
       $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
       if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o_CXX=yes
-@@ -14056,16 +14323,16 @@
+@@ -14070,16 +14323,16 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -11257,7 +3177,7 @@
       $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
       if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o_CXX=yes
-@@ -14120,10 +14387,8 @@
+@@ -14134,10 +14387,8 @@
    aix[4-9]*)
      # If we're using GNU nm, then we don't want the "-C" option.
      # -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -11269,7 +3189,7 @@
      else
        export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
      fi
-@@ -14134,6 +14399,9 @@
+@@ -14148,6 +14399,9 @@
    cygwin* | mingw* | cegcc*)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -11279,7 +3199,7 @@
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -14170,50 +14438,44 @@
+@@ -14184,50 +14438,44 @@
        # to ld, don't add -lc before -lgcc.
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
  $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -11359,7 +3279,7 @@
        ;;
      esac
    fi
-@@ -14370,7 +14632,7 @@
+@@ -14384,7 +14632,7 @@
    m68k)
      library_names_spec='$libname.ixlibrary $libname.a'
      # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11368,7 +3288,7 @@
      ;;
    esac
    ;;
-@@ -14423,11 +14685,23 @@
+@@ -14437,11 +14685,23 @@
      cygwin*)
        # Cygwin DLLs use 'cyg' prefix rather than 'lib'
        soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -11393,7 +3313,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -14526,19 +14800,6 @@
+@@ -14540,19 +14800,6 @@
    hardcode_into_libs=yes
    ;;
  
@@ -11413,7 +3333,7 @@
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -14581,10 +14842,8 @@
+@@ -14595,10 +14842,8 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      ;;
    esac
@@ -11425,7 +3345,7 @@
    ;;
  
  interix[3-9]*)
-@@ -14651,17 +14910,12 @@
+@@ -14665,17 +14910,12 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -11448,7 +3368,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -14674,31 +14928,23 @@
+@@ -14688,31 +14928,23 @@
  _ACEOF
  if ac_fn_cxx_try_link "$LINENO"; then :
    if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -11485,7 +3405,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14710,6 +14956,18 @@
+@@ -14724,6 +14956,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -11504,7 +3424,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14949,8 +15207,6 @@
+@@ -14963,8 +15207,6 @@
  
  
  
@@ -11513,7 +3433,7 @@
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action_CXX=
-@@ -15037,15 +15293,16 @@
+@@ -15051,15 +15293,16 @@
  : ${CONFIG_LT=./config.lt}
  { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
  $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -11535,7 +3455,7 @@
  ## -------------------- ##
  ## M4sh Initialization. ##
  ## -------------------- ##
-@@ -15170,6 +15427,7 @@
+@@ -15184,6 +15427,7 @@
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
  
@@ -11543,7 +3463,7 @@
  # as_fn_error STATUS ERROR [LINENO LOG_FD]
  # ----------------------------------------
  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-@@ -15378,7 +15636,7 @@
+@@ -15392,7 +15636,7 @@
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -11552,7 +3472,7 @@
  
  
  } # as_fn_mkdir_p
-@@ -15419,15 +15677,8 @@
+@@ -15433,15 +15677,8 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -11569,10 +3489,10 @@
  exec 5>>config.log
  {
    echo
-@@ -15452,9 +15703,9 @@
+@@ -15466,9 +15703,9 @@
  
  lt_cl_version="\
- gtk+ config.lt 2.21.8
+ gtk+ config.lt 2.22.0
 -configured by $0, generated by GNU Autoconf 2.66.
 +configured by $0, generated by GNU Autoconf 2.67.
  
@@ -11581,7 +3501,7 @@
  This config.lt script is free software; the Free Software Foundation
  gives unlimited permision to copy, distribute and modify it."
  
-@@ -15471,10 +15722,10 @@
+@@ -15485,10 +15722,10 @@
        lt_cl_silent=: ;;
  
      -*) as_fn_error $? "unrecognized option: $1
@@ -11594,7 +3514,7 @@
    esac
    shift
  done
-@@ -15494,203 +15745,186 @@
+@@ -15508,203 +15745,186 @@
  sed_quote_subst='$sed_quote_subst'
  double_quote_subst='$double_quote_subst'
  delay_variable_subst='$delay_variable_subst'
@@ -11972,7 +3892,7 @@
  GREP \
  EGREP \
  FGREP \
-@@ -15713,6 +15947,8 @@
+@@ -15727,6 +15947,8 @@
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -11981,7 +3901,7 @@
  lt_prog_compiler_no_builtin_flag \
  lt_prog_compiler_wl \
  lt_prog_compiler_pic \
-@@ -15742,7 +15978,6 @@
+@@ -15756,7 +15978,6 @@
  libname_spec \
  library_names_spec \
  soname_spec \
@@ -11989,7 +3909,7 @@
  finish_eval \
  old_striplib \
  striplib \
-@@ -15753,7 +15988,6 @@
+@@ -15767,7 +15988,6 @@
  postdeps \
  compiler_lib_search_path \
  LD_CXX \
@@ -11997,7 +3917,7 @@
  compiler_CXX \
  lt_prog_compiler_no_builtin_flag_CXX \
  lt_prog_compiler_wl_CXX \
-@@ -15779,9 +16013,9 @@
+@@ -15793,9 +16013,9 @@
  predeps_CXX \
  postdeps_CXX \
  compiler_lib_search_path_CXX; do
@@ -12009,7 +3929,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -15808,7 +16042,6 @@
+@@ -15822,7 +16042,6 @@
  finish_cmds \
  sys_lib_search_path_spec \
  sys_lib_dlsearch_path_spec \
@@ -12017,7 +3937,7 @@
  old_archive_cmds_CXX \
  old_archive_from_new_cmds_CXX \
  old_archive_from_expsyms_cmds_CXX \
-@@ -15818,9 +16051,9 @@
+@@ -15832,9 +16051,9 @@
  module_expsym_cmds_CXX \
  export_symbols_cmds_CXX \
  prelink_cmds_CXX; do
@@ -12029,7 +3949,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -15828,6 +16061,12 @@
+@@ -15842,6 +16061,12 @@
      esac
  done
  
@@ -12042,7 +3962,7 @@
  ac_aux_dir='$ac_aux_dir'
  xsi_shell='$xsi_shell'
  lt_shell_append='$lt_shell_append'
-@@ -15875,8 +16114,7 @@
+@@ -15889,8 +16114,7 @@
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12052,7 +3972,7 @@
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -15912,13 +16150,13 @@
+@@ -15926,13 +16150,13 @@
  build_old_libs=$enable_static
  
  # Assembler program.
@@ -12069,7 +3989,7 @@
  
  # Which release of libtool.m4 was used?
  macro_version=$macro_version
-@@ -15933,12 +16171,6 @@
+@@ -15947,12 +16171,6 @@
  # Whether or not to optimize for fast installation.
  fast_install=$enable_fast_install
  
@@ -12082,7 +4002,7 @@
  # The host system.
  host_alias=$host_alias
  host=$host
-@@ -15988,6 +16220,10 @@
+@@ -16002,6 +16220,10 @@
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -12093,7 +4013,7 @@
  # Method to check whether dependent libraries are shared objects.
  deplibs_check_method=$lt_deplibs_check_method
  
-@@ -16006,9 +16242,6 @@
+@@ -16020,9 +16242,6 @@
  old_postinstall_cmds=$lt_old_postinstall_cmds
  old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
@@ -12103,7 +4023,7 @@
  # A C compiler.
  LTCC=$lt_CC
  
-@@ -16030,6 +16263,12 @@
+@@ -16044,6 +16263,12 @@
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
@@ -12116,7 +4036,7 @@
  # Used to examine libraries when file_magic_cmd begins with "file".
  MAGIC_CMD=$MAGIC_CMD
  
-@@ -16092,9 +16331,6 @@
+@@ -16106,9 +16331,6 @@
  # The coded name of the library, if different from the real name.
  soname_spec=$lt_soname_spec
  
@@ -12126,7 +4046,7 @@
  # Command to use after installation of a shared archive.
  postinstall_cmds=$lt_postinstall_cmds
  
-@@ -16134,10 +16370,6 @@
+@@ -16148,10 +16370,6 @@
  # The linker used to build libraries.
  LD=$lt_LD
  
@@ -12137,7 +4057,7 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds
  
-@@ -16411,7 +16643,7 @@
+@@ -16425,7 +16643,7 @@
  func_dirname ()
  {
    # Extract subdirectory from the argument.
@@ -12146,7 +4066,7 @@
    if test "X$func_dirname_result" = "X${1}"; then
      func_dirname_result="${3}"
    else
-@@ -16422,7 +16654,7 @@
+@@ -16436,7 +16654,7 @@
  # func_basename file
  func_basename ()
  {
@@ -12155,7 +4075,7 @@
  }
  
  
-@@ -16435,8 +16667,10 @@
+@@ -16449,8 +16667,10 @@
  func_stripname ()
  {
    case ${2} in
@@ -12168,7 +4088,7 @@
    esac
  }
  
-@@ -16447,20 +16681,20 @@
+@@ -16461,20 +16681,20 @@
  # func_opt_split
  func_opt_split ()
  {
@@ -12193,7 +4113,7 @@
  }
  
  # func_arith arithmetic-term...
-@@ -16521,10 +16755,6 @@
+@@ -16535,10 +16755,6 @@
  # The linker used to build libraries.
  LD=$lt_LD_CXX
  
@@ -12204,7 +4124,7 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds_CXX
  
-@@ -16679,13 +16909,15 @@
+@@ -16693,13 +16909,15 @@
  # appending to config.log, which fails on DOS, as config.log is still kept
  # open by configure.  Here we exec the FD to /dev/null, effectively closing
  # config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -12227,7 +4147,7 @@
  
  
  
-@@ -17307,6 +17539,26 @@
+@@ -17321,6 +17539,26 @@
    enable_xinerama="yes"
  fi
  
@@ -12254,7 +4174,7 @@
  # Check whether --enable-rebuilds was given.
  if test "${enable_rebuilds+set}" = set; then :
    enableval=$enable_rebuilds;
-@@ -17345,7 +17597,7 @@
+@@ -17359,7 +17597,7 @@
  
  case $gdktarget in
    x11|win32|quartz|directfb) ;;
@@ -12263,7 +4183,7 @@
  esac
  
  gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -17390,11 +17642,11 @@
+@@ -17404,11 +17642,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -12277,7 +4197,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -17790,7 +18042,7 @@
+@@ -17804,7 +18042,7 @@
  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error $? "no acceptable C compiler found in \$PATH
@@ -12286,7 +4206,7 @@
  
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -18573,7 +18825,6 @@
+@@ -18587,7 +18825,6 @@
  Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS
  and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details." "$LINENO" 5
@@ -12294,7 +4214,7 @@
  elif test $pkg_failed = untried; then
       	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -18588,8 +18839,7 @@
+@@ -18602,8 +18839,7 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12304,7 +4224,7 @@
  else
  	BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
  	BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-@@ -18675,7 +18925,6 @@
+@@ -18689,7 +18925,6 @@
  Alternatively, you may set the environment variables CAIRO_BACKEND_CFLAGS
  and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details." "$LINENO" 5
@@ -12312,7 +4232,7 @@
  elif test $pkg_failed = untried; then
       	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -18690,8 +18939,7 @@
+@@ -18704,8 +18939,7 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12322,7 +4242,7 @@
  else
  	CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
  	CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
-@@ -20926,7 +21174,7 @@
+@@ -20940,7 +21174,7 @@
  else
    gdk_wchar_h=no
  fi
@@ -12331,7 +4251,7 @@
  if test $gdk_wchar_h = yes; then
  
  $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
-@@ -20947,7 +21195,7 @@
+@@ -20961,7 +21195,7 @@
  else
    gdk_wctype_h=no
  fi
@@ -12340,7 +4260,7 @@
  if test $gdk_wctype_h = yes; then
  
  $as_echo "#define HAVE_WCTYPE_H 1" >>confdefs.h
-@@ -21065,7 +21313,7 @@
+@@ -21079,7 +21313,7 @@
  else
    gtk_uxtheme_h=no
  fi
@@ -12349,7 +4269,7 @@
  if test $gtk_uxtheme_h = yes; then
  
  $as_echo "#define HAVE_UXTHEME_H 1" >>confdefs.h
-@@ -21709,7 +21957,7 @@
+@@ -21723,7 +21957,7 @@
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
@@ -12358,7 +4278,7 @@
      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-@@ -21813,7 +22061,7 @@
+@@ -21827,7 +22061,7 @@
    fi
  done
  fi
@@ -12367,7 +4287,7 @@
  fi # $ac_x_includes = no
  
  if test "$ac_x_libraries" = no; then
-@@ -22839,7 +23087,8 @@
+@@ -22853,7 +23087,8 @@
  
  
    # Check for the RANDR extension
@@ -12377,7 +4297,7 @@
  
  $as_echo "#define HAVE_RANDR 1" >>confdefs.h
  
-@@ -22859,7 +23108,8 @@
+@@ -22873,7 +23108,8 @@
  
    # Checks for XFixes extension
  
@@ -12387,7 +4307,7 @@
  
  $as_echo "#define HAVE_XFIXES 1" >>confdefs.h
  
-@@ -22870,7 +23120,8 @@
+@@ -22884,7 +23120,8 @@
  
    # Checks for Xcomposite extension
  
@@ -12397,7 +4317,7 @@
  
  $as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
  
-@@ -22881,7 +23132,7 @@
+@@ -22895,7 +23132,7 @@
  
    # Checks for Xdamage extension
  
@@ -12406,7 +4326,7 @@
  
  $as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
  
-@@ -23050,7 +23301,6 @@
+@@ -23064,7 +23301,6 @@
  Alternatively, you may set the environment variables DIRECTFB_CFLAGS
  and DIRECTFB_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details." "$LINENO" 5
@@ -12414,7 +4334,7 @@
  elif test $pkg_failed = untried; then
       	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -23065,8 +23315,7 @@
+@@ -23079,8 +23315,7 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12424,7 +4344,7 @@
  else
  	DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
  	DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
-@@ -23159,20 +23408,23 @@
+@@ -23173,20 +23408,23 @@
  
  # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
  if test "x$gdktarget" = "xx11"; then
@@ -12453,7 +4373,7 @@
  fi
  
  
-@@ -23182,6 +23434,7 @@
+@@ -23196,6 +23434,7 @@
  
  
  
@@ -12461,7 +4381,7 @@
  ########################################
  # Check for Accessibility Toolkit flags
  ########################################
-@@ -24479,6 +24732,10 @@
+@@ -24493,6 +24732,10 @@
    as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -12472,7 +4392,7 @@
  if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
    as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -24491,6 +24748,10 @@
+@@ -24505,6 +24748,10 @@
    as_fn_error $? "conditional \"HAVE_OBJC\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -12483,25 +4403,25 @@
  if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
    as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -25112,7 +25373,7 @@
+@@ -25126,7 +25373,7 @@
  # values after options handling.
  ac_log="
- This file was extended by gtk+ $as_me 2.21.8, which was
+ This file was extended by gtk+ $as_me 2.22.0, which was
 -generated by GNU Autoconf 2.66.  Invocation command line was
 +generated by GNU Autoconf 2.67.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -25178,7 +25439,7 @@
+@@ -25192,7 +25439,7 @@
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- gtk+ config.status 2.21.8
+ gtk+ config.status 2.22.0
 -configured by $0, generated by GNU Autoconf 2.66,
 +configured by $0, generated by GNU Autoconf 2.67,
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -25199,11 +25460,16 @@
+@@ -25213,11 +25460,16 @@
  while test $# != 0
  do
    case $1 in
@@ -12519,7 +4439,7 @@
    *)
      ac_option=$1
      ac_optarg=$2
-@@ -25225,6 +25491,7 @@
+@@ -25239,6 +25491,7 @@
      $ac_shift
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -12527,7 +4447,7 @@
      esac
      as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
-@@ -25300,203 +25567,186 @@
+@@ -25314,203 +25567,186 @@
  sed_quote_subst='$sed_quote_subst'
  double_quote_subst='$double_quote_subst'
  delay_variable_subst='$delay_variable_subst'
@@ -12905,7 +4825,7 @@
  GREP \
  EGREP \
  FGREP \
-@@ -25519,6 +25769,8 @@
+@@ -25533,6 +25769,8 @@
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12914,7 +4834,7 @@
  lt_prog_compiler_no_builtin_flag \
  lt_prog_compiler_wl \
  lt_prog_compiler_pic \
-@@ -25548,7 +25800,6 @@
+@@ -25562,7 +25800,6 @@
  libname_spec \
  library_names_spec \
  soname_spec \
@@ -12922,7 +4842,7 @@
  finish_eval \
  old_striplib \
  striplib \
-@@ -25559,7 +25810,6 @@
+@@ -25573,7 +25810,6 @@
  postdeps \
  compiler_lib_search_path \
  LD_CXX \
@@ -12930,7 +4850,7 @@
  compiler_CXX \
  lt_prog_compiler_no_builtin_flag_CXX \
  lt_prog_compiler_wl_CXX \
-@@ -25585,9 +25835,9 @@
+@@ -25599,9 +25835,9 @@
  predeps_CXX \
  postdeps_CXX \
  compiler_lib_search_path_CXX; do
@@ -12942,7 +4862,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25614,7 +25864,6 @@
+@@ -25628,7 +25864,6 @@
  finish_cmds \
  sys_lib_search_path_spec \
  sys_lib_dlsearch_path_spec \
@@ -12950,7 +4870,7 @@
  old_archive_cmds_CXX \
  old_archive_from_new_cmds_CXX \
  old_archive_from_expsyms_cmds_CXX \
-@@ -25624,9 +25873,9 @@
+@@ -25638,9 +25873,9 @@
  module_expsym_cmds_CXX \
  export_symbols_cmds_CXX \
  prelink_cmds_CXX; do
@@ -12962,7 +4882,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25634,6 +25883,12 @@
+@@ -25648,6 +25883,12 @@
      esac
  done
  
@@ -12975,7 +4895,7 @@
  ac_aux_dir='$ac_aux_dir'
  xsi_shell='$xsi_shell'
  lt_shell_append='$lt_shell_append'
-@@ -25768,7 +26023,7 @@
+@@ -25782,7 +26023,7 @@
      "modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;;
      "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
  
@@ -12984,7 +4904,7 @@
    esac
  done
  
-@@ -26084,7 +26339,7 @@
+@@ -26098,7 +26339,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -12993,7 +4913,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -26112,7 +26367,7 @@
+@@ -26126,7 +26367,7 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -13002,7 +4922,7 @@
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
        as_fn_append ac_file_inputs " '$ac_f'"
-@@ -26139,7 +26394,7 @@
+@@ -26153,7 +26394,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -13011,7 +4931,7 @@
      esac
      ;;
    esac
-@@ -26475,8 +26730,7 @@
+@@ -26489,8 +26730,7 @@
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -13021,7 +4941,7 @@
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -26512,13 +26766,13 @@
+@@ -26526,13 +26766,13 @@
  build_old_libs=$enable_static
  
  # Assembler program.
@@ -13038,7 +4958,7 @@
  
  # Which release of libtool.m4 was used?
  macro_version=$macro_version
-@@ -26533,12 +26787,6 @@
+@@ -26547,12 +26787,6 @@
  # Whether or not to optimize for fast installation.
  fast_install=$enable_fast_install
  
@@ -13051,7 +4971,7 @@
  # The host system.
  host_alias=$host_alias
  host=$host
-@@ -26588,6 +26836,10 @@
+@@ -26602,6 +26836,10 @@
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -13062,7 +4982,7 @@
  # Method to check whether dependent libraries are shared objects.
  deplibs_check_method=$lt_deplibs_check_method
  
-@@ -26606,9 +26858,6 @@
+@@ -26620,9 +26858,6 @@
  old_postinstall_cmds=$lt_old_postinstall_cmds
  old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
@@ -13072,7 +4992,7 @@
  # A C compiler.
  LTCC=$lt_CC
  
-@@ -26630,6 +26879,12 @@
+@@ -26644,6 +26879,12 @@
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
@@ -13085,7 +5005,7 @@
  # Used to examine libraries when file_magic_cmd begins with "file".
  MAGIC_CMD=$MAGIC_CMD
  
-@@ -26692,9 +26947,6 @@
+@@ -26706,9 +26947,6 @@
  # The coded name of the library, if different from the real name.
  soname_spec=$lt_soname_spec
  
@@ -13095,7 +5015,7 @@
  # Command to use after installation of a shared archive.
  postinstall_cmds=$lt_postinstall_cmds
  
-@@ -26734,10 +26986,6 @@
+@@ -26748,10 +26986,6 @@
  # The linker used to build libraries.
  LD=$lt_LD
  
@@ -13106,7 +5026,7 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds
  
-@@ -27011,7 +27259,7 @@
+@@ -27025,7 +27259,7 @@
  func_dirname ()
  {
    # Extract subdirectory from the argument.
@@ -13115,7 +5035,7 @@
    if test "X$func_dirname_result" = "X${1}"; then
      func_dirname_result="${3}"
    else
-@@ -27022,7 +27270,7 @@
+@@ -27036,7 +27270,7 @@
  # func_basename file
  func_basename ()
  {
@@ -13124,7 +5044,7 @@
  }
  
  
-@@ -27035,8 +27283,10 @@
+@@ -27049,8 +27283,10 @@
  func_stripname ()
  {
    case ${2} in
@@ -13137,7 +5057,7 @@
    esac
  }
  
-@@ -27047,20 +27297,20 @@
+@@ -27061,20 +27297,20 @@
  # func_opt_split
  func_opt_split ()
  {
@@ -13162,7 +5082,7 @@
  }
  
  # func_arith arithmetic-term...
-@@ -27121,10 +27371,6 @@
+@@ -27135,10 +27371,6 @@
  # The linker used to build libraries.
  LD=$lt_LD_CXX
  
@@ -13173,19 +5093,40 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds_CXX
  
-Index: gtk+2.0-2.21.8/demos/gtk-demo/Makefile.in
+Index: gtk+2.0-2.22.0/demos/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/demos/gtk-demo/Makefile.in	2010-09-14 20:24:44.756683903 +0200
-+++ gtk+2.0-2.21.8/demos/gtk-demo/Makefile.in	2010-09-14 20:24:13.873677616 +0200
-@@ -42,11 +42,14 @@
- bin_PROGRAMS = gtk-demo$(EXEEXT)
- subdir = demos/gtk-demo
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/demos/Makefile.in	2010-09-23 20:31:07.485578142 +0200
++++ gtk+2.0-2.22.0/demos/Makefile.in	2010-09-23 20:30:28.678578433 +0200
+@@ -51,7 +51,7 @@
+ 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -216,6 +216,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -366,6 +367,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.22.0/demos/gtk-demo/Makefile.in
+===================================================================
+--- gtk+2.0-2.22.0.orig/demos/gtk-demo/Makefile.in	2010-09-23 20:31:07.413580297 +0200
++++ gtk+2.0-2.22.0/demos/gtk-demo/Makefile.in	2010-09-23 20:30:28.781578531 +0200
+@@ -49,7 +49,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13194,7 +5135,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = geninclude.pl
  CONFIG_CLEAN_VPATH_FILES =
-@@ -193,6 +196,7 @@
+@@ -196,6 +196,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13202,7 +5143,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -343,6 +347,7 @@
+@@ -346,6 +347,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13210,19 +5151,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/demos/Makefile.in
+Index: gtk+2.0-2.22.0/docs/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/demos/Makefile.in	2010-09-14 20:24:44.868691438 +0200
-+++ gtk+2.0-2.21.8/demos/Makefile.in	2010-09-14 20:24:13.748678276 +0200
-@@ -44,11 +44,14 @@
- 	testpixbuf$(EXEEXT)
- subdir = demos
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/Makefile.in	2010-09-23 20:31:13.661610706 +0200
++++ gtk+2.0-2.22.0/docs/Makefile.in	2010-09-23 20:30:28.853578537 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13231,7 +5164,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -213,6 +216,7 @@
+@@ -160,6 +160,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13239,7 +5172,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -363,6 +367,7 @@
+@@ -310,6 +311,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13247,19 +5180,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/faq/Makefile.in
+Index: gtk+2.0-2.22.0/docs/faq/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/faq/Makefile.in	2010-09-14 20:24:51.084680630 +0200
-+++ gtk+2.0-2.21.8/docs/faq/Makefile.in	2010-09-14 20:24:14.041679006 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = docs/faq
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/faq/Makefile.in	2010-09-23 20:31:13.781592709 +0200
++++ gtk+2.0-2.22.0/docs/faq/Makefile.in	2010-09-23 20:30:28.925578753 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13268,7 +5193,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -117,6 +120,7 @@
+@@ -120,6 +120,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13276,7 +5201,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -267,6 +271,7 @@
+@@ -270,6 +271,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13284,19 +5209,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/Makefile.in
+Index: gtk+2.0-2.22.0/docs/reference/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/Makefile.in	2010-09-14 20:24:50.740677957 +0200
-+++ gtk+2.0-2.21.8/docs/Makefile.in	2010-09-14 20:24:13.957680966 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = docs
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/reference/Makefile.in	2010-09-23 20:31:16.814579934 +0200
++++ gtk+2.0-2.22.0/docs/reference/Makefile.in	2010-09-23 20:30:29.001578711 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13305,7 +5222,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -160,6 +160,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13313,7 +5230,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -310,6 +311,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13321,19 +5238,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/reference/gdk/Makefile.in
+Index: gtk+2.0-2.22.0/docs/reference/gdk/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/reference/gdk/Makefile.in	2010-09-14 20:24:51.960710053 +0200
-+++ gtk+2.0-2.21.8/docs/reference/gdk/Makefile.in	2010-09-14 20:24:14.197677521 +0200
-@@ -46,11 +46,14 @@
- 	$(top_srcdir)/gtk-doc.make
- subdir = docs/reference/gdk
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/reference/gdk/Makefile.in	2010-09-23 20:31:14.601579618 +0200
++++ gtk+2.0-2.22.0/docs/reference/gdk/Makefile.in	2010-09-23 20:30:29.093604024 +0200
+@@ -53,7 +53,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13342,7 +5251,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = version.xml
  CONFIG_CLEAN_VPATH_FILES =
-@@ -124,6 +127,7 @@
+@@ -127,6 +127,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13350,7 +5259,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -274,6 +278,7 @@
+@@ -277,6 +278,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13358,19 +5267,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/reference/gtk/Makefile.in
+Index: gtk+2.0-2.22.0/docs/reference/gtk/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/reference/gtk/Makefile.in	2010-09-14 20:24:54.256679501 +0200
-+++ gtk+2.0-2.21.8/docs/reference/gtk/Makefile.in	2010-09-14 20:24:14.293678341 +0200
-@@ -46,11 +46,14 @@
- 	$(top_srcdir)/gtk-doc.make
- subdir = docs/reference/gtk
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/reference/gtk/Makefile.in	2010-09-23 20:31:16.773618720 +0200
++++ gtk+2.0-2.22.0/docs/reference/gtk/Makefile.in	2010-09-23 20:30:29.198627906 +0200
+@@ -53,7 +53,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13379,7 +5280,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = version.xml
  CONFIG_CLEAN_VPATH_FILES =
-@@ -149,6 +152,7 @@
+@@ -152,6 +152,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13387,7 +5288,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -299,6 +303,7 @@
+@@ -302,6 +303,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13395,19 +5296,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/reference/libgail-util/Makefile.in
+Index: gtk+2.0-2.22.0/docs/reference/libgail-util/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/reference/libgail-util/Makefile.in	2010-09-14 20:24:51.220693225 +0200
-+++ gtk+2.0-2.21.8/docs/reference/libgail-util/Makefile.in	2010-09-14 20:24:14.385677396 +0200
-@@ -45,11 +45,14 @@
- 	$(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make
- subdir = docs/reference/libgail-util
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/reference/libgail-util/Makefile.in	2010-09-23 20:31:13.913580508 +0200
++++ gtk+2.0-2.22.0/docs/reference/libgail-util/Makefile.in	2010-09-23 20:30:29.289579130 +0200
+@@ -52,7 +52,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13416,7 +5309,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -123,6 +126,7 @@
+@@ -126,6 +126,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13424,7 +5317,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -273,6 +277,7 @@
+@@ -276,6 +277,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13432,19 +5325,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/reference/Makefile.in
+Index: gtk+2.0-2.22.0/docs/tools/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/reference/Makefile.in	2010-09-14 20:24:54.316678540 +0200
-+++ gtk+2.0-2.21.8/docs/reference/Makefile.in	2010-09-14 20:24:14.113680332 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
- subdir = docs/reference
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/tools/Makefile.in	2010-09-23 20:31:13.577592003 +0200
++++ gtk+2.0-2.22.0/docs/tools/Makefile.in	2010-09-23 20:30:29.381578884 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13453,7 +5338,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -155,6 +155,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13461,7 +5346,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -305,6 +306,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13469,19 +5354,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/tools/Makefile.in
+Index: gtk+2.0-2.22.0/docs/tutorial/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/tools/Makefile.in	2010-09-14 20:24:50.672692436 +0200
-+++ gtk+2.0-2.21.8/docs/tools/Makefile.in	2010-09-14 20:24:14.485677893 +0200
-@@ -41,11 +41,14 @@
- @USE_X11_TRUE at noinst_PROGRAMS = doc-shooter$(EXEEXT)
- subdir = docs/tools
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/docs/tutorial/Makefile.in	2010-09-23 20:31:16.982591730 +0200
++++ gtk+2.0-2.22.0/docs/tutorial/Makefile.in	2010-09-23 20:30:29.453604594 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13490,7 +5367,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -152,6 +155,7 @@
+@@ -120,6 +120,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13498,7 +5375,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -302,6 +306,7 @@
+@@ -270,6 +271,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13506,19 +5383,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/docs/tutorial/Makefile.in
+Index: gtk+2.0-2.22.0/gdk/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/docs/tutorial/Makefile.in	2010-09-14 20:24:54.936678854 +0200
-+++ gtk+2.0-2.21.8/docs/tutorial/Makefile.in	2010-09-14 20:24:14.557678107 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = docs/tutorial
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gdk/Makefile.in	2010-09-23 20:31:08.533580266 +0200
++++ gtk+2.0-2.22.0/gdk/Makefile.in	2010-09-23 20:30:29.653578052 +0200
+@@ -53,7 +53,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13527,7 +5396,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -117,6 +120,7 @@
+@@ -308,6 +308,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13535,7 +5404,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -267,6 +271,7 @@
+@@ -458,6 +459,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13543,19 +5412,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gdk/directfb/Makefile.in
+Index: gtk+2.0-2.22.0/gdk/directfb/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gdk/directfb/Makefile.in	2010-09-14 20:24:45.912680480 +0200
-+++ gtk+2.0-2.21.8/gdk/directfb/Makefile.in	2010-09-14 20:24:14.841679416 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
- subdir = gdk/directfb
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gdk/directfb/Makefile.in	2010-09-23 20:31:08.685586376 +0200
++++ gtk+2.0-2.22.0/gdk/directfb/Makefile.in	2010-09-23 20:30:29.750578780 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13564,7 +5425,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -181,6 +184,7 @@
+@@ -184,6 +184,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13572,7 +5433,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -331,6 +335,7 @@
+@@ -334,6 +335,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13580,19 +5441,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gdk/Makefile.in
+Index: gtk+2.0-2.22.0/gdk/quartz/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gdk/Makefile.in	2010-09-14 20:24:45.768678235 +0200
-+++ gtk+2.0-2.21.8/gdk/Makefile.in	2010-09-14 20:24:14.745677826 +0200
-@@ -45,11 +45,14 @@
- @HAVE_INTROSPECTION_TRUE at am__append_3 = $(gir_DATA) $(typelibs_DATA)
- subdir = gdk
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gdk/quartz/Makefile.in	2010-09-23 20:31:07.641581067 +0200
++++ gtk+2.0-2.22.0/gdk/quartz/Makefile.in	2010-09-23 20:30:29.842577907 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13601,7 +5454,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -304,6 +307,7 @@
+@@ -183,6 +183,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13609,7 +5462,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -454,6 +458,7 @@
+@@ -333,6 +334,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13617,19 +5470,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gdk/quartz/Makefile.in
+Index: gtk+2.0-2.22.0/gdk/tests/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gdk/quartz/Makefile.in	2010-09-14 20:24:45.088678973 +0200
-+++ gtk+2.0-2.21.8/gdk/quartz/Makefile.in	2010-09-14 20:24:14.933678752 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = gdk/quartz
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gdk/tests/Makefile.in	2010-09-23 20:31:08.421582086 +0200
++++ gtk+2.0-2.22.0/gdk/tests/Makefile.in	2010-09-23 20:30:29.914577912 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13638,7 +5483,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -180,6 +183,7 @@
+@@ -125,6 +125,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13646,7 +5491,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -330,6 +334,7 @@
+@@ -275,6 +276,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13654,19 +5499,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gdk/tests/Makefile.in
+Index: gtk+2.0-2.22.0/gdk/win32/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gdk/tests/Makefile.in	2010-09-14 20:24:45.692679888 +0200
-+++ gtk+2.0-2.21.8/gdk/tests/Makefile.in	2010-09-14 20:24:15.009678151 +0200
-@@ -41,11 +41,14 @@
- TESTS = $(am__EXEEXT_1)
- subdir = gdk/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gdk/win32/Makefile.in	2010-09-23 20:31:08.013581352 +0200
++++ gtk+2.0-2.22.0/gdk/win32/Makefile.in	2010-09-23 20:30:30.018578498 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13675,7 +5512,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -122,6 +125,7 @@
+@@ -221,6 +221,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13683,7 +5520,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -272,6 +276,7 @@
+@@ -371,6 +372,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13691,19 +5528,40 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gdk/win32/Makefile.in
+Index: gtk+2.0-2.22.0/gdk/win32/rc/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gdk/win32/Makefile.in	2010-09-14 20:24:45.288677564 +0200
-+++ gtk+2.0-2.21.8/gdk/win32/Makefile.in	2010-09-14 20:24:15.105678060 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = gdk/win32
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gdk/win32/rc/Makefile.in	2010-09-23 20:31:07.785583788 +0200
++++ gtk+2.0-2.22.0/gdk/win32/rc/Makefile.in	2010-09-23 20:30:30.086578341 +0200
+@@ -47,7 +47,7 @@
+ 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = gdk.rc
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -122,6 +122,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -272,6 +273,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.22.0/gdk/x11/Makefile.in
+===================================================================
+--- gtk+2.0-2.22.0.orig/gdk/x11/Makefile.in	2010-09-23 20:31:08.277592481 +0200
++++ gtk+2.0-2.22.0/gdk/x11/Makefile.in	2010-09-23 20:30:30.202578827 +0200
+@@ -53,7 +53,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13712,7 +5570,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -218,6 +221,7 @@
+@@ -212,6 +212,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13720,7 +5578,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -368,6 +372,7 @@
+@@ -362,6 +363,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13728,93 +5586,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gdk/win32/rc/Makefile.in
+Index: gtk+2.0-2.22.0/gtk/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gdk/win32/rc/Makefile.in	2010-09-14 20:24:45.168687808 +0200
-+++ gtk+2.0-2.21.8/gdk/win32/rc/Makefile.in	2010-09-14 20:24:15.209678279 +0200
-@@ -40,11 +40,14 @@
- 	$(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl
- subdir = gdk/win32/rc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = gdk.rc
- CONFIG_CLEAN_VPATH_FILES =
-@@ -119,6 +122,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -269,6 +273,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gdk/x11/Makefile.in
-===================================================================
---- gtk+2.0-2.21.8.orig/gdk/x11/Makefile.in	2010-09-14 20:24:45.524709181 +0200
-+++ gtk+2.0-2.21.8/gdk/x11/Makefile.in	2010-09-14 20:24:15.325678779 +0200
-@@ -46,11 +46,14 @@
- TESTS = checksettings$(EXEEXT)
- subdir = gdk/x11
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -209,6 +212,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -359,6 +363,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gtk/Makefile.in
-===================================================================
---- gtk+2.0-2.21.8.orig/gtk/Makefile.in	2010-09-14 20:24:48.828680696 +0200
-+++ gtk+2.0-2.21.8/gtk/Makefile.in	2010-09-14 20:24:15.673678664 +0200
-@@ -78,11 +78,14 @@
- 
- subdir = gtk
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gtk/Makefile.in	2010-09-23 20:31:11.578581584 +0200
++++ gtk+2.0-2.22.0/gtk/Makefile.in	2010-09-23 20:30:30.562579761 +0200
+@@ -85,7 +85,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13823,7 +5599,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
  CONFIG_CLEAN_VPATH_FILES =
-@@ -723,6 +726,7 @@
+@@ -726,6 +726,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13831,7 +5607,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -873,6 +877,7 @@
+@@ -876,6 +877,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13839,7 +5615,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-@@ -963,6 +968,8 @@
+@@ -966,6 +968,8 @@
  	-I$(top_srcdir) -I../gdk			\
  	-I$(top_srcdir)/gdk				\
  	-DGDK_DISABLE_DEPRECATED			\
@@ -13848,7 +5624,7 @@
  	-DGTK_DISABLE_DEPRECATED			\
  	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
  	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-@@ -1075,17 +1082,21 @@
+@@ -1078,17 +1082,21 @@
  # Installed header files without compatibility guarantees
  # that are not included in gtk/gtk.h
  gtk_semi_private_h_sources = \
@@ -13878,19 +5654,11 @@
  	gtkmnemonichash.h gtkmountoperationprivate.h gtkpango.h \
  	gtkpathbar.h gtkplugprivate.h gtkprintoperation-private.h \
  	gtkprintutils.h gtkrbtree.h gtkrecentchooserdefault.h \
-Index: gtk+2.0-2.21.8/gtk/tests/Makefile.in
+Index: gtk+2.0-2.22.0/gtk/tests/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/tests/Makefile.in	2010-09-14 20:24:48.552680962 +0200
-+++ gtk+2.0-2.21.8/gtk/tests/Makefile.in	2010-09-14 20:24:15.797678571 +0200
-@@ -42,11 +42,14 @@
- @OS_UNIX_TRUE at am__append_1 = defaultvalue
- subdir = gtk/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gtk/tests/Makefile.in	2010-09-23 20:31:11.297580845 +0200
++++ gtk+2.0-2.22.0/gtk/tests/Makefile.in	2010-09-23 20:30:30.682578312 +0200
+@@ -49,7 +49,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13899,7 +5667,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -211,6 +214,7 @@
+@@ -214,6 +214,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13907,7 +5675,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -361,6 +365,7 @@
+@@ -364,6 +365,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13915,19 +5683,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/gtk/theme-bits/Makefile.in
+Index: gtk+2.0-2.22.0/gtk/theme-bits/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/gtk/theme-bits/Makefile.in	2010-09-14 20:24:47.368681102 +0200
-+++ gtk+2.0-2.21.8/gtk/theme-bits/Makefile.in	2010-09-14 20:24:15.889677976 +0200
-@@ -41,11 +41,14 @@
- noinst_PROGRAMS = decompose-bits$(EXEEXT)
- subdir = gtk/theme-bits
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/gtk/theme-bits/Makefile.in	2010-09-23 20:31:10.005580477 +0200
++++ gtk+2.0-2.22.0/gtk/theme-bits/Makefile.in	2010-09-23 20:30:30.770580834 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -13936,7 +5696,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -149,6 +152,7 @@
+@@ -152,6 +152,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -13944,7 +5704,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -299,6 +303,7 @@
+@@ -302,6 +303,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13952,10 +5712,10 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/ltmain.sh
+Index: gtk+2.0-2.22.0/ltmain.sh
 ===================================================================
---- gtk+2.0-2.21.8.orig/ltmain.sh	2010-09-14 20:24:44.408708117 +0200
-+++ gtk+2.0-2.21.8/ltmain.sh	2010-09-14 20:24:04.837693572 +0200
+--- gtk+2.0-2.22.0.orig/ltmain.sh	2010-09-23 20:31:07.077581317 +0200
++++ gtk+2.0-2.22.0/ltmain.sh	2010-09-23 20:30:20.273582753 +0200
 @@ -1,10 +1,9 @@
  # Generated from ltmain.m4sh.
  
@@ -17058,272 +8818,87 @@
  	  esac
  	  $ECHO > $output "\
  # $outputname - a libtool library file
-Index: gtk+2.0-2.21.8/m4/gtk-doc.m4
+Index: gtk+2.0-2.22.0/m4/libtool.m4
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/m4/gtk-doc.m4	2010-09-14 20:24:05.724688495 +0200
-@@ -0,0 +1,61 @@
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+
-+  dnl check for tools we added during development
-+  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-+  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-+  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-+
-+  dnl for overriding the documentation installation directory
-+  AC_ARG_WITH([html-dir],
-+    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+    [with_html_dir='${datadir}/gtk-doc/html'])
-+  HTML_DIR="$with_html_dir"
-+  AC_SUBST([HTML_DIR])
-+
-+  dnl enable/disable documentation building
-+  AC_ARG_ENABLE([gtk-doc],
-+    AS_HELP_STRING([--enable-gtk-doc],
-+                   [use gtk-doc to build documentation [[default=no]]]),,
-+    [enable_gtk_doc=no])
-+
-+  if test x$enable_gtk_doc = xyes; then
-+    ifelse([$1],[],
-+      [PKG_CHECK_EXISTS([gtk-doc],,
-+                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-+      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-+                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-+  fi
-+
-+  AC_MSG_CHECKING([whether to build gtk-doc documentation])
-+  AC_MSG_RESULT($enable_gtk_doc)
-+
-+  dnl enable/disable output formats
-+  AC_ARG_ENABLE([gtk-doc-html],
-+    AS_HELP_STRING([--enable-gtk-doc-html],
-+                   [build documentation in html format [[default=yes]]]),,
-+    [enable_gtk_doc_html=yes])
-+    AC_ARG_ENABLE([gtk-doc-pdf],
-+      AS_HELP_STRING([--enable-gtk-doc-pdf],
-+                     [build documentation in pdf format [[default=no]]]),,
-+      [enable_gtk_doc_pdf=no])
-+
-+  if test -z "$GTKDOC_MKPDF"; then
-+    enable_gtk_doc_pdf=no
-+  fi
-+
-+
-+  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-+  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-+  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-+  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-+  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-+])
-Index: gtk+2.0-2.21.8/m4/libtool.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/m4/libtool.m4	2010-09-14 20:24:04.953682552 +0200
-@@ -0,0 +1,7377 @@
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+--- gtk+2.0-2.22.0.orig/m4/libtool.m4	2010-09-23 20:31:13.077579991 +0200
++++ gtk+2.0-2.22.0/m4/libtool.m4	2010-09-23 20:30:20.389581368 +0200
+@@ -1,8 +1,7 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ #
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-#                 Inc.
 +#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+m4_define([_LT_COPYING], [dnl
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+ #   Written by Gordon Matzigkeit, 1996
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -11,8 +10,7 @@
+ 
+ m4_define([_LT_COPYING], [dnl
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-#                 Inc.
 +#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+])
-+
+ #   Written by Gordon Matzigkeit, 1996
+ #
+ #   This file is part of GNU Libtool.
+@@ -39,7 +37,7 @@
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ])
+ 
+-# serial 57 LT_INIT
 +# serial 56 LT_INIT
-+
-+
-+# LT_PREREQ(VERSION)
-+# ------------------
-+# Complain and exit if this libtool version is less that VERSION.
-+m4_defun([LT_PREREQ],
-+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-+       [m4_default([$3],
-+		   [m4_fatal([Libtool version $1 or higher is required],
-+		             63)])],
-+       [$2])])
-+
-+
-+# _LT_CHECK_BUILDDIR
-+# ------------------
-+# Complain if the absolute build directory name contains unusual characters
-+m4_defun([_LT_CHECK_BUILDDIR],
-+[case `pwd` in
-+  *\ * | *\	*)
-+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+esac
-+])
-+
-+
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
-+
-+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-+dnl unless we require an AC_DEFUNed macro:
-+AC_REQUIRE([LTOPTIONS_VERSION])dnl
-+AC_REQUIRE([LTSUGAR_VERSION])dnl
-+AC_REQUIRE([LTVERSION_VERSION])dnl
-+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-+m4_require([_LT_PROG_LTMAIN])dnl
-+
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+_LT_SETUP
-+
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
-+
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-+
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+m4_defun([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
+ 
+ 
+ # LT_PREREQ(VERSION)
+@@ -68,7 +66,6 @@
+ # ------------------
+ AC_DEFUN([LT_INIT],
+ [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+ AC_BEFORE([$0], [LT_LANG])dnl
+ AC_BEFORE([$0], [LT_OUTPUT])dnl
+ AC_BEFORE([$0], [LTDL_INIT])dnl
+@@ -85,8 +82,6 @@
+ AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+ m4_require([_LT_PROG_LTMAIN])dnl
+ 
+-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+-
+ dnl Parse OPTIONS
+ _LT_SET_OPTIONS([$0], [$1])
+ 
+@@ -123,7 +118,7 @@
+     *) break;;
+   esac
+ done
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_FILEUTILS_DEFAULTS
-+# ----------------------
-+# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-+m4_defun([_LT_FILEUTILS_DEFAULTS],
-+[: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+])# _LT_FILEUTILS_DEFAULTS
-+
-+
-+# _LT_SETUP
-+# ---------
-+m4_defun([_LT_SETUP],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+_LT_DECL([], [host_alias], [0], [The host system])dnl
-+_LT_DECL([], [host], [0])dnl
-+_LT_DECL([], [host_os], [0])dnl
-+dnl
-+_LT_DECL([], [build_alias], [0], [The build system])dnl
-+_LT_DECL([], [build], [0])dnl
-+_LT_DECL([], [build_os], [0])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+test -z "$LN_S" && LN_S="ln -s"
-+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-+dnl
-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-+dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_CMD_RELOAD])dnl
-+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+
-+_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+])
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+
-+_LT_CHECK_OBJDIR
-+
-+m4_require([_LT_TAG_COMPILER])dnl
+ ])
+ 
+ 
+@@ -143,9 +138,6 @@
+ m4_defun([_LT_SETUP],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+-
+ _LT_DECL([], [host_alias], [0], [The host system])dnl
+ _LT_DECL([], [host], [0])dnl
+ _LT_DECL([], [host_os], [0])dnl
+@@ -187,6 +179,7 @@
+ _LT_CHECK_OBJDIR
+ 
+ m4_require([_LT_TAG_COMPILER])dnl
 +_LT_PROG_ECHO_BACKSLASH
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
+ 
+ case $host_os in
+ aix3*)
+@@ -200,6 +193,23 @@
+   ;;
+ esac
+ 
 +# Sed substitution that helps us do robust quoting.  It backslashifies
 +# metacharacters that are still active within double-quoted strings.
 +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
@@ -17341,339 +8916,95 @@
 +# Sed substitution to avoid accidental globbing in evaled expressions
 +no_glob_subst='s/\*/\\\*/g'
 +
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
-+
-+_LT_CC_BASENAME([$compiler])
-+
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    _LT_PATH_MAGIC
-+  fi
-+  ;;
-+esac
-+
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
-+
-+
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
-+
-+
-+## ------------------------------------- ##
-+## Accumulate code for creating libtool. ##
-+## ------------------------------------- ##
-+
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
-+
-+
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+                     [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-+
-+
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+                     [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+
-+
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
-+
-+
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
-+
-+
-+
-+## ------------------------ ##
-+## FIXME: Eliminate VARNAME ##
-+## ------------------------ ##
-+
-+
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME.  Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+	[m4_ifval([$1], [$1], [$2])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+    m4_ifval([$4],
-+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2],
-+	[tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
-+
-+
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+  [0], [m4_fatal([$0: too few arguments: $#])],
-+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-+])
-+
-+
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
-+
-+
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
-+
-+
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_varnames_tagged],
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-+
-+
-+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_all_varnames],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+     m4_if([$2], [],
-+	   m4_quote(lt_decl_varnames),
-+	m4_quote(m4_shift($@))))[]dnl
-+])
-+m4_define([_lt_decl_all_varnames],
-+[lt_join($@, lt_decl_varnames_tagged([$1],
-+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-+# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'.  VARNAME
-+# must have a single quote delimited value for this to work.
-+m4_define([_LT_CONFIG_STATUS_DECLARE],
+ # Global variables:
+ ofile=libtool
+ can_build_shared=yes
+@@ -240,28 +250,6 @@
+ ])# _LT_SETUP
+ 
+ 
+-# _LT_PREPARE_SED_QUOTE_VARS
+-# --------------------------
+-# Define a few sed substitution that help us do robust quoting.
+-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+-[# Backslashify metacharacters that are still active within
+-# double-quoted strings.
+-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-])
+-
+ # _LT_PROG_LTMAIN
+ # ---------------
+ # Note that this code is called both from `configure', and `config.status'
+@@ -420,7 +408,7 @@
+ # declaration there will have the same value as in `configure'.  VARNAME
+ # must have a single quote delimited value for this to work.
+ m4_define([_LT_CONFIG_STATUS_DECLARE],
+-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARATIONS
-+# ------------------------------
-+# We delimit libtool config variables with single quotes, so when
-+# we write them to config.status, we have to be sure to quote all
-+# embedded single quotes properly.  In configure, this macro expands
-+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-+#
+ 
+ 
+ # _LT_CONFIG_STATUS_DECLARATIONS
+@@ -430,7 +418,7 @@
+ # embedded single quotes properly.  In configure, this macro expands
+ # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+ #
+-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 +#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAGS
-+# ----------------
-+# Output comment and list of tags supported by the script
-+m4_defun([_LT_LIBTOOL_TAGS],
-+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
-+])
-+
-+
-+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-+# -----------------------------------
-+# Extract the dictionary values for VARNAME (optionally with TAG) and
-+# expand to a commented shell variable setting:
-+#
-+#    # Some comment about what VAR is for.
-+#    visible_name=$lt_internal_name
-+m4_define([_LT_LIBTOOL_DECLARE],
-+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-+					   [description])))[]dnl
-+m4_pushdef([_libtool_name],
-+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-+    [0], [_libtool_name=[$]$1],
-+    [1], [_libtool_name=$lt_[]$1],
-+    [2], [_libtool_name=$lt_[]$1],
-+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-+])
-+
-+
-+# _LT_LIBTOOL_CONFIG_VARS
-+# -----------------------
-+# Produce commented declarations of non-tagged libtool config variables
-+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-+# section) are produced by _LT_LIBTOOL_TAG_VARS.
-+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-+[m4_foreach([_lt_var],
-+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAG_VARS(TAG)
-+# -------------------------
-+m4_define([_LT_LIBTOOL_TAG_VARS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-+
-+
-+# _LT_TAGVAR(VARNAME, [TAGNAME])
-+# ------------------------------
-+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-+
-+
-+# _LT_CONFIG_COMMANDS
-+# -------------------
-+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-+# variables for single and double quote escaping we saved from calls
-+# to _LT_DECL, we can put quote escaped variables declarations
-+# into `config.status', and then the shell code to quote escape them in
-+# for loops in `config.status'.  Finally, any additional code accumulated
-+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-+m4_defun([_LT_CONFIG_COMMANDS],
-+[AC_PROVIDE_IFELSE([LT_OUTPUT],
-+	dnl If the libtool generation code has been placed in $CONFIG_LT,
-+	dnl instead of duplicating it all over again into config.status,
-+	dnl then we will have config.status run $CONFIG_LT later, so it
-+	dnl needs to know what name is stored there:
-+        [AC_CONFIG_COMMANDS([libtool],
-+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-+    dnl If the libtool generation code is destined for config.status,
-+    dnl expand the accumulated commands and init code now:
-+    [AC_CONFIG_COMMANDS([libtool],
-+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-+])#_LT_CONFIG_COMMANDS
-+
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-+[
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+_LT_CONFIG_STATUS_DECLARATIONS
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# Quote evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_quote_varnames); do
+ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+ [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+@@ -529,20 +517,12 @@
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+ 
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+-  eval 'cat <<_LTECHO_EOF
+-\$[]1
+-_LTECHO_EOF'
+-}
+-
+ # Quote evaled strings.
+ for var in lt_decl_all_varnames([[ \
+ ]], lt_decl_quote_varnames); do
+-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
+     *[[\\\\\\\`\\"\\\$]]*)
+-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
 +      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+# Double-quote double-evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_dquote_varnames); do
+       ;;
+     *)
+       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -553,9 +533,9 @@
+ # Double-quote double-evaled strings.
+ for var in lt_decl_all_varnames([[ \
+ ]], lt_decl_dquote_varnames); do
+-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
+     *[[\\\\\\\`\\"\\\$]]*)
+-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
 +      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
+       ;;
+     *)
+       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -563,38 +543,16 @@
+     esac
+ done
+ 
 +# Fix-up fallback echo if it was mangled by the above quoting rules.
 +case \$lt_ECHO in
 +*'\\\[$]0 --fallback-echo"')dnl "
@@ -17681,24 +9012,54 @@
 +  ;;
 +esac
 +
-+_LT_OUTPUT_LIBTOOL_INIT
-+])
-+
-+
-+# LT_OUTPUT
-+# ---------
-+# This macro allows early generation of the libtool script (before
-+# AC_OUTPUT is called), incase it is used in configure for compilation
-+# tests.
-+AC_DEFUN([LT_OUTPUT],
-+[: ${CONFIG_LT=./config.lt}
-+AC_MSG_NOTICE([creating $CONFIG_LT])
+ _LT_OUTPUT_LIBTOOL_INIT
+ ])
+ 
+-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+-# ------------------------------------
+-# Generate a child script FILE with all initialization necessary to
+-# reuse the environment learned by the parent script, and make the
+-# file executable.  If COMMENT is supplied, it is inserted after the
+-# `#!' sequence but before initialization text begins.  After this
+-# macro, additional text can be appended to FILE to form the body of
+-# the child script.  The macro ends with non-zero status if the
+-# file could not be fully written (such as if the disk is full).
+-m4_ifdef([AS_INIT_GENERATED],
+-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+-[m4_defun([_LT_GENERATED_FILE_INIT],
+-[m4_require([AS_PREPARE])]dnl
+-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+-[lt_write_fail=0
+-cat >$1 <<_ASEOF || lt_write_fail=1
+-#! $SHELL
+-# Generated by $as_me.
+-$2
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-export SHELL
+-_ASEOF
+-cat >>$1 <<\_ASEOF || lt_write_fail=1
+-AS_SHELL_SANITIZE
+-_AS_PREPARE
+-exec AS_MESSAGE_FD>&1
+-_ASEOF
+-test $lt_write_fail = 0 && chmod +x $1[]dnl
+-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+ 
+ # LT_OUTPUT
+ # ---------
+@@ -604,11 +562,20 @@
+ AC_DEFUN([LT_OUTPUT],
+ [: ${CONFIG_LT=./config.lt}
+ AC_MSG_NOTICE([creating $CONFIG_LT])
+-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+-[# Run this file to recreate a libtool stub with the current configuration.])
 +cat >"$CONFIG_LT" <<_LTEOF
 +#! $SHELL
 +# Generated by $as_me.
 +# Run this file to recreate a libtool stub with the current configuration.
-+
-+lt_cl_silent=false
+ 
+-cat >>"$CONFIG_LT" <<\_LTEOF
+ lt_cl_silent=false
 +SHELL=\${CONFIG_SHELL-$SHELL}
 +_LTEOF
 +
@@ -17707,76 +9068,29 @@
 +_AS_PREPARE
 +
 +exec AS_MESSAGE_FD>&1
-+exec AS_MESSAGE_LOG_FD>>config.log
-+{
-+  echo
-+  AS_BOX([Running $as_me.])
-+} >&AS_MESSAGE_LOG_FD
-+
-+lt_cl_help="\
-+\`$as_me' creates a local libtool stub from the current configuration,
-+for use in further configure time tests before the real libtool is
-+generated.
-+
-+Usage: $[0] [[OPTIONS]]
-+
-+  -h, --help      print this help, then exit
-+  -V, --version   print version number, then exit
-+  -q, --quiet     do not print progress messages
-+  -d, --debug     don't remove temporary files
-+
-+Report bugs to <bug-libtool at gnu.org>."
-+
-+lt_cl_version="\
-+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-+configured by $[0], generated by m4_PACKAGE_STRING.
-+
+ exec AS_MESSAGE_LOG_FD>>config.log
+ {
+   echo
+@@ -634,7 +601,7 @@
+ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+ configured by $[0], generated by m4_PACKAGE_STRING.
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
 +Copyright (C) 2008 Free Software Foundation, Inc.
-+This config.lt script is free software; the Free Software Foundation
-+gives unlimited permision to copy, distribute and modify it."
-+
-+while test $[#] != 0
-+do
-+  case $[1] in
-+    --version | --v* | -V )
-+      echo "$lt_cl_version"; exit 0 ;;
-+    --help | --h* | -h )
-+      echo "$lt_cl_help"; exit 0 ;;
-+    --debug | --d* | -d )
-+      debug=: ;;
-+    --quiet | --q* | --silent | --s* | -q )
-+      lt_cl_silent=: ;;
-+
-+    -*) AC_MSG_ERROR([unrecognized option: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+
-+    *) AC_MSG_ERROR([unrecognized argument: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+  esac
-+  shift
-+done
-+
-+if $lt_cl_silent; then
-+  exec AS_MESSAGE_FD>/dev/null
-+fi
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<_LTEOF
-+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AC_MSG_NOTICE([creating $ofile])
-+_LT_OUTPUT_LIBTOOL_COMMANDS
-+AS_EXIT(0)
-+_LTEOF
-+chmod +x "$CONFIG_LT"
-+
-+# configure is writing to config.log, but config.lt does its own redirection,
-+# appending to config.log, which fails on DOS, as config.log is still kept
-+# open by configure.  Here we exec the FD to /dev/null, effectively closing
-+# config.log, so it can be properly (re)opened and appended to by config.lt.
+ This config.lt script is free software; the Free Software Foundation
+ gives unlimited permision to copy, distribute and modify it."
+ 
+@@ -679,13 +646,15 @@
+ # appending to config.log, which fails on DOS, as config.log is still kept
+ # open by configure.  Here we exec the FD to /dev/null, effectively closing
+ # config.log, so it can be properly (re)opened and appended to by config.lt.
+-lt_cl_success=:
+-test "$silent" = yes &&
+-  lt_config_lt_args="$lt_config_lt_args --quiet"
+-exec AS_MESSAGE_LOG_FD>/dev/null
+-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+-exec AS_MESSAGE_LOG_FD>>config.log
+-$lt_cl_success || AS_EXIT(1)
 +if test "$no_create" != yes; then
 +  lt_cl_success=:
 +  test "$silent" = yes &&
@@ -17786,405 +9100,121 @@
 +  exec AS_MESSAGE_LOG_FD>>config.log
 +  $lt_cl_success || AS_EXIT(1)
 +fi
-+])# LT_OUTPUT
-+
-+
-+# _LT_CONFIG(TAG)
-+# ---------------
-+# If TAG is the built-in tag, create an initial libtool script with a
-+# default configuration from the untagged config vars.  Otherwise add code
-+# to config.status for appending the configuration named by TAG from the
-+# matching tagged config vars.
-+m4_defun([_LT_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_CONFIG_SAVE_COMMANDS([
-+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-+  m4_if(_LT_TAG, [C], [
-+    # See if we are running on zsh, and set the options which allow our
-+    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
-+      setopt NO_GLOB_SUBST
-+    fi
-+
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
-+
-+    cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+_LT_COPYING
-+_LT_LIBTOOL_TAGS
-+
-+# ### BEGIN LIBTOOL CONFIG
-+_LT_LIBTOOL_CONFIG_VARS
-+_LT_LIBTOOL_TAG_VARS
-+# ### END LIBTOOL CONFIG
-+
-+_LT_EOF
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+_LT_EOF
-+    ;;
-+  esac
-+
-+  _LT_PROG_LTMAIN
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  _LT_PROG_XSI_SHELLFNS
-+
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+],
-+[cat <<_LT_EOF >> "$ofile"
-+
-+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-+dnl in a comment (ie after a #).
-+# ### BEGIN LIBTOOL TAG CONFIG: $1
-+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-+# ### END LIBTOOL TAG CONFIG: $1
-+_LT_EOF
-+])dnl /m4_if
-+],
-+[m4_if([$1], [], [
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'], [])
-+])dnl /_LT_CONFIG_SAVE_COMMANDS
-+])# _LT_CONFIG
-+
-+
-+# LT_SUPPORTED_TAG(TAG)
-+# ---------------------
-+# Trace this macro to discover what tags are supported by the libtool
-+# --tag option, using:
-+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-+AC_DEFUN([LT_SUPPORTED_TAG], [])
-+
-+
-+# C support is built-in for now
-+m4_define([_LT_LANG_C_enabled], [])
-+m4_define([_LT_TAGS], [])
-+
-+
-+# LT_LANG(LANG)
-+# -------------
-+# Enable libtool support for the given language if not already enabled.
-+AC_DEFUN([LT_LANG],
-+[AC_BEFORE([$0], [LT_OUTPUT])dnl
-+m4_case([$1],
-+  [C],			[_LT_LANG(C)],
-+  [C++],		[_LT_LANG(CXX)],
-+  [Java],		[_LT_LANG(GCJ)],
-+  [Fortran 77],		[_LT_LANG(F77)],
-+  [Fortran],		[_LT_LANG(FC)],
-+  [Windows Resource],	[_LT_LANG(RC)],
-+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-+    [_LT_LANG($1)],
-+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-+])# LT_LANG
-+
-+
-+# _LT_LANG(LANGNAME)
-+# ------------------
-+m4_defun([_LT_LANG],
-+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-+  [LT_SUPPORTED_TAG([$1])dnl
-+  m4_append([_LT_TAGS], [$1 ])dnl
-+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-+  _LT_LANG_$1_CONFIG($1)])dnl
-+])# _LT_LANG
-+
-+
-+# _LT_LANG_DEFAULT_CONFIG
-+# -----------------------
-+m4_defun([_LT_LANG_DEFAULT_CONFIG],
-+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+  [LT_LANG(CXX)],
-+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_F77],
-+  [LT_LANG(F77)],
-+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_FC],
-+  [LT_LANG(FC)],
-+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-+
-+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-+dnl pulling things in needlessly.
-+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+  [LT_LANG(GCJ)],
-+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+    [LT_LANG(GCJ)],
-+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-+      [LT_LANG(GCJ)],
-+      [m4_ifdef([AC_PROG_GCJ],
-+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([A][M_PROG_GCJ],
-+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([LT_PROG_GCJ],
-+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-+
-+AC_PROVIDE_IFELSE([LT_PROG_RC],
-+  [LT_LANG(RC)],
-+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-+])# _LT_LANG_DEFAULT_CONFIG
-+
-+# Obsolete macros:
-+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-+
-+
-+# _LT_TAG_COMPILER
-+# ----------------
-+m4_defun([_LT_TAG_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+
-+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_TAG_COMPILER
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+m4_defun([_LT_COMPILER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+m4_defun([_LT_LINKER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# -------------------------
-+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+    AC_CHECK_TOOL([LIPO], [lipo], [:])
-+    AC_CHECK_TOOL([OTOOL], [otool], [:])
-+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-+    _LT_DECL([], [DSYMUTIL], [1],
-+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-+    _LT_DECL([], [NMEDIT], [1],
-+      [Tool to change global to local symbols on Mac OS X])
-+    _LT_DECL([], [LIPO], [1],
-+      [Tool to manipulate fat objects and archives on Mac OS X])
-+    _LT_DECL([], [OTOOL], [1],
-+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-+    _LT_DECL([], [OTOOL64], [1],
-+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-+
-+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+      [lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+	# By default we will add the -single_module flag. You can override
-+	# by either setting the environment variable LT_MULTI_MODULE
-+	# non-empty at configure time, or by adding -multi_module to the
-+	# link flags.
-+	rm -rf libconftest.dylib*
-+	echo "int foo(void){return 1;}" > conftest.c
-+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+        _lt_result=$?
-+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	  lt_cv_apple_cc_single_mod=yes
-+	else
-+	  cat conftest.err >&AS_MESSAGE_LOG_FD
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      fi])
-+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+      [lt_cv_ld_exported_symbols_list],
-+      [lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+	[lt_cv_ld_exported_symbols_list=yes],
-+	[lt_cv_ld_exported_symbols_list=no])
-+	LDFLAGS="$save_LDFLAGS"
-+    ])
-+    case $host_os in
-+    rhapsody* | darwin1.[[012]])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[[012]]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
+ ])# LT_OUTPUT
+ 
+ 
+@@ -862,13 +831,11 @@
+ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+ AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+ AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+ dnl aclocal-1.4 backwards compatibility:
+ dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+ dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+ dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+ dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+ 
+ 
+ # _LT_TAG_COMPILER
+@@ -973,31 +940,6 @@
+ 	[lt_cv_ld_exported_symbols_list=no])
+ 	LDFLAGS="$save_LDFLAGS"
+     ])
+-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+-      [lt_cv_ld_force_load=no
+-      cat > conftest.c << _LT_EOF
+-int forced_loaded() { return 2;}
+-_LT_EOF
+-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+-      cat > conftest.c << _LT_EOF
+-int main() { return 0;}
+-_LT_EOF
+-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+-      _lt_result=$?
+-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+-	lt_cv_ld_force_load=yes
+-      else
+-	cat conftest.err >&AS_MESSAGE_LOG_FD
+-      fi
+-        rm -f conftest.err libconftest.a conftest conftest.c
+-        rm -rf conftest.dSYM
+-    ])
+     case $host_os in
+     rhapsody* | darwin1.[[012]])
+       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+@@ -1025,7 +967,7 @@
+     else
+       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     fi
+-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
 +    if test "$DSYMUTIL" != ":"; then
-+      _lt_dsymutil='~$DSYMUTIL $lib || :'
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+])
-+
-+
-+# _LT_DARWIN_LINKER_FEATURES
-+# --------------------------
-+# Checks for linker and compiler features on darwin
-+m4_defun([_LT_DARWIN_LINKER_FEATURES],
-+[
-+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+  _LT_TAGVAR(hardcode_direct, $1)=no
-+  _LT_TAGVAR(hardcode_automatic, $1)=yes
-+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+       _lt_dsymutil='~$DSYMUTIL $lib || :'
+     else
+       _lt_dsymutil=
+@@ -1045,11 +987,7 @@
+   _LT_TAGVAR(hardcode_direct, $1)=no
+   _LT_TAGVAR(hardcode_automatic, $1)=yes
+   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-  if test "$lt_cv_ld_force_load" = "yes"; then
+-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+-  else
+-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+-  fi
 +  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+  _LT_TAGVAR(link_all_deplibs, $1)=yes
-+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
+   _LT_TAGVAR(link_all_deplibs, $1)=yes
+   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+   case $cc_basename in
+@@ -1057,7 +995,7 @@
+      *) _lt_dar_can_shared=$GCC ;;
+   esac
+   if test "$_lt_dar_can_shared" = "yes"; then
+-    output_verbose_link_cmd=func_echo_all
 +    output_verbose_link_cmd=echo
-+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+    m4_if([$1], [CXX],
-+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-+    fi
-+],[])
-+  else
-+  _LT_TAGVAR(ld_shlibs, $1)=no
-+  fi
-+])
-+
-+# _LT_SYS_MODULE_PATH_AIX
-+# -----------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+m4_defun([_LT_SYS_MODULE_PATH_AIX],
-+[m4_require([_LT_DECL_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_SYS_MODULE_PATH_AIX
-+
-+
-+# _LT_SHELL_INIT(ARG)
-+# -------------------
-+m4_define([_LT_SHELL_INIT],
+     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -1103,65 +1041,170 @@
+ # _LT_SHELL_INIT(ARG)
+ # -------------------
+ m4_define([_LT_SHELL_INIT],
+-[m4_divert_text([M4SH-INIT], [$1
+-])])# _LT_SHELL_INIT
+-
 +[ifdef([AC_DIVERSION_NOTICE],
 +	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
 +	 [AC_DIVERT_PUSH(NOTICE)])
 +$1
 +AC_DIVERT_POP
 +])# _LT_SHELL_INIT
-+
-+
-+# _LT_PROG_ECHO_BACKSLASH
-+# -----------------------
+ 
+ 
+ # _LT_PROG_ECHO_BACKSLASH
+ # -----------------------
+-# Find how we can fake an echo command that does not interpret backslash.
+-# In particular, with Autoconf 2.60 or later we add some code to the start
+-# of the generated configure script which will find a shell with a builtin
+-# printf (which we can use as an echo command).
 +# Add some code to the start of the generated configure script which
 +# will find an echo command which doesn't interpret backslashes.
-+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+ m4_defun([_LT_PROG_ECHO_BACKSLASH],
+-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+-
+-AC_MSG_CHECKING([how to print strings])
+-# Test print first, because it will be a builtin if present.
+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+-  ECHO='print -r --'
+-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+-  ECHO='printf %s\n'
 +[_LT_SHELL_INIT([
 +# Check that we are running under the correct shell.
 +SHELL=${CONFIG_SHELL-/bin/sh}
@@ -18206,11 +9236,25 @@
 +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
 +  # Yippee, $ECHO works!
 +  :
-+else
+ else
+-  # Use this function as a fallback that always works.
+-  func_fallback_echo ()
+-  {
+-    eval 'cat <<_LTECHO_EOF
+-$[]1
+-_LTECHO_EOF'
+-  }
+-  ECHO='func_fallback_echo'
 +  # Restart under the correct shell.
 +  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
-+
+ fi
+ 
+-# func_echo_all arg...
+-# Invoke $ECHO with all args, space-separated.
+-func_echo_all ()
+-{
+-    $ECHO "$*" 
+-}
 +if test "X[$]1" = X--fallback-echo; then
 +  # used as fallback echo
 +  shift
@@ -18219,7 +9263,12 @@
 +_LT_EOF
 +  exit 0
 +fi
-+
+ 
+-case "$ECHO" in
+-  printf*) AC_MSG_RESULT([printf]) ;;
+-  print*) AC_MSG_RESULT([print -r]) ;;
+-  *) AC_MSG_RESULT([cat]) ;;
+-esac
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -18301,7 +9350,16 @@
 +        else
 +	  # maybe with a smaller string...
 +	  prev=:
-+
+ 
+-m4_ifdef([_AS_DETECT_SUGGESTED],
+-[_AS_DETECT_SUGGESTED([
+-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+-    PATH=/empty FPATH=/empty; export PATH FPATH
+-    test "X`printf %s $ECHO`" = "X$ECHO" \
+-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 +	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
 +	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
 +	    then
@@ -18309,7 +9367,7 @@
 +	    fi
 +	    prev="$cmd"
 +	  done
-+
+ 
 +	  if test "$prev" != 'sed 50q "[$]0"'; then
 +	    echo_test_string=`eval $prev`
 +	    export echo_test_string
@@ -18333,1037 +9391,232 @@
 +
 +AC_SUBST(lt_ECHO)
 +])
-+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+ _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 +_LT_DECL([], [ECHO], [1],
 +    [An echo program that does not interpret backslashes])
-+])# _LT_PROG_ECHO_BACKSLASH
-+
-+
-+# _LT_ENABLE_LOCK
-+# ---------------
-+m4_defun([_LT_ENABLE_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+  [AS_HELP_STRING([--disable-libtool-lock],
-+    [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+      *ELF-32*)
-+	HPUX_IA64_MODE="32"
-+	;;
-+      *ELF-64*)
-+	HPUX_IA64_MODE="64"
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
+ ])# _LT_PROG_ECHO_BACKSLASH
+ 
+ 
+@@ -1193,7 +1236,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
 +  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    if test "$lt_cv_prog_gnu_ld" = yes; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -melf32bsmip"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -melf32bmipn32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -melf64bmip"
-+	;;
-+      esac
-+    else
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -32"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -n32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -64"
-+	  ;;
-+      esac
-+    fi
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+      *32-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_i386_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_i386"
-+	    ;;
-+	  ppc64-*linux*|powerpc64-*linux*)
-+	    LD="${LD-ld} -m elf32ppclinux"
-+	    ;;
-+	  s390x-*linux*)
-+	    LD="${LD-ld} -m elf_s390"
-+	    ;;
-+	  sparc64-*linux*)
-+	    LD="${LD-ld} -m elf32_sparc"
-+	    ;;
-+	esac
-+	;;
-+      *64-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_x86_64_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_x86_64"
-+	    ;;
-+	  ppc*-*linux*|powerpc*-*linux*)
-+	    LD="${LD-ld} -m elf64ppc"
-+	    ;;
-+	  s390*-*linux*|s390*-*tpf*)
-+	    LD="${LD-ld} -m elf64_s390"
-+	    ;;
-+	  sparc*-*linux*)
-+	    LD="${LD-ld} -m elf64_sparc"
-+	    ;;
-+	esac
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_PUSH(C)
-+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      *)
-+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+])# _LT_ENABLE_LOCK
-+
-+
-+# _LT_CMD_OLD_ARCHIVE
-+# -------------------
-+m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[AC_CHECK_TOOL(AR, ar, false)
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1])
-+
-+AC_CHECK_TOOL(STRIP, strip, :)
-+test -z "$STRIP" && STRIP=:
-+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-+
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+test -z "$RANLIB" && RANLIB=:
-+_LT_DECL([], [RANLIB], [1],
-+    [Commands used to install an old-style archive])
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+_LT_DECL([], [old_postinstall_cmds], [2])
-+_LT_DECL([], [old_postuninstall_cmds], [2])
-+_LT_TAGDECL([], [old_archive_cmds], [2],
-+    [Commands used to build an old-style archive])
-+])# _LT_CMD_OLD_ARCHIVE
-+
-+
-+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([_LT_COMPILER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$3"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+   if AC_TRY_EVAL(ac_compile); then
+     if test "$lt_cv_prog_gnu_ld" = yes; then
+       case `/usr/bin/file conftest.$ac_objext` in
+@@ -1345,19 +1388,10 @@
+   esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+-
+-case $host_os in
+-  darwin*)
+-    lock_old_archive_extraction=yes ;;
+-  *)
+-    lock_old_archive_extraction=no ;;
+-esac
+ _LT_DECL([], [old_postinstall_cmds], [2])
+ _LT_DECL([], [old_postuninstall_cmds], [2])
+ _LT_TAGDECL([], [old_archive_cmds], [2],
+     [Commands used to build an old-style archive])
+-_LT_DECL([], [lock_old_archive_extraction], [0],
+-    [Whether to use a lock for old archive extraction])
+ ])# _LT_CMD_OLD_ARCHIVE
+ 
+ 
+@@ -1382,15 +1416,15 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 +   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&AS_MESSAGE_LOG_FD
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 +   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
 +     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       $2=yes
-+     fi
-+   fi
-+   $RM conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    m4_if([$5], , :, [$5])
-+else
-+    m4_if([$6], , :, [$6])
-+fi
-+])# _LT_COMPILER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-+
-+
-+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------
-+# Check whether the given linker option works
-+AC_DEFUN([_LT_LINKER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $3"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+@@ -1430,7 +1464,7 @@
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
 +       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-+     else
-+       $2=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    m4_if([$4], , :, [$4])
-+else
-+    m4_if([$5], , :, [$5])
-+fi
-+])# _LT_LINKER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-+
-+
-+# LT_CMD_MAX_LEN
-+#---------------
-+AC_DEFUN([LT_CMD_MAX_LEN],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+  i=0
-+  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw* | cegcc*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  amigaos*)
-+    # On AmigaOS with pdksh, this test takes hours, literally.
-+    # So we just punt and use a minimum line length of 8192.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
-+
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-+    ;;
-+  sysv5* | sco5v6* | sysv4.2uw2*)
-+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+    if test -n "$kargmax"; then
-+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-+    else
-+      lt_cv_sys_max_cmd_len=32768
-+    fi
-+    ;;
-+  *)
-+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+    if test -n "$lt_cv_sys_max_cmd_len"; then
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    else
-+      # Make teststring a little bigger before we do anything with it.
-+      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
-+        teststring=$teststring$teststring
-+      done
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      # If test is not a shell built-in, we'll probably end up computing a
-+      # maximum length that is only half of the actual maximum length, but
-+      # we can't tell.
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+          $2=yes
+@@ -1493,11 +1527,6 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  mint*)
+-    # On MiNT this can take a long time and run out of memory.
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
+-
+   amigaos*)
+     # On AmigaOS with pdksh, this test takes hours, literally.
+     # So we just punt and use a minimum line length of 8192.
+@@ -1562,8 +1591,8 @@
+       # If test is not a shell built-in, we'll probably end up computing a
+       # maximum length that is only half of the actual maximum length, but
+       # we can't tell.
+-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 +      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
 +	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+	      test $i != 17 # 1/2 MB should be enough
-+      do
-+        i=`expr $i + 1`
-+        teststring=$teststring$teststring
-+      done
-+      # Only check the string length outside the loop.
-+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+      teststring=
-+      # Add a significant safety factor because C++ compilers can tack on
-+      # massive amounts of additional arguments before passing them to the
-+      # linker.  It appears as though 1/2 is a usable value.
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    fi
-+    ;;
-+  esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+  AC_MSG_RESULT(none)
-+fi
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+_LT_DECL([], [max_cmd_len], [0],
-+    [What is the maximum length of a command?])
-+])# LT_CMD_MAX_LEN
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-+
-+
-+# _LT_HEADER_DLFCN
-+# ----------------
-+m4_defun([_LT_HEADER_DLFCN],
-+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-+])# _LT_HEADER_DLFCN
-+
-+
-+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ----------------------------------------------------------------
-+m4_defun([_LT_TRY_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
+ 	      test $i != 17 # 1/2 MB should be enough
+       do
+         i=`expr $i + 1`
+@@ -1614,7 +1643,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-[#line $LINENO "configure"
 +[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -1655,13 +1684,7 @@
+ #  endif
+ #endif
+ 
+-/* When -fvisbility=hidden is used, assume the code has been annotated
+-   correspondingly for the symbols needed.  */
+-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
+-#endif
+-
+-void fnord () { int i=42; }
 +void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+ int main ()
+ {
+   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -1670,11 +1693,7 @@
+   if (self)
+     {
+       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else
+-        {
+-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+-          else puts (dlerror ());
+-	}
 +      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+  return status;
-+}]
-+_LT_EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_dlunknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_TRY_DLOPEN_SELF
-+
-+
-+# LT_SYS_DLOPEN_SELF
-+# ------------------
-+AC_DEFUN([LT_SYS_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ])
-+    ;;
-+
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+	  [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+_LT_DECL([dlopen_support], [enable_dlopen], [0],
-+	 [Whether dlopen is supported])
-+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-+	 [Whether dlopen of programs is supported])
-+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-+	 [Whether dlopen of statically linked programs is supported])
-+])# LT_SYS_DLOPEN_SELF
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-+
-+
-+# _LT_COMPILER_C_O([TAGNAME])
-+# ---------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler.
-+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-+m4_defun([_LT_COMPILER_C_O],
-+[m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+       /* dlclose (self); */
+     }
+   else
+@@ -1850,16 +1869,16 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 +   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 +   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
 +     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+])
-+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-+	[Does compiler simultaneously support -c and -o options?])
-+])# _LT_COMPILER_C_O
-+
-+
-+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-+# ----------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+m4_defun([_LT_COMPILER_FILE_LOCKS],
-+[m4_require([_LT_ENABLE_LOCK])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_COMPILER_C_O([$1])
-+
-+hard_links="nottested"
-+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $RM conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-+])# _LT_COMPILER_FILE_LOCKS
-+
-+
-+# _LT_CHECK_OBJDIR
-+# ----------------
-+m4_defun([_LT_CHECK_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+_LT_DECL([], [objdir], [0],
-+         [The name of the directory that contains temporary libtool files])dnl
-+m4_pattern_allow([LT_OBJDIR])dnl
-+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-+])# _LT_CHECK_OBJDIR
-+
-+
-+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-+# --------------------------------------
-+# Check hardcoding attributes.
-+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
-+  # We can hardcode non-existent directories.
-+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    _LT_TAGVAR(hardcode_action, $1)=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    _LT_TAGVAR(hardcode_action, $1)=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  _LT_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+_LT_TAGDECL([], [hardcode_action], [0],
-+    [How to hardcode a shared library path into an executable])
-+])# _LT_LINKER_HARDCODE_LIBPATH
-+
-+
-+# _LT_CMD_STRIPLIB
-+# ----------------
-+m4_defun([_LT_CMD_STRIPLIB],
-+[m4_require([_LT_DECL_EGREP])
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+  darwin*)
-+    if test -n "$STRIP" ; then
-+      striplib="$STRIP -x"
-+      old_striplib="$STRIP -S"
-+      AC_MSG_RESULT([yes])
-+    else
-+      AC_MSG_RESULT([no])
-+    fi
-+    ;;
-+  *)
-+    AC_MSG_RESULT([no])
-+    ;;
-+  esac
-+fi
-+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-+_LT_DECL([], [striplib], [1])
-+])# _LT_CMD_STRIPLIB
-+
-+
-+# _LT_SYS_DYNAMIC_LINKER([TAG])
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+m4_defun([_LT_SYS_DYNAMIC_LINKER],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+m4_if([$1],
-+	[], [
-+if test "$GCC" = yes; then
-+  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
-+  esac
+      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+@@ -2018,7 +2037,6 @@
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_OBJDUMP])dnl
+ m4_require([_LT_DECL_SED])dnl
+-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ m4_if([$1],
+ 	[], [
+@@ -2027,23 +2045,16 @@
+     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+     *) lt_awk_arg="/^libraries:/" ;;
+   esac
+-  case $host_os in
+-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+-    *) lt_sed_strip_eq="s,=/,/,g" ;;
+-  esac
+-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+-  case $lt_search_path_spec in
+-  *\;*)
 +  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+-    ;;
+-  *)
+-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+-    ;;
+-  esac
 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
 +  else
 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 +  fi
-+  # Ok, now we have the path, separated by spaces, we can step through it
-+  # and add multilib dir if necessary.
-+  lt_tmp_lt_search_path_spec=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+    else
-+      test -d "$lt_sys_path" && \
-+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+    fi
-+  done
+   # Ok, now we have the path, separated by spaces, we can step through it
+   # and add multilib dir if necessary.
+   lt_tmp_lt_search_path_spec=
+@@ -2056,7 +2067,7 @@
+ 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+     fi
+   done
+-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 +  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
-+  for (lt_i = NF; lt_i > 0; lt_i--) {
-+    if ($lt_i != "" && $lt_i != ".") {
-+      if ($lt_i == "..") {
-+        lt_count++;
-+      } else {
-+        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
-+        } else {
-+          lt_count--;
-+        }
-+      }
-+    }
-+  }
-+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
+ BEGIN {RS=" "; FS="/|\n";} {
+   lt_foo="";
+   lt_count=0;
+@@ -2076,13 +2087,7 @@
+   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+ }'`
+-  # AWK program above erroneously prepends '/' to C:/dos/paths
+-  # for these hosts.
+-  case $host_os in
+-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+-  esac
+-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 +  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix[[4-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    library_names_spec='$libname.ixlibrary $libname.a'
-+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi])
+@@ -2170,7 +2175,7 @@
+   m68k)
+     library_names_spec='$libname.ixlibrary $libname.a'
+     # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    ;;
-+  esac
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi[[45]]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+     ;;
+   esac
+   ;;
+@@ -2223,12 +2228,23 @@
+     cygwin*)
+       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-m4_if([$1], [],[
+-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
 +      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw* | cegcc*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 +      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 +        # It is most probably a Windows format PATH printed by
@@ -19376,216 +9629,60 @@
 +      else
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 +      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+m4_if([$1], [],[
-+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  hppa*64*)
-+    shrext_cmds='.sl'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+@@ -2328,19 +2344,6 @@
+   hardcode_into_libs=yes
+   ;;
+ 
+-haiku*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  dynamic_linker="$host_os runtime_loader"
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+-  hardcode_into_libs=yes
+-  ;;
+-
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -2383,10 +2386,8 @@
+     soname_spec='${libname}${release}${shared_ext}$major'
+     ;;
+   esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
 +  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+interix[[3-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # Some binutils ld are patched to set DT_RUNPATH
+   postinstall_cmds='chmod 555 $lib'
+-  # or fails outright, so override atomically:
+-  install_override_mode=555
+   ;;
+ 
+ interix[[3-9]]*)
+@@ -2453,35 +2454,26 @@
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-
+   # Some binutils ld are patched to set DT_RUNPATH
+-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+-    [lt_cv_shlibpath_overrides_runpath=no
+-    save_LDFLAGS=$LDFLAGS
+-    save_libdir=$libdir
+-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+-	 [lt_cv_shlibpath_overrides_runpath=yes])])
+-    LDFLAGS=$save_LDFLAGS
+-    libdir=$save_libdir
+-    ])
+-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 +  save_LDFLAGS=$LDFLAGS
 +  save_libdir=$libdir
 +  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
@@ -19595,27 +9692,29 @@
 +       [shlibpath_overrides_runpath=yes])])
 +  LDFLAGS=$save_LDFLAGS
 +  libdir=$save_libdir
-+
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
+ 
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # Add ABI-specific directories to the system library path.
+-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2493,6 +2485,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -19628,2640 +9727,651 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+*nto* | *qnx*)
-+  version_type=qnx
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[[89]] | openbsd2.[[89]].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+rdos*)
-+  dynamic_linker=no
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+_LT_DECL([], [variables_saved_for_relink], [1],
-+    [Variables whose values should be saved in libtool wrapper scripts and
-+    restored at link time])
-+_LT_DECL([], [need_lib_prefix], [0],
-+    [Do we need the "lib" prefix for modules?])
-+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-+_LT_DECL([], [version_type], [0], [Library versioning type])
-+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-+_LT_DECL([], [shlibpath_overrides_runpath], [0],
-+    [Is shlibpath searched before the hard-coded library search path?])
-+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-+_LT_DECL([], [library_names_spec], [1],
-+    [[List of archive names.  First name is the real one, the rest are links.
-+    The last name is the one that the linker finds with -lNAME]])
-+_LT_DECL([], [soname_spec], [1],
-+    [[The coded name of the library, if different from the real name]])
-+_LT_DECL([], [postinstall_cmds], [2],
-+    [Command to use after installation of a shared archive])
-+_LT_DECL([], [postuninstall_cmds], [2],
-+    [Command to use after uninstallation of a shared archive])
-+_LT_DECL([], [finish_cmds], [2],
-+    [Commands used to finish a libtool library installation in a directory])
-+_LT_DECL([], [finish_eval], [1],
-+    [[As "finish_cmds", except a single script fragment to be evaled but
-+    not shown]])
-+_LT_DECL([], [hardcode_into_libs], [0],
-+    [Whether we should hardcode library paths into libraries])
-+_LT_DECL([], [sys_lib_search_path_spec], [2],
-+    [Compile-time system search path for libraries])
-+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-+    [Run-time system search path for libraries])
-+])# _LT_SYS_DYNAMIC_LINKER
-+
-+
-+# _LT_PATH_TOOL_PREFIX(TOOL)
-+# --------------------------
-+# find a file program which can recognize shared library
-+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-+[m4_require([_LT_DECL_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] |  ?:[\\/]*])
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="m4_if([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+_LT_DECL([], [MAGIC_CMD], [0],
-+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-+])# _LT_PATH_TOOL_PREFIX
-+
-+# Old name:
-+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-+
-+
-+# _LT_PATH_MAGIC
-+# --------------
-+# find a file program which can recognize a shared library
-+m4_defun([_LT_PATH_MAGIC],
-+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# _LT_PATH_MAGIC
-+
-+
-+# LT_PATH_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([LT_PATH_LD],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+
-+AC_ARG_WITH([gnu-ld],
-+    [AS_HELP_STRING([--with-gnu-ld],
-+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+    [test "$withval" = no || with_gnu_ld=yes],
-+    [with_gnu_ld=no])dnl
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by $CC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | ?:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+_LT_PATH_LD_GNU
-+AC_SUBST([LD])
-+
-+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-+])# LT_PATH_LD
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_LD], [])
-+dnl AC_DEFUN([AC_PROG_LD], [])
-+
-+
-+# _LT_PATH_LD_GNU
-+#- --------------
-+m4_defun([_LT_PATH_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# _LT_PATH_LD_GNU
-+
-+
-+# _LT_CMD_RELOAD
-+# --------------
-+# find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+m4_defun([_LT_CMD_RELOAD],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+  lt_cv_ld_reload_flag,
-+  [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -2713,8 +2717,6 @@
+     The last name is the one that the linker finds with -lNAME]])
+ _LT_DECL([], [soname_spec], [1],
+     [[The coded name of the library, if different from the real name]])
+-_LT_DECL([], [install_override_mode], [1],
+-    [Permission mode override for installation of shared libraries])
+ _LT_DECL([], [postinstall_cmds], [2],
+     [Command to use after installation of a shared archive])
+ _LT_DECL([], [postuninstall_cmds], [2],
+@@ -2827,7 +2829,6 @@
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ m4_require([_LT_DECL_SED])dnl
+ m4_require([_LT_DECL_EGREP])dnl
+-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+ 
+ AC_ARG_WITH([gnu-ld],
+     [AS_HELP_STRING([--with-gnu-ld],
+@@ -2957,8 +2958,8 @@
+     fi
+     ;;
+ esac
+-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+-_LT_TAGDECL([], [reload_cmds], [2])dnl
 +_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 +_LT_DECL([], [reload_cmds], [2])dnl
-+])# _LT_CMD_RELOAD
-+
-+
-+# _LT_CHECK_MAGIC_METHOD
-+# ----------------------
-+# how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_MAGIC_METHOD],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+AC_CACHE_CHECK([how to recognize dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix[[4-9]]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi[[45]]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin*)
-+  # func_win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
-+
-+mingw* | pw32*)
-+  # Base MSYS/MinGW do not provide the 'file' command needed by
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+  # unless we find 'file', for example because we are cross-compiling.
+ ])# _LT_CMD_RELOAD
+ 
+ 
+@@ -3010,18 +3011,16 @@
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
 +  if ( file / ) >/dev/null 2>&1; then
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_file_magic_cmd='func_win32_libid'
-+  else
+     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+-    # Keep this pattern in sync with the one in func_win32_libid.
+-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
 +    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  fi
-+  ;;
-+
+     lt_cv_file_magic_cmd='$OBJDUMP -f'
+   fi
+   ;;
+ 
+-cegcc*)
 +cegcc)
-+  # use the weaker test based on 'objdump'. See mingw*.
-+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case $host_cpu in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+    ;;
-+  hppa*64*)
+   # use the weaker test based on 'objdump'. See mingw*.
+   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+   lt_cv_file_magic_cmd='$OBJDUMP -f'
+@@ -3051,10 +3050,6 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-haiku*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case $host_cpu in
+@@ -3063,11 +3058,11 @@
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+     ;;
+   hppa*64*)
+-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
 +    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
+     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
+   *)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
 +    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
-+interix[[3-9]]*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+     lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+   esac
+@@ -3093,7 +3088,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
 +netbsd* | netbsdelf*-gnu)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+*nto* | *qnx*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+rdos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+
-+tpf*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+_LT_DECL([], [deplibs_check_method], [1],
-+    [Method to check whether dependent libraries are shared objects])
-+_LT_DECL([], [file_magic_cmd], [1],
-+    [Command to use when deplibs_check_method == "file_magic"])
-+])# _LT_CHECK_MAGIC_METHOD
-+
-+
-+# LT_PATH_NM
-+# ----------
-+# find the pathname to a BSD- or MS-compatible name lister
-+AC_DEFUN([LT_PATH_NM],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  lt_nm_to_check="${ac_tool_prefix}nm"
-+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+  done
-+  : ${lt_cv_path_NM=no}
-+fi])
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
-+else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -3231,19 +3226,7 @@
+   NM="$lt_cv_path_NM"
+ else
+   # Didn't find any BSD compatible name lister, look for dumpbin.
+-  if test -n "$DUMPBIN"; then :
+-    # Let the user override the test.
+-  else
+-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+-    *COFF*)
+-      DUMPBIN="$DUMPBIN -symbols"
+-      ;;
+-    *)
+-      DUMPBIN=:
+-      ;;
+-    esac
+-  fi
 +  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-+  AC_SUBST([DUMPBIN])
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-+  fi
-+fi
-+test -z "$NM" && NM=nm
-+AC_SUBST([NM])
-+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-+
-+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-+  [lt_cv_nm_interface="BSD nm"
-+  echo "int some_variable = 0;" > conftest.$ac_ext
+   AC_SUBST([DUMPBIN])
+   if test "$DUMPBIN" != ":"; then
+     NM="$DUMPBIN"
+@@ -3256,13 +3239,13 @@
+ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+   [lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 +  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-+  (eval "$ac_compile" 2>conftest.err)
-+  cat conftest.err >&AS_MESSAGE_LOG_FD
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 +  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+  cat conftest.err >&AS_MESSAGE_LOG_FD
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
 +  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-+  cat conftest.out >&AS_MESSAGE_LOG_FD
-+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+    lt_cv_nm_interface="MS dumpbin"
-+  fi
-+  rm -f conftest*])
-+])# LT_PATH_NM
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_NM], [])
-+dnl AC_DEFUN([AC_PROG_NM], [])
-+
-+
-+# LT_LIB_M
-+# --------
-+# check for math library
-+AC_DEFUN([LT_LIB_M],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
+   cat conftest.out >&AS_MESSAGE_LOG_FD
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -3285,7 +3268,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
 +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+  # These system don't have libm, or don't need it
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
-+  ;;
-+esac
-+AC_SUBST([LIBM])
-+])# LT_LIB_M
-+
-+# Old name:
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
-+
-+
-+# _LT_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------
-+m4_defun([_LT_COMPILER_NO_RTTI],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+
-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+
-+if test "$GCC" = yes; then
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3313,12 +3296,7 @@
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ 
+ if test "$GCC" = yes; then
+-  case $cc_basename in
+-  nvcc*)
+-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+-  *)
+-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+-  esac
 +  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+
-+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+    lt_cv_prog_compiler_rtti_exceptions,
-+    [-fno-rtti -fno-exceptions], [],
-+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+	[Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
-+
-+
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-+  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris*)
-+  symcode='[[BDRT]]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[[ABDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[[ABCDGIRSTW]]' ;;
-+esac
-+
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-+  # Write the raw and C identifiers.
-+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
-+    # Also find C++ and __fastcall symbols from MSVC++,
-+    # which start with @ or ?.
-+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-+"     {last_section=section; section=\$ 3};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx]"
-+  else
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+  fi
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
-+
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
+ 
+   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+     lt_cv_prog_compiler_rtti_exceptions,
+@@ -3335,7 +3313,6 @@
+ m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([LT_PATH_NM])dnl
+ AC_REQUIRE([LT_PATH_LD])dnl
+ m4_require([_LT_DECL_SED])dnl
+@@ -3461,7 +3438,7 @@
+   if AC_TRY_EVAL(ac_compile); then
+     # Now try to grab the symbols.
+     nlist=conftest.nm
+-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
 +    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<_LT_EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+_LT_EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-+
-+	  cat <<_LT_EOF >> conftest.$ac_ext
-+
-+/* The mapping between symbol names and symbols.  */
-+const struct {
-+  const char *name;
-+  void       *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+  { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+	  cat <<\_LT_EOF >> conftest.$ac_ext
-+  {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -rf conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+
-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-+    [Take the output of nm and produce a listing of raw symbols and C names])
-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-+    [Transform the output of nm in a proper C declaration])
-+_LT_DECL([global_symbol_to_c_name_address],
-+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-+    [Transform the output of nm in a C name address pair])
-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-+    [Transform the output of nm in a C name address pair when lib prefix is needed])
-+]) # _LT_CMD_GLOBAL_SYMBOLS
-+
-+
-+# _LT_COMPILER_PIC([TAGNAME])
-+# ---------------------------
-+m4_defun([_LT_COMPILER_PIC],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
-+
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+m4_if([$1], [CXX], [
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
-+
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    mingw* | cygwin* | os2* | pw32* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+      ;;
-+    interix[[3-9]]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *qnx* | *nto*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+    *)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    case $host_os in
-+      aix[[4-9]]*)
-+	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
-+	  # AIX 5 now supports IA64 processor
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	else
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
-+	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
-+	;;
-+      dgux*)
-+	case $cc_basename in
-+	  ec++*)
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	    fi
-+	    ;;
-+	  aCC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	      ;;
-+	    esac
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      interix*)
-+	# This is c89, which is MS Visual C++ (no shared libs)
-+	# Anyone wants to do a port?
-+	;;
-+      irix5* | irix6* | nonstopux*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    # CC pic flag -KPIC is the default.
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+	case $cc_basename in
-+	  KCC*)
-+	    # KAI C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    ;;
-+	  ecpc* )
-+	    # old Intel C++ for x86_64 which still supported -KPIC.
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;;
-+	  icpc* )
-+	    # Intel C++, used to be incompatible with GCC.
-+	    # ICC 10 doesn't accept -KPIC any more.
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;;
-+	  pgCC* | pgcpp*)
-+	    # Portland Group C++ compiler
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
+       # Try sorting and uniquifying the output.
+       if sort "$nlist" | uniq > "$nlist"T; then
+ 	mv -f "$nlist"T "$nlist"
+@@ -3623,11 +3600,6 @@
+       # DJGPP does not support shared libraries at all
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+-    haiku*)
+-      # PIC is the default for Haiku.
+-      # The "-static" flag exists, but is broken.
+-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+-      ;;
+     interix[[3-9]]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+@@ -3766,8 +3738,8 @@
+ 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 +	  xlc* | xlC*)
 +	    # IBM XL 8.0 on PPC
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
-+	  cxx*)
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+@@ -3797,7 +3769,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
 +      netbsd* | netbsdelf*-gnu)
-+	;;
-+      *qnx* | *nto*)
-+        # QNX uses GNU C++, but need to define -shared option too, otherwise
-+        # it will coredump.
-+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+        ;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
-+	  KCC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    ;;
-+	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  cxx*)
-+	    # Digital/Compaq C++
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      solaris*)
-+	case $cc_basename in
+ 	;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -3829,7 +3801,7 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC* | sunCC*)
 +	  CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	    ;;
-+	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.x
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  lcc*)
-+	    # Lucid
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
-+	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+	;;
-+    esac
-+  fi
-+],
-+[
-+  if test "$GCC" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
-+
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    interix[[3-9]]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      enable_shared=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+
-+    *)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      else
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-+	;;
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -3933,12 +3905,6 @@
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
+-    haiku*)
+-      # PIC is the default for Haiku.
+-      # The "-static" flag exists, but is broken.
+-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+-      ;;
+-
+     hpux*)
+       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+@@ -3981,13 +3947,6 @@
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+     esac
+-
+-    case $cc_basename in
+-    nvcc*) # Cuda Compiler Driver 2.2
+-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+-      ;;
+-    esac
+   else
+     # PORTME Check for flag to pass linker flags through the system compiler.
+     case $host_os in
+@@ -4051,7 +4010,7 @@
+ 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+ 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+ 	;;
+-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 +      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-+      ccc*)
-+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+        # All Alpha code is PIC.
-+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+        ;;
+         # Portland Group compilers (*not* the Pentium gcc compiler,
+ 	# which looks to be a dead project)
+ 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+@@ -4063,26 +4022,26 @@
+         # All Alpha code is PIC.
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+         ;;
+-      xl* | bgxl* | bgf* | mpixl*)
+-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 +      xl*)
 +	# IBM XL C 8.0/Fortran 10.1 on PPC
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	  ;;
+ 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+ 	;;
+       *)
+ 	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ F* | *Sun*Fortran*)
+-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+-	  ;;
+ 	*Sun\ C*)
+ 	  # Sun C 5.9
+ 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	  ;;
 +	*Sun\ F*)
 +	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 +	  ;;
-+	esac
-+	;;
-+      esac
-+      ;;
-+
-+    newsos6)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # All OSF/1 code is PIC.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    rdos*)
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
+ 	esac
+ 	;;
+       esac
+@@ -4113,7 +4072,7 @@
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       case $cc_basename in
+-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 +      f77* | f90* | f95*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+
-+    uts4*)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *)
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+    ;;
-+  *)
-+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-+    ;;
-+esac
-+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+	[How to pass a linker flag through the compiler])
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-+     "" | " "*) ;;
-+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+     esac],
-+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-+	[Additional compiler flags for building library objects])
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-+  $lt_tmp_static_flag,
-+  [],
-+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-+	[Compiler flag to prevent dynamic linking])
-+])# _LT_COMPILER_PIC
-+
-+
-+# _LT_LINKER_SHLIBS([TAGNAME])
-+# ----------------------------
-+# See if the linker supports building shared libraries.
-+m4_defun([_LT_LINKER_SHLIBS],
-+[AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+m4_if([$1], [CXX], [
-+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  case $host_os in
-+  aix[[4-9]]*)
-+    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+       *)
+ 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+@@ -4223,10 +4182,8 @@
+   aix[[4-9]]*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+-    # Also, AIX nm treats weak defined symbols like other global defined
+-    # symbols, whereas GNU nm marks them as "W".
+     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+    else
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+    fi
-+    ;;
-+  pw32*)
-+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw* | cegcc*)
-+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
+     else
+       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+     fi
+@@ -4237,6 +4194,9 @@
+   cygwin* | mingw* | cegcc*)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
 +  linux* | k*bsd*-gnu)
 +    _LT_TAGVAR(link_all_deplibs, $1)=no
 +  ;;
-+  *)
-+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  esac
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+], [
-+  runpath_var=
-+  _LT_TAGVAR(allow_undefined_flag, $1)=
-+  _LT_TAGVAR(always_export_symbols, $1)=no
-+  _LT_TAGVAR(archive_cmds, $1)=
-+  _LT_TAGVAR(archive_expsym_cmds, $1)=
-+  _LT_TAGVAR(compiler_needs_object, $1)=no
-+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  _LT_TAGVAR(hardcode_automatic, $1)=no
-+  _LT_TAGVAR(hardcode_direct, $1)=no
-+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+  _LT_TAGVAR(hardcode_minus_L, $1)=no
-+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_TAGVAR(inherit_rpath, $1)=no
-+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-+  _LT_TAGVAR(module_cmds, $1)=
-+  _LT_TAGVAR(module_expsym_cmds, $1)=
-+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  _LT_TAGVAR(include_expsyms, $1)=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
-+  extract_expsyms_cmds=
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
+   *)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -4301,36 +4261,13 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
 +  linux* | k*bsd*-gnu)
 +    _LT_TAGVAR(link_all_deplibs, $1)=no
 +    ;;
-+  esac
-+
-+  _LT_TAGVAR(ld_shlibs, $1)=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix[[3-9]]*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
-+
+   esac
+ 
+   _LT_TAGVAR(ld_shlibs, $1)=yes
+-
+-  # On some targets, GNU ld is compatible enough with the native linker
+-  # that we're better off using the native interface for both.
+-  lt_use_gnu_ld_interface=no
+   if test "$with_gnu_ld" = yes; then
+-    case $host_os in
+-      aix*)
+-	# The AIX port of GNU ld has always aspired to compatibility
+-	# with the native linker.  However, as the warning in the GNU ld
+-	# block says, versions before 2.19.5* couldn't really create working
+-	# shared libraries, regardless of the interface used.
+-	case `$LD -v 2>&1` in
+-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+-	  *)
+-	    lt_use_gnu_ld_interface=yes
+-	    ;;
+-	esac
+-	;;
+-      *)
+-	lt_use_gnu_ld_interface=yes
+-	;;
+-    esac
+-  fi
+-
+-  if test "$lt_use_gnu_ld_interface" = yes; then
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
+@@ -4364,12 +4301,11 @@
+ 	_LT_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<_LT_EOF 1>&2
+ 
+-*** Warning: the GNU linker, at least up to release 2.19, is reported
 +*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to install binutils
+-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+-*** You will then need to restart the configuration process.
 +*** really care for shared libraries, you may want to modify your PATH
 +*** so that a non-GNU linker is found, and then restart.
-+
-+_LT_EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+        ;;
-+      m68k)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=no
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    interix[[3-9]]*)
-+      _LT_TAGVAR(hardcode_direct, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	tmp_sharedflag='-shared'
-+	case $cc_basename,$host_cpu in
-+        pgcc*)				# Portland Group C compiler
+ 
+ _LT_EOF
+       fi
+@@ -4405,7 +4341,6 @@
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_TAGVAR(always_export_symbols, $1)=no
+       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+@@ -4427,11 +4362,6 @@
+       fi
+       ;;
+ 
+-    haiku*)
+-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      _LT_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
+-
+     interix[[3-9]]*)
+       _LT_TAGVAR(hardcode_direct, $1)=no
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -4461,12 +4391,11 @@
+ 	tmp_sharedflag='-shared'
+ 	case $cc_basename,$host_cpu in
+         pgcc*)				# Portland Group C compiler
+-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
+ 	  tmp_addflag=' $pic_flag'
+ 	  ;;
+-	pgf77* | pgf90* | pgf95* | pgfortran*)
+-					# Portland Group f77 and f90 compilers
+-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+	  tmp_sharedflag='--shared' ;;
+ 	  tmp_addflag=' $pic_flag -Mnomain' ;;
+ 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+ 	  tmp_addflag=' -i_dynamic' ;;
+@@ -4477,17 +4406,13 @@
+ 	lf95*)				# Lahey Fortran 8.1
+ 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ 	  tmp_sharedflag='--shared' ;;
+-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 +	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	esac
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)			# Sun C 5.9
+ 	  tmp_sharedflag='-qmkshrobj'
+ 	  tmp_addflag= ;;
+-	nvcc*)	# Cuda Compiler Driver 2.2
+-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+-	  ;;
+ 	esac
+ 	case `$CC -V 2>&1 | sed 5q` in
+ 	*Sun\ C*)			# Sun C 5.9
+-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+        if test "x$supports_anon_versioning" = xyes; then
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
-+
-+	case $cc_basename in
+ 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+ 	  tmp_sharedflag='-G' ;;
+ 	*Sun\ F*)			# Sun Fortran 8.3
+@@ -4503,17 +4428,17 @@
+         fi
+ 
+ 	case $cc_basename in
+-	xlf* | bgf* | bgxlf* | mpixlf*)
 +	xlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+ 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+ 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ 	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  if test "x$supports_anon_versioning" = xyes; then
+ 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ 	      echo "local: *; };" >> $output_objdir/$libname.ver~
+-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 +	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
+ 	  fi
+ 	  ;;
+ 	esac
+@@ -4522,7 +4447,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+	;;
-+	*)
-+	  # For security reasons, it is highly recommended that you always
-+	  # use absolute paths for naming shared libraries, and exclude the
-+	  # DT_RUNPATH tag from executables and libraries.  But doing so
-+	  # requires that you compile everything twice, which is a pain.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	  fi
-+	;;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+
-+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-+      fi
-+      ;;
-+
-+    aix[[4-9]]*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
-+	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -4634,10 +4559,8 @@
+       else
+ 	# If we're using GNU nm, then we don't want the "-C" option.
+ 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	# Also, AIX nm treats weak defined symbols like other global
+-	# defined symbols, whereas GNU nm marks them as "W".
+ 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 +	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	aix_use_runtimelinking=no
-+
-+	# Test if we are trying to use run time linking or normal
-+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
-+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-+	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  fi
-+	  done
-+	  ;;
-+	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      _LT_TAGVAR(archive_cmds, $1)=''
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+      if test "$GCC" = yes; then
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	# We only want to do this on AIX 4.2 and lower, the check
-+	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	  # We have reworked collect2
-+	  :
-+	  else
-+	  # We have old collect2
-+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
+ 	else
+ 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ 	fi
+@@ -4699,6 +4622,7 @@
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
 +	_LT_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
-+	fi
-+      fi
-+
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        _LT_SYS_MODULE_PATH_AIX
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -4726,7 +4650,7 @@
+         # empty executable.
+         _LT_SYS_MODULE_PATH_AIX
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
-+	 _LT_SYS_MODULE_PATH_AIX
-+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+       else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+@@ -4741,13 +4665,8 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  if test "$with_gnu_ld" = yes; then
+-	    # We only use this code for GNU lds that support --whole-archive.
+-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	  else
+-	    # Exported symbols can be pulled into shared objects from archives
+-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	  fi
 +	  # Exported symbols can be pulled into shared objects from archives
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+        ;;
-+      m68k)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    bsdi[[45]]*)
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
+ 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	  # This is similar to how AIX traditionally builds its shared libraries.
+ 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+@@ -4786,7 +4705,7 @@
+       # Tell ltmain to make .dll files, not .so files.
+       shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 +      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      _LT_DARWIN_LINKER_FEATURES($1)
-+      ;;
-+
-+    dgux*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    freebsd1*)
-+      _LT_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      ;;
-+
-+    hpux10*)
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+@@ -4853,7 +4772,7 @@
+       ;;
+ 
+     hpux10*)
+-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
+ 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+@@ -4872,7 +4791,7 @@
+       ;;
+ 
+     hpux11*)
+-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	case $host_cpu in
+ 	hppa*64*)
+ 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -4893,14 +4812,7 @@
+ 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	m4_if($1, [], [
+-	  # Older versions of the 11.00 compiler do not understand -b yet
+-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+-	  _LT_LINKER_OPTION([if $CC understands -b],
+-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
+ 	  ;;
+ 	esac
+       fi
+@@ -4928,19 +4840,19 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        AC_LINK_IFELSE(int foo(void) {},
+ 	# Try to use the -exported_symbol ld option, if it does not
+ 	# work, assume that -exports_file does not work either and
+ 	# implicitly export all symbols.
+         save_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+         AC_LINK_IFELSE(int foo(void) {},
+-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 +          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+        )
-+        LDFLAGS="$save_LDFLAGS"
-+      else
+         )
+         LDFLAGS="$save_LDFLAGS"
+       else
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(inherit_rpath, $1)=yes
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
+       fi
+       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+@@ -4949,7 +4861,7 @@
+       _LT_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    newsos6)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      ;;
-+
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	     ;;
-+	   *)
-+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    os2*)
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -5002,17 +4914,17 @@
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 +      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       else
+ 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       fi
+       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+@@ -5022,13 +4934,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      else
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+ 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 +	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    solaris*)
-+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      case $host_os in
-+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+      *)
-+	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-+	# but is careful enough not to reorder.
-+	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	else
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-+      esac
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-+    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
-+	# Use $CC to link under sequent, because it throws in some extra .o
-+	# files that make .init and .fini sections work.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+        ;;
-+	motorola)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4.3*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	_LT_TAGVAR(ld_shlibs, $1)=yes
-+      fi
-+      ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    uts4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      _LT_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    esac
-+
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-+
-+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-+_LT_DECL([], [extract_expsyms_cmds], [2],
-+    [The commands to extract the exported symbol list from a shared archive])
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+  # Assume -lc should be added
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $_LT_TAGVAR(archive_cmds, $1) in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5219,38 +5131,36 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+-	[$RM conftest*
+-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+-	  soname=conftest
+-	  lib=conftest
+-	  libobjs=conftest.$ac_objext
+-	  deplibs=
+-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+-	  compiler_flags=-v
+-	  linker_flags=-v
+-	  verstring=
+-	  output_objdir=.
+-	  libname=conftest
+-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+-	  _LT_TAGVAR(allow_undefined_flag, $1)=
+-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+-	  then
+-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+-	  else
+-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  fi
+-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+-	else
+-	  cat conftest.err 1>&5
+-	fi
+-	$RM conftest*
+-	])
+-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
 +      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
 +      $RM conftest*
 +      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22292,175 +10402,21 @@
 +      fi
 +      $RM conftest*
 +      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
-+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-+    [Whether or not to add -lc for building shared libraries])
-+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-+    [enable_shared_with_static_runtimes], [0],
-+    [Whether or not to disallow shared libs when runtime libs are static])
-+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-+    [Compiler flag to allow reflexive dlopens])
-+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-+    [Compiler flag to generate shared objects directly from archives])
-+_LT_TAGDECL([], [compiler_needs_object], [1],
-+    [Whether the compiler copes with passing no objects directly])
-+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-+    [Create an old-style archive from a shared archive])
-+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-+    [Create a temporary old-style archive to link instead of a shared archive])
-+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-+_LT_TAGDECL([], [archive_expsym_cmds], [2])
-+_LT_TAGDECL([], [module_cmds], [2],
-+    [Commands used to build a loadable module if different from building
-+    a shared archive.])
-+_LT_TAGDECL([], [module_expsym_cmds], [2])
-+_LT_TAGDECL([], [with_gnu_ld], [1],
-+    [Whether we are building with GNU ld or not])
-+_LT_TAGDECL([], [allow_undefined_flag], [1],
-+    [Flag that allows shared libraries with undefined symbols to be built])
-+_LT_TAGDECL([], [no_undefined_flag], [1],
-+    [Flag that enforces no undefined symbols])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-+    [Flag to hardcode $libdir into a binary during linking.
-+    This must work even if $libdir does not exist])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-+    [[If ld is used when linking, flag to hardcode $libdir into a binary
-+    during linking.  This must work even if $libdir does not exist]])
-+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-+    [Whether we need a single "-rpath" flag with a separated argument])
-+_LT_TAGDECL([], [hardcode_direct], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary])
-+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary and the resulting library dependency is
-+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-+    library is relocated])
-+_LT_TAGDECL([], [hardcode_minus_L], [0],
-+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_automatic], [0],
-+    [Set to "yes" if building a shared library automatically hardcodes DIR
-+    into the library and all subsequent libraries and executables linked
-+    against it])
-+_LT_TAGDECL([], [inherit_rpath], [0],
-+    [Set to yes if linker adds runtime paths of dependent libraries
-+    to runtime path list])
-+_LT_TAGDECL([], [link_all_deplibs], [0],
-+    [Whether libtool must link a program against all its dependency libraries])
-+_LT_TAGDECL([], [fix_srcfile_path], [1],
-+    [Fix the shell variable $srcfile for the compiler])
-+_LT_TAGDECL([], [always_export_symbols], [0],
-+    [Set to "yes" if exported symbols are required])
-+_LT_TAGDECL([], [export_symbols_cmds], [2],
-+    [The commands to list exported symbols])
-+_LT_TAGDECL([], [exclude_expsyms], [1],
-+    [Symbols that should not be listed in the preloaded symbols])
-+_LT_TAGDECL([], [include_expsyms], [1],
-+    [Symbols that must always be exported])
-+_LT_TAGDECL([], [prelink_cmds], [2],
-+    [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [file_list_spec], [1],
-+    [Specify filename containing input files])
-+dnl FIXME: Not yet implemented
-+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-+dnl    [Compiler flag to generate thread safe objects])
-+])# _LT_LINKER_SHLIBS
-+
-+
-+# _LT_LANG_C_CONFIG([TAG])
-+# ------------------------
-+# Ensure that the configuration variables for a C compiler are suitably
-+# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_C_CONFIG],
-+[m4_require([_LT_DECL_EGREP])dnl
-+lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
-+
-+_LT_TAG_COMPILER
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_SYS_DYNAMIC_LINKER($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+  LT_SYS_DLOPEN_SELF
-+  _LT_CMD_STRIPLIB
-+
-+  # Report which library types will actually be built
-+  AC_MSG_CHECKING([if libtool supports shared libraries])
-+  AC_MSG_RESULT([$can_build_shared])
-+
-+  AC_MSG_CHECKING([whether to build shared libraries])
-+  test "$can_build_shared" = "no" && enable_shared=no
-+
-+  # On AIX, shared libraries and static libraries use the same namespace, and
-+  # are all built from PIC.
-+  case $host_os in
-+  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
-+
-+  aix[[4-9]]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  AC_MSG_RESULT([$enable_shared])
-+
-+  AC_MSG_CHECKING([whether to build static libraries])
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  AC_MSG_RESULT([$enable_static])
-+
-+  _LT_CONFIG($1)
-+fi
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# _LT_LANG_C_CONFIG
-+
-+
+       ;;
+     esac
+   fi
+@@ -5420,14 +5330,14 @@
+ ])# _LT_LANG_C_CONFIG
+ 
+ 
+-# _LT_LANG_CXX_CONFIG([TAG])
+-# --------------------------
+-# Ensure that the configuration variables for a C++ compiler are suitably
+-# defined.  These variables are subsequently used by _LT_CONFIG to write
+-# the compiler configuration to `libtool'.
+-m4_defun([_LT_LANG_CXX_CONFIG],
+-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-m4_require([_LT_DECL_EGREP])dnl
 +# _LT_PROG_CXX
 +# ------------
 +# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
@@ -22469,13 +10425,13 @@
 +[
 +pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
 +AC_PROG_CXX
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+else
-+  _lt_caught_CXX_error=yes
-+fi
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+     (test "X$CXX" != "Xg++"))) ; then
+@@ -5435,6 +5345,22 @@
+ else
+   _lt_caught_CXX_error=yes
+ fi
 +popdef([AC_MSG_ERROR])
 +])# _LT_PROG_CXX
 +
@@ -22492,1222 +10448,308 @@
 +[AC_REQUIRE([_LT_PROG_CXX])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_EGREP])dnl
-+
-+AC_LANG_PUSH(C++)
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(compiler_needs_object, $1)=no
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the CXX compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="int some_variable = 0;"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-+
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
-+
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
-+
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC=$CC
-+  lt_save_LD=$LD
-+  lt_save_GCC=$GCC
-+  GCC=$GXX
-+  lt_save_with_gnu_ld=$with_gnu_ld
-+  lt_save_path_LD=$lt_cv_path_LD
-+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+  else
-+    $as_unset lt_cv_prog_gnu_ld
-+  fi
-+  if test -n "${lt_cv_path_LDCXX+set}"; then
-+    lt_cv_path_LD=$lt_cv_path_LDCXX
-+  else
-+    $as_unset lt_cv_path_LD
-+  fi
-+  test -z "${LDCXX+set}" || LD=$LDCXX
-+  CC=${CXX-"c++"}
-+  compiler=$CC
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+
-+  if test -n "$compiler"; then
-+    # We don't want -fno-exception when compiling C++ code, so set the
-+    # no_builtin_flag separately
-+    if test "$GXX" = yes; then
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+    else
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+    fi
-+
-+    if test "$GXX" = yes; then
-+      # Set up default GNU C++ configuration
-+
-+      LT_PATH_LD
-+
-+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+      # archiving commands below assume that GNU ld is being used.
-+      if test "$with_gnu_ld" = yes; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+        # If archive_cmds runs LD, not CC, wlarc should be empty
-+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+        #     investigate it a little bit more. (MM)
-+        wlarc='${wl}'
-+
-+        # ancient GNU ld didn't support --whole-archive et. al.
-+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-+	  $GREP 'no-whole-archive' > /dev/null; then
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        else
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+        fi
-+      else
-+        with_gnu_ld=no
-+        wlarc=
-+
-+        # A generic and very simple default shared library creation
-+        # command for GNU C++ for the case where it uses the native
-+        # linker, instead of GNU ld.  If possible, this setting should
-+        # overridden to take advantage of the native linker features on
-+        # the platform it is being used on.
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      fi
-+
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
+ 
+ AC_LANG_PUSH(C++)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+@@ -5456,8 +5382,6 @@
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -5560,7 +5484,7 @@
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-+    fi
-+
-+    # PORTME: fill in a description of your system's C++ link characteristics
-+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+    _LT_TAGVAR(ld_shlibs, $1)=yes
-+    case $host_os in
-+      aix3*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+      aix[[4-9]]*)
-+        if test "$host_cpu" = ia64; then
-+          # On IA64, the linker does run time linking by default, so we don't
-+          # have to do anything special.
-+          aix_use_runtimelinking=no
-+          exp_sym_flag='-Bexport'
-+          no_entry_flag=""
-+        else
-+          aix_use_runtimelinking=no
-+
-+          # Test if we are trying to use run time linking or normal
-+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+          # need to do runtime linking.
-+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-+	    for ld_flag in $LDFLAGS; do
-+	      case $ld_flag in
-+	      *-brtl*)
-+	        aix_use_runtimelinking=yes
-+	        break
-+	        ;;
-+	      esac
-+	    done
-+	    ;;
-+          esac
-+
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        fi
-+
-+        # When large executables or shared objects are built, AIX ld can
-+        # have problems creating the table of contents.  If linking a library
-+        # or program results in "error TOC overflow" add -mminimal-toc to
-+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+        _LT_TAGVAR(archive_cmds, $1)=''
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+        if test "$GXX" = yes; then
-+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+          # We only want to do this on AIX 4.2 and lower, the check
-+          # below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	    # We have reworked collect2
-+	    :
-+	  else
-+	    # We have old collect2
-+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+	    # It fails to find uninstalled libraries when the uninstalled
-+	    # path is not listed in the libpath.  Setting hardcode_minus_L
-+	    # to unsupported forces relinking
-+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+          esac
-+          shared_flag='-shared'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag="$shared_flag "'${wl}-G'
-+	  fi
-+        else
-+          # not using gcc
-+          if test "$host_cpu" = ia64; then
-+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	  # chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+          else
-+	    if test "$aix_use_runtimelinking" = yes; then
-+	      shared_flag='${wl}-G'
-+	    else
-+	      shared_flag='${wl}-bM:SRE'
-+	    fi
-+          fi
-+        fi
-+
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+        # It seems that -bexpall does not export symbols beginning with
-+        # underscore (_), so it is better to generate a list of symbols to
-+	# export.
-+        _LT_TAGVAR(always_export_symbols, $1)=yes
-+        if test "$aix_use_runtimelinking" = yes; then
-+          # Warning - without using the other runtime loading flags (-brtl),
-+          # -berok will link without error, but may produce a broken library.
-+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-+          # Determine the default libpath from the value encoded in an empty
-+          # executable.
-+          _LT_SYS_MODULE_PATH_AIX
-+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
+ 
+     else
+       GXX=no
+@@ -5672,7 +5596,7 @@
+           _LT_SYS_MODULE_PATH_AIX
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        else
-+          if test "$host_cpu" = ia64; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+          else
-+	    # Determine the default libpath from the value encoded in an
-+	    # empty executable.
-+	    _LT_SYS_MODULE_PATH_AIX
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	    # Warning - without using the other run time loading flags,
-+	    # -berok will link without error, but may produce a broken library.
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+         else
+           if test "$host_cpu" = ia64; then
+ 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+@@ -5687,13 +5611,8 @@
+ 	    # -berok will link without error, but may produce a broken library.
+ 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	    if test "$with_gnu_ld" = yes; then
+-	      # We only use this code for GNU lds that support --whole-archive.
+-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	    else
+-	      # Exported symbols can be pulled into shared objects from archives
+-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	    fi
 +	    # Exported symbols can be pulled into shared objects from archives
 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+          fi
-+        fi
-+        ;;
-+
-+      beos*)
-+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	  # support --undefined.  This deserves some investigation.  FIXME
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+
-+      chorus*)
-+        case $cc_basename in
-+          *)
-+	  # FIXME: insert proper C++ library support
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	  ;;
-+        esac
-+        ;;
-+
-+      cygwin* | mingw* | pw32* | cegcc*)
-+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+        # as there is no search path for DLLs.
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+        _LT_TAGVAR(always_export_symbols, $1)=no
-+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+          # If the export-symbols file already is a .def file (1st line
-+          # is EXPORTS), use it as is; otherwise, prepend...
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    cp $export_symbols $output_objdir/$soname.def;
-+          else
-+	    echo EXPORTS > $output_objdir/$soname.def;
-+	    cat $export_symbols >> $output_objdir/$soname.def;
-+          fi~
-+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+        else
-+          _LT_TAGVAR(ld_shlibs, $1)=no
-+        fi
-+        ;;
-+      darwin* | rhapsody*)
-+        _LT_DARWIN_LINKER_FEATURES($1)
-+	;;
-+
-+      dgux*)
-+        case $cc_basename in
-+          ec++*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          ghcx*)
-+	    # Green Hills C++ Compiler
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      freebsd[[12]]*)
-+        # C++ shared libraries reported to be fairly broken before
-+	# switch to ELF
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+
-+      freebsd-elf*)
-+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        ;;
-+
-+      freebsd* | dragonfly*)
-+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+        # conventions
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+        ;;
-+
-+      gnu*)
-+        ;;
-+
-+      hpux9*)
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+				             # but as the default
-+				             # location of the library.
-+
-+        case $cc_basename in
+ 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	    # This is similar to how AIX traditionally builds its shared
+ 	    # libraries.
+@@ -5726,7 +5645,6 @@
+         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+         # as there is no search path for DLLs.
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+         _LT_TAGVAR(always_export_symbols, $1)=no
+         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+@@ -5787,11 +5705,6 @@
+       gnu*)
+         ;;
+ 
+-      haiku*)
+-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-        _LT_TAGVAR(link_all_deplibs, $1)=yes
+-        ;;
+-
+       hpux9*)
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -5816,7 +5729,7 @@
+             # explicitly linking system object files so we need to strip them
+             # from the output so that they don't get included in the library
+             # dependencies.
+-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+             ;;
+           *)
+             if test "$GXX" = yes; then
+@@ -5881,7 +5794,7 @@
+ 	    # explicitly linking system object files so we need to strip them
+ 	    # from the output so that they don't get included in the library
+ 	    # dependencies.
+-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 	    ;;
+           *)
+ 	    if test "$GXX" = yes; then
+@@ -5924,7 +5837,7 @@
+         case $cc_basename in
+           CC*)
+ 	    # SGI C++
+-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	    # Archives containing C++ object files must be created using
+ 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -5935,9 +5848,9 @@
+           *)
+ 	    if test "$GXX" = yes; then
+ 	      if test "$with_gnu_ld" = no; then
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	      else
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ 	      fi
+ 	    fi
+ 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+@@ -5966,7 +5879,7 @@
+ 	    # explicitly linking system object files so we need to strip them
+ 	    # from the output so that they don't get included in the library
+ 	    # dependencies.
+-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 
+ 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -6003,26 +5916,26 @@
+           pgCC* | pgcpp*)
+             # Portland Group C++ compiler
+ 	    case `$CC -V` in
+-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
++	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+ 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+ 		rm -rf $tpldir~
+ 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+ 		rm -rf $tpldir~
+ 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ 		$RANLIB $oldlib'
+ 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+ 		rm -rf $tpldir~
+ 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+ 		rm -rf $tpldir~
+ 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ 	      ;;
+-	    *) # Version 6 and above use weak symbols
++	    *) # Version 6 will use weak symbols
+ 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ 	      ;;
+@@ -6030,7 +5943,7 @@
+ 
+ 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+             ;;
+ 	  cxx*)
+ 	    # Compaq C++
+@@ -6049,9 +5962,9 @@
+ 	    # explicitly linking system object files so we need to strip them
+ 	    # from the output so that they don't get included in the library
+ 	    # dependencies.
+-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 	    ;;
+-	  xl* | mpixl* | bgxl*)
++	  xl*)
+ 	    # IBM XL 8.0 on PPC, with GNU ld
+ 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -6071,13 +5984,13 @@
+ 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+ 
+ 	      # Not sure whether something based on
+ 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ 	      # would be better.
+-	      output_verbose_link_cmd='func_echo_all'
++	      output_verbose_link_cmd='echo'
+ 
+ 	      # Archives containing C++ object files must be created using
+ 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -6146,7 +6059,7 @@
+ 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ 	  fi
+-	  output_verbose_link_cmd=func_echo_all
++	  output_verbose_link_cmd=echo
+ 	else
+ 	  _LT_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+@@ -6181,15 +6094,15 @@
+ 	    case $host in
+ 	      osf3*)
+ 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 		;;
+ 	      *)
+ 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	          echo "-hidden">> $lib.exp~
+-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
++	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ 	          $RM $lib.exp'
+ 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ 		;;
+@@ -6205,17 +6118,17 @@
+ 	    # explicitly linking system object files so we need to strip them
+ 	    # from the output so that they don't get included in the library
+ 	    # dependencies.
+-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 	    ;;
+ 	  *)
+ 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	      case $host in
+ 	        osf3*)
+-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 		  ;;
+ 	        *)
+-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 		  ;;
+ 	      esac
+ 
+@@ -6225,7 +6138,7 @@
+ 	      # Commands to make compiler produce verbose output that lists
+ 	      # what "hidden" libraries, object files and flags are used when
+ 	      # linking a shared library.
+-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ 
+ 	    else
+ 	      # FIXME: insert proper C++ library support
+@@ -6261,7 +6174,7 @@
+ 
+       solaris*)
+         case $cc_basename in
+-          CC* | sunCC*)
 +          CC*)
-+            # FIXME: insert proper C++ library support
-+            _LT_TAGVAR(ld_shlibs, $1)=no
-+            ;;
-+          aCC*)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            # Commands to make compiler produce verbose output that lists
-+            # what "hidden" libraries, object files and flags are used when
-+            # linking a shared library.
-+            #
-+            # There doesn't appear to be a way to prevent this compiler from
-+            # explicitly linking system object files so we need to strip them
-+            # from the output so that they don't get included in the library
-+            # dependencies.
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+            ;;
-+          *)
-+            if test "$GXX" = yes; then
-+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            else
-+              # FIXME: insert proper C++ library support
-+              _LT_TAGVAR(ld_shlibs, $1)=no
-+            fi
-+            ;;
-+        esac
-+        ;;
-+
-+      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+          case $host_cpu in
-+            hppa*64*|ia64*)
-+              ;;
-+            *)
-+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+              ;;
-+          esac
-+        fi
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            _LT_TAGVAR(hardcode_direct, $1)=no
-+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+            ;;
-+          *)
-+            _LT_TAGVAR(hardcode_direct, $1)=yes
-+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+					         # but as the default
-+					         # location of the library.
-+            ;;
-+        esac
-+
-+        case $cc_basename in
-+          CC*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          aCC*)
-+	    case $host_cpu in
-+	      hppa*64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      ia64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      *)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	    esac
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test $with_gnu_ld = no; then
-+	        case $host_cpu in
-+	          hppa*64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          ia64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          *)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	        esac
-+	      fi
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      _LT_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
-+
-+      interix[[3-9]]*)
-+	_LT_TAGVAR(hardcode_direct, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+	# Instead, shared libraries are loaded at an image base (0x10000000 by
-+	# default) and relocated if they conflict, which is a slow very memory
-+	# consuming and fragmenting process.  To avoid this, we pick a random,
-+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	;;
-+      irix5* | irix6*)
-+        case $cc_basename in
-+          CC*)
-+	    # SGI C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test "$with_gnu_ld" = no; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	      else
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-+	      fi
-+	    fi
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+	    ;;
-+        esac
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(inherit_rpath, $1)=yes
-+        ;;
-+
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+	    ;;
-+	  icpc* | ecpc* )
-+	    # Intel C++
-+	    with_gnu_ld=yes
-+	    # version 8.0 and above of icpc choke on multiply defined symbols
-+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-+	    # earlier do not add the objects themselves.
-+	    case `$CC -V 2>&1` in
-+	      *"Version 7."*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	      *)  # Version 8.0 or newer
-+	        tmp_idyn=
-+	        case $host_cpu in
-+		  ia64*) tmp_idyn=' -i_dynamic';;
-+		esac
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	    esac
-+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    ;;
-+          pgCC* | pgcpp*)
-+            # Portland Group C++ compiler
-+	    case `$CC -V` in
-+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+		$RANLIB $oldlib'
-+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    *) # Version 6 will use weak symbols
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    esac
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+            ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+	    runpath_var=LD_RUN_PATH
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+	  xl*)
-+	    # IBM XL 8.0 on PPC, with GNU ld
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+		echo "local: *; };" >> $output_objdir/$libname.ver~
-+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	    fi
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-+
-+	      # Not sure whether something based on
-+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+	      # would be better.
-+	      output_verbose_link_cmd='echo'
-+
-+	      # Archives containing C++ object files must be created using
-+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	      # necessary to make sure instantiated templates are included
-+	      # in the archive.
-+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
-+
-+      lynxos*)
-+        # FIXME: insert proper C++ library support
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      m88k*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      mvs*)
-+        case $cc_basename in
-+          cxx*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	  *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	esac
-+	;;
-+
-+      netbsd*)
-+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+	  wlarc=
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	fi
-+	# Workaround some broken pre-1.5 toolchains
-+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+	;;
-+
-+      *nto* | *qnx*)
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+	;;
-+
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      openbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  fi
-+	  output_verbose_link_cmd=echo
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+
-+      osf3* | osf4* | osf5*)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Archives containing C++ object files must be created using
-+	    # the KAI C++ compiler.
-+	    case $host in
-+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-+	    esac
-+	    ;;
-+          RCC*)
-+	    # Rational C++ 2.4.1
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          cxx*)
-+	    case $host in
-+	      osf3*)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+		;;
-+	      *)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	          echo "-hidden">> $lib.exp~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $RM $lib.exp'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+		;;
-+	    esac
-+
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+	  *)
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	      case $host in
-+	        osf3*)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	        *)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	      esac
-+
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	      # Commands to make compiler produce verbose output that lists
-+	      # what "hidden" libraries, object files and flags are used when
-+	      # linking a shared library.
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      _LT_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
-+
-+      psos*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+
-+      sunos4*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.x
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          lcc*)
-+	    # Lucid
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      solaris*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	    case $host_os in
-+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+	      *)
-+		# The compiler driver will combine and reorder linker options,
-+		# but understands `-z linker_flag'.
-+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+	        ;;
-+	    esac
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+ 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+@@ -6282,7 +6195,7 @@
+ 	    esac
+ 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	    output_verbose_link_cmd='func_echo_all'
 +	    output_verbose_link_cmd='echo'
-+
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	    ;;
-+          gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+	    # The C++ compiler must be used to create the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    # GNU C++ compiler with Solaris linker
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
+ 
+ 	    # Archives containing C++ object files must be created using
+ 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -6309,7 +6222,7 @@
+ 	        # Commands to make compiler produce verbose output that lists
+ 	        # what "hidden" libraries, object files and flags are used when
+ 	        # linking a shared library.
+-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      else
-+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	        # platform.
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
+ 	      else
+ 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	        # platform.
+@@ -6320,7 +6233,7 @@
+ 	        # Commands to make compiler produce verbose output that lists
+ 	        # what "hidden" libraries, object files and flags are used when
+ 	        # linking a shared library.
+-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      fi
-+
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+	      case $host_os in
-+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+		*)
-+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+		  ;;
-+	      esac
-+	    fi
-+	    ;;
-+        esac
-+        ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      case $cc_basename in
-+        CC*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+      esac
-+      ;;
-+
-+      sysv5* | sco3.2v5* | sco5v6*)
-+	# Note: We can NOT use -z defs as we might desire, because we do not
-+	# link with -lc, and that would cause any symbols used from libc to
-+	# always be unresolved, which means just about no library would
-+	# ever link correctly.  If we're not using GNU ld we use -z text
-+	# though, which does catch some bad symbols but isn't as heavy-handed
-+	# as -z defs.
-+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+	_LT_TAGVAR(link_all_deplibs, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+	runpath_var='LD_RUN_PATH'
-+
-+	case $cc_basename in
-+          CC*)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	  *)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	esac
-+      ;;
-+
-+      tandem*)
-+        case $cc_basename in
-+          NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      vxworks*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+
-+      *)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+    esac
-+
-+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+    _LT_TAGVAR(GCC, $1)="$GXX"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_SYS_HIDDEN_LIBDEPS($1)
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  CC=$lt_save_CC
-+  LDCXX=$LD
-+  LD=$lt_save_LD
-+  GCC=$lt_save_GCC
-+  with_gnu_ld=$lt_save_with_gnu_ld
-+  lt_cv_path_LDCXX=$lt_cv_path_LD
-+  lt_cv_path_LD=$lt_save_path_LD
-+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_CXX_CONFIG
-+
-+
-+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-+# ---------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+# Dependencies to place before and after the object being linked:
-+_LT_TAGVAR(predep_objects, $1)=
-+_LT_TAGVAR(postdep_objects, $1)=
-+_LT_TAGVAR(predeps, $1)=
-+_LT_TAGVAR(postdeps, $1)=
-+_LT_TAGVAR(compiler_lib_search_path, $1)=
-+
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library.  It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-+int a;
-+void foo (void) { a = 0; }
-+_LT_EOF
-+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+_LT_EOF
-+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer*4 a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-+public class foo {
-+  private int a;
-+  public void bar (void) {
-+    a = 0;
-+  }
-+};
-+_LT_EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
-+
-+  for p in `eval "$output_verbose_link_cmd"`; do
-+    case $p in
-+
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" ||
-+          test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+	   else
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-+	 else
-+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
-+
-+    *.$objext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-+	   _LT_TAGVAR(predep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-+	 fi
-+       else
-+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_TAGVAR(postdep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-+	 fi
-+       fi
-+       ;;
-+
-+    *) ;; # Ignore the rest.
-+
-+    esac
-+  done
-+
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$RM -f confest.$objext
-+
-+# PORTME: override above test on systems where it is broken
-+m4_if([$1], [CXX],
-+[case $host_os in
-+interix[[3-9]]*)
-+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+  # hack all around it, let's just trust "g++" to DTRT.
-+  _LT_TAGVAR(predep_objects,$1)=
-+  _LT_TAGVAR(postdep_objects,$1)=
-+  _LT_TAGVAR(postdeps,$1)=
-+  ;;
-+
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
-+
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+
-+solaris*)
-+  case $cc_basename in
+ 	      fi
+ 
+ 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+@@ -6374,10 +6287,6 @@
+           CC*)
+ 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+-	      '"$_LT_TAGVAR(reload_cmds, $1)"
+ 	    ;;
+ 	  *)
+ 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -6624,7 +6533,7 @@
+ 
+ solaris*)
+   case $cc_basename in
+-  CC* | sunCC*)
 +  CC*)
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+esac
-+])
-+
-+case " $_LT_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-+    [The directories searched by this compiler when creating a shared library])
-+_LT_TAGDECL([], [predep_objects], [1],
-+    [Dependencies to place before and after the objects being linked to
-+    create a shared library])
-+_LT_TAGDECL([], [postdep_objects], [1])
-+_LT_TAGDECL([], [predeps], [1])
-+_LT_TAGDECL([], [postdeps], [1])
-+_LT_TAGDECL([], [compiler_lib_search_path], [1],
-+    [The library search path used internally by the compiler when linking
-+    a shared library])
-+])# _LT_SYS_HIDDEN_LIBDEPS
-+
-+
+     # The more standards-conforming stlport4 library is
+     # incompatible with the Cstd library. Avoid specifying
+     # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -6668,16 +6577,32 @@
+ ])# _LT_SYS_HIDDEN_LIBDEPS
+ 
+ 
 +# _LT_PROG_F77
 +# ------------
 +# Since AC_PROG_F77 is broken, in that it returns the empty string
@@ -23726,131 +10768,34 @@
 +dnl AC_DEFUN([_LT_PROG_F77], [])
 +
 +
-+# _LT_LANG_F77_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a Fortran 77 compiler are
-+# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_F77_CONFIG],
+ # _LT_LANG_F77_CONFIG([TAG])
+ # --------------------------
+ # Ensure that the configuration variables for a Fortran 77 compiler are
+ # suitably defined.  These variables are subsequently used by _LT_CONFIG
+ # to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_F77_CONFIG],
+-[AC_LANG_PUSH(Fortran 77)
+-if test -z "$F77" || test "X$F77" = "Xno"; then
+-  _lt_disable_F77=yes
+-fi
 +[AC_REQUIRE([_LT_PROG_F77])dnl
 +AC_LANG_PUSH(Fortran 77)
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the F77 compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
-+
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
-+
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
-+
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${F77-"f77"}
-+  compiler=$CC
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+  GCC=$G77
-+  if test -n "$compiler"; then
-+    AC_MSG_CHECKING([if libtool supports shared libraries])
-+    AC_MSG_RESULT([$can_build_shared])
-+
-+    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
-+
-+    # On AIX, shared libraries and static libraries use the same namespace, and
-+    # are all built from PIC.
-+    case $host_os in
-+      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
-+        if test -n "$RANLIB"; then
-+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+          postinstall_cmds='$RANLIB $lib'
-+        fi
-+        ;;
-+      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
-+	fi
-+        ;;
-+    esac
-+    AC_MSG_RESULT([$enable_shared])
-+
-+    AC_MSG_CHECKING([whether to build static libraries])
-+    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
-+    AC_MSG_RESULT([$enable_static])
-+
-+    _LT_TAGVAR(GCC, $1)="$G77"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_F77" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
-+
-+
+ 
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -6696,8 +6621,6 @@
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -6797,17 +6720,32 @@
+ ])# _LT_LANG_F77_CONFIG
+ 
+ 
 +# _LT_PROG_FC
 +# -----------
 +# Since AC_PROG_FC is broken, in that it returns the empty string
@@ -23869,1282 +10814,212 @@
 +dnl AC_DEFUN([_LT_PROG_FC], [])
 +
 +
-+# _LT_LANG_FC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for a Fortran compiler are
-+# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_FC_CONFIG],
+ # _LT_LANG_FC_CONFIG([TAG])
+ # -------------------------
+ # Ensure that the configuration variables for a Fortran compiler are
+ # suitably defined.  These variables are subsequently used by _LT_CONFIG
+ # to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_FC_CONFIG],
+-[AC_LANG_PUSH(Fortran)
+-
+-if test -z "$FC" || test "X$FC" = "Xno"; then
+-  _lt_disable_FC=yes
+-fi
 +[AC_REQUIRE([_LT_PROG_FC])dnl
 +AC_LANG_PUSH(Fortran)
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
-+
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the FC compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
-+
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
-+
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
-+
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${FC-"f95"}
-+  compiler=$CC
-+  GCC=$ac_cv_fc_compiler_gnu
-+
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+
-+  if test -n "$compiler"; then
-+    AC_MSG_CHECKING([if libtool supports shared libraries])
-+    AC_MSG_RESULT([$can_build_shared])
-+
-+    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
-+
-+    # On AIX, shared libraries and static libraries use the same namespace, and
-+    # are all built from PIC.
-+    case $host_os in
-+      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
-+        if test -n "$RANLIB"; then
-+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+          postinstall_cmds='$RANLIB $lib'
-+        fi
-+        ;;
-+      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
-+	fi
-+        ;;
-+    esac
-+    AC_MSG_RESULT([$enable_shared])
-+
-+    AC_MSG_CHECKING([whether to build static libraries])
-+    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
-+    AC_MSG_RESULT([$enable_static])
-+
-+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_SYS_HIDDEN_LIBDEPS($1)
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_FC" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_FC_CONFIG
-+
-+
-+# _LT_LANG_GCJ_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Java Compiler compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GCJ_CONFIG],
-+[AC_REQUIRE([LT_PROG_GCJ])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+  _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC="$lt_save_CC"
-+])# _LT_LANG_GCJ_CONFIG
-+
-+
-+# _LT_LANG_RC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for the Windows resource compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_RC_CONFIG],
-+[AC_REQUIRE([LT_PROG_RC])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+lt_save_GCC=$GCC
-+GCC=
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+if test -n "$compiler"; then
-+  :
-+  _LT_CONFIG($1)
-+fi
-+
-+GCC=$lt_save_GCC
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# _LT_LANG_RC_CONFIG
-+
-+
-+# LT_PROG_GCJ
-+# -----------
-+AC_DEFUN([LT_PROG_GCJ],
-+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-+    [AC_CHECK_TOOL(GCJ, gcj,)
-+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+      AC_SUBST(GCJFLAGS)])])[]dnl
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+
-+
-+# LT_PROG_RC
-+# ----------
-+AC_DEFUN([LT_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres,)
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_RC], [])
-+
-+
-+# _LT_DECL_EGREP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best grep
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_EGREP],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_REQUIRE([AC_PROG_FGREP])dnl
-+test -z "$GREP" && GREP=grep
-+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-+_LT_DECL([], [EGREP], [1], [An ERE matcher])
-+_LT_DECL([], [FGREP], [1], [A literal string matcher])
-+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-+AC_SUBST([GREP])
-+])
-+
-+
-+# _LT_DECL_OBJDUMP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best objdump
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_OBJDUMP],
-+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-+AC_SUBST([OBJDUMP])
-+])
-+
-+
-+# _LT_DECL_SED
-+# ------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+m4_defun([_LT_DECL_SED],
-+[AC_PROG_SED
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-+])# _LT_DECL_SED
-+
-+m4_ifndef([AC_PROG_SED], [
-+############################################################
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+############################################################
-+
-+m4_defun([AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for lt_ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+IFS=$as_save_IFS
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && continue
-+  cat /dev/null > conftest.in
-+  lt_ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+  # Check for GNU sed and select it if it is found.
-+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+    lt_cv_path_SED=$lt_ac_sed
-+    break
-+  fi
-+  while true; do
-+    cat conftest.in conftest.in >conftest.tmp
-+    mv conftest.tmp conftest.in
-+    cp conftest.in conftest.nl
-+    echo >>conftest.nl
-+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+    cmp -s conftest.out conftest.nl || break
-+    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
-+    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
-+      lt_ac_max=$lt_ac_count
-+      lt_cv_path_SED=$lt_ac_sed
-+    fi
-+  done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_SUBST([SED])
-+AC_MSG_RESULT([$SED])
-+])#AC_PROG_SED
-+])#m4_ifndef
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_SED], [])
-+
-+
-+# _LT_CHECK_SHELL_FEATURES
-+# ------------------------
-+# Find out whether the shell is Bourne or XSI compatible,
-+# or has some other useful features.
-+m4_defun([_LT_CHECK_SHELL_FEATURES],
-+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+AC_MSG_RESULT([$xsi_shell])
-+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-+
-+AC_MSG_CHECKING([whether the shell understands "+="])
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+AC_MSG_RESULT([$lt_shell_append])
-+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
-+else
-+  lt_unset=false
-+fi
-+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-+
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-+  ;;
-+esac
-+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-+])# _LT_CHECK_SHELL_FEATURES
-+
-+
-+# _LT_PROG_XSI_SHELLFNS
-+# ---------------------
-+# Bourne and XSI compatible variants of some useful shell functions.
-+m4_defun([_LT_PROG_XSI_SHELLFNS],
-+[case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# 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 ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+}
-+
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
-+
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+  func_basename_result="${1##*/}"
-+}
-+
-+# 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_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
-+
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $[*] ))
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
-+
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# 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 ()
-+{
-+  # Extract subdirectory from the argument.
+ 
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -6826,8 +6764,6 @@
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -6973,8 +6909,6 @@
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -7342,7 +7276,7 @@
+ func_dirname ()
+ {
+   # Extract subdirectory from the argument.
+-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
 +  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 file
-+func_basename ()
-+{
+   if test "X$func_dirname_result" = "X${1}"; then
+     func_dirname_result="${3}"
+   else
+@@ -7353,7 +7287,7 @@
+ # func_basename file
+ func_basename ()
+ {
+-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
 +  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
-+
-+dnl func_dirname_and_basename
-+dnl A portable version of this function is already defined in general.m4sh
-+dnl so there is no need for it here.
-+
-+# 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
+ }
+ 
+ dnl func_dirname_and_basename
+@@ -7369,8 +7303,10 @@
+ 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}\$%%"`;;
 +    .*) func_stripname_result=`$ECHO "X${3}" \
 +           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
 +    *)  func_stripname_result=`$ECHO "X${3}" \
 +           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-+  esac
-+}
-+
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[[^=]]*=//'
-+
-+# func_opt_split
-+func_opt_split ()
-+{
+   esac
+ }
+ 
+@@ -7381,20 +7317,20 @@
+ # func_opt_split
+ func_opt_split ()
+ {
+-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
 +  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
 +  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
+ }
+ 
+ # func_lo2o object
+ func_lo2o ()
+ {
+-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
 +  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
+ }
+ 
+ # func_xform libobj-or-source
+ func_xform ()
+ {
+-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
 +  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$[@]"`
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
-+
-+_LT_EOF
-+esac
-+
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]+=\$[2]"
-+}
-+_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]=\$$[1]\$[2]"
-+}
-+
-+_LT_EOF
-+    ;;
-+  esac
-+])
-Index: gtk+2.0-2.21.8/m4/lt~obsolete.m4
+ }
+ 
+ # func_arith arithmetic-term...
+Index: gtk+2.0-2.22.0/m4/ltoptions.m4
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/m4/lt~obsolete.m4	2010-09-14 20:24:05.552686759 +0200
-@@ -0,0 +1,92 @@
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-+#
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004.
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 4 lt~obsolete.m4
-+
-+# These exist entirely to fool aclocal when bootstrapping libtool.
-+#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-+# which have later been changed to m4_define as they aren't part of the
-+# exported API, or moved to Autoconf or Automake where they belong.
-+#
-+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-+# using a macro with the same name in our local m4/libtool.m4 it'll
-+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-+# and doesn't know about Autoconf macros at all.)
-+#
-+# So we provide this file, which has a silly filename so it's always
-+# included after everything else.  This provides aclocal with the
-+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-+# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-+#
-+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-+# Yes, that means every name once taken will need to remain here until
-+# we give up compatibility with versions before 1.7, at which point
-+# we need to keep only those names which we still refer to.
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-+
-+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-Index: gtk+2.0-2.21.8/m4/ltoptions.m4
+--- gtk+2.0-2.22.0.orig/m4/ltoptions.m4	2010-09-23 20:31:13.149580338 +0200
++++ gtk+2.0-2.22.0/m4/ltoptions.m4	2010-09-23 20:30:20.461592832 +0200
+@@ -1,14 +1,13 @@
+ # Helper functions for option handling.                    -*- Autoconf -*-
+ #
+-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+-#   Inc.
++#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+ #   Written by Gary V. Vaughan, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+ 
+-# serial 7 ltoptions.m4
++# serial 6 ltoptions.m4
+ 
+ # This is to help aclocal find these macros, as it can't see m4_define.
+ AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+@@ -126,7 +125,7 @@
+ [enable_win32_dll=yes
+ 
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -134,13 +133,13 @@
+ esac
+ 
+ test -z "$AS" && AS=as
+-_LT_DECL([], [AS],      [1], [Assembler program])dnl
++_LT_DECL([], [AS],      [0], [Assembler program])dnl
+ 
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+ 
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+ ])# win32-dll
+ 
+ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+Index: gtk+2.0-2.22.0/m4/ltversion.m4
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/m4/ltoptions.m4	2010-09-14 20:24:05.184679850 +0200
-@@ -0,0 +1,368 @@
-+# Helper functions for option handling.                    -*- Autoconf -*-
-+#
-+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltoptions.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+
-+
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+
-+
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+        _LT_MANGLE_DEFUN([$1], [$2]),
-+    [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
-+
-+
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-+
-+
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+		      [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
-+
-+
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME.  If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+    [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+  dnl
-+  dnl Simply set some default values (i.e off) if boolean options were not
-+  dnl specified:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+  ])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+  ])
-+  dnl
-+  dnl If no reference was made to various pairs of opposing options, then
-+  dnl we run the default mode handler for the pair.  For example, if neither
-+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+  dnl archives by default:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+  		   [_LT_ENABLE_FAST_INSTALL])
-+  ])
-+])# _LT_SET_OPTIONS
-+
-+
-+## --------------------------------- ##
-+## Macros to handle LT_INIT options. ##
-+## --------------------------------- ##
-+
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+
-+
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
-+
-+
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
-+
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+
-+
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
-+
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+esac
-+
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS],      [0], [Assembler program])dnl
-+
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
-+
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+
-+
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+
-+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+	[Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
-+
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
-+
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
-+
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-+
-+    _LT_DECL([build_old_libs], [enable_static], [0],
-+	[Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
-+
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
-+
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-+
-+
-+
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-+
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+	 [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+
-+
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+    [AS_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
-+## ----------------- ##
-+## LTDL_INIT Options ##
-+## ----------------- ##
-+
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+		 [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+		 [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+		 [m4_define([_LTDL_MODE], [subproject])])
-+
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+		 [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+		 [m4_define([_LTDL_TYPE], [convenience])])
-Index: gtk+2.0-2.21.8/m4/ltsugar.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/m4/ltsugar.m4	2010-09-14 20:24:05.316694535 +0200
-@@ -0,0 +1,123 @@
-+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltsugar.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+
-+
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+       [$#], [2], [[$2]],
-+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+
-+
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+       [$#], 1, [],
-+       [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-+
-+
-+
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+	     [m4_foreach([_Lt_suffix],
-+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-+
-+
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+		 [lt_append([$1], [$2], [$3])$4],
-+		 [$5])],
-+	  [lt_append([$1], [$2], [$3])$4])])
-+
-+
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-+
-+
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-+
-+
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+
-+
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+	[$5],
-+    [$6])])
-+
-+
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
-Index: gtk+2.0-2.21.8/m4/ltversion.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/m4/ltversion.m4	2010-09-14 20:24:05.448694558 +0200
-@@ -0,0 +1,23 @@
-+# ltversion.m4 -- version numbers			-*- Autoconf -*-
-+#
-+#   Copyright (C) 2004 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# Generated from ltversion.in.
-+
+--- gtk+2.0-2.22.0.orig/m4/ltversion.m4	2010-09-23 20:31:13.109587759 +0200
++++ gtk+2.0-2.22.0/m4/ltversion.m4	2010-09-23 20:30:20.565587546 +0200
+@@ -9,15 +9,15 @@
+ 
+ # Generated from ltversion.in.
+ 
+-# serial 3175 ltversion.m4
 +# serial 3017 ltversion.m4
-+# This file is part of GNU Libtool
-+
+ # This file is part of GNU Libtool
+ 
+-m4_define([LT_PACKAGE_VERSION], [2.2.10])
+-m4_define([LT_PACKAGE_REVISION], [1.3175])
 +m4_define([LT_PACKAGE_VERSION], [2.2.6b])
 +m4_define([LT_PACKAGE_REVISION], [1.3017])
-+
-+AC_DEFUN([LTVERSION_VERSION],
+ 
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.10'
+-macro_revision='1.3175'
 +[macro_version='2.2.6b'
 +macro_revision='1.3017'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
-Index: gtk+2.0-2.21.8/m4macros/Makefile.in
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+Index: gtk+2.0-2.22.0/m4/lt~obsolete.m4
 ===================================================================
---- gtk+2.0-2.21.8.orig/m4macros/Makefile.in	2010-09-14 20:24:44.496681247 +0200
-+++ gtk+2.0-2.21.8/m4macros/Makefile.in	2010-09-14 20:24:15.973677973 +0200
-@@ -40,11 +40,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = m4macros
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/m4/lt~obsolete.m4	2010-09-23 20:31:13.029611115 +0200
++++ gtk+2.0-2.22.0/m4/lt~obsolete.m4	2010-09-23 20:30:20.609579308 +0200
+@@ -1,13 +1,13 @@
+ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+ #
+-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
++#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+ #   Written by Scott James Remnant, 2004.
+ #
+ # This file is free software; the Free Software Foundation gives
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+ 
+-# serial 5 lt~obsolete.m4
++# serial 4 lt~obsolete.m4
+ 
+ # These exist entirely to fool aclocal when bootstrapping libtool.
+ #
+@@ -77,6 +77,7 @@
+ m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+ m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+ m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
++m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
+ m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+ m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+ m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+@@ -89,10 +90,3 @@
+ m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+ m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+ m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
+Index: gtk+2.0-2.22.0/m4macros/Makefile.in
+===================================================================
+--- gtk+2.0-2.22.0.orig/m4macros/Makefile.in	2010-09-23 20:31:07.165611912 +0200
++++ gtk+2.0-2.22.0/m4macros/Makefile.in	2010-09-23 20:30:30.842577976 +0200
+@@ -47,7 +47,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25153,7 +11028,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -141,6 +144,7 @@
+@@ -144,6 +144,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25161,7 +11036,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -291,6 +295,7 @@
+@@ -294,6 +295,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25169,76 +11044,10 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/Makefile.in
-===================================================================
---- gtk+2.0-2.21.8.orig/Makefile.in	2010-09-14 20:24:55.004680797 +0200
-+++ gtk+2.0-2.21.8/Makefile.in	2010-09-14 20:24:18.669678364 +0200
-@@ -45,17 +45,20 @@
- 	$(srcdir)/gtk-zip.sh.in $(top_srcdir)/Makefile.decl \
- 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- 	compile config.guess config.sub depcomp install-sh ltmain.sh \
--	missing
-+	missing mkinstalldirs
- @OS_UNIX_TRUE at am__append_1 = gtk+-unix-print-2.0.pc
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno config.status.lineno
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-2.0.pc gtk+-2.0.pc \
- 	gtk+-unix-print-2.0.pc gail.pc gdk-2.0-uninstalled.pc \
-@@ -106,7 +109,8 @@
- 	distdir dist dist-all distcheck
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = $(SUBDIRS)
-+DIST_SUBDIRS = po po-properties gdk gtk modules demos tests perf docs \
-+	m4macros build
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -204,6 +208,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -354,6 +359,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-@@ -455,7 +461,10 @@
- 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- 	&& DISPLAY=:$$XID && export DISPLAY
- 
--SRC_SUBDIRS = gdk gtk modules demos tests perf
-+
-+# don't build perf measurement tools in static builds
-+ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
-+SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- 
- # require automake 1.4
-Index: gtk+2.0-2.21.8/mkinstalldirs
+Index: gtk+2.0-2.22.0/mkinstalldirs
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.8/mkinstalldirs	2010-09-14 20:24:18.608680325 +0200
++++ gtk+2.0-2.22.0/mkinstalldirs	2010-09-23 20:30:33.129607899 +0200
 @@ -0,0 +1,162 @@
 +#! /bin/sh
 +# mkinstalldirs --- make directory hierarchy
@@ -25402,19 +11211,11 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-Index: gtk+2.0-2.21.8/modules/engines/Makefile.in
+Index: gtk+2.0-2.22.0/modules/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/engines/Makefile.in	2010-09-14 20:24:42.408681785 +0200
-+++ gtk+2.0-2.21.8/modules/engines/Makefile.in	2010-09-14 20:24:16.133677496 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = modules/engines
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/Makefile.in	2010-09-23 20:31:06.281581461 +0200
++++ gtk+2.0-2.22.0/modules/Makefile.in	2010-09-23 20:30:30.914578470 +0200
+@@ -47,7 +47,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25423,7 +11224,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -161,6 +161,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25431,7 +11232,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -311,6 +312,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25439,19 +11240,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/engines/ms-windows/Makefile.in
+Index: gtk+2.0-2.22.0/modules/engines/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/engines/ms-windows/Makefile.in	2010-09-14 20:24:42.560678765 +0200
-+++ gtk+2.0-2.21.8/modules/engines/ms-windows/Makefile.in	2010-09-14 20:24:16.237677716 +0200
-@@ -40,11 +40,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/engines/Makefile.in	2010-09-23 20:31:04.774579104 +0200
++++ gtk+2.0-2.22.0/modules/engines/Makefile.in	2010-09-23 20:30:30.986577851 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25460,7 +11253,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -214,6 +217,7 @@
+@@ -160,6 +160,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25468,7 +11261,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -364,6 +368,7 @@
+@@ -310,6 +311,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25476,19 +11269,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+Index: gtk+2.0-2.22.0/modules/engines/ms-windows/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2010-09-14 20:24:42.480678792 +0200
-+++ gtk+2.0-2.21.8/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2010-09-14 20:24:16.397679062 +0200
-@@ -40,11 +40,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows/Theme/gtk-2.0
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/engines/ms-windows/Makefile.in	2010-09-23 20:31:04.922613637 +0200
++++ gtk+2.0-2.22.0/modules/engines/ms-windows/Makefile.in	2010-09-23 20:30:31.078579210 +0200
+@@ -47,7 +47,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25497,7 +11282,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -141,6 +144,7 @@
+@@ -217,6 +217,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25505,7 +11290,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -291,6 +295,7 @@
+@@ -367,6 +368,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25513,19 +11298,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/engines/ms-windows/Theme/Makefile.in
+Index: gtk+2.0-2.22.0/modules/engines/ms-windows/Theme/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/engines/ms-windows/Theme/Makefile.in	2010-09-14 20:24:42.532688546 +0200
-+++ gtk+2.0-2.21.8/modules/engines/ms-windows/Theme/Makefile.in	2010-09-14 20:24:16.313678231 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows/Theme
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/engines/ms-windows/Theme/Makefile.in	2010-09-23 20:31:04.886589643 +0200
++++ gtk+2.0-2.22.0/modules/engines/ms-windows/Theme/Makefile.in	2010-09-23 20:30:31.150578300 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25534,7 +11311,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -160,6 +160,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25542,7 +11319,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -310,6 +311,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25550,19 +11327,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/engines/pixbuf/Makefile.in
+Index: gtk+2.0-2.22.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/engines/pixbuf/Makefile.in	2010-09-14 20:24:42.328680623 +0200
-+++ gtk+2.0-2.21.8/modules/engines/pixbuf/Makefile.in	2010-09-14 20:24:16.513678660 +0200
-@@ -40,11 +40,14 @@
- 	$(top_srcdir)/Makefile.decl ChangeLog
- subdir = modules/engines/pixbuf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2010-09-23 20:31:04.842586284 +0200
++++ gtk+2.0-2.22.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2010-09-23 20:30:31.222578924 +0200
+@@ -47,7 +47,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25571,7 +11340,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -177,6 +180,7 @@
+@@ -144,6 +144,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25579,7 +11348,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -327,6 +331,7 @@
+@@ -294,6 +295,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25587,19 +11356,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/input/Makefile.in
+Index: gtk+2.0-2.22.0/modules/engines/pixbuf/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/input/Makefile.in	2010-09-14 20:24:42.640680478 +0200
-+++ gtk+2.0-2.21.8/modules/input/Makefile.in	2010-09-14 20:24:16.713678299 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/input
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/engines/pixbuf/Makefile.in	2010-09-23 20:31:04.674592446 +0200
++++ gtk+2.0-2.22.0/modules/engines/pixbuf/Makefile.in	2010-09-23 20:30:31.310578657 +0200
+@@ -47,7 +47,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25608,7 +11369,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -378,6 +381,7 @@
+@@ -180,6 +180,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25616,7 +11377,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -528,6 +532,7 @@
+@@ -330,6 +331,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25624,7 +11385,36 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-@@ -693,7 +698,8 @@
+Index: gtk+2.0-2.22.0/modules/input/Makefile.in
+===================================================================
+--- gtk+2.0-2.22.0.orig/modules/input/Makefile.in	2010-09-23 20:31:04.982578107 +0200
++++ gtk+2.0-2.22.0/modules/input/Makefile.in	2010-09-23 20:30:31.494578380 +0200
+@@ -48,7 +48,7 @@
+ 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -381,6 +381,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -531,6 +532,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+@@ -696,7 +698,8 @@
  @INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
  imconffiledir = $(sysconfdir)/gtk-2.0
  dist_imconffile_DATA = im-multipress.conf
@@ -25634,7 +11424,7 @@
  @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
  @BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
  @BUILD_DYNAMIC_MODULES_TRUE@	$(AM_ET_MODULE)			\
-@@ -1249,7 +1255,18 @@
+@@ -1252,7 +1255,18 @@
  included-modules: $(noinst_LTLIBRARIES)
  
  gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -25654,19 +11444,11 @@
  
  @CROSS_COMPILING_FALSE at all-local: gtk.immodules
  
-Index: gtk+2.0-2.21.8/modules/Makefile.in
+Index: gtk+2.0-2.22.0/modules/other/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/Makefile.in	2010-09-14 20:24:43.676686658 +0200
-+++ gtk+2.0-2.21.8/modules/Makefile.in	2010-09-14 20:24:16.057680062 +0200
-@@ -40,11 +40,14 @@
- @OS_UNIX_TRUE at am__append_1 = printbackends
- subdir = modules
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/other/Makefile.in	2010-09-23 20:31:05.450578371 +0200
++++ gtk+2.0-2.22.0/modules/other/Makefile.in	2010-09-23 20:30:31.570579940 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25675,7 +11457,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -158,6 +161,7 @@
+@@ -160,6 +160,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25683,7 +11465,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -308,6 +312,7 @@
+@@ -310,6 +311,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25691,19 +11473,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/other/gail/libgail-util/Makefile.in
+Index: gtk+2.0-2.22.0/modules/other/gail/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/other/gail/libgail-util/Makefile.in	2010-09-14 20:24:42.776679252 +0200
-+++ gtk+2.0-2.21.8/modules/other/gail/libgail-util/Makefile.in	2010-09-14 20:24:17.217679505 +0200
-@@ -42,11 +42,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/other/gail/libgail-util
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/other/gail/Makefile.in	2010-09-23 20:31:05.394580746 +0200
++++ gtk+2.0-2.22.0/modules/other/gail/Makefile.in	2010-09-23 20:30:31.862577935 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25712,7 +11486,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -182,6 +185,7 @@
+@@ -251,6 +251,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25720,7 +11494,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -332,6 +336,7 @@
+@@ -401,6 +402,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25728,19 +11502,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/other/gail/Makefile.in
+Index: gtk+2.0-2.22.0/modules/other/gail/libgail-util/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/other/gail/Makefile.in	2010-09-14 20:24:43.224679904 +0200
-+++ gtk+2.0-2.21.8/modules/other/gail/Makefile.in	2010-09-14 20:24:17.113679076 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
- subdir = modules/other/gail
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/other/gail/libgail-util/Makefile.in	2010-09-23 20:31:05.050588569 +0200
++++ gtk+2.0-2.22.0/modules/other/gail/libgail-util/Makefile.in	2010-09-23 20:30:31.966578101 +0200
+@@ -49,7 +49,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25749,7 +11515,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -248,6 +251,7 @@
+@@ -185,6 +185,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25757,7 +11523,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -398,6 +402,7 @@
+@@ -335,6 +336,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25765,19 +11531,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/other/gail/tests/Makefile.in
+Index: gtk+2.0-2.22.0/modules/other/gail/tests/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/other/gail/tests/Makefile.in	2010-09-14 20:24:43.144901547 +0200
-+++ gtk+2.0-2.21.8/modules/other/gail/tests/Makefile.in	2010-09-14 20:24:17.377678056 +0200
-@@ -40,11 +40,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = modules/other/gail/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/other/gail/tests/Makefile.in	2010-09-23 20:31:05.326581110 +0200
++++ gtk+2.0-2.22.0/modules/other/gail/tests/Makefile.in	2010-09-23 20:30:32.110578527 +0200
+@@ -47,7 +47,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25786,7 +11544,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -321,6 +324,7 @@
+@@ -324,6 +324,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25794,7 +11552,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -471,6 +475,7 @@
+@@ -474,6 +475,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25802,19 +11560,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/other/Makefile.in
+Index: gtk+2.0-2.22.0/modules/printbackends/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/other/Makefile.in	2010-09-14 20:24:43.284688441 +0200
-+++ gtk+2.0-2.21.8/modules/other/Makefile.in	2010-09-14 20:24:16.785678163 +0200
-@@ -39,11 +39,14 @@
- 	$(top_srcdir)/Makefile.decl
- subdir = modules/other
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/printbackends/Makefile.in	2010-09-23 20:31:06.205593242 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/Makefile.in	2010-09-23 20:30:32.186578891 +0200
+@@ -49,7 +49,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25823,7 +11573,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -162,6 +162,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25831,7 +11581,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -312,6 +313,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25839,19 +11589,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/printbackends/cups/Makefile.in
+Index: gtk+2.0-2.22.0/modules/printbackends/cups/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/cups/Makefile.in	2010-09-14 20:24:43.444707530 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/cups/Makefile.in	2010-09-14 20:24:17.557678037 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/cups
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/printbackends/cups/Makefile.in	2010-09-23 20:31:05.694584236 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/cups/Makefile.in	2010-09-23 20:30:32.278578150 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25860,7 +11602,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -181,6 +184,7 @@
+@@ -184,6 +184,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25868,7 +11610,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -331,6 +335,7 @@
+@@ -334,6 +335,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25876,19 +11618,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/printbackends/file/Makefile.in
+Index: gtk+2.0-2.22.0/modules/printbackends/file/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/file/Makefile.in	2010-09-14 20:24:43.368687388 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/file/Makefile.in	2010-09-14 20:24:17.665678975 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/file
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/printbackends/file/Makefile.in	2010-09-23 20:31:05.586582601 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/file/Makefile.in	2010-09-23 20:30:32.378578572 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25897,7 +11631,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -180,6 +183,7 @@
+@@ -183,6 +183,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25905,7 +11639,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -330,6 +334,7 @@
+@@ -333,6 +334,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25913,19 +11647,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/printbackends/lpr/Makefile.in
+Index: gtk+2.0-2.22.0/modules/printbackends/lpr/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/lpr/Makefile.in	2010-09-14 20:24:43.600687971 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/lpr/Makefile.in	2010-09-14 20:24:17.781677584 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/lpr
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/printbackends/lpr/Makefile.in	2010-09-23 20:31:06.129582750 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/lpr/Makefile.in	2010-09-23 20:30:32.486579039 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25934,7 +11660,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -178,6 +181,7 @@
+@@ -181,6 +181,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25942,7 +11668,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -328,6 +332,7 @@
+@@ -331,6 +332,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25950,19 +11676,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/printbackends/Makefile.in
+Index: gtk+2.0-2.22.0/modules/printbackends/papi/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/Makefile.in	2010-09-14 20:24:43.648687642 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/Makefile.in	2010-09-14 20:24:17.465678772 +0200
-@@ -42,11 +42,14 @@
- @HAVE_PAPI_TRUE at am__append_3 = papi
- subdir = modules/printbackends
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/printbackends/papi/Makefile.in	2010-09-23 20:31:05.790610545 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/papi/Makefile.in	2010-09-23 20:30:32.582578810 +0200
+@@ -46,7 +46,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -25971,7 +11689,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -159,6 +162,7 @@
+@@ -181,6 +181,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -25979,7 +11697,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -309,6 +313,7 @@
+@@ -331,6 +332,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25987,19 +11705,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/printbackends/papi/Makefile.in
+Index: gtk+2.0-2.22.0/modules/printbackends/test/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/papi/Makefile.in	2010-09-14 20:24:43.540690962 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/papi/Makefile.in	2010-09-14 20:24:17.873677548 +0200
-@@ -39,11 +39,14 @@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/modules/printbackends/test/Makefile.in	2010-09-23 20:31:05.506608750 +0200
++++ gtk+2.0-2.22.0/modules/printbackends/test/Makefile.in	2010-09-23 20:30:32.681578884 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -26008,7 +11718,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -178,6 +181,7 @@
+@@ -182,6 +182,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -26016,7 +11726,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -328,6 +332,7 @@
+@@ -332,6 +333,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -26024,19 +11734,11 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/modules/printbackends/test/Makefile.in
+Index: gtk+2.0-2.22.0/perf/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/modules/printbackends/test/Makefile.in	2010-09-14 20:24:43.336677942 +0200
-+++ gtk+2.0-2.21.8/modules/printbackends/test/Makefile.in	2010-09-14 20:24:17.981679061 +0200
-@@ -41,11 +41,14 @@
- 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/test
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/perf/Makefile.in	2010-09-23 20:31:17.114587695 +0200
++++ gtk+2.0-2.22.0/perf/Makefile.in	2010-09-23 20:30:32.781579509 +0200
+@@ -48,7 +48,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -26045,7 +11747,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -179,6 +182,7 @@
+@@ -155,6 +155,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -26053,7 +11755,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -329,6 +333,7 @@
+@@ -305,6 +306,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -26061,47 +11763,10 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/perf/Makefile.in
+Index: gtk+2.0-2.22.0/po/Makefile.in.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/perf/Makefile.in	2010-09-14 20:24:55.125694289 +0200
-+++ gtk+2.0-2.21.8/perf/Makefile.in	2010-09-14 20:24:18.077678553 +0200
-@@ -41,11 +41,14 @@
- noinst_PROGRAMS = testperf$(EXEEXT)
- subdir = perf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -152,6 +155,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -302,6 +306,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.8/po/Makefile.in.in
-===================================================================
---- gtk+2.0-2.21.8.orig/po/Makefile.in.in	2010-09-14 20:24:44.112678040 +0200
-+++ gtk+2.0-2.21.8/po/Makefile.in.in	2010-09-14 20:24:05.684682645 +0200
+--- gtk+2.0-2.22.0.orig/po/Makefile.in.in	2010-09-23 20:31:06.801580444 +0200
++++ gtk+2.0-2.22.0/po/Makefile.in.in	2010-09-23 20:30:20.729620671 +0200
 @@ -25,23 +25,23 @@
  
  prefix = @prefix@
@@ -26216,19 +11881,11 @@
  	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
  			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
  	else \
-Index: gtk+2.0-2.21.8/tests/Makefile.in
+Index: gtk+2.0-2.22.0/tests/Makefile.in
 ===================================================================
---- gtk+2.0-2.21.8.orig/tests/Makefile.in	2010-09-14 20:24:50.568680691 +0200
-+++ gtk+2.0-2.21.8/tests/Makefile.in	2010-09-14 20:24:18.345678039 +0200
-@@ -73,11 +73,14 @@
- @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE at am__append_2 = -DHAVE_OBJC=1 -x objective-c++
- subdir = tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+--- gtk+2.0-2.22.0.orig/tests/Makefile.in	2010-09-23 20:31:13.421579291 +0200
++++ gtk+2.0-2.22.0/tests/Makefile.in	2010-09-23 20:30:33.030579464 +0200
+@@ -80,7 +80,7 @@
  	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
@@ -26237,7 +11894,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
-@@ -402,6 +405,7 @@
+@@ -405,6 +405,7 @@
  GDK_PACKAGES = @GDK_PACKAGES@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -26245,7 +11902,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -552,6 +556,7 @@
+@@ -555,6 +556,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@

Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series [utf-8] Thu Sep 23 18:32:15 2010
@@ -11,5 +11,4 @@
 042_treeview_single-focus.patch
 060_ignore-random-icons.patch
 061_use_pdf_as_default_printing_standard.patch
-062_udeb-no-composite.patch
 070_mandatory-relibtoolize.patch

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=25190&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Thu Sep 23 18:32:15 2010
@@ -53,7 +53,7 @@
 VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
 APIVER := 2.0
 SONAME := 0
-SHVER := 2.21.8
+SHVER := 2.22.0
 
 # earliest version that this release has backwards binary compatibility for
 GTK_BINARY_VERSION := 2.10.0




More information about the pkg-gnome-commits mailing list