r24988 - in /desktop/experimental/gtk+2.0/debian: changelog libgtk2.0-0.symbols patches/009_gtk-export-filechooser.patch patches/042_treeview_single-focus.patch patches/070_mandatory-relibtoolize.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Aug 17 09:55:11 UTC 2010
Author: slomo
Date: Tue Aug 17 09:55:08 2010
New Revision: 24988
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24988
Log:
* New upstream development release:
+ debian/rules,
debian/libgtk2.0-0.symbols:
- Update for new API symbols.
+ debian/patches/009_gtk-export-filechooser.patch,
debian/patches/042_treeview_single-focus.patch,
debian/patches/070_mandatory-relibtoolize.patch:
- Refreshed.
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/009_gtk-export-filechooser.patch
desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
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=24988&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Tue Aug 17 09:55:08 2010
@@ -1,9 +1,17 @@
-gtk+2.0 (2.21.5-2) UNRELEASED; urgency=low
+gtk+2.0 (2.21.6-1) experimental; urgency=low
* debian/rules:
+ Remove obsolete configure parameter.
-
- -- Sebastian Dröge <slomo at debian.org> Fri, 30 Jul 2010 19:18:51 +0200
+ * New upstream development release:
+ + debian/rules,
+ debian/libgtk2.0-0.symbols:
+ - Update for new API symbols.
+ + debian/patches/009_gtk-export-filechooser.patch,
+ debian/patches/042_treeview_single-focus.patch,
+ debian/patches/070_mandatory-relibtoolize.patch:
+ - Refreshed.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 17 Aug 2010 11:44:53 +0200
gtk+2.0 (2.21.5-1) experimental; urgency=low
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=24988&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] Tue Aug 17 09:55:08 2010
@@ -57,6 +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.6
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
@@ -70,14 +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.5
+ gdk_device_get_axis_use at Base 2.21.6
gdk_device_get_core_pointer at Base 2.8.0
- gdk_device_get_has_cursor at Base 2.21.5
+ gdk_device_get_has_cursor at Base 2.21.6
gdk_device_get_history at Base 2.8.0
- gdk_device_get_key at Base 2.21.5
- gdk_device_get_mode at Base 2.21.5
- gdk_device_get_name at Base 2.21.5
- gdk_device_get_source at Base 2.21.5
+ gdk_device_get_key at Base 2.21.6
+ gdk_device_get_mode at Base 2.21.6
+ gdk_device_get_n_axes at Base 2.21.6
+ gdk_device_get_name at Base 2.21.6
+ gdk_device_get_source at Base 2.21.6
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
@@ -103,6 +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.6
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
@@ -133,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.5
- gdk_drag_context_get_selected_action at Base 2.21.5
- gdk_drag_context_get_source_window at Base 2.21.5
- gdk_drag_context_get_suggested_action at Base 2.21.5
+ gdk_drag_context_get_actions at Base 2.21.6
+ gdk_drag_context_get_selected_action at Base 2.21.6
+ gdk_drag_context_get_source_window at Base 2.21.6
+ gdk_drag_context_get_suggested_action at Base 2.21.6
gdk_drag_context_get_type at Base 2.8.0
- gdk_drag_context_list_targets at Base 2.21.5
+ gdk_drag_context_list_targets at Base 2.21.6
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
@@ -284,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.5
- gdk_image_get_byte_order at Base 2.21.5
- gdk_image_get_bytes_per_line at Base 2.21.5
- gdk_image_get_bytes_per_pixel at Base 2.21.5
+ gdk_image_get_bits_per_pixel at Base 2.21.6
+ gdk_image_get_byte_order at Base 2.21.6
+ gdk_image_get_bytes_per_line at Base 2.21.6
+ gdk_image_get_bytes_per_pixel at Base 2.21.6
gdk_image_get_colormap at Base 2.8.0
- gdk_image_get_depth at Base 2.21.5
- gdk_image_get_height at Base 2.21.5
- gdk_image_get_image_type at Base 2.21.5
+ gdk_image_get_depth at Base 2.21.6
+ gdk_image_get_height at Base 2.21.6
+ gdk_image_get_image_type at Base 2.21.6
gdk_image_get_pixel at Base 2.8.0
- gdk_image_get_pixels at Base 2.21.5
+ gdk_image_get_pixels at Base 2.21.6
gdk_image_get_type at Base 2.8.0
- gdk_image_get_visual at Base 2.21.5
- gdk_image_get_width at Base 2.21.5
+ gdk_image_get_visual at Base 2.21.6
+ gdk_image_get_width at Base 2.21.6
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
@@ -545,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.5
- gdk_visual_get_blue_pixel_details at Base 2.21.5
- gdk_visual_get_byte_order at Base 2.21.5
- gdk_visual_get_colormap_size at Base 2.21.5
- gdk_visual_get_depth at Base 2.21.5
- gdk_visual_get_green_pixel_details at Base 2.21.5
- gdk_visual_get_red_pixel_details at Base 2.21.5
+ gdk_visual_get_bits_per_rgb at Base 2.21.6
+ gdk_visual_get_blue_pixel_details at Base 2.21.6
+ gdk_visual_get_byte_order at Base 2.21.6
+ gdk_visual_get_colormap_size at Base 2.21.6
+ gdk_visual_get_depth at Base 2.21.6
+ gdk_visual_get_green_pixel_details at Base 2.21.6
+ gdk_visual_get_red_pixel_details at Base 2.21.6
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.5
+ gdk_visual_get_visual_type at Base 2.21.6
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
@@ -572,8 +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.5
- gdk_window_coords_to_parent at Base 2.21.5
+ gdk_window_coords_from_parent at Base 2.21.6
+ gdk_window_coords_to_parent at Base 2.21.6
+ gdk_window_create_similar_surface at Base 2.21.6
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
@@ -589,23 +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.5
- gdk_window_get_back_pixmap at Base 2.21.5
- gdk_window_get_background at Base 2.21.5
+ gdk_window_get_accept_focus at Base 2.21.6
+ gdk_window_get_background_pattern at Base 2.21.6
gdk_window_get_children at Base 2.8.0
- gdk_window_get_composited at Base 2.21.5
+ gdk_window_get_composited at Base 2.21.6
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.5
- gdk_window_get_effective_toplevel at Base 2.21.5
+ gdk_window_get_effective_parent at Base 2.21.6
+ gdk_window_get_effective_toplevel at Base 2.21.6
gdk_window_get_events at Base 2.8.0
- gdk_window_get_focus_on_map at Base 2.21.5
+ gdk_window_get_focus_on_map at Base 2.21.6
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.5
+ gdk_window_get_modal_hint at Base 2.21.6
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
@@ -619,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.5
+ gdk_window_has_native at Base 2.21.6
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
@@ -631,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.5
- gdk_window_is_shaped at Base 2.21.5
+ gdk_window_is_input_only at Base 2.21.6
+ gdk_window_is_shaped at Base 2.21.6
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
@@ -843,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.5
- gtk_accessible_set_widget at Base 2.21.5
+ gtk_accessible_get_widget at Base 2.21.6
+ gtk_accessible_set_widget at Base 2.21.6
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
@@ -956,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.5
+ gtk_assistant_commit at Base 2.21.6
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
@@ -1054,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.5
+ gtk_button_get_event_window at Base 2.21.6
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
@@ -1669,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.5
+ gtk_entry_im_context_filter_keypress at Base 2.21.6
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.5
+ gtk_entry_reset_im_context at Base 2.21.6
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
@@ -1717,6 +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.6
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
@@ -1726,6 +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.6
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
@@ -1857,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.5
+ gtk_font_selection_dialog_get_font_selection at Base 2.21.6
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
@@ -2030,9 +2035,9 @@
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.5
+ gtk_icon_view_get_item_column at Base 2.21.6
gtk_icon_view_get_item_padding at Base 2.18.0
- gtk_icon_view_get_item_row at Base 2.21.5
+ gtk_icon_view_get_item_row at Base 2.21.6
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
@@ -2445,7 +2450,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.5
+ gtk_message_dialog_get_message_area at Base 2.21.6
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
@@ -2482,6 +2487,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.6
+ gtk_notebook_get_tab_vborder at Base 2.21.6
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
@@ -3390,7 +3397,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.5
+ gtk_statusbar_remove_all at Base 2.21.6
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
@@ -3425,7 +3432,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.5
+ gtk_table_get_size at Base 2.21.6
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
@@ -3756,7 +3763,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.5
+ gtk_text_view_get_hadjustment at Base 2.21.6
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
@@ -3772,18 +3779,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.5
+ gtk_text_view_get_vadjustment at Base 2.21.6
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.5
+ gtk_text_view_im_context_filter_keypress at Base 2.21.6
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.5
+ gtk_text_view_reset_im_context at Base 2.21.6
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
@@ -4078,7 +4085,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.5
+ gtk_tree_path_get_indices_with_depth at Base 2.21.6
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
@@ -4364,7 +4371,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.5
+ gtk_viewport_get_view_window at Base 2.21.6
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
@@ -4508,7 +4515,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.5
+ gtk_widget_send_focus_change at Base 2.21.6
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
@@ -4608,12 +4615,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.5
+ gtk_window_group_get_current_grab at Base 2.21.6
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.5
+ gtk_window_has_group at Base 2.21.6
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/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=24988&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] Tue Aug 17 09:55:08 2010
@@ -34,10 +34,10 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: gtk+2.0-2.21.5/gtk/Makefile.am
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/Makefile.am 2010-07-12 18:23:44.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/Makefile.am 2010-07-22 17:54:37.921095291 +0200
+Index: gtk+2.0-2.21.6/gtk/Makefile.am
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/Makefile.am 2010-08-16 22:57:55.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/Makefile.am 2010-08-17 11:51:57.600996862 +0200
@@ -49,6 +49,8 @@
-I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
@@ -79,11 +79,11 @@
gtkiconcache.h \
gtkintl.h \
gtkkeyhash.h \
-Index: gtk+2.0-2.21.5/gtk/gtk.symbols
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtk.symbols 2010-07-12 18:57:41.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtk.symbols 2010-07-22 17:54:37.941054321 +0200
-@@ -1639,6 +1639,12 @@
+Index: gtk+2.0-2.21.6/gtk/gtk.symbols
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/gtk.symbols 2010-08-16 22:57:55.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtk.symbols 2010-08-17 11:51:57.600996862 +0200
+@@ -1641,6 +1641,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.5/gtk/gtkfilechooserprivate.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserprivate.h 2010-06-16 17:27:01.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilechooserprivate.h 2010-07-22 17:54:37.941054321 +0200
+Index: gtk+2.0-2.21.6/gtk/gtkfilechooserprivate.h
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/gtkfilechooserprivate.h 2010-08-16 22:57:55.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtkfilechooserprivate.h 2010-08-17 11:51:57.819997600 +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.5/gtk/gtkfilechooserutils.c
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.c 2010-07-12 18:23:44.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c 2010-07-22 17:54:37.949054430 +0200
+Index: gtk+2.0-2.21.6/gtk/gtkfilechooserutils.c
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/gtkfilechooserutils.c 2010-08-16 22:57:55.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtkfilechooserutils.c 2010-08-17 11:51:57.819997600 +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.5/gtk/gtkfilechooserutils.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.h 2010-07-12 18:23:44.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h 2010-07-22 17:54:37.961058330 +0200
+Index: gtk+2.0-2.21.6/gtk/gtkfilechooserutils.h
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/gtkfilechooserutils.h 2010-08-16 22:57:55.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtkfilechooserutils.h 2010-08-17 11:51:57.819997600 +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.5/gtk/gtkfilesystemmodel.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilesystemmodel.h 2010-06-16 17:27:02.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h 2010-07-22 17:54:37.961058330 +0200
+Index: gtk+2.0-2.21.6/gtk/gtkfilesystemmodel.h
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/gtkfilesystemmodel.h 2010-06-16 17:27:02.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtkfilesystemmodel.h 2010-08-17 11:51:57.823997341 +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.5/gtk/gtkquery.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkquery.h 2009-04-02 15:54:56.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkquery.h 2010-07-22 17:54:37.977054916 +0200
+Index: gtk+2.0-2.21.6/gtk/gtkquery.h
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/gtkquery.h 2009-04-02 15:54:56.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtkquery.h 2010-08-17 11:51:57.823997341 +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.5/gtk/gtksearchengine.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtksearchengine.h 2010-04-09 04:29:58.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtksearchengine.h 2010-07-22 17:54:37.977054916 +0200
+Index: gtk+2.0-2.21.6/gtk/gtksearchengine.h
+===================================================================
+--- gtk+2.0-2.21.6.orig/gtk/gtksearchengine.h 2010-04-09 04:29:58.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtksearchengine.h 2010-08-17 11:51:57.873067895 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__
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=24988&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] Tue Aug 17 09:55:08 2010
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.21.5/gtk/gtktreeview.c
+Index: gtk+2.0-2.21.6/gtk/gtktreeview.c
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtktreeview.c 2010-07-12 18:32:54.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtktreeview.c 2010-07-22 17:57:20.833053801 +0200
-@@ -9591,7 +9591,8 @@
+--- gtk+2.0-2.21.6.orig/gtk/gtktreeview.c 2010-08-16 22:57:56.000000000 +0200
++++ gtk+2.0-2.21.6/gtk/gtktreeview.c 2010-08-17 11:52:07.864006434 +0200
+@@ -9616,7 +9616,8 @@
if (cursor_path)
{
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=24988&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] Tue Aug 17 09:55:08 2010
@@ -1,15 +1,15 @@
-Index: gtk+2.0-2.21.5/aclocal.m4
+Index: gtk+2.0-2.21.6/aclocal.m4
===================================================================
---- gtk+2.0-2.21.5.orig/aclocal.m4 2010-07-22 17:59:09.889062200 +0200
-+++ gtk+2.0-2.21.5/aclocal.m4 2010-07-22 17:58:41.518052047 +0200
+--- gtk+2.0-2.21.6.orig/aclocal.m4 2010-08-17 11:53:32.803998752 +0200
++++ gtk+2.0-2.21.6/aclocal.m4 2010-08-17 11:53:00.896005134 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
-[m4_warning([this file was generated for autoconf 2.66.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
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'.])])
@@ -8119,61 +8119,6 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
-@@ -8808,7 +709,7 @@
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
--fi[]
-+fi[]dnl
- ])# PKG_PROG_PKG_CONFIG
-
- # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-@@ -8822,12 +723,12 @@
- # have to call PKG_CHECK_EXISTS manually
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_EXISTS],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
- if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
- m4_ifvaln([$3], [else
-- $3])
-+ $3])dnl
- fi])
-
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-@@ -8841,7 +742,7 @@
- [pkg_failed=yes])
- else
- pkg_failed=untried
--fi[]
-+fi[]dnl
- ])# _PKG_CONFIG
-
- # _PKG_SHORT_ERRORS_SUPPORTED
-@@ -8852,7 +753,7 @@
- _pkg_short_errors_supported=yes
- else
- _pkg_short_errors_supported=no
--fi[]
-+fi[]dnl
- ])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-@@ -8867,9 +768,9 @@
- #
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_MODULES],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
--AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])
--AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
- pkg_failed=no
- AC_MSG_CHECKING([for $1])
@@ -8900,7 +801,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -8183,7 +8128,7 @@
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
-@@ -8911,14 +812,14 @@
+@@ -8911,7 +812,7 @@
_PKG_TEXT
@@ -8192,14 +8137,6 @@
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
--fi[]
-+fi[]dnl
- ])# PKG_CHECK_MODULES
-
- # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -10010,5 +1911,11 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
@@ -8212,10 +8149,10 @@
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
m4_include([acinclude.m4])
-Index: gtk+2.0-2.21.5/build/Makefile.in
+Index: gtk+2.0-2.21.6/build/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/build/Makefile.in 2010-07-22 17:59:08.757060229 +0200
-+++ gtk+2.0-2.21.5/build/Makefile.in 2010-07-22 17:58:44.326051820 +0200
+--- gtk+2.0-2.21.6.orig/build/Makefile.in 2010-08-17 11:53:31.552996868 +0200
++++ gtk+2.0-2.21.6/build/Makefile.in 2010-08-17 11:53:04.748995601 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build
@@ -8249,10 +8186,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/build/win32/Makefile.in
+Index: gtk+2.0-2.21.6/build/win32/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/build/win32/Makefile.in 2010-07-22 17:59:08.705081202 +0200
-+++ gtk+2.0-2.21.5/build/win32/Makefile.in 2010-07-22 17:58:44.394051311 +0200
+--- gtk+2.0-2.21.6.orig/build/win32/Makefile.in 2010-08-17 11:53:31.521005370 +0200
++++ gtk+2.0-2.21.6/build/win32/Makefile.in 2010-08-17 11:53:04.820996163 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32
@@ -8286,10 +8223,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/build/win32/vs9/Makefile.in
+Index: gtk+2.0-2.21.6/build/win32/vs9/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/build/win32/vs9/Makefile.in 2010-07-22 17:59:08.641050994 +0200
-+++ gtk+2.0-2.21.5/build/win32/vs9/Makefile.in 2010-07-22 17:58:44.458050848 +0200
+--- gtk+2.0-2.21.6.orig/build/win32/vs9/Makefile.in 2010-08-17 11:53:31.464999160 +0200
++++ gtk+2.0-2.21.6/build/win32/vs9/Makefile.in 2010-08-17 11:53:04.888996212 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32/vs9
@@ -8323,27 +8260,18 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/configure
+Index: gtk+2.0-2.21.6/configure
===================================================================
---- gtk+2.0-2.21.5.orig/configure 2010-07-22 17:59:08.553063831 +0200
-+++ gtk+2.0-2.21.5/configure 2010-07-22 17:58:43.046052744 +0200
-@@ -1,13 +1,13 @@
+--- gtk+2.0-2.21.6.orig/configure 2010-08-17 11:53:31.344999074 +0200
++++ gtk+2.0-2.21.6/configure 2010-08-17 11:53:02.319995827 +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.5.
-+# Generated by GNU Autoconf 2.65 for gtk+ 2.21.5.
+-# Generated by GNU Autoconf 2.66 for gtk+ 2.21.6.
++# Generated by GNU Autoconf 2.67 for gtk+ 2.21.6.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
@@ -173,14 +173,6 @@
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -8359,44 +8287,7 @@
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
-@@ -328,7 +320,7 @@
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
- } # as_fn_mkdir_p
-@@ -368,19 +360,19 @@
- fi # as_fn_arith
-
-
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
-- as_status=$1; test $as_status -eq 0 && as_status=1
-- if test "$4"; then
-- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- fi
-- $as_echo "$as_me: error: $2" >&2
-+ $as_echo "$as_me: error: $1" >&2
- as_fn_exit $as_status
- } # as_fn_error
-
-@@ -537,14 +529,161 @@
+@@ -537,8 +529,155 @@
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -8552,13 +8443,6 @@
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
-
- # Name of the host.
--# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
@@ -673,6 +812,7 @@
GDK_DEP_LIBS
GDK_EXTRA_CFLAGS
@@ -8595,134 +8479,19 @@
enable_rebuilds
enable_visibility
with_xinput
-@@ -1094,7 +1241,7 @@
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid feature name: $ac_useropt"
-+ as_fn_error "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1120,7 +1267,7 @@
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid feature name: $ac_useropt"
-+ as_fn_error "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1324,7 +1471,7 @@
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid package name: $ac_useropt"
-+ as_fn_error "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1340,7 +1487,7 @@
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- as_fn_error $? "invalid package name: $ac_useropt"
-+ as_fn_error "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
-@@ -1370,8 +1517,8 @@
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
-- -*) as_fn_error $? "unrecognized option: \`$ac_option'
--Try \`$0 --help' for more information"
-+ -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
- ;;
-
- *=*)
-@@ -1379,7 +1526,7 @@
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | [0-9]* | *[!_$as_cr_alnum]* )
-- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-@@ -1397,13 +1544,13 @@
-
- if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-- as_fn_error $? "missing argument to $ac_option"
-+ as_fn_error "missing argument to $ac_option"
- fi
-
- if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
-- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+@@ -1048,8 +1195,9 @@
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
esac
- fi
-@@ -1426,7 +1573,7 @@
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1440,8 +1587,8 @@
- if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
-- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-- If a cross compiler is detected then cross compile mode will be used" >&2
-+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-@@ -1456,9 +1603,9 @@
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-- as_fn_error $? "working directory cannot be determined"
-+ as_fn_error "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-- as_fn_error $? "pwd does not report name of working directory"
-+ as_fn_error "pwd does not report name of working directory"
-
-
- # Find the source files, if location was not specified.
-@@ -1497,11 +1644,11 @@
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
-- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
- pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1541,7 +1688,7 @@
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
-- -q, --quiet, --silent do not print \`checking ...' messages
-+ -q, --quiet, --silent do not print \`checking...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
-@@ -1627,6 +1774,12 @@
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1627,6 +1775,12 @@
--enable-xkb support XKB [default=maybe]
--enable-xinerama support xinerama extension if available
[default=yes]
@@ -8735,375 +8504,138 @@
--disable-rebuilds disable all source autogeneration rules
--disable-visibility don't use ELF visibility attributes
--enable-explicit-deps=[yes/no/auto]
-@@ -1764,9 +1917,9 @@
+@@ -1764,7 +1918,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.21.5
+ gtk+ configure 2.21.6
-generated by GNU Autoconf 2.66
-+generated by GNU Autoconf 2.65
-
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++generated by GNU Autoconf 2.67
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1908,7 +2061,7 @@
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
+@@ -1951,7 +2105,7 @@
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2097,7 +2251,7 @@
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2206,7 +2360,7 @@
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2017,7 +2170,7 @@
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2167,10 +2320,10 @@
- ac_fn_c_check_header_mongrel ()
- {
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- if eval "test \"\${$3+set}\"" = set; then :
-+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
+ ac_header_preproc=no
fi
- eval ac_res=\$$3
-@@ -2229,15 +2382,17 @@
- $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--( $as_echo "## --------------------------------------------------------------------- ##
-+( cat <<\_ASBOX
-+## --------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ##
--## --------------------------------------------------------------------- ##"
-+## --------------------------------------------------------------------- ##
-+_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=\$ac_header_compiler"
-@@ -2259,7 +2414,7 @@
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
- $as_echo_n "checking for $2.$3... " >&6; }
--if eval "test \"\${$4+set}\"" = set; then :
-+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2311,7 +2466,7 @@
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -2311,7 +2465,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.21.5, which was
+ It was created by gtk+ $as_me 2.21.6, which was
-generated by GNU Autoconf 2.66. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
-@@ -2421,9 +2576,11 @@
- {
- echo
-
-- $as_echo "## ---------------- ##
-+ cat <<\_ASBOX
-+## ---------------- ##
- ## Cache variables. ##
--## ---------------- ##"
-+## ---------------- ##
-+_ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
- (
-@@ -2457,9 +2614,11 @@
- )
- echo
-
-- $as_echo "## ----------------- ##
-+ cat <<\_ASBOX
-+## ----------------- ##
- ## Output variables. ##
--## ----------------- ##"
-+## ----------------- ##
-+_ASBOX
- echo
- for ac_var in $ac_subst_vars
- do
-@@ -2472,9 +2631,11 @@
- echo
-
- if test -n "$ac_subst_files"; then
-- $as_echo "## ------------------- ##
-+ cat <<\_ASBOX
-+## ------------------- ##
- ## File substitutions. ##
--## ------------------- ##"
-+## ------------------- ##
-+_ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-@@ -2488,9 +2649,11 @@
- fi
-
- if test -s confdefs.h; then
-- $as_echo "## ----------- ##
-+ cat <<\_ASBOX
-+## ----------- ##
- ## confdefs.h. ##
--## ----------- ##"
-+## ----------- ##
-+_ASBOX
- echo
- cat confdefs.h
- echo
-@@ -2545,12 +2708,7 @@
- ac_site_file1=NONE
- ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
-- # We do not want a PATH search for config.site.
-- case $CONFIG_SITE in #((
-- -*) ac_site_file1=./$CONFIG_SITE;;
-- */*) ac_site_file1=$CONFIG_SITE;;
-- *) ac_site_file1=./$CONFIG_SITE;;
-- esac
-+ ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
-@@ -2565,11 +2723,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
-- . "$ac_site_file" \
-- || { { $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
+@@ -2569,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
-See \`config.log' for more details" "$LINENO" 5; }
-+ . "$ac_site_file"
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
-@@ -2648,7 +2802,7 @@
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
- ## -------------------- ##
- ## Main body of script. ##
-@@ -2673,22 +2827,16 @@
-
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-- if test -f "$ac_dir/install-sh"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install-sh -c"
-- break
-- elif test -f "$ac_dir/install.sh"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install.sh -c"
-- break
-- elif test -f "$ac_dir/shtool"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/shtool install -c"
-- break
-- fi
-+ for ac_t in install-sh install.sh shtool; do
-+ if test -f "$ac_dir/$ac_t"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/$ac_t -c"
-+ break 2
-+ fi
-+ done
- done
- if test -z "$ac_aux_dir"; then
-- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
-
- # These three variables are undocumented and unsupported,
-@@ -2804,11 +2952,11 @@
+@@ -2804,11 +2958,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2830,7 +2978,7 @@
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
-
-@@ -2840,7 +2988,7 @@
- # Ok.
- :
- else
-- as_fn_error $? "newly created file is older than distributed files!
-+ as_fn_error "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -3078,7 +3226,7 @@
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
-@@ -3086,7 +3234,7 @@
- all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -3120,7 +3268,7 @@
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
-- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
- fi
- fi
-
-@@ -3250,7 +3398,7 @@
-
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
-@@ -3261,16 +3409,16 @@
- test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
-- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+@@ -3270,7 +3424,7 @@
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3295,7 +3443,7 @@
- ac_cv_host=$ac_cv_build
- else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
-
- fi
-@@ -3303,7 +3451,7 @@
+@@ -3303,7 +3457,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3653,8 +3801,8 @@
-
+@@ -3654,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
+ as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3768,8 +3916,9 @@
-
+@@ -3769,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
+ as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3811,8 +3960,8 @@
- else
+@@ -3812,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
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3869,9 +4018,9 @@
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -3871,7 +4025,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
+ as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
fi
-@@ -3922,8 +4071,8 @@
-
+@@ -3923,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
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -4363,6 +4512,14 @@
+@@ -4363,6 +4517,14 @@
@@ -9118,7 +8650,7 @@
if test -n "$ac_tool_prefix"; then
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-@@ -4934,7 +5091,7 @@
+@@ -4934,7 +5096,7 @@
enable_win32_dll=yes
case $host in
@@ -9127,7 +8659,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 +5399,8 @@
+@@ -5242,8 +5404,8 @@
@@ -9138,7 +8670,7 @@
-@@ -5259,75 +5416,6 @@
+@@ -5259,75 +5421,6 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -9214,52 +8746,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 :
-@@ -5385,7 +5473,7 @@
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
-- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
- else
- ac_cv_path_SED=$SED
-@@ -5461,7 +5549,7 @@
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
-- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_GREP=$GREP
-@@ -5527,7 +5615,7 @@
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
-- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_EGREP=$EGREP
-@@ -5594,7 +5682,7 @@
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_FGREP"; then
-- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_FGREP=$FGREP
-@@ -5710,7 +5798,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-@@ -5793,11 +5881,8 @@
+@@ -5793,11 +5886,8 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -9273,7 +8760,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 +5926,7 @@
+@@ -5841,7 +5931,7 @@
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -9282,7 +8769,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 +5981,6 @@
+@@ -5896,15 +5986,6 @@
fi
fi
@@ -9298,24 +8785,24 @@
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5924,13 +6000,13 @@
+@@ -5924,13 +6005,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6003: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6008: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6006: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6011: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+ (eval echo "\"\$as_me:6009: output\"" >&5)
++ (eval echo "\"\$as_me:6014: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5987,11 +6063,6 @@
+@@ -5987,11 +6068,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -9327,7 +8814,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 +6127,8 @@
+@@ -6056,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.
@@ -9338,7 +8825,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -6325,18 +6396,16 @@
+@@ -6325,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.
@@ -9360,7 +8847,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 +6435,6 @@
+@@ -6366,10 +6440,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -9371,7 +8858,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -6378,11 +6443,11 @@
+@@ -6378,11 +6448,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -9385,7 +8872,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -6408,7 +6473,7 @@
+@@ -6408,7 +6478,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -9394,7 +8881,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 +6885,6 @@
+@@ -6820,18 +6890,6 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -9413,7 +8900,7 @@
-@@ -7001,8 +7054,8 @@
+@@ -7001,8 +7059,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -9424,16 +8911,16 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7156,7 +7209,7 @@
+@@ -7156,7 +7214,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+ echo '#line 7212 "configure"' > conftest.$ac_ext
++ echo '#line 7217 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7868,38 +7921,6 @@
+@@ -7868,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; }
@@ -9472,7 +8959,7 @@
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -7927,7 +7948,7 @@
+@@ -7927,7 +7953,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -9481,28 +8968,61 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -8062,8 +8083,8 @@
+@@ -7977,7 +8003,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -7993,11 +8019,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -8036,7 +8062,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -8052,18 +8078,18 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
-@@ -8192,7 +8213,8 @@
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -8217,20 +8239,544 @@
+@@ -8217,51 +8243,575 @@
@@ -9543,18 +9063,46 @@
+ done
+IFS=$as_save_IFS
+-
+-# Set options
+-
+-
+-
+- 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
+ else
+- enable_shared=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
-+fi
-
--# Set options
+ fi
+
+ test -n "$CXX" && break
+ done
@@ -9599,11 +9147,17 @@
+$as_echo "no" >&6; }
+fi
-- enable_dlopen=no
+ 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
@@ -9616,11 +9170,7 @@
+ CXX=$ac_ct_CXX
+ fi
+fi
-
-- # Check whether --enable-shared was given.
--if test "${enable_shared+set}" = set; then :
-- enableval=$enable_shared; p=${PACKAGE-default}
-- case $enableval in
++
+ fi
+fi
+# Provide some information about the compiler.
@@ -9937,7 +9487,7 @@
+ # Broken: fails on valid input.
+continue
+fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
@@ -9953,11 +9503,11 @@
+ac_preproc_ok=:
+break
+fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
@@ -9996,7 +9546,7 @@
+ # Broken: fails on valid input.
+continue
+fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
@@ -10012,11 +9562,11 @@
+ac_preproc_ok=:
+break
+fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
@@ -10050,10 +9600,41 @@
+if test "${enable_shared+set}" = set; then :
+ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
-@@ -8339,7 +8885,6 @@
++ 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
++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 @@
@@ -10061,7 +9642,7 @@
test -z "$LN_S" && LN_S="ln -s"
-@@ -8389,6 +8934,19 @@
+@@ -8389,6 +8938,19 @@
@@ -10081,7 +9662,7 @@
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8401,6 +8959,23 @@
+@@ -8401,6 +8963,23 @@
;;
esac
@@ -10105,7 +9686,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8429,7 +9004,7 @@
+@@ -8429,7 +9008,7 @@
*) break;;
esac
done
@@ -10114,7 +9695,7 @@
# Only perform the check for file, if the check method requires it
-@@ -8629,17 +9204,16 @@
+@@ -8629,17 +9208,16 @@
$RM -r conftest*
@@ -10137,17 +9718,17 @@
{ $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 +9233,15 @@
+@@ -8659,15 +9237,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\"" >&5)
-+ (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9240: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9240: \$? = $ac_status" >&5
++ echo "$as_me:9244: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10156,7 +9737,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 +9319,6 @@
+@@ -8745,12 +9323,6 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -10169,7 +9750,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 +9361,6 @@
+@@ -8793,13 +9365,6 @@
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -10183,7 +9764,7 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8862,7 +9423,7 @@
+@@ -8862,7 +9427,7 @@
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -10192,7 +9773,7 @@
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8874,26 +9435,26 @@
+@@ -8874,26 +9439,26 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -10227,7 +9808,7 @@
esac
;;
esac
-@@ -8924,7 +9485,7 @@
+@@ -8924,7 +9489,7 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -10236,17 +9817,17 @@
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -9011,15 +9572,15 @@
+@@ -9011,15 +9576,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\"" >&5)
-+ (eval echo "\"\$as_me:9575: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9579: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9579: \$? = $ac_status" >&5
++ echo "$as_me:9583: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10255,7 +9836,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 +9628,7 @@
+@@ -9067,7 +9632,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -10264,17 +9845,17 @@
$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 +9677,16 @@
+@@ -9116,16 +9681,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\"" >&5)
-+ (eval echo "\"\$as_me:9680: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9684: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9684: \$? = $ac_status" >&5
++ echo "$as_me:9688: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10284,17 +9865,17 @@
$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 +9732,16 @@
+@@ -9171,16 +9736,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\"" >&5)
-+ (eval echo "\"\$as_me:9735: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9739: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9739: \$? = $ac_status" >&5
++ echo "$as_me:9743: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10304,7 +9885,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 +9851,13 @@
+@@ -9290,36 +9855,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -10344,7 +9925,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9353,12 +9891,11 @@
+@@ -9353,12 +9895,11 @@
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -10360,7 +9941,7 @@
_LT_EOF
fi
-@@ -9394,7 +9931,6 @@
+@@ -9394,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'
@@ -10368,7 +9949,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
-@@ -9416,11 +9952,6 @@
+@@ -9416,11 +9956,6 @@
fi
;;
@@ -10380,7 +9961,7 @@
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9450,12 +9981,11 @@
+@@ -9450,12 +9985,11 @@
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -10396,7 +9977,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9466,17 +9996,13 @@
+@@ -9466,17 +10000,13 @@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -10416,7 +9997,7 @@
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9492,17 +10018,17 @@
+@@ -9492,17 +10022,17 @@
fi
case $cc_basename in
@@ -10437,7 +10018,7 @@
fi
;;
esac
-@@ -9511,7 +10037,7 @@
+@@ -9511,7 +10041,7 @@
fi
;;
@@ -10446,7 +10027,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9623,10 +10149,8 @@
+@@ -9623,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
@@ -10458,7 +10039,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 +10212,7 @@
+@@ -9688,6 +10216,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10466,7 +10047,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9744,7 +10269,7 @@
+@@ -9744,7 +10273,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10475,7 +10056,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9788,13 +10313,8 @@
+@@ -9788,13 +10317,8 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -10491,7 +10072,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 +10353,7 @@
+@@ -9833,7 +10357,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -10500,7 +10081,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 +10369,7 @@
+@@ -9849,11 +10373,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -10513,7 +10094,7 @@
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9861,7 +10377,7 @@
+@@ -9861,7 +10381,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -10522,7 +10103,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 +10443,7 @@
+@@ -9927,7 +10447,7 @@
;;
hpux10*)
@@ -10531,7 +10112,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 +10462,7 @@
+@@ -9946,7 +10466,7 @@
;;
hpux11*)
@@ -10540,7 +10121,7 @@
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -9967,46 +10483,7 @@
+@@ -9967,46 +10487,7 @@
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -10588,7 +10169,7 @@
;;
esac
fi
-@@ -10034,7 +10511,7 @@
+@@ -10034,7 +10515,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10597,7 +10178,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 +10522,15 @@
+@@ -10045,15 +10526,15 @@
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -10616,7 +10197,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10062,7 +10539,7 @@
+@@ -10062,7 +10543,7 @@
link_all_deplibs=yes
;;
@@ -10625,7 +10206,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 +10592,17 @@
+@@ -10115,17 +10596,17 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -10646,7 +10227,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10135,13 +10612,13 @@
+@@ -10135,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}\*'
@@ -10663,7 +10244,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10344,50 +10821,44 @@
+@@ -10344,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; }
@@ -10743,7 +10324,7 @@
;;
esac
fi
-@@ -10558,23 +11029,16 @@
+@@ -10558,23 +11033,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -10773,7 +10354,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 +11051,7 @@
+@@ -10587,7 +11055,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -10782,7 +10363,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10607,13 +11071,7 @@
+@@ -10607,13 +11075,7 @@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -10797,7 +10378,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10701,7 +11159,7 @@
+@@ -10701,7 +11163,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -10806,7 +10387,7 @@
;;
esac
;;
-@@ -10754,12 +11212,23 @@
+@@ -10754,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}'
@@ -10832,7 +10413,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -10859,19 +11328,6 @@
+@@ -10859,19 +11332,6 @@
hardcode_into_libs=yes
;;
@@ -10852,7 +10433,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -10914,10 +11370,8 @@
+@@ -10914,10 +11374,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -10864,7 +10445,7 @@
;;
interix[3-9]*)
-@@ -10984,17 +11438,12 @@
+@@ -10984,17 +11442,12 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -10887,7 +10468,7 @@
/* end confdefs.h. */
int
-@@ -11007,31 +11456,23 @@
+@@ -11007,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 :
@@ -10924,7 +10505,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11043,6 +11484,18 @@
+@@ -11043,6 +11488,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10943,7 +10524,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11333,11 +11786,6 @@
+@@ -11333,11 +11790,6 @@
@@ -10955,16 +10536,16 @@
{ $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 +12116,7 @@
+@@ -11668,7 +12120,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 12119 "configure"
++#line 12123 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11709,13 +12157,7 @@
+@@ -11709,13 +12161,7 @@
# endif
#endif
@@ -10979,7 +10560,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11724,11 +12166,7 @@
+@@ -11724,11 +12170,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -10992,16 +10573,16 @@
/* dlclose (self); */
}
else
-@@ -11774,7 +12212,7 @@
+@@ -11774,7 +12216,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 12215 "configure"
++#line 12219 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11815,13 +12253,7 @@
+@@ -11815,13 +12257,7 @@
# endif
#endif
@@ -11016,7 +10597,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11830,11 +12262,7 @@
+@@ -11830,11 +12266,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -11029,10 +10610,28 @@
/* dlclose (self); */
}
else
-@@ -11970,166 +12398,27 @@
- ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+@@ -11952,184 +12384,45 @@
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+ 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
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
@@ -11122,7 +10721,17 @@
-
- done
- ac_cv_prog_CXXCPP=$CXXCPP
--
++ # 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
++ ;;
+
-fi
- CXXCPP=$ac_cv_prog_CXXCPP
-else
@@ -11149,6 +10758,13 @@
- Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
++ aix[4-9]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
++ ;;
++ esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
-else
@@ -11206,7 +10822,7 @@
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -12156,8 +12445,6 @@
+@@ -12156,8 +12449,6 @@
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
old_archive_cmds_CXX=$old_archive_cmds
@@ -11215,7 +10831,7 @@
no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-@@ -12240,7 +12527,7 @@
+@@ -12240,7 +12531,7 @@
*) break;;
esac
done
@@ -11224,16 +10840,7 @@
if test -n "$compiler"; then
-@@ -12340,7 +12627,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-@@ -12402,7 +12689,7 @@
+@@ -12402,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.
@@ -11242,7 +10849,7 @@
else
GXX=no
-@@ -12544,7 +12831,7 @@
+@@ -12544,7 +12835,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11251,7 +10858,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -12588,13 +12875,8 @@
+@@ -12588,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'
@@ -11267,7 +10874,7 @@
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -12627,7 +12909,6 @@
+@@ -12627,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'
@@ -11275,7 +10882,7 @@
allow_undefined_flag_CXX=unsupported
always_export_symbols_CXX=no
enable_shared_with_static_runtimes_CXX=yes
-@@ -12654,11 +12935,7 @@
+@@ -12654,11 +12939,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
@@ -11288,7 +10895,7 @@
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -12666,7 +12943,7 @@
+@@ -12666,7 +12947,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -11297,7 +10904,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 +12996,6 @@
+@@ -12719,11 +13000,6 @@
gnu*)
;;
@@ -11309,7 +10916,7 @@
hpux9*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12748,7 +13020,7 @@
+@@ -12748,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.
@@ -11318,7 +10925,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -12813,7 +13085,7 @@
+@@ -12813,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.
@@ -11327,7 +10934,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -12856,7 +13128,7 @@
+@@ -12856,7 +13132,7 @@
case $cc_basename in
CC*)
# SGI C++
@@ -11336,7 +10943,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12867,9 +13139,9 @@
+@@ -12867,9 +13143,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -11348,7 +10955,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -12898,7 +13170,7 @@
+@@ -12898,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.
@@ -11357,7 +10964,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12935,26 +13207,26 @@
+@@ -12935,26 +13211,26 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -11390,7 +10997,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 +13234,7 @@
+@@ -12962,7 +13238,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -11399,7 +11006,7 @@
;;
cxx*)
# Compaq C++
-@@ -12981,9 +13253,9 @@
+@@ -12981,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.
@@ -11411,7 +11018,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 +13275,13 @@
+@@ -13003,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'
@@ -11427,7 +11034,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13078,7 +13350,7 @@
+@@ -13078,7 +13354,7 @@
export_dynamic_flag_spec_CXX='${wl}-E'
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -11436,7 +11043,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -13113,15 +13385,15 @@
+@@ -13113,15 +13389,15 @@
case $host in
osf3*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -11455,7 +11062,7 @@
$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
-@@ -13137,17 +13409,17 @@
+@@ -13137,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.
@@ -11476,7 +11083,7 @@
;;
esac
-@@ -13157,7 +13429,7 @@
+@@ -13157,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.
@@ -11485,7 +11092,7 @@
else
# FIXME: insert proper C++ library support
-@@ -13193,7 +13465,7 @@
+@@ -13193,7 +13469,7 @@
solaris*)
case $cc_basename in
@@ -11494,7 +11101,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
-@@ -13214,7 +13486,7 @@
+@@ -13214,7 +13490,7 @@
esac
link_all_deplibs_CXX=yes
@@ -11503,7 +11110,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13241,7 +13513,7 @@
+@@ -13241,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.
@@ -11512,7 +11119,7 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -13252,7 +13524,7 @@
+@@ -13252,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.
@@ -11521,7 +11128,7 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -13306,10 +13578,6 @@
+@@ -13306,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'
@@ -11532,7 +11139,7 @@
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -13491,7 +13759,7 @@
+@@ -13491,7 +13763,7 @@
solaris*)
case $cc_basename in
@@ -11541,7 +11148,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 +13875,6 @@
+@@ -13607,11 +13879,6 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -11553,7 +11160,7 @@
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -13750,8 +14013,8 @@
+@@ -13750,8 +14017,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
@@ -11564,7 +11171,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -13781,7 +14044,7 @@
+@@ -13781,7 +14048,7 @@
;;
esac
;;
@@ -11573,7 +11180,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -13813,7 +14076,7 @@
+@@ -13813,7 +14080,7 @@
;;
solaris*)
case $cc_basename in
@@ -11582,17 +11189,17 @@
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
-@@ -13905,15 +14168,15 @@
+@@ -13905,15 +14172,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\"" >&5)
-+ (eval echo "\"\$as_me:14171: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14175: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:14175: \$? = $ac_status" >&5
++ echo "$as_me:14179: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11601,7 +11208,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 +14221,7 @@
+@@ -13958,7 +14225,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -11610,17 +11217,17 @@
$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 +14267,16 @@
+@@ -14004,16 +14271,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\"" >&5)
-+ (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14274: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:14274: \$? = $ac_status" >&5
++ echo "$as_me:14278: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11630,17 +11237,17 @@
$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 +14319,16 @@
+@@ -14056,16 +14323,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\"" >&5)
-+ (eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14326: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:14326: \$? = $ac_status" >&5
++ echo "$as_me:14330: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11650,7 +11257,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 +14383,8 @@
+@@ -14120,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
@@ -11662,7 +11269,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 +14395,9 @@
+@@ -14134,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'
;;
@@ -11672,7 +11279,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14170,50 +14434,44 @@
+@@ -14170,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; }
@@ -11752,7 +11359,7 @@
;;
esac
fi
-@@ -14370,7 +14628,7 @@
+@@ -14370,7 +14632,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11761,7 +11368,7 @@
;;
esac
;;
-@@ -14423,11 +14681,23 @@
+@@ -14423,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}'
@@ -11786,7 +11393,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -14526,19 +14796,6 @@
+@@ -14526,19 +14800,6 @@
hardcode_into_libs=yes
;;
@@ -11806,7 +11413,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -14581,10 +14838,8 @@
+@@ -14581,10 +14842,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -11818,7 +11425,7 @@
;;
interix[3-9]*)
-@@ -14651,17 +14906,12 @@
+@@ -14651,17 +14910,12 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11841,7 +11448,7 @@
/* end confdefs.h. */
int
-@@ -14674,31 +14924,23 @@
+@@ -14674,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 :
@@ -11878,7 +11485,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14710,6 +14952,18 @@
+@@ -14710,6 +14956,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11897,7 +11504,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14949,8 +15203,6 @@
+@@ -14949,8 +15207,6 @@
@@ -11906,7 +11513,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 +15289,16 @@
+@@ -15037,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;}
@@ -11928,45 +11535,24 @@
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
-@@ -15170,19 +15423,20 @@
+@@ -15170,6 +15427,7 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
++
+ # as_fn_error STATUS ERROR [LINENO LOG_FD]
+ # ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
-- as_status=$1; test $as_status -eq 0 && as_status=1
-- if test "$4"; then
-- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- fi
-- $as_echo "$as_me: error: $2" >&2
-+ $as_echo "$as_me: error: $1" >&2
- as_fn_exit $as_status
- } # as_fn_error
-
-@@ -15378,7 +15632,7 @@
+@@ -15378,7 +15636,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" "$LINENO" 5
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" "$LINENO" 5
} # as_fn_mkdir_p
-@@ -15419,15 +15673,8 @@
+@@ -15419,15 +15677,8 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -11983,32 +11569,32 @@
exec 5>>config.log
{
echo
-@@ -15452,9 +15699,9 @@
+@@ -15452,9 +15703,9 @@
lt_cl_version="\
- gtk+ config.lt 2.21.5
+ gtk+ config.lt 2.21.6
-configured by $0, generated by GNU Autoconf 2.66.
-+configured by $0, generated by GNU Autoconf 2.65.
++configured by $0, generated by GNU Autoconf 2.67.
-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."
-@@ -15470,10 +15717,10 @@
- --quiet | --q* | --silent | --s* | -q )
+@@ -15471,10 +15722,10 @@
lt_cl_silent=: ;;
-- -*) as_fn_error $? "unrecognized option: $1
-+ -*) as_fn_error "unrecognized option: $1
- Try \`$0 --help' for more information." "$LINENO" 5 ;;
-
-- *) as_fn_error $? "unrecognized argument: $1
-+ *) as_fn_error "unrecognized argument: $1
- Try \`$0 --help' for more information." "$LINENO" 5 ;;
+ -*) as_fn_error $? "unrecognized option: $1
+-Try \`$0 --help' for more information." "$LINENO" 5 ;;
++Try \`$0 --help' for more information." "$LINENO" 5 ;;
+
+ *) as_fn_error $? "unrecognized argument: $1
+-Try \`$0 --help' for more information." "$LINENO" 5 ;;
++Try \`$0 --help' for more information." "$LINENO" 5 ;;
esac
shift
-@@ -15494,203 +15741,186 @@
+ done
+@@ -15494,203 +15745,186 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -12386,7 +11972,7 @@
GREP \
EGREP \
FGREP \
-@@ -15713,6 +15943,8 @@
+@@ -15713,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 \
@@ -12395,7 +11981,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -15742,7 +15974,6 @@
+@@ -15742,7 +15978,6 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -12403,7 +11989,7 @@
finish_eval \
old_striplib \
striplib \
-@@ -15753,7 +15984,6 @@
+@@ -15753,7 +15988,6 @@
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -12411,7 +11997,7 @@
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
lt_prog_compiler_wl_CXX \
-@@ -15779,9 +16009,9 @@
+@@ -15779,9 +16013,9 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -12423,7 +12009,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -15808,7 +16038,6 @@
+@@ -15808,7 +16042,6 @@
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
@@ -12431,7 +12017,7 @@
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -15818,9 +16047,9 @@
+@@ -15818,9 +16051,9 @@
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
prelink_cmds_CXX; do
@@ -12443,7 +12029,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -15828,6 +16057,12 @@
+@@ -15828,6 +16061,12 @@
esac
done
@@ -12456,7 +12042,7 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -15875,8 +16110,7 @@
+@@ -15875,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,
@@ -12466,7 +12052,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -15912,13 +16146,13 @@
+@@ -15912,13 +16150,13 @@
build_old_libs=$enable_static
# Assembler program.
@@ -12483,7 +12069,7 @@
# Which release of libtool.m4 was used?
macro_version=$macro_version
-@@ -15933,12 +16167,6 @@
+@@ -15933,12 +16171,6 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -12496,7 +12082,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -15988,6 +16216,10 @@
+@@ -15988,6 +16220,10 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -12507,7 +12093,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -16006,9 +16238,6 @@
+@@ -16006,9 +16242,6 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -12517,7 +12103,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -16030,6 +16259,12 @@
+@@ -16030,6 +16263,12 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -12530,7 +12116,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -16092,9 +16327,6 @@
+@@ -16092,9 +16331,6 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -12540,7 +12126,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -16134,10 +16366,6 @@
+@@ -16134,10 +16370,6 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -12551,7 +12137,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -16411,7 +16639,7 @@
+@@ -16411,7 +16643,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -12560,7 +12146,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -16422,7 +16650,7 @@
+@@ -16422,7 +16654,7 @@
# func_basename file
func_basename ()
{
@@ -12569,7 +12155,7 @@
}
-@@ -16435,8 +16663,10 @@
+@@ -16435,8 +16667,10 @@
func_stripname ()
{
case ${2} in
@@ -12582,7 +12168,7 @@
esac
}
-@@ -16447,20 +16677,20 @@
+@@ -16447,20 +16681,20 @@
# func_opt_split
func_opt_split ()
{
@@ -12607,7 +12193,7 @@
}
# func_arith arithmetic-term...
-@@ -16521,10 +16751,6 @@
+@@ -16521,10 +16755,6 @@
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -12618,7 +12204,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -16679,13 +16905,15 @@
+@@ -16679,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.
@@ -12641,16 +12227,7 @@
-@@ -17227,7 +17455,7 @@
- fi
-
- if test "$WINDRES" = no; then
-- as_fn_error $? "*** Could not find an implementation of windres in your PATH." "$LINENO" 5
-+ as_fn_error "*** Could not find an implementation of windres in your PATH." "$LINENO" 5
- fi
- # Extract the first word of "lib.exe", so it can be a program name with args.
- set dummy lib.exe; ac_word=$2
-@@ -17307,6 +17535,26 @@
+@@ -17307,6 +17539,26 @@
enable_xinerama="yes"
fi
@@ -12677,159 +12254,39 @@
# Check whether --enable-rebuilds was given.
if test "${enable_rebuilds+set}" = set; then :
enableval=$enable_rebuilds;
-@@ -17345,7 +17593,7 @@
+@@ -17345,7 +17597,7 @@
case $gdktarget in
x11|win32|quartz|directfb) ;;
- *) as_fn_error $? "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
-+ *) as_fn_error "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
++ *) as_fn_error $? "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5 ;;
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -17390,11 +17638,11 @@
+@@ -17390,11 +17642,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -17416,7 +17664,7 @@
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
-
-@@ -17426,7 +17674,7 @@
- # Ok.
- :
- else
-- as_fn_error $? "newly created file is older than distributed files!
-+ as_fn_error "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -17789,8 +18037,8 @@
-
+@@ -17790,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
+ as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -18168,7 +18416,7 @@
- fi
- set dummy $CC; ac_cc=`$as_echo "$2" |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -18290,7 +18538,7 @@
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
-@@ -18298,7 +18546,7 @@
- all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -18507,10 +18755,6 @@
- fi
- fi
-
--
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASE_DEPENDENCIES" >&5
- $as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
-@@ -18518,8 +18762,7 @@
- if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
- ac_status=$?
-@@ -18528,17 +18771,14 @@
- pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$BASE_DEPENDENCIES_LIBS"; then
- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
- ac_status=$?
-@@ -18547,7 +18787,6 @@
- pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -18555,7 +18794,6 @@
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -18565,7 +18803,6 @@
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>&1`
- else
-@@ -18574,7 +18811,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
-+ as_fn_error "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
-
- $BASE_DEPENDENCIES_PKG_ERRORS
-
-@@ -18584,13 +18821,12 @@
+@@ -18573,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
@@ -12837,104 +12294,17 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -18599,8 +18835,7 @@
+@@ -18588,8 +18839,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-@@ -18609,7 +18844,6 @@
-
- fi
-
--
- ## In addition to checking that cairo is present, we also need to
- ## check that the correct cairo backend is there. E.g. if the GDK
- ## target is win32 we need the cairo-win32 backend and so on.
-@@ -18621,9 +18855,6 @@
- cairo_backend=xlib
- fi
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_BACKEND" >&5
- $as_echo_n "checking for CAIRO_BACKEND... " >&6; }
-@@ -18631,8 +18862,7 @@
- if test -n "$CAIRO_BACKEND_CFLAGS"; then
- pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
- ac_status=$?
-@@ -18641,17 +18871,14 @@
- pkg_cv_CAIRO_BACKEND_CFLAGS=`$PKG_CONFIG --cflags "cairo-$cairo_backend >= 1.6" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$CAIRO_BACKEND_LIBS"; then
- pkg_cv_CAIRO_BACKEND_LIBS="$CAIRO_BACKEND_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
- ac_status=$?
-@@ -18660,7 +18887,6 @@
- pkg_cv_CAIRO_BACKEND_LIBS=`$PKG_CONFIG --libs "cairo-$cairo_backend >= 1.6" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -18668,7 +18894,6 @@
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -18678,7 +18903,6 @@
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
- else
-@@ -18687,7 +18911,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$CAIRO_BACKEND_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
-+ as_fn_error "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
-
- $CAIRO_BACKEND_PKG_ERRORS
-
-@@ -18697,13 +18921,12 @@
+@@ -18675,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
@@ -12942,185 +12312,62 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -18712,8 +18935,7 @@
+@@ -18690,8 +18939,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
-@@ -18722,7 +18944,6 @@
-
+@@ -20926,7 +21174,7 @@
+ else
+ gdk_wchar_h=no
fi
-
--
- if test "$os_win32" != yes; then
- # libtool option to control which symbols are exported
- # right now, symbols starting with _ are not exported
-@@ -18756,7 +18977,7 @@
- ;;
- yes|no)
- ;;
-- *) as_fn_error $? "Value given to --enable-explicit-deps must be one of yes, no or auto" "$LINENO" 5
-+ *) as_fn_error "Value given to --enable-explicit-deps must be one of yes, no or auto" "$LINENO" 5
- ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_explicit_deps" >&5
-@@ -18871,7 +19092,8 @@
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -20079,7 +20301,6 @@
- fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ if test $gdk_wchar_h = yes; then
+
+ $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
+@@ -20947,7 +21195,7 @@
+ else
+ gdk_wctype_h=no
fi
-
--
- no_glib=""
-
- if test "x$PKG_CONFIG" = x ; then
-@@ -20273,7 +20494,7 @@
- GLIB_GENMARSHAL=""
- GOBJECT_QUERY=""
- GLIB_MKENUMS=""
-- as_fn_error $? "
-+ as_fn_error "
- *** GLIB 2.25.10 or better is required. The latest version of
- *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5
- fi
-@@ -20641,7 +20862,8 @@
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -21240,7 +21462,7 @@
- if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
- :
- else
-- as_fn_error $? "the specified input method $immodule does not exist" "$LINENO" 5
-+ as_fn_error "the specified input method $immodule does not exist" "$LINENO" 5
- fi
-
- INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
-@@ -21667,7 +21889,7 @@
-
- if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
- test "x$REBUILD_PNGS" = "x#" ; then
-- as_fn_error $? "
-+ as_fn_error "
- *** gtkbuiltincache.h is not in the tree, and cannot be built
- *** because you don't have libpng, or (when cross-compiling) you
- *** don't have a prebuilt gtk-update-icon-cache on the build system." "$LINENO" 5
-@@ -21692,7 +21914,7 @@
- # settings.
- #
- if $PKG_CONFIG --exists fontconfig; then : ; else
-- as_fn_error $? "
-+ as_fn_error "
- *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5
- fi
-
-@@ -21733,7 +21955,7 @@
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ if test $gdk_wctype_h = yes; then
+
+ $as_echo "#define HAVE_WCTYPE_H 1" >>confdefs.h
+@@ -21065,7 +21313,7 @@
+ else
+ gtk_uxtheme_h=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ if test $gtk_uxtheme_h = yes; then
+
+ $as_echo "#define HAVE_UXTHEME_H 1" >>confdefs.h
+@@ -21709,7 +21957,7 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
++ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-@@ -21751,7 +21973,7 @@
- @echo libdir='${LIBDIR}'
- _ACEOF
- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- for ac_var in incroot usrlibdir libdir; do
- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
- done
-@@ -22402,7 +22624,7 @@
+@@ -21813,7 +22061,7 @@
+ fi
+ done
fi
-
- if test x$no_x = xyes ; then
-- as_fn_error $? "X development libraries not found" "$LINENO" 5
-+ as_fn_error "X development libraries not found" "$LINENO" 5
- fi
-
- x_cflags="$X_CFLAGS"
-@@ -22427,21 +22649,21 @@
- if test "x$ac_cv_func_XOpenDisplay" = x""yes; then :
- :
- else
-- as_fn_error $? "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
-+ as_fn_error "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
- fi
-
- ac_fn_c_check_func "$LINENO" "XextFindDisplay" "ac_cv_func_XextFindDisplay"
- if test "x$ac_cv_func_XextFindDisplay" = x""yes; then :
- :
- else
-- as_fn_error $? "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
-+ as_fn_error "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
- fi
-
- ac_fn_c_check_func "$LINENO" "XRenderQueryExtension" "ac_cv_func_XRenderQueryExtension"
- if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then :
- :
- else
-- as_fn_error $? "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
-+ as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
- fi
-
-
-@@ -22485,7 +22707,7 @@
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
- $as_echo "unknown" >&6; }
-- as_fn_error $? "xReply type unavailable. X11 is too old" "$LINENO" 5
-+ as_fn_error "xReply type unavailable. X11 is too old" "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -22497,7 +22719,8 @@
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -22559,7 +22782,7 @@
- if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then :
- :
- else
-- as_fn_error $? "Shape extension not found, check your development headers" "$LINENO" 5
-+ as_fn_error "Shape extension not found, check your development headers" "$LINENO" 5
- fi
-
-
-@@ -22863,7 +23086,8 @@
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ fi # $ac_x_includes = no
+
+ if test "$ac_x_libraries" = no; then
+@@ -22839,7 +23087,8 @@
# Check for the RANDR extension
@@ -13130,7 +12377,7 @@
$as_echo "#define HAVE_RANDR 1" >>confdefs.h
-@@ -22883,7 +23107,8 @@
+@@ -22859,7 +23108,8 @@
# Checks for XFixes extension
@@ -13140,7 +12387,7 @@
$as_echo "#define HAVE_XFIXES 1" >>confdefs.h
-@@ -22894,7 +23119,8 @@
+@@ -22870,7 +23120,8 @@
# Checks for Xcomposite extension
@@ -13150,7 +12397,7 @@
$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
-@@ -22905,7 +23131,7 @@
+@@ -22881,7 +23132,7 @@
# Checks for Xdamage extension
@@ -13159,79 +12406,7 @@
$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
-@@ -23008,9 +23234,6 @@
- $as_echo_n "checking for DirectFB... " >&6; }
-
-
--
--
--
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
- $as_echo_n "checking for DIRECTFB... " >&6; }
-@@ -23018,8 +23241,7 @@
- if test -n "$DIRECTFB_CFLAGS"; then
- pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -23028,17 +23250,14 @@
- pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
- fi
--
- if test -n "$DIRECTFB_LIBS"; then
- pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
- elif test -n "$PKG_CONFIG"; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -23047,7 +23266,6 @@
- pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
- else
- pkg_failed=yes
--
- fi
- else
- pkg_failed=untried
-@@ -23055,7 +23273,6 @@
-
-
-
--
- if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -23065,7 +23282,6 @@
- else
- _pkg_short_errors_supported=no
- fi
--
- if test $_pkg_short_errors_supported = yes; then
- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
- else
-@@ -23074,7 +23290,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$DIRECTFB_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met:
-+ as_fn_error "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met:
-
- $DIRECTFB_PKG_ERRORS
-
-@@ -23084,13 +23300,12 @@
+@@ -23050,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
@@ -13239,50 +12414,17 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -23099,8 +23314,7 @@
+@@ -23065,8 +23315,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
else
DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
-@@ -23108,7 +23322,6 @@
- $as_echo "yes" >&6; }
-
- fi
--
- if true; then
- USE_DIRECTFB_TRUE=
- USE_DIRECTFB_FALSE='#'
-@@ -23146,7 +23359,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5
- $as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; }
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** Pango not found. Pango built with Cairo support is required
- *** to build GTK+. See http://www.pango.org for Pango information.
- " "$LINENO" 5
-@@ -23180,7 +23393,7 @@
- if ac_fn_c_try_link "$LINENO"; then :
- :
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** Can't link to Pango. Pango is required to build
- *** GTK+. For more information see http://www.pango.org" "$LINENO" 5
- fi
-@@ -23194,20 +23407,23 @@
+@@ -23159,20 +23408,23 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
@@ -13311,7 +12453,7 @@
fi
-@@ -23217,6 +23433,7 @@
+@@ -23182,6 +23434,7 @@
@@ -13319,539 +12461,73 @@
########################################
# Check for Accessibility Toolkit flags
########################################
-@@ -23231,7 +23448,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ATK_CFLAGS $ATK_LIBS" >&5
- $as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; }
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** Accessibility Toolkit not found. Accessibility Toolkit is required
- *** to build GTK+.
- " "$LINENO" 5
-@@ -23263,7 +23480,7 @@
- if ac_fn_c_try_link "$LINENO"; then :
- :
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
- *** to build GTK+" "$LINENO" 5
- fi
-@@ -23582,7 +23799,7 @@
- fi
-
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** cups not found.
- " "$LINENO" 5
- fi
-@@ -23610,7 +23827,7 @@
- if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
-
- else
-- as_fn_error $? "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5
-+ as_fn_error "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5
- fi
-
-
-@@ -23743,7 +23960,7 @@
- fi
-
- if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
-- as_fn_error $? "
-+ as_fn_error "
- *** papi not found.
- " "$LINENO" 5
- fi
-@@ -23765,7 +23982,7 @@
- if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then :
-
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** Can't find cairo-pdf.h. You must build Cairo with the pdf
- *** backend enabled." "$LINENO" 5
- fi
-@@ -23777,7 +23994,7 @@
- if test "x$ac_cv_header_cairo_ps_h" = x""yes; then :
-
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** Can't find cairo-ps.h. You must build Cairo with the
- *** postscript backend enabled." "$LINENO" 5
- fi
-@@ -23788,7 +24005,7 @@
- if test "x$ac_cv_header_cairo_svg_h" = x""yes; then :
-
- else
-- as_fn_error $? "
-+ as_fn_error "
- *** Can't find cairo-svg.h. You must build Cairo with the
- *** svg backend enabled." "$LINENO" 5
- fi
-@@ -23859,8 +24076,7 @@
- found_introspection="no (disabled, use --enable-introspection to enable)"
- ;; #(
- yes) :
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
- ac_status=$?
-@@ -23868,11 +24084,9 @@
- test $ac_status = 0; }; then
- :
- else
-- as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
--
-+ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
- fi
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
- ac_status=$?
-@@ -23880,13 +24094,11 @@
- test $ac_status = 0; }; then
- found_introspection=yes
- else
-- as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
--
-+ as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
- fi
- ;; #(
- auto) :
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
- ac_status=$?
-@@ -23895,11 +24107,10 @@
- found_introspection=yes
- else
- found_introspection=no
--
- fi
- ;; #(
- *) :
-- as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
-+ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
- ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
-@@ -24095,8 +24306,7 @@
-
-
- if test x$enable_gtk_doc = xyes; then
--
--if test -n "$PKG_CONFIG" && \
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5
- ac_status=$?
-@@ -24104,8 +24314,7 @@
- test $ac_status = 0; }; then
- :
- else
-- as_fn_error $? "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
--
-+ as_fn_error "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
- fi
- fi
-
-@@ -24491,7 +24700,6 @@
-
- ac_libobjs=
- ac_ltlibobjs=
--U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -24515,235 +24723,243 @@
- fi
-
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-- as_fn_error $? "conditional \"AMDEP\" was never defined.
-+ as_fn_error "conditional \"AMDEP\" was never defined.
+@@ -24479,6 +24732,10 @@
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
++ as_fn_error $? "conditional \"ENABLE_STATIC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
-+if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
-+ as_fn_error "conditional \"ENABLE_STATIC\" was never defined.
+ 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 @@
+ as_fn_error $? "conditional \"HAVE_OBJC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_CXX\" was never defined.
-+ as_fn_error "conditional \"HAVE_CXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_OBJC\" was never defined.
-+ as_fn_error "conditional \"HAVE_OBJC\" was never defined.
++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
+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ 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
- fi
- if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
-- as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
-+ as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
-- as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
-+ as_fn_error "conditional \"PLATFORM_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
-- as_fn_error $? "conditional \"OS_WIN32\" was never defined.
-+ as_fn_error "conditional \"OS_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then
-- as_fn_error $? "conditional \"OS_UNIX\" was never defined.
-+ as_fn_error "conditional \"OS_UNIX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then
-- as_fn_error $? "conditional \"OS_LINUX\" was never defined.
-+ as_fn_error "conditional \"OS_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then
-- as_fn_error $? "conditional \"MS_LIB_AVAILABLE\" was never defined.
-+ as_fn_error "conditional \"MS_LIB_AVAILABLE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then
-- as_fn_error $? "conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
-+ as_fn_error "conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then
-- as_fn_error $? "conditional \"BUILD_DYNAMIC_MODULES\" was never defined.
-+ as_fn_error "conditional \"BUILD_DYNAMIC_MODULES\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined.
-+ as_fn_error "conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_AM_ET\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_AM_ET\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_CEDILLA\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_CEDILLA\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_IME\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_IME\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_INUKTITUT\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_INUKTITUT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_IPA\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_IPA\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_MULTIPRESS\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_MULTIPRESS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_THAI\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_THAI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_TI_ER\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_TI_ER\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_TI_ET\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_TI_ET\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_VIQR\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_VIQR\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then
-- as_fn_error $? "conditional \"INCLUDE_IM_XIM\" was never defined.
-+ as_fn_error "conditional \"INCLUDE_IM_XIM\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then
-- as_fn_error $? "conditional \"USE_MEDIALIB\" was never defined.
-+ as_fn_error "conditional \"USE_MEDIALIB\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then
-- as_fn_error $? "conditional \"USE_MEDIALIB25\" was never defined.
-+ as_fn_error "conditional \"USE_MEDIALIB25\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
-- as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined.
-+ as_fn_error "conditional \"CROSS_COMPILING\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_X11R6\" was never defined.
-+ as_fn_error "conditional \"HAVE_X11R6\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then
-- as_fn_error $? "conditional \"XINPUT_XFREE\" was never defined.
-+ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
-- as_fn_error $? "conditional \"USE_X11\" was never defined.
-+ as_fn_error "conditional \"USE_X11\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then
-- as_fn_error $? "conditional \"XINPUT_XFREE\" was never defined.
-+ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
-- as_fn_error $? "conditional \"USE_X11\" was never defined.
-+ as_fn_error "conditional \"USE_X11\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_X11R6\" was never defined.
-+ as_fn_error "conditional \"HAVE_X11R6\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then
-- as_fn_error $? "conditional \"USE_WIN32\" was never defined.
-+ as_fn_error "conditional \"USE_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then
-- as_fn_error $? "conditional \"USE_WIN32\" was never defined.
-+ as_fn_error "conditional \"USE_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
-- as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
-+ as_fn_error "conditional \"USE_QUARTZ\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
-- as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
-+ as_fn_error "conditional \"USE_QUARTZ\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then
-- as_fn_error $? "conditional \"USE_DIRECTFB\" was never defined.
-+ as_fn_error "conditional \"USE_DIRECTFB\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then
-- as_fn_error $? "conditional \"USE_DIRECTFB\" was never defined.
-+ as_fn_error "conditional \"USE_DIRECTFB\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
-+ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
-+ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
-+ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PAPI_TRUE}" && test -z "${HAVE_PAPI_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_PAPI\" was never defined.
-+ as_fn_error "conditional \"HAVE_PAPI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PAPI_TRUE}" && test -z "${HAVE_PAPI_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_PAPI\" was never defined.
-+ as_fn_error "conditional \"HAVE_PAPI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PAPI_CUPS_TRUE}" && test -z "${HAVE_PAPI_CUPS_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_PAPI_CUPS\" was never defined.
-+ as_fn_error "conditional \"HAVE_PAPI_CUPS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then
-- as_fn_error $? "conditional \"TEST_PRINT_BACKEND\" was never defined.
-+ as_fn_error "conditional \"TEST_PRINT_BACKEND\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
-+ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-- as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
-+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
-- as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
-+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then
-- as_fn_error $? "conditional \"HAVE_DOCBOOK\" was never defined.
-+ as_fn_error "conditional \"HAVE_DOCBOOK\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
-- as_fn_error $? "conditional \"ENABLE_MAN\" was never defined.
-+ as_fn_error "conditional \"ENABLE_MAN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-
-@@ -24893,19 +25109,19 @@
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
-- as_status=$1; test $as_status -eq 0 && as_status=1
-- if test "$4"; then
-- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- fi
-- $as_echo "$as_me: error: $2" >&2
-+ $as_echo "$as_me: error: $1" >&2
- as_fn_exit $as_status
- } # as_fn_error
-
-@@ -25101,7 +25317,7 @@
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
- } # as_fn_mkdir_p
-@@ -25155,7 +25371,7 @@
+@@ -25112,7 +25373,7 @@
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.21.5, which was
+ This file was extended by gtk+ $as_me 2.21.6, which was
-generated by GNU Autoconf 2.66. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25221,10 +25437,10 @@
+@@ -25178,7 +25439,7 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- gtk+ config.status 2.21.5
+ gtk+ config.status 2.21.6
-configured by $0, generated by GNU Autoconf 2.66,
-+configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
-
-@@ -25280,7 +25496,7 @@
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -25199,11 +25460,16 @@
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -25225,6 +25491,7 @@
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
-- as_fn_error $? "ambiguous option: \`$1'
-+ as_fn_error "ambiguous option: \`$1'
- Try \`$0 --help' for more information.";;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
-@@ -25289,7 +25505,7 @@
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) as_fn_error $? "unrecognized option: \`$1'
-+ -*) as_fn_error "unrecognized option: \`$1'
- Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
-@@ -25343,203 +25559,186 @@
+@@ -25300,203 +25567,186 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -14229,7 +12905,7 @@
GREP \
EGREP \
FGREP \
-@@ -25562,6 +25761,8 @@
+@@ -25519,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 \
@@ -14238,7 +12914,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -25591,7 +25792,6 @@
+@@ -25548,7 +25800,6 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -14246,7 +12922,7 @@
finish_eval \
old_striplib \
striplib \
-@@ -25602,7 +25802,6 @@
+@@ -25559,7 +25810,6 @@
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -14254,7 +12930,7 @@
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
lt_prog_compiler_wl_CXX \
-@@ -25628,9 +25827,9 @@
+@@ -25585,9 +25835,9 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -14266,7 +12942,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25657,7 +25856,6 @@
+@@ -25614,7 +25864,6 @@
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
@@ -14274,7 +12950,7 @@
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -25667,9 +25865,9 @@
+@@ -25624,9 +25873,9 @@
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
prelink_cmds_CXX; do
@@ -14286,7 +12962,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25677,6 +25875,12 @@
+@@ -25634,6 +25883,12 @@
esac
done
@@ -14299,189 +12975,43 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -25811,7 +26015,7 @@
+@@ -25768,7 +26023,7 @@
"modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;;
"perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
-@@ -25849,7 +26053,7 @@
- {
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
--} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -25866,7 +26070,7 @@
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-- ac_cs_awk_cr='\\r'
-+ ac_cs_awk_cr='\r'
- else
- ac_cs_awk_cr=$ac_cr
- fi
-@@ -25880,18 +26084,18 @@
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
- } >conf$$subs.sh ||
-- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
-- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
-- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-@@ -25980,28 +26184,20 @@
- else
- cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
-
--# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
--# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
--h
--s///
--s/^/:/
--s/[ ]*$/:/
--s/:\$(srcdir):/:/g
--s/:\${srcdir}:/:/g
--s/:@srcdir@:/:/g
--s/^:*//
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[ ]*\):*/\1/
- s/:*$//
--x
--s/\(=[ ]*\).*/\1/
--G
--s/\n//
- s/^[^=]*=[ ]*$//
- }'
- fi
-@@ -26029,7 +26225,7 @@
- if test -z "$ac_t"; then
- break
- elif $ac_last_try; then
-- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-@@ -26114,7 +26310,7 @@
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
-
-
-@@ -26127,7 +26323,7 @@
+@@ -26084,7 +26339,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -26155,7 +26351,7 @@
+@@ -26112,7 +26367,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -26182,7 +26378,7 @@
+@@ -26139,7 +26394,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
-@@ -26319,22 +26515,22 @@
- $ac_datarootdir_hack
- "
- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined. Please make sure it is defined" >&5
-+which seems to be undefined. Please make sure it is defined." >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined. Please make sure it is defined" >&2;}
-+which seems to be undefined. Please make sure it is defined." >&2;}
-
- rm -f "$tmp/stdin"
- case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
- esac \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
- :H)
- #
-@@ -26345,19 +26541,19 @@
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-- || as_fn_error $? "could not create -" "$LINENO" 5
-+ || as_fn_error "could not create -" "$LINENO" 5
- fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
-@@ -26518,8 +26714,7 @@
+@@ -26475,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,
@@ -14491,7 +13021,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -26555,13 +26750,13 @@
+@@ -26512,13 +26766,13 @@
build_old_libs=$enable_static
# Assembler program.
@@ -14508,7 +13038,7 @@
# Which release of libtool.m4 was used?
macro_version=$macro_version
-@@ -26576,12 +26771,6 @@
+@@ -26533,12 +26787,6 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -14521,7 +13051,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -26631,6 +26820,10 @@
+@@ -26588,6 +26836,10 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -14532,7 +13062,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -26649,9 +26842,6 @@
+@@ -26606,9 +26858,6 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -14542,7 +13072,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -26673,6 +26863,12 @@
+@@ -26630,6 +26879,12 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -14555,7 +13085,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -26735,9 +26931,6 @@
+@@ -26692,9 +26947,6 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -14565,7 +13095,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -26777,10 +26970,6 @@
+@@ -26734,10 +26986,6 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -14576,7 +13106,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -27054,7 +27243,7 @@
+@@ -27011,7 +27259,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -14585,7 +13115,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -27065,7 +27254,7 @@
+@@ -27022,7 +27270,7 @@
# func_basename file
func_basename ()
{
@@ -14594,7 +13124,7 @@
}
-@@ -27078,8 +27267,10 @@
+@@ -27035,8 +27283,10 @@
func_stripname ()
{
case ${2} in
@@ -14607,7 +13137,7 @@
esac
}
-@@ -27090,20 +27281,20 @@
+@@ -27047,20 +27297,20 @@
# func_opt_split
func_opt_split ()
{
@@ -14632,7 +13162,7 @@
}
# func_arith arithmetic-term...
-@@ -27164,10 +27355,6 @@
+@@ -27121,10 +27371,6 @@
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -14643,28 +13173,10 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -27379,7 +27566,7 @@
- ac_clean_files=$ac_clean_files_save
-
- test $ac_write_fail = 0 ||
-- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
- # configure is writing to config.log, and then calls config.status.
-@@ -27400,7 +27587,7 @@
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
-- $ac_cs_success || as_fn_exit 1
-+ $ac_cs_success || as_fn_exit $?
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-Index: gtk+2.0-2.21.5/demos/gtk-demo/Makefile.in
+Index: gtk+2.0-2.21.6/demos/gtk-demo/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/demos/gtk-demo/Makefile.in 2010-07-22 17:59:02.321064383 +0200
-+++ gtk+2.0-2.21.5/demos/gtk-demo/Makefile.in 2010-07-22 17:58:44.718050938 +0200
+--- gtk+2.0-2.21.6.orig/demos/gtk-demo/Makefile.in 2010-08-17 11:53:27.032009631 +0200
++++ gtk+2.0-2.21.6/demos/gtk-demo/Makefile.in 2010-08-17 11:53:05.216996142 +0200
@@ -42,11 +42,14 @@
bin_PROGRAMS = gtk-demo$(EXEEXT)
subdir = demos/gtk-demo
@@ -14698,10 +13210,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/demos/Makefile.in
+Index: gtk+2.0-2.21.6/demos/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/demos/Makefile.in 2010-07-22 17:59:02.533064976 +0200
-+++ gtk+2.0-2.21.5/demos/Makefile.in 2010-07-22 17:58:44.622052141 +0200
+--- gtk+2.0-2.21.6.orig/demos/Makefile.in 2010-08-17 11:53:27.084004789 +0200
++++ gtk+2.0-2.21.6/demos/Makefile.in 2010-08-17 11:53:05.084997584 +0200
@@ -44,11 +44,14 @@
testpixbuf$(EXEEXT)
subdir = demos
@@ -14735,10 +13247,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/faq/Makefile.in
+Index: gtk+2.0-2.21.6/docs/faq/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/faq/Makefile.in 2010-07-22 17:59:10.833064793 +0200
-+++ gtk+2.0-2.21.5/docs/faq/Makefile.in 2010-07-22 17:58:44.850051099 +0200
+--- gtk+2.0-2.21.6.orig/docs/faq/Makefile.in 2010-08-17 11:53:33.531999436 +0200
++++ gtk+2.0-2.21.6/docs/faq/Makefile.in 2010-08-17 11:53:05.372996904 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/faq
@@ -14772,10 +13284,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/Makefile.in
+Index: gtk+2.0-2.21.6/docs/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/Makefile.in 2010-07-22 17:59:10.446084804 +0200
-+++ gtk+2.0-2.21.5/docs/Makefile.in 2010-07-22 17:58:44.786051764 +0200
+--- gtk+2.0-2.21.6.orig/docs/Makefile.in 2010-08-17 11:53:33.231998957 +0200
++++ gtk+2.0-2.21.6/docs/Makefile.in 2010-08-17 11:53:05.288996008 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs
@@ -14809,10 +13321,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/gdk/Makefile.in
+Index: gtk+2.0-2.21.6/docs/reference/gdk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/gdk/Makefile.in 2010-07-22 17:59:11.741060918 +0200
-+++ gtk+2.0-2.21.5/docs/reference/gdk/Makefile.in 2010-07-22 17:58:45.002055252 +0200
+--- gtk+2.0-2.21.6.orig/docs/reference/gdk/Makefile.in 2010-08-17 11:53:34.407998276 +0200
++++ gtk+2.0-2.21.6/docs/reference/gdk/Makefile.in 2010-08-17 11:53:05.552997706 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gdk
@@ -14846,10 +13358,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/gtk/Makefile.in
+Index: gtk+2.0-2.21.6/docs/reference/gtk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/gtk/Makefile.in 2010-07-22 17:59:13.962055058 +0200
-+++ gtk+2.0-2.21.5/docs/reference/gtk/Makefile.in 2010-07-22 17:58:45.114051124 +0200
+--- gtk+2.0-2.21.6.orig/docs/reference/gtk/Makefile.in 2010-08-17 11:53:36.544010530 +0200
++++ gtk+2.0-2.21.6/docs/reference/gtk/Makefile.in 2010-08-17 11:53:05.672996411 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gtk
@@ -14883,10 +13395,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/libgail-util/Makefile.in
+Index: gtk+2.0-2.21.6/docs/reference/libgail-util/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/libgail-util/Makefile.in 2010-07-22 17:59:10.961053605 +0200
-+++ gtk+2.0-2.21.5/docs/reference/libgail-util/Makefile.in 2010-07-22 17:58:45.194051167 +0200
+--- gtk+2.0-2.21.6.orig/docs/reference/libgail-util/Makefile.in 2010-08-17 11:53:33.659998737 +0200
++++ gtk+2.0-2.21.6/docs/reference/libgail-util/Makefile.in 2010-08-17 11:53:05.760997267 +0200
@@ -45,11 +45,14 @@
$(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make
subdir = docs/reference/libgail-util
@@ -14920,10 +13432,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/Makefile.in
+Index: gtk+2.0-2.21.6/docs/reference/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/Makefile.in 2010-07-22 17:59:14.061084683 +0200
-+++ gtk+2.0-2.21.5/docs/reference/Makefile.in 2010-07-22 17:58:44.918053382 +0200
+--- gtk+2.0-2.21.6.orig/docs/reference/Makefile.in 2010-08-17 11:53:36.644000475 +0200
++++ gtk+2.0-2.21.6/docs/reference/Makefile.in 2010-08-17 11:53:05.444996410 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
subdir = docs/reference
@@ -14957,10 +13469,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/tools/Makefile.in
+Index: gtk+2.0-2.21.6/docs/tools/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/tools/Makefile.in 2010-07-22 17:59:10.354054471 +0200
-+++ gtk+2.0-2.21.5/docs/tools/Makefile.in 2010-07-22 17:58:45.278052772 +0200
+--- gtk+2.0-2.21.6.orig/docs/tools/Makefile.in 2010-08-17 11:53:33.143997681 +0200
++++ gtk+2.0-2.21.6/docs/tools/Makefile.in 2010-08-17 11:53:05.848996509 +0200
@@ -41,11 +41,14 @@
@USE_X11_TRUE at noinst_PROGRAMS = doc-shooter$(EXEEXT)
subdir = docs/tools
@@ -14994,10 +13506,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/tutorial/Makefile.in
+Index: gtk+2.0-2.21.6/docs/tutorial/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/tutorial/Makefile.in 2010-07-22 17:59:14.685367311 +0200
-+++ gtk+2.0-2.21.5/docs/tutorial/Makefile.in 2010-07-22 17:58:45.350052495 +0200
+--- gtk+2.0-2.21.6.orig/docs/tutorial/Makefile.in 2010-08-17 11:53:37.272009979 +0200
++++ gtk+2.0-2.21.6/docs/tutorial/Makefile.in 2010-08-17 11:53:05.924996804 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/tutorial
@@ -15031,10 +13543,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/directfb/Makefile.in
+Index: gtk+2.0-2.21.6/gdk/directfb/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/directfb/Makefile.in 2010-07-22 17:59:05.690054680 +0200
-+++ gtk+2.0-2.21.5/gdk/directfb/Makefile.in 2010-07-22 17:58:45.602053020 +0200
+--- gtk+2.0-2.21.6.orig/gdk/directfb/Makefile.in 2010-08-17 11:53:28.392008808 +0200
++++ gtk+2.0-2.21.6/gdk/directfb/Makefile.in 2010-08-17 11:53:06.224995832 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
subdir = gdk/directfb
@@ -15068,12 +13580,12 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/Makefile.in
+Index: gtk+2.0-2.21.6/gdk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/Makefile.in 2010-07-22 17:59:05.594052457 +0200
-+++ gtk+2.0-2.21.5/gdk/Makefile.in 2010-07-22 17:58:45.510052218 +0200
-@@ -44,11 +44,14 @@
- @HAVE_INTROSPECTION_TRUE at am__append_2 = $(gir_DATA) $(typelibs_DATA)
+--- gtk+2.0-2.21.6.orig/gdk/Makefile.in 2010-08-17 11:53:28.240028248 +0200
++++ gtk+2.0-2.21.6/gdk/Makefile.in 2010-08-17 11:53:06.128996473 +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 \
@@ -15089,7 +13601,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -303,6 +306,7 @@
+@@ -304,6 +307,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -15097,7 +13609,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -453,6 +457,7 @@
+@@ -454,6 +458,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15105,10 +13617,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/quartz/Makefile.in
+Index: gtk+2.0-2.21.6/gdk/quartz/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/quartz/Makefile.in 2010-07-22 17:59:02.789054854 +0200
-+++ gtk+2.0-2.21.5/gdk/quartz/Makefile.in 2010-07-22 17:58:45.694051097 +0200
+--- gtk+2.0-2.21.6.orig/gdk/quartz/Makefile.in 2010-08-17 11:53:27.288010127 +0200
++++ gtk+2.0-2.21.6/gdk/quartz/Makefile.in 2010-08-17 11:53:06.320996233 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/quartz
@@ -15142,10 +13654,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/tests/Makefile.in
+Index: gtk+2.0-2.21.6/gdk/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/tests/Makefile.in 2010-07-22 17:59:04.493054578 +0200
-+++ gtk+2.0-2.21.5/gdk/tests/Makefile.in 2010-07-22 17:58:45.766051176 +0200
+--- gtk+2.0-2.21.6.orig/gdk/tests/Makefile.in 2010-08-17 11:53:28.007999036 +0200
++++ gtk+2.0-2.21.6/gdk/tests/Makefile.in 2010-08-17 11:53:06.396996530 +0200
@@ -41,11 +41,14 @@
TESTS = $(am__EXEEXT_1)
subdir = gdk/tests
@@ -15179,10 +13691,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/win32/Makefile.in
+Index: gtk+2.0-2.21.6/gdk/win32/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/win32/Makefile.in 2010-07-22 17:59:03.077052908 +0200
-+++ gtk+2.0-2.21.5/gdk/win32/Makefile.in 2010-07-22 17:58:45.870051964 +0200
+--- gtk+2.0-2.21.6.orig/gdk/win32/Makefile.in 2010-08-17 11:53:27.611998990 +0200
++++ gtk+2.0-2.21.6/gdk/win32/Makefile.in 2010-08-17 11:53:06.496996592 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32
@@ -15216,10 +13728,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/win32/rc/Makefile.in
+Index: gtk+2.0-2.21.6/gdk/win32/rc/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/win32/rc/Makefile.in 2010-07-22 17:59:02.941054548 +0200
-+++ gtk+2.0-2.21.5/gdk/win32/rc/Makefile.in 2010-07-22 17:58:45.938052290 +0200
+--- gtk+2.0-2.21.6.orig/gdk/win32/rc/Makefile.in 2010-08-17 11:53:27.420009508 +0200
++++ gtk+2.0-2.21.6/gdk/win32/rc/Makefile.in 2010-08-17 11:53:06.580996586 +0200
@@ -40,11 +40,14 @@
$(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32/rc
@@ -15253,10 +13765,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/x11/Makefile.in
+Index: gtk+2.0-2.21.6/gdk/x11/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/x11/Makefile.in 2010-07-22 17:59:03.381053422 +0200
-+++ gtk+2.0-2.21.5/gdk/x11/Makefile.in 2010-07-22 17:58:46.038052635 +0200
+--- gtk+2.0-2.21.6.orig/gdk/x11/Makefile.in 2010-08-17 11:53:27.871998732 +0200
++++ gtk+2.0-2.21.6/gdk/x11/Makefile.in 2010-08-17 11:53:06.684996890 +0200
@@ -46,11 +46,14 @@
TESTS = checksettings$(EXEEXT)
subdir = gdk/x11
@@ -15290,10 +13802,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gtk/Makefile.in
+Index: gtk+2.0-2.21.6/gtk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/Makefile.in 2010-07-22 17:59:08.357065817 +0200
-+++ gtk+2.0-2.21.5/gtk/Makefile.in 2010-07-22 17:58:46.370051614 +0200
+--- gtk+2.0-2.21.6.orig/gtk/Makefile.in 2010-08-17 11:53:31.141000163 +0200
++++ gtk+2.0-2.21.6/gtk/Makefile.in 2010-08-17 11:53:07.060997186 +0200
@@ -77,11 +77,14 @@
subdir = gtk
@@ -15363,13 +13875,13 @@
+ gtkcustompaperunixdialog.h gtkfilechooserdefault.h \
+ gtkfilechooserembed.h gtkfilechooserentry.h \
+ gtkfilechoosersettings.h gtkiconcache.h gtkintl.h gtkkeyhash.h \
- gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
- gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
- gtkrbtree.h gtkrecentchooserdefault.h \
-Index: gtk+2.0-2.21.5/gtk/tests/Makefile.in
+ 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.6/gtk/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/tests/Makefile.in 2010-07-22 17:59:08.097053712 +0200
-+++ gtk+2.0-2.21.5/gtk/tests/Makefile.in 2010-07-22 17:58:46.486051613 +0200
+--- gtk+2.0-2.21.6.orig/gtk/tests/Makefile.in 2010-08-17 11:53:30.872999488 +0200
++++ gtk+2.0-2.21.6/gtk/tests/Makefile.in 2010-08-17 11:53:07.184996680 +0200
@@ -42,11 +42,14 @@
@OS_UNIX_TRUE at am__append_1 = defaultvalue
subdir = gtk/tests
@@ -15403,10 +13915,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gtk/theme-bits/Makefile.in
+Index: gtk+2.0-2.21.6/gtk/theme-bits/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/theme-bits/Makefile.in 2010-07-22 17:59:06.969066211 +0200
-+++ gtk+2.0-2.21.5/gtk/theme-bits/Makefile.in 2010-07-22 17:58:46.582051036 +0200
+--- gtk+2.0-2.21.6.orig/gtk/theme-bits/Makefile.in 2010-08-17 11:53:29.699998587 +0200
++++ gtk+2.0-2.21.6/gtk/theme-bits/Makefile.in 2010-08-17 11:53:07.288996776 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = decompose-bits$(EXEEXT)
subdir = gtk/theme-bits
@@ -15440,10 +13952,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/ltmain.sh
+Index: gtk+2.0-2.21.6/ltmain.sh
===================================================================
---- gtk+2.0-2.21.5.orig/ltmain.sh 2010-07-22 17:59:02.037054460 +0200
-+++ gtk+2.0-2.21.5/ltmain.sh 2010-07-22 17:58:36.638055918 +0200
+--- gtk+2.0-2.21.6.orig/ltmain.sh 2010-08-17 11:53:26.756009690 +0200
++++ gtk+2.0-2.21.6/ltmain.sh 2010-08-17 11:52:53.388011937 +0200
@@ -1,10 +1,9 @@
# Generated from ltmain.m4sh.
@@ -18546,10 +17058,10 @@
esac
$ECHO > $output "\
# $outputname - a libtool library file
-Index: gtk+2.0-2.21.5/m4/gtk-doc.m4
+Index: gtk+2.0-2.21.6/m4/gtk-doc.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/gtk-doc.m4 2010-07-22 17:58:37.342052247 +0200
++++ gtk+2.0-2.21.6/m4/gtk-doc.m4 2010-08-17 11:52:54.308007151 +0200
@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
@@ -18612,10 +17124,10 @@
+ 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.5/m4/libtool.m4
+Index: gtk+2.0-2.21.6/m4/libtool.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/libtool.m4 2010-07-22 17:58:36.722054309 +0200
++++ gtk+2.0-2.21.6/m4/libtool.m4 2010-08-17 11:52:53.559998245 +0200
@@ -0,0 +1,7377 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -25994,10 +24506,10 @@
+ ;;
+ esac
+])
-Index: gtk+2.0-2.21.5/m4/lt~obsolete.m4
+Index: gtk+2.0-2.21.6/m4/lt~obsolete.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/lt~obsolete.m4 2010-07-22 17:58:37.094054446 +0200
++++ gtk+2.0-2.21.6/m4/lt~obsolete.m4 2010-08-17 11:52:54.048006637 +0200
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@@ -26091,10 +24603,10 @@
+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.5/m4/ltoptions.m4
+Index: gtk+2.0-2.21.6/m4/ltoptions.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/ltoptions.m4 2010-07-22 17:58:36.854053352 +0200
++++ gtk+2.0-2.21.6/m4/ltoptions.m4 2010-08-17 11:52:53.688003137 +0200
@@ -0,0 +1,368 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
@@ -26464,10 +24976,10 @@
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
-Index: gtk+2.0-2.21.5/m4/ltsugar.m4
+Index: gtk+2.0-2.21.6/m4/ltsugar.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/ltsugar.m4 2010-07-22 17:58:36.942056499 +0200
++++ gtk+2.0-2.21.6/m4/ltsugar.m4 2010-08-17 11:52:53.760006497 +0200
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@@ -26592,10 +25104,10 @@
+ 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.5/m4/ltversion.m4
+Index: gtk+2.0-2.21.6/m4/ltversion.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/ltversion.m4 2010-07-22 17:58:37.010052915 +0200
++++ gtk+2.0-2.21.6/m4/ltversion.m4 2010-08-17 11:52:53.951999393 +0200
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
@@ -26620,10 +25132,10 @@
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
-Index: gtk+2.0-2.21.5/m4macros/Makefile.in
+Index: gtk+2.0-2.21.6/m4macros/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/m4macros/Makefile.in 2010-07-22 17:59:02.117065331 +0200
-+++ gtk+2.0-2.21.5/m4macros/Makefile.in 2010-07-22 17:58:46.650050811 +0200
+--- gtk+2.0-2.21.6.orig/m4macros/Makefile.in 2010-08-17 11:53:26.811996555 +0200
++++ gtk+2.0-2.21.6/m4macros/Makefile.in 2010-08-17 11:53:07.360996497 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = m4macros
@@ -26657,10 +25169,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/Makefile.in
+Index: gtk+2.0-2.21.6/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/Makefile.in 2010-07-22 17:59:14.750052494 +0200
-+++ gtk+2.0-2.21.5/Makefile.in 2010-07-22 17:58:48.926051254 +0200
+--- gtk+2.0-2.21.6.orig/Makefile.in 2010-08-17 11:53:37.332006361 +0200
++++ gtk+2.0-2.21.6/Makefile.in 2010-08-17 11:53:10.072997035 +0200
@@ -45,17 +45,20 @@
$(srcdir)/gtk-zip.sh.in $(top_srcdir)/Makefile.decl \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
@@ -26723,10 +25235,10 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
-Index: gtk+2.0-2.21.5/mkinstalldirs
+Index: gtk+2.0-2.21.6/mkinstalldirs
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/mkinstalldirs 2010-07-22 17:58:48.878051861 +0200
++++ gtk+2.0-2.21.6/mkinstalldirs 2010-08-17 11:53:10.004999214 +0200
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -26890,10 +25402,10 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-Index: gtk+2.0-2.21.5/modules/engines/Makefile.in
+Index: gtk+2.0-2.21.6/modules/engines/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/Makefile.in 2010-07-22 17:58:59.382060735 +0200
-+++ gtk+2.0-2.21.5/modules/engines/Makefile.in 2010-07-22 17:58:46.794051384 +0200
+--- gtk+2.0-2.21.6.orig/modules/engines/Makefile.in 2010-08-17 11:53:24.380011046 +0200
++++ gtk+2.0-2.21.6/modules/engines/Makefile.in 2010-08-17 11:53:07.512996321 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines
@@ -26927,10 +25439,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Makefile.in
+Index: gtk+2.0-2.21.6/modules/engines/ms-windows/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Makefile.in 2010-07-22 17:58:59.833069875 +0200
-+++ gtk+2.0-2.21.5/modules/engines/ms-windows/Makefile.in 2010-07-22 17:58:46.882050834 +0200
+--- gtk+2.0-2.21.6.orig/modules/engines/ms-windows/Makefile.in 2010-08-17 11:53:24.588009339 +0200
++++ gtk+2.0-2.21.6/modules/engines/ms-windows/Makefile.in 2010-08-17 11:53:07.604995587 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows
@@ -26964,10 +25476,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+Index: gtk+2.0-2.21.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 17:58:59.625052638 +0200
-+++ gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 17:58:47.022050949 +0200
+--- gtk+2.0-2.21.6.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-08-17 11:53:24.444005418 +0200
++++ gtk+2.0-2.21.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-08-17 11:53:07.752996459 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows/Theme/gtk-2.0
@@ -27001,10 +25513,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/Makefile.in
+Index: gtk+2.0-2.21.6/modules/engines/ms-windows/Theme/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 17:58:59.702072908 +0200
-+++ gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 17:58:46.954051458 +0200
+--- gtk+2.0-2.21.6.orig/modules/engines/ms-windows/Theme/Makefile.in 2010-08-17 11:53:24.512009941 +0200
++++ gtk+2.0-2.21.6/modules/engines/ms-windows/Theme/Makefile.in 2010-08-17 11:53:07.676996221 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows/Theme
@@ -27038,10 +25550,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/pixbuf/Makefile.in
+Index: gtk+2.0-2.21.6/modules/engines/pixbuf/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/pixbuf/Makefile.in 2010-07-22 17:58:59.330054264 +0200
-+++ gtk+2.0-2.21.5/modules/engines/pixbuf/Makefile.in 2010-07-22 17:58:47.110052152 +0200
+--- gtk+2.0-2.21.6.orig/modules/engines/pixbuf/Makefile.in 2010-08-17 11:53:24.284009457 +0200
++++ gtk+2.0-2.21.6/modules/engines/pixbuf/Makefile.in 2010-08-17 11:53:07.844996350 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl ChangeLog
subdir = modules/engines/pixbuf
@@ -27075,10 +25587,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/input/Makefile.in
+Index: gtk+2.0-2.21.6/modules/input/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/input/Makefile.in 2010-07-22 17:58:59.949061219 +0200
-+++ gtk+2.0-2.21.5/modules/input/Makefile.in 2010-07-22 17:58:47.290050875 +0200
+--- gtk+2.0-2.21.6.orig/modules/input/Makefile.in 2010-08-17 11:53:24.723999328 +0200
++++ gtk+2.0-2.21.6/modules/input/Makefile.in 2010-08-17 11:53:08.088998093 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/input
@@ -27122,7 +25634,7 @@
@CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
@BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
@BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
-@@ -1245,7 +1251,18 @@
+@@ -1249,7 +1255,18 @@
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -27142,10 +25654,10 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
-Index: gtk+2.0-2.21.5/modules/Makefile.in
+Index: gtk+2.0-2.21.6/modules/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/Makefile.in 2010-07-22 17:59:01.246053515 +0200
-+++ gtk+2.0-2.21.5/modules/Makefile.in 2010-07-22 17:58:46.722050609 +0200
+--- gtk+2.0-2.21.6.orig/modules/Makefile.in 2010-08-17 11:53:25.979998619 +0200
++++ gtk+2.0-2.21.6/modules/Makefile.in 2010-08-17 11:53:07.436996372 +0200
@@ -40,11 +40,14 @@
@OS_UNIX_TRUE at am__append_1 = printbackends
subdir = modules
@@ -27179,10 +25691,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/gail/libgail-util/Makefile.in
+Index: gtk+2.0-2.21.6/modules/other/gail/libgail-util/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/gail/libgail-util/Makefile.in 2010-07-22 17:59:00.077053466 +0200
-+++ gtk+2.0-2.21.5/modules/other/gail/libgail-util/Makefile.in 2010-07-22 17:58:47.802051353 +0200
+--- gtk+2.0-2.21.6.orig/modules/other/gail/libgail-util/Makefile.in 2010-08-17 11:53:24.876010689 +0200
++++ gtk+2.0-2.21.6/modules/other/gail/libgail-util/Makefile.in 2010-08-17 11:53:08.636996512 +0200
@@ -42,11 +42,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/other/gail/libgail-util
@@ -27216,10 +25728,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/gail/Makefile.in
+Index: gtk+2.0-2.21.6/modules/other/gail/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/gail/Makefile.in 2010-07-22 17:59:00.529053303 +0200
-+++ gtk+2.0-2.21.5/modules/other/gail/Makefile.in 2010-07-22 17:58:47.682051386 +0200
+--- gtk+2.0-2.21.6.orig/modules/other/gail/Makefile.in 2010-08-17 11:53:25.352009180 +0200
++++ gtk+2.0-2.21.6/modules/other/gail/Makefile.in 2010-08-17 11:53:08.524996799 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
subdir = modules/other/gail
@@ -27253,10 +25765,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/gail/tests/Makefile.in
+Index: gtk+2.0-2.21.6/modules/other/gail/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/gail/tests/Makefile.in 2010-07-22 17:59:00.445054155 +0200
-+++ gtk+2.0-2.21.5/modules/other/gail/tests/Makefile.in 2010-07-22 17:58:47.938051731 +0200
+--- gtk+2.0-2.21.6.orig/modules/other/gail/tests/Makefile.in 2010-08-17 11:53:25.232010197 +0200
++++ gtk+2.0-2.21.6/modules/other/gail/tests/Makefile.in 2010-08-17 11:53:08.800996974 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/other/gail/tests
@@ -27290,10 +25802,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/Makefile.in
+Index: gtk+2.0-2.21.6/modules/other/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/Makefile.in 2010-07-22 17:59:00.609053559 +0200
-+++ gtk+2.0-2.21.5/modules/other/Makefile.in 2010-07-22 17:58:47.378051234 +0200
+--- gtk+2.0-2.21.6.orig/modules/other/Makefile.in 2010-08-17 11:53:25.435998547 +0200
++++ gtk+2.0-2.21.6/modules/other/Makefile.in 2010-08-17 11:53:08.180996730 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/other
@@ -27327,10 +25839,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/cups/Makefile.in
+Index: gtk+2.0-2.21.6/modules/printbackends/cups/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/cups/Makefile.in 2010-07-22 17:59:00.825065031 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/cups/Makefile.in 2010-07-22 17:58:48.102051344 +0200
+--- gtk+2.0-2.21.6.orig/modules/printbackends/cups/Makefile.in 2010-08-17 11:53:25.779999537 +0200
++++ gtk+2.0-2.21.6/modules/printbackends/cups/Makefile.in 2010-08-17 11:53:09.008996301 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/cups
@@ -27364,10 +25876,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/file/Makefile.in
+Index: gtk+2.0-2.21.6/modules/printbackends/file/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/file/Makefile.in 2010-07-22 17:59:00.733053473 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/file/Makefile.in 2010-07-22 17:58:48.194051237 +0200
+--- gtk+2.0-2.21.6.orig/modules/printbackends/file/Makefile.in 2010-08-17 11:53:25.692010694 +0200
++++ gtk+2.0-2.21.6/modules/printbackends/file/Makefile.in 2010-08-17 11:53:09.128996613 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/file
@@ -27401,10 +25913,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/lpr/Makefile.in
+Index: gtk+2.0-2.21.6/modules/printbackends/lpr/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/lpr/Makefile.in 2010-07-22 17:59:00.961064010 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/lpr/Makefile.in 2010-07-22 17:58:48.282051255 +0200
+--- gtk+2.0-2.21.6.orig/modules/printbackends/lpr/Makefile.in 2010-08-17 11:53:25.896009460 +0200
++++ gtk+2.0-2.21.6/modules/printbackends/lpr/Makefile.in 2010-08-17 11:53:09.231997491 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/lpr
@@ -27438,10 +25950,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/Makefile.in
+Index: gtk+2.0-2.21.6/modules/printbackends/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/Makefile.in 2010-07-22 17:59:01.189054714 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/Makefile.in 2010-07-22 17:58:48.010051031 +0200
+--- gtk+2.0-2.21.6.orig/modules/printbackends/Makefile.in 2010-08-17 11:53:25.939996540 +0200
++++ gtk+2.0-2.21.6/modules/printbackends/Makefile.in 2010-08-17 11:53:08.888996353 +0200
@@ -42,11 +42,14 @@
@HAVE_PAPI_TRUE at am__append_3 = papi
subdir = modules/printbackends
@@ -27475,10 +25987,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/papi/Makefile.in
+Index: gtk+2.0-2.21.6/modules/printbackends/papi/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/papi/Makefile.in 2010-07-22 17:59:00.889053119 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/papi/Makefile.in 2010-07-22 17:58:48.370051195 +0200
+--- gtk+2.0-2.21.6.orig/modules/printbackends/papi/Makefile.in 2010-08-17 11:53:25.840004929 +0200
++++ gtk+2.0-2.21.6/modules/printbackends/papi/Makefile.in 2010-08-17 11:53:09.343998249 +0200
@@ -39,11 +39,14 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -27512,10 +26024,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/test/Makefile.in
+Index: gtk+2.0-2.21.6/modules/printbackends/test/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/test/Makefile.in 2010-07-22 17:59:00.669063840 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/test/Makefile.in 2010-07-22 17:58:48.462051287 +0200
+--- gtk+2.0-2.21.6.orig/modules/printbackends/test/Makefile.in 2010-08-17 11:53:25.560999208 +0200
++++ gtk+2.0-2.21.6/modules/printbackends/test/Makefile.in 2010-08-17 11:53:09.495998071 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/test
@@ -27549,10 +26061,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/perf/Makefile.in
+Index: gtk+2.0-2.21.6/perf/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/perf/Makefile.in 2010-07-22 17:59:14.882053698 +0200
-+++ gtk+2.0-2.21.5/perf/Makefile.in 2010-07-22 17:58:48.550051158 +0200
+--- gtk+2.0-2.21.6.orig/perf/Makefile.in 2010-08-17 11:53:37.479996247 +0200
++++ gtk+2.0-2.21.6/perf/Makefile.in 2010-08-17 11:53:09.600997732 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = testperf$(EXEEXT)
subdir = perf
@@ -27586,10 +26098,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/po/Makefile.in.in
+Index: gtk+2.0-2.21.6/po/Makefile.in.in
===================================================================
---- gtk+2.0-2.21.5.orig/po/Makefile.in.in 2010-07-22 17:59:01.753053846 +0200
-+++ gtk+2.0-2.21.5/po/Makefile.in.in 2010-07-22 17:58:37.318052549 +0200
+--- gtk+2.0-2.21.6.orig/po/Makefile.in.in 2010-08-17 11:53:26.435998548 +0200
++++ gtk+2.0-2.21.6/po/Makefile.in.in 2010-08-17 11:52:54.259997488 +0200
@@ -25,23 +25,23 @@
prefix = @prefix@
@@ -27704,10 +26216,10 @@
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
-Index: gtk+2.0-2.21.5/tests/Makefile.in
+Index: gtk+2.0-2.21.6/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/tests/Makefile.in 2010-07-22 17:59:10.197053365 +0200
-+++ gtk+2.0-2.21.5/tests/Makefile.in 2010-07-22 17:58:48.782052093 +0200
+--- gtk+2.0-2.21.6.orig/tests/Makefile.in 2010-08-17 11:53:33.068010997 +0200
++++ gtk+2.0-2.21.6/tests/Makefile.in 2010-08-17 11:53:09.876996294 +0200
@@ -73,11 +73,14 @@
@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE at am__append_2 = -DHAVE_OBJC=1 -x objective-c++
subdir = tests
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=24988&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Tue Aug 17 09:55:08 2010
@@ -53,7 +53,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.21.5
+SHVER := 2.21.6
# 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